summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/kmess/ChangeLog7
-rw-r--r--net-im/kmess/Manifest10
-rw-r--r--net-im/kmess/files/kmess-2.0_beta2-fix-broken-RPATH.patch12
-rw-r--r--net-im/kmess/files/kmess-9999-fix-broken-RPATH.patch13
-rw-r--r--net-im/kmess/kmess-2.0_beta2.ebuild28
-rw-r--r--net-im/kmess/kmess-9999.ebuild23
-rw-r--r--net-im/kmess/metadata.xml5
7 files changed, 77 insertions, 21 deletions
diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index 6566b7e7bdb..2fc56c5cf01 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ kmess-2.0_beta2.ebuild, +files/kmess-2.0_beta2-fix-broken-RPATH.patch,
+ kmess-9999.ebuild, +files/kmess-9999-fix-broken-RPATH.patch:
+ Fixed libkonq/giflib automagic deps, screensaver support optional via USE
+ flag, fixed build, removed obsolete src_prepare,
+ fixed broken RPATH.
+
*kmess-2.0_beta2 (19 May 2009)
19 May 2009; Markos Chandras <hwoarang@gentoo.org>
diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest
index c4f1cea4dab..999a0269adb 100644
--- a/net-im/kmess/Manifest
+++ b/net-im/kmess/Manifest
@@ -1,5 +1,7 @@
+AUX kmess-2.0_beta2-fix-broken-RPATH.patch 544 RMD160 8564c95e360f2bba65423651841d58674e919583 SHA1 305f7f567a27bec21962f6dca18df6ccb52fb162 SHA256 79b9b8955de74c3128b298eea281a01d1c43baa328985d0142806c4e0f443db6
+AUX kmess-9999-fix-broken-RPATH.patch 442 RMD160 3a0854f82d35e6b5d123b376f1cd667905253245 SHA1 2f866340becaa2451cedc142a86db255debcc17e SHA256 9461447b9c8e04b4d3d6e7037485712faedaa6fa023fb6da0c7baf673583a599
DIST kmess-2.0beta2.tar.gz 3692238 RMD160 e0d16e577dfa823894eaea2dac7bb337d10453f3 SHA1 c3b447b14718f58e7cd23fdc42d20ff64d9b9fa3 SHA256 13b64ff5f312ecff91c24672cf7dc7ab8a4521d3752903257e34a752d29676d0
-EBUILD kmess-2.0_beta2.ebuild 1082 RMD160 998495ea42c51474c729be4e98484398367ae725 SHA1 3b657c47fae9855c7c70ce289e47cd468fadcb5e SHA256 55c6763508a39f4f13cbbddeff33f4aa16cc2a151b7b3d3170f3ef1c5f39cfb3
-EBUILD kmess-9999.ebuild 1268 RMD160 cd58f78c52baf376f328e274a572f9d19c04e369 SHA1 e30d1f4952c8153bb299f692f7fb054ca53c7ec6 SHA256 dfc0b2b546095565ac90848a64149d799431a862d5c528a43aa3047e9440a322
-MISC ChangeLog 1089 RMD160 4b818e1644bba96c557f74013e42820b1000d7eb SHA1 daa9358001b83d69cfcd34be7a972f0581f8a910 SHA256 fc28cbedc074bbc88e2b9b2aa054ab3128cdd38a623d162e8530f1715aa8fab3
-MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
+EBUILD kmess-2.0_beta2.ebuild 1374 RMD160 fec475dd2369533896c9a8188d65e8b96838138a SHA1 2f26fa43ded8fd451acfd08e5934f5839ac63b59 SHA256 f68b1930d0e772cce8dae78acff97377770028aa9e9c19b81420f11011febe97
+EBUILD kmess-9999.ebuild 1547 RMD160 e9a73d80aa66b0d9344fe6ea26c200c3e76f5640 SHA1 1b7546271bbbced617671a15f456e57f25b7cdd5 SHA256 7d0d421b282354ce139cf6d98ec1cd13a7adad370255a768f2ff041fc290d982
+MISC ChangeLog 1440 RMD160 05f3cf38ea061bbb1e16f978e30e4c42f95aeeef SHA1 6ad07ab27c42ab2c16a9ae9ac19639b8410cee0f SHA256 a8c0e679547c4323ffbfe7382cbf2bd9083f03c00356fed6021866b77a94fa6a
+MISC metadata.xml 443 RMD160 babae4b6cb135bc35df363e7106d9adbaae3acd6 SHA1 005713f02fe125b963552c18f75145d4a0242efb SHA256 66e9d89ee66055b6acfc8cc04b71f825ed218ac77812f6d299e38b80f750fa28
diff --git a/net-im/kmess/files/kmess-2.0_beta2-fix-broken-RPATH.patch b/net-im/kmess/files/kmess-2.0_beta2-fix-broken-RPATH.patch
new file mode 100644
index 00000000000..f6228adc8ba
--- /dev/null
+++ b/net-im/kmess/files/kmess-2.0_beta2-fix-broken-RPATH.patch
@@ -0,0 +1,12 @@
+diff -ru ../kmess-old/src/utils/kmess-send/CMakeLists.txt ./src/utils/kmess-send/CMakeLists.txt
+--- ../kmess-old/src/utils/kmess-send/CMakeLists.txt 2009-05-10 23:53:09.000000000 +0200
++++ ./src/utils/kmess-send/CMakeLists.txt 2009-05-19 19:40:55.619404139 +0200
+@@ -12,8 +12,6 @@
+ ../../contact/msnstatus.cpp
+ )
+
+-LINK_DIRECTORIES( kmesssendpluginlib )
+-
+ KDE4_ADD_PLUGIN( kmesssendplugin WITH_PREFIX ${kmesssendplugin_SOURCES} )
+
+ TARGET_LINK_LIBRARIES( kmesssendplugin kmesssendpluginlib konq ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} )
diff --git a/net-im/kmess/files/kmess-9999-fix-broken-RPATH.patch b/net-im/kmess/files/kmess-9999-fix-broken-RPATH.patch
new file mode 100644
index 00000000000..e600610dc81
--- /dev/null
+++ b/net-im/kmess/files/kmess-9999-fix-broken-RPATH.patch
@@ -0,0 +1,13 @@
+Index: src/utils/kmess-send/CMakeLists.txt
+===================================================================
+--- src/utils/kmess-send/CMakeLists.txt (revision 4848)
++++ src/utils/kmess-send/CMakeLists.txt (working copy)
+@@ -12,8 +12,6 @@
+ ../../contact/msnstatus.cpp
+ )
+
+-
+-LINK_DIRECTORIES( kmesssendpluginlib )
+ ADD_DEPENDENCIES( kmesssendpluginlib kmess )
+
+ KDE4_ADD_PLUGIN( kmesssendplugin WITH_PREFIX ${kmesssendplugin_SOURCES} )
diff --git a/net-im/kmess/kmess-2.0_beta2.ebuild b/net-im/kmess/kmess-2.0_beta2.ebuild
index 5574d8ba221..f86efb17002 100644
--- a/net-im/kmess/kmess-2.0_beta2.ebuild
+++ b/net-im/kmess/kmess-2.0_beta2.ebuild
@@ -6,9 +6,10 @@ EAPI="2"
KDE_MINIMAL="4.2"
KDE_LINGUAS="ar ca da de el es et fi fr hu it ko nb nl pt_BR sk sl sv th tr zh_CN zh_TW"
-inherit kde4-base versionator
+inherit kde4-base
MY_P="${P/_/}"
+
DESCRIPTION="KMess is an alternative MSN Messenger chat client for Linux"
HOMEPAGE="http://www.kmess.org"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -16,27 +17,36 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="4"
-IUSE="debug"
+IUSE="debug gif konqueror xscreensaver"
COMMONDEPEND="
app-crypt/qca:2
- app-crypt/qca-ossl
+ app-crypt/qca-ossl:2
dev-libs/libxml2
dev-libs/libxslt
- x11-libs/libXScrnSaver
+ gif? ( media-libs/giflib )
+ konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+ xscreensaver? ( x11-libs/libXScrnSaver )
"
DEPEND="${COMMONDEPEND}
- x11-proto/scrnsaverproto
+ xscreensaver? ( x11-proto/scrnsaverproto )
"
RDEPEND="${COMMONDEPEND}
!kdeprefix? ( !net-im/kmess:0 )
+ konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
"
-src_prepare() {
- sed -i -e '/MACRO_LOG_FEATURE( QCA2_OSSL_PLUGIN_FOUND.*$/,/^.*t=3100" )/d' \
- CMakeLists.txt || die "failed to patch CMakeLists.txt"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-broken-RPATH.patch" )
+
+src_configure() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_with gif GIF)
+ $(cmake-utils_use_with konqueror LibKonq)
+ $(cmake-utils_use_want xscreensaver XSCREENSAVER)"
- kde4-base_src_prepare
+ kde4-base_src_configure
}
pkg_postinst() {
diff --git a/net-im/kmess/kmess-9999.ebuild b/net-im/kmess/kmess-9999.ebuild
index 59ee9cefd74..5bd2996df0c 100644
--- a/net-im/kmess/kmess-9999.ebuild
+++ b/net-im/kmess/kmess-9999.ebuild
@@ -16,22 +16,27 @@ ESVN_PROJECT="kmess"
LICENSE="GPL-2"
KEYWORDS=""
SLOT="4"
-IUSE="debug"
+IUSE="debug gif konqueror xscreensaver"
COMMONDEPEND="
app-crypt/qca:2
- app-crypt/qca-ossl
+ app-crypt/qca-ossl:2
dev-libs/libxml2
dev-libs/libxslt
- x11-libs/libXScrnSaver
+ gif? ( media-libs/giflib )
+ konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
+ xscreensaver? ( x11-libs/libXScrnSaver )
"
DEPEND="${COMMONDEPEND}
- x11-proto/scrnsaverproto
+ xscreensaver? ( x11-proto/scrnsaverproto )
"
RDEPEND="${COMMONDEPEND}
!kdeprefix? ( !net-im/kmess:0 )
+ konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
"
+PATCHES=( "${FILESDIR}/${P}-fix-broken-RPATH.patch" )
+
src_unpack() {
kde4-base_src_unpack
@@ -39,11 +44,13 @@ src_unpack() {
|| ewarn "SVN revision information will not be available."
}
-src_prepare() {
- sed -i -e '/MACRO_LOG_FEATURE( QCA2_OSSL_PLUGIN_FOUND.*$/,/^.*t=3100" )/d' \
- CMakeLists.txt || die "failed to patch CMakeLists.txt"
+src_configure() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_with gif GIF)
+ $(cmake-utils_use_with konqueror LibKonq)
+ $(cmake-utils_use_want xscreensaver XSCREENSAVER)"
- kde4-base_src_prepare
+ kde4-base_src_configure
}
pkg_postinst() {
diff --git a/net-im/kmess/metadata.xml b/net-im/kmess/metadata.xml
index 8d36d5b01cd..bcad863b610 100644
--- a/net-im/kmess/metadata.xml
+++ b/net-im/kmess/metadata.xml
@@ -2,4 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
+ <use>
+ <flag name="gif">Enables sending of handwriting, using <pkg>media-libs/giflib</pkg>.</flag>
+ <flag name="konqueror">Enable context menu integration for <pkg>kde-base/konqueror</pkg>.</flag>
+ <flag name="xscreensaver">Enable auto-away support via XScreenSaver.</flag>
+ </use>
</pkgmetadata>