summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-01-04 15:04:42 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2009-01-04 15:04:42 +0100
commite3a863a07023c7f78ca682c85e66dbb310d7d35a (patch)
tree4c03725ec56f4c770ce11bccf11fbdb11ce61793
parentc2ff72853a544d5112de5eb5934b58424fff3633 (diff)
downloadkde-e3a863a07023c7f78ca682c85e66dbb310d7d35a.tar.gz
kde-e3a863a07023c7f78ca682c85e66dbb310d7d35a.tar.bz2
kde-e3a863a07023c7f78ca682c85e66dbb310d7d35a.zip
Fixup all mess in kopete, thanks to devurandom.
-rw-r--r--kde-base/kopete/Manifest2
-rw-r--r--kde-base/kopete/kopete-4.1.87.ebuild33
2 files changed, 17 insertions, 18 deletions
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 55213cd8e42..5e25df32a04 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,6 @@
DIST kdenetwork-4.1.85.tar.bz2 7515098 RMD160 f8407db14ce4b5187a2cf012c3a5c9cefd53fe50 SHA1 db36cb9badf6f2c3bfdfa57aa72e0a461a00dbdc SHA256 ff1cd8b72b7277dfdd018fa612161c12fec82feb7b396b018686ae4eddb39c35
DIST kdenetwork-4.1.87.tar.bz2 7517545 RMD160 257e8901a8f3b29e9c8e792f0a762c1613b546e7 SHA1 d773cd9357cc74ba62cc6147b0b958eb387f6778 SHA256 697cafc57c91e710d31043ed88095760552d6f82a5c2abd27af29bbbc2d18d60
EBUILD kopete-4.1.85.ebuild 3499 RMD160 a4a2f180c61723a33933783fffd53d3608935077 SHA1 2ccd5a4c096be6cf95610221ff54c977f4b0c5d0 SHA256 7afc79310f77692b92aa99dfca5beacf3e844a6b9be410a916ea7fd6154a4ed4
-EBUILD kopete-4.1.87.ebuild 3418 RMD160 73327c1947456becffacdfa2931b562adbbc9f18 SHA1 bb629ca002a1746e79fcd9026a91c9d78014f921 SHA256 10ef933c1ca8150dabd3c76bf43a24263a305ff2922346fc2290cd548a6606f1
+EBUILD kopete-4.1.87.ebuild 3346 RMD160 6c0d2e9372cde0916dd9d7d961acfdefcf3ea86e SHA1 53179ca7f7897382380b8f4c786c9099e320cf39 SHA256 106a75fe88af34e220109a63a7efdaf034c9b333f28424996dd1dba455b85b9b
MISC ChangeLog 3354 RMD160 da299cbef9e2fe8ef8182028ec5c38c04650d838 SHA1 94289815f6c8daa35c910d999ae1f70064da89ed SHA256 149848e78a8a948062b6a65c1414242899aee6241786fcda3d0194e752631933
MISC metadata.xml 2757 RMD160 f457dce40f26718ca207eaf9e652526ab1220e28 SHA1 bf1be31a903d422445393de48124ea1894ed8b6e SHA256 187d383c288460ea47b32bd45c31b50803a65189e92114260e9bdea03d9d8c15
diff --git a/kde-base/kopete/kopete-4.1.87.ebuild b/kde-base/kopete/kopete-4.1.87.ebuild
index f913aa1be34..3573f9b61cb 100644
--- a/kde-base/kopete/kopete-4.1.87.ebuild
+++ b/kde-base/kopete/kopete-4.1.87.ebuild
@@ -51,8 +51,12 @@ PLUGINS="+addbookmarks +alias +autoreplace +contactnotes +highlight +history lat
# winpopup: NO DEPS
# wlm: libmsn
# yahoo: NO DEPS
-PROTOCOLS="bonjour gadu groupwise irc +jabber meanwhile messenger msn oscar qq
-testbed telepathy winpopup wlm yahoo"
+PROTOCOLS="bonjour gadu groupwise +jabber meanwhile messenger msn oscar qq
+testbed winpopup wlm yahoo"
+
+# disabled protocols
+# telepathy: net-libs/decibel
+# irc: NO DEPS
IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -67,7 +71,6 @@ COMMONDEPEND="dev-libs/libpcre
net-dns/libidn
app-crypt/qca:2
jingle? (
- net-libs/libjingle
>=net-libs/ortp-0.13
>=media-libs/speex-1.2_rc1
)
@@ -80,8 +83,8 @@ COMMONDEPEND="dev-libs/libpcre
wlm? ( net-libs/libmsn )"
RDEPEND="${COMMONDEPEND}
- latex? ( virtual/latex-base )
- telepathy? ( net-libs/decibel )"
+ latex? ( virtual/latex-base )"
+# telepathy? ( net-libs/decibel )"
DEPEND="${COMMONDEPEND}
x11-proto/scrnsaverproto"
@@ -94,15 +97,11 @@ src_configure() {
mycmakeargs="${mycmakeargs} -DWITH_Xmms=OFF"
# enable protocols
for x in ${PROTOCOLS}; do
- if [[ $x = irc ]]; then
- elog "IRC is not working yet so I only show this info instead of compiling it. Sorry"
- else
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x})"
- fi
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})"
done
# enable plugins
for x in ${PLUGINS}; do
- mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x})"
+ mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})"
done
# additional defines
if use jingle && ! use jabber; then
@@ -116,13 +115,13 @@ src_configure() {
}
pkg_postinst() {
- if use telepathy; then
- elog "To use kopete telepathy plugins, you need to start gabble first:"
- elog "GABBLE_PERSIST=1 telepathy-gabble &"
- elog "export TELEPATHY_DATA_PATH=/usr/share/telepathy/managers/"
- fi
+ #if use telepathy; then
+ # elog "To use kopete telepathy plugins, you need to start gabble first:"
+ # elog "GABBLE_PERSIST=1 telepathy-gabble &"
+ # elog "export TELEPATHY_DATA_PATH=/usr/share/telepathy/managers/"
+ #fi
if ! use ssl; then
- if use jabber || use messenger || use irc; then
+ if use jabber || use messenger; then # || use irc; then
echo
elog "In order to use ssl in jabber, messenger and irc you'll need to"
elog "install app-crypt/qca-ossl package."