From 9dbda1124e2d2e2609aed91af22c573d38f74eb5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 24 Nov 2006 03:16:46 +0000 Subject: [PATCH] Cleanup old versions Package-Manager: portage-2.1.1-r2 --- net-im/gaim/Manifest | 56 +--- net-im/gaim/files/digest-gaim-2.0.0_beta4 | 3 - net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 | 3 - net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 | 3 - .../files/gaim-2.0.0_beta3-as-needed.patch | 11 - .../files/gaim-2.0.0_beta3-avahi-compat.patch | 30 --- .../gaim/files/gaim-2.0.0_beta3-dbus-1.patch | 73 ------ .../files/gaim-2.0.0_beta4-configure.patch | 79 ------ net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch | 62 ----- net-im/gaim/gaim-2.0.0_beta4-r1.ebuild | 239 ----------------- net-im/gaim/gaim-2.0.0_beta4-r2.ebuild | 242 ------------------ net-im/gaim/gaim-2.0.0_beta4.ebuild | 237 ----------------- 12 files changed, 7 insertions(+), 1031 deletions(-) delete mode 100644 net-im/gaim/files/digest-gaim-2.0.0_beta4 delete mode 100644 net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 delete mode 100644 net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 delete mode 100644 net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch delete mode 100644 net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch delete mode 100644 net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch delete mode 100644 net-im/gaim/files/gaim-2.0.0_beta4-configure.patch delete mode 100644 net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch delete mode 100644 net-im/gaim/gaim-2.0.0_beta4-r1.ebuild delete mode 100644 net-im/gaim/gaim-2.0.0_beta4-r2.ebuild delete mode 100644 net-im/gaim/gaim-2.0.0_beta4.ebuild diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 4ff75e792b33..34474bda1520 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -5,57 +5,24 @@ AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f S MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 files/gaim-0.76-xinput.patch 644 -AUX gaim-2.0.0_beta3-as-needed.patch 401 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 SHA1 21416ead465dd22ae0c9b3005656ff4e00e3405e SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 -MD5 5b872a7214f3650a286c300a7511cc94 files/gaim-2.0.0_beta3-as-needed.patch 401 -RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 files/gaim-2.0.0_beta3-as-needed.patch 401 -SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 files/gaim-2.0.0_beta3-as-needed.patch 401 -AUX gaim-2.0.0_beta3-avahi-compat.patch 977 RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 SHA1 a7e7117ce866fb1ef277fb6048bc8b27adf36c4d SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 -MD5 ebb905b4a73583eaa4b68c022beb110f files/gaim-2.0.0_beta3-avahi-compat.patch 977 -RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 files/gaim-2.0.0_beta3-avahi-compat.patch 977 -SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 files/gaim-2.0.0_beta3-avahi-compat.patch 977 -AUX gaim-2.0.0_beta3-dbus-1.patch 2845 RMD160 8a16ba09713a28a93fce789c9daa98f12fdb533c SHA1 f220de23b96d0e833826bd337d515eb85cd9e86f SHA256 886e5918f1cdddf172e9db52c049d7571dc1bb277faa75d154c78a0ef658e447 -MD5 fe24d2f46894db059e7f41e48a6789c3 files/gaim-2.0.0_beta3-dbus-1.patch 2845 -RMD160 8a16ba09713a28a93fce789c9daa98f12fdb533c files/gaim-2.0.0_beta3-dbus-1.patch 2845 -SHA256 886e5918f1cdddf172e9db52c049d7571dc1bb277faa75d154c78a0ef658e447 files/gaim-2.0.0_beta3-dbus-1.patch 2845 -AUX gaim-2.0.0_beta4-configure.patch 3324 RMD160 f634d925e82eb6bce95409c69d35ca1ee01d6d0e SHA1 7706fea880c0aef907b166c174a45f4649a15363 SHA256 4a4a0e821503736462c93748bc0af5ea58663fd36592d66ab663ca1b27985415 -MD5 844c0f8e20c7cd246335b326f4d2d80e files/gaim-2.0.0_beta4-configure.patch 3324 -RMD160 f634d925e82eb6bce95409c69d35ca1ee01d6d0e files/gaim-2.0.0_beta4-configure.patch 3324 -SHA256 4a4a0e821503736462c93748bc0af5ea58663fd36592d66ab663ca1b27985415 files/gaim-2.0.0_beta4-configure.patch 3324 -AUX gaim-2.0.0_beta4-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd -MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta4-dbus.patch 2347 -RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta4-dbus.patch 2347 -SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta4-dbus.patch 2347 AUX gaim-2.0.0_beta5-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta5-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta5-dbus.patch 2347 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta5-dbus.patch 2347 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa -DIST gaim-2.0.0beta4.tar.bz2 6298151 RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 SHA1 c4aaa9417d897e38c630699eb76c5f26e4a54881 SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 DIST gaim-2.0.0beta5.tar.bz2 6489271 RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 SHA1 cc897b656b933c60d9557df7f6dfdffc913fb6b6 SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SHA1 6168859d926d724e236b0906fd8ed41536cd0f1e SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993 -EBUILD gaim-2.0.0_beta4-r1.ebuild 6625 RMD160 6d4157be8c515ddd97f3047af4a7b7437170524a SHA1 4ed945251ff03bb59e5609dede31573771d868ae SHA256 02a86689ba88481cfaeb244c9dd1b4427d35c2e03baa7169ba5ea5c43348ad97 -MD5 a5c3a0b600e7479a7e7b6ec0067752db gaim-2.0.0_beta4-r1.ebuild 6625 -RMD160 6d4157be8c515ddd97f3047af4a7b7437170524a gaim-2.0.0_beta4-r1.ebuild 6625 -SHA256 02a86689ba88481cfaeb244c9dd1b4427d35c2e03baa7169ba5ea5c43348ad97 gaim-2.0.0_beta4-r1.ebuild 6625 -EBUILD gaim-2.0.0_beta4-r2.ebuild 6684 RMD160 750addc8e7552cdeb6f0fff184ce6748e0d63593 SHA1 abdacd8cfe64bb766a4f44a2bdc47d4f75686bd6 SHA256 05cfc6afb301f9142b2c01197c166706c12ebe22ea366ec44cd43922f2980bc6 -MD5 6c2abcc4356e0878b41bd191d1b856a7 gaim-2.0.0_beta4-r2.ebuild 6684 -RMD160 750addc8e7552cdeb6f0fff184ce6748e0d63593 gaim-2.0.0_beta4-r2.ebuild 6684 -SHA256 05cfc6afb301f9142b2c01197c166706c12ebe22ea366ec44cd43922f2980bc6 gaim-2.0.0_beta4-r2.ebuild 6684 -EBUILD gaim-2.0.0_beta4.ebuild 6517 RMD160 89e88a5247b8fb36063a2f3dbd0ca5e619a5889c SHA1 aa20ee4de2770edc98b051f2c11cc40c03fa9e98 SHA256 0936b788134ffe122c00528f070283e278ecf517d07cd441af9260644018a171 -MD5 92201d8baf53afdda09be61bbbf6d313 gaim-2.0.0_beta4.ebuild 6517 -RMD160 89e88a5247b8fb36063a2f3dbd0ca5e619a5889c gaim-2.0.0_beta4.ebuild 6517 -SHA256 0936b788134ffe122c00528f070283e278ecf517d07cd441af9260644018a171 gaim-2.0.0_beta4.ebuild 6517 EBUILD gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 SHA1 458ecd9a30437695f7456c509cdfde4cf128dbde SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c MD5 e5879ae6ca7137a352a5d6f5a8376bd9 gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 gaim-2.0.0_beta5.ebuild 6633 SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c gaim-2.0.0_beta5.ebuild 6633 -MISC ChangeLog 61478 RMD160 d6f33b5e05d36f1cbf6271afb9d29c52e85c0298 SHA1 aea6bb87dc9ea99a70d7a28ad509629478eeb4ea SHA256 52ccf5b297985050be8cc2eb5aca041fe9ccbe28a03372da0b6d054c91188a0c -MD5 0b1f4b92fb10d796eba1afa1c58afa00 ChangeLog 61478 -RMD160 d6f33b5e05d36f1cbf6271afb9d29c52e85c0298 ChangeLog 61478 -SHA256 52ccf5b297985050be8cc2eb5aca041fe9ccbe28a03372da0b6d054c91188a0c ChangeLog 61478 +MISC ChangeLog 61848 RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 SHA1 f04e12b57ea0d459d3af2fb1ffef9a296992db5b SHA256 41aca6f1122d2a948aefaeb6229befa5d8b01505ab1cbb63ebac5edd6ae9f088 +MD5 3ab8e5f9550c4cd1a745d7a3fff67393 ChangeLog 61848 +RMD160 9c7552aaaff64b7ed65d3abd7140e07cb5fdcf39 ChangeLog 61848 +SHA256 41aca6f1122d2a948aefaeb6229befa5d8b01505ab1cbb63ebac5edd6ae9f088 ChangeLog 61848 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414 @@ -63,22 +30,13 @@ SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata MD5 390f6cb2111f1f54bb55da3cb074981e files/digest-gaim-1.5.0 238 RMD160 565afdbee5ecd1f78913ee6d3d813ff9db8bb185 files/digest-gaim-1.5.0 238 SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/digest-gaim-1.5.0 238 -MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4 253 -RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4 253 -SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4 253 -MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4-r1 253 -RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4-r1 253 -SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4-r1 253 -MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4-r2 253 -RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4-r2 253 -SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4-r2 253 MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5 253 RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5 253 SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXrmwoeSe8B0zEfwRAhplAJ93chAjvZz/thM+vf6ZXwvTKyQDRACggzfU -aKE6qugcot0yZJwoxPDR/lc= -=l7jZ +iD8DBQFFZmQqmOfEJZHYOKcRAsBkAKCdW6bmMR7Av+OJTrY0By38huVifACeMegD +j2PMhA9hUBw8J6xRhDmuvOY= +=zOE9 -----END PGP SIGNATURE----- diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4 b/net-im/gaim/files/digest-gaim-2.0.0_beta4 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch b/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch deleted file mode 100644 index 066e2c5e4ffe..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.org 2006-05-05 19:09:26.785534520 -0500 -+++ src/Makefile.am 2006-05-05 19:09:38.371773144 -0500 -@@ -199,6 +199,8 @@ - - libgaim_client_la_SOURCES = gaim-client.c gaim-client.h - -+libgaim_client_la_LIBADD = $(DBUS_LIBS) -+ - gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) - cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@ - diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch b/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch deleted file mode 100644 index 2520e7233d7e..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur gaim-2.0.0beta3/configure.ac gaim-2.0.0beta3-patched/configure.ac ---- gaim-2.0.0beta3/configure.ac 2006-03-26 07:45:35.000000000 +0000 -+++ gaim-2.0.0beta3-patched/configure.ac 2006-05-07 23:13:46.000000000 +0000 -@@ -183,15 +183,17 @@ - HOWL_CFLAGS="" - HOWL_LIBS="" - --dnl Attempt to autodetect Howl --PKG_CHECK_MODULES(HOWL, howl, [ -- howlincludes="yes" -- howllibs="yes" -- ], [ -- AC_MSG_RESULT(no) -- howlincludes="no" -- howllibs="no" -- ]) -+dnl First we attempt to use avahi-compat-howl -+PKG_CHECK_MODULES(HOWL, avahi-compat-howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+ -+dnl If that fails, autodetect the "real" howl -+if test "$howlincludes" = "no" ; then -+ PKG_CHECK_MODULES(HOWL, howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+fi - - dnl Override HOWL_CFLAGS if the user specified an include dir - if test "$ac_howl_includes" != "no"; then diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch b/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch deleted file mode 100644 index c372eaebfcf2..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Nur gaim-2.0.0+beta3/configure.ac gaim-2.0.0+beta3.new/configure.ac ---- gaim-2.0.0+beta3/configure.ac 2006-08-18 16:10:38.000000000 +0200 -+++ gaim-2.0.0+beta3.new/configure.ac 2006-08-18 16:10:39.000000000 +0200 -@@ -587,7 +587,7 @@ - AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([ - *** GLib 2.0 is required to build Gaim; please make sure you have the GLib - *** development headers installed. The latest version of GLib is --*** always available at http://www.gtk.org/.])) -+*** always available at http://www.gtk.org/.]),gthread) - AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([ - *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+ - *** development headers installed. The latest version of GTK+ is -diff -Nur gaim-2.0.0+beta3/src/dbus-server.c gaim-2.0.0+beta3.new/src/dbus-server.c ---- gaim-2.0.0+beta3/src/dbus-server.c 2006-02-11 06:25:47.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/dbus-server.c 2006-08-18 16:10:39.000000000 +0200 -@@ -710,6 +710,8 @@ - - gboolean gaim_dbus_init(void) - { -+ if (g_thread_supported()) -+ dbus_g_thread_init(); - gaim_dbus_init_ids(); - return gaim_dbus_dispatch_init() ; - } -diff -Nur gaim-2.0.0+beta3/src/gtkmain.c gaim-2.0.0+beta3.new/src/gtkmain.c ---- gaim-2.0.0+beta3/src/gtkmain.c 2006-03-07 05:45:22.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/gtkmain.c 2006-08-18 16:10:39.000000000 +0200 -@@ -65,6 +65,7 @@ - #include "gtkstock.h" - #include "gtkwhiteboard.h" - -+#include - #ifdef HAVE_SIGNAL_H - # include - #endif -@@ -643,6 +644,15 @@ - gtk_rc_add_default_file(search_path); - g_free(search_path); - -+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)) -+ /* Since threads can be yanked in all unawares by other libraries, -+ * and some libraries aren't smart enough to initialize the thread -+ * subsystem when they need it, we need to do this here. We also -+ * threadify dbus when that gets initialized. Ugh. */ -+ if (!g_thread_supported()) -+ g_thread_init(NULL); -+ gdk_threads_init(); -+#endif /* Glib has threads */ - - gui_check = gtk_init_check(&argc, &argv); - if (!gui_check) { -diff -Nur gaim-2.0.0+beta3/src/Makefile.am gaim-2.0.0+beta3.new/src/Makefile.am ---- gaim-2.0.0+beta3/src/Makefile.am 2006-03-25 16:45:49.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/Makefile.am 2006-08-18 16:10:39.000000000 +0200 -@@ -334,6 +334,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(SOUND_LIBS) \ -diff -Nur gaim-2.0.0+beta3/src/Makefile.in gaim-2.0.0+beta3.new/src/Makefile.in ---- gaim-2.0.0+beta3/src/Makefile.in 2006-03-29 00:39:14.000000000 +0200 -+++ gaim-2.0.0+beta3.new/src/Makefile.in 2006-08-18 16:11:20.000000000 +0200 -@@ -772,6 +772,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(SOUND_LIBS) \ diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch b/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch deleted file mode 100644 index 37b345ecbf03..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 17552) -+++ configure.ac (working copy) -@@ -186,27 +186,27 @@ - AC_ARG_ENABLE(screensaver, - [AC_HELP_STRING([--disable-screensaver], - [compile without X screensaver extension (used to detect idleness)])], -- enable_screensaver="no", enable_screensaver="yes") -+ enable_screensaver="$enableval", enable_screensaver="yes") - AC_ARG_ENABLE(sm, - [AC_HELP_STRING([--disable-sm], - [compile without X session management support])], -- enable_sm="no", enable_sm="yes") -+ enable_sm="$enableval", enable_sm="yes") - AC_ARG_ENABLE(startup-notification, - [AC_HELP_STRING([--disable-startup-notification], - [compile without startup notification support])], -- enable_startup_notification="no", enable_startup_notification="yes") -+ enable_startup_notification="$enableval", enable_startup_notification="yes") - AC_ARG_ENABLE(gtkspell, - [AC_HELP_STRING([--disable-gtkspell], - [compile without GtkSpell automatic spell checking])], -- enable_gtkspell="no", enable_gtkspell="yes") -+ enable_gtkspell="$enableval", enable_gtkspell="yes") - AC_ARG_ENABLE(gevolution, - [AC_HELP_STRING([--disable-gevolution], - [compile without the Gaim Evolution plugin])], -- enable_gevolution="no", enable_gevolution="yes") -+ enable_gevolution="$enableval", enable_gevolution="yes") - AC_ARG_ENABLE(cap, - [AC_HELP_STRING([--disable-cap], - [compile without Contact Availability Prediction plugin])], -- enable_cap="no", enable_cap="yes") -+ enable_cap="$enableval", enable_cap="yes") - - - AC_PATH_XTRA -@@ -455,7 +455,7 @@ - dnl ####################################################################### - AC_ARG_ENABLE(gstreamer, - [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], -- enable_gst="no", enable_gst="yes") -+ enable_gst="$enableval", enable_gst="yes") - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [ - AC_MSG_RESULT(no) - enable_gst="no" -@@ -1564,7 +1564,7 @@ - dnl # Check for Tcl - dnl ####################################################################### - AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], -- [compile without Tcl scripting])], enable_tcl="no", enable_tcl="yes") -+ [compile without Tcl scripting])], enable_tcl="$enableval", enable_tcl="yes") - AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], - [directory containing tclConfig.sh])]) - -@@ -1633,7 +1633,7 @@ - dnl # Check for Tk - dnl ####################################################################### - AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], -- [compile without Tcl support for Tk])], enable_tk="no", enable_tk="yes") -+ [compile without Tcl support for Tk])], enable_tk="$enableval", enable_tk="yes") - AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], - [directory containing tkConfig.sh])]) - -@@ -1812,11 +1812,11 @@ - AC_ARG_ENABLE(doxygen, - [AC_HELP_STRING([--disable-doxygen], - [enable documentation with doxygen])], -- enable_doxygen="no", enable_doxygen="yes") -+ enable_doxygen="$enableval", enable_doxygen="yes") - AC_ARG_ENABLE(dot, - [AC_HELP_STRING([--enable-dot], - [enable graphs in doxygen via 'dot'])], -- enable_dot="no", enable_dot="yes") -+ enable_dot="$enableval", enable_dot="yes") - - if test "x$enable_doxygen" = xyes; then - AC_CHECK_PROG(DOXYGEN, doxygen, true, false) diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch b/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch deleted file mode 100644 index a77178a28f0c..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.am gaim-2.0.0beta4/gtk/Makefile.am ---- gaim-2.0.0beta4-old/gtk/Makefile.am 2006-10-18 12:37:48.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/Makefile.am 2006-10-19 12:36:13.000000000 -0500 -@@ -161,6 +161,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(GSTREAMER_LIBS) \ - $(STATIC_LINK_LIBS) \ -diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.in gaim-2.0.0beta4/gtk/Makefile.in ---- gaim-2.0.0beta4-old/gtk/Makefile.in 2006-10-18 15:00:12.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/Makefile.in 2006-10-19 12:37:26.000000000 -0500 -@@ -611,6 +611,7 @@ - @ENABLE_GTK_TRUE@gaim_LDFLAGS = -export-dynamic - @ENABLE_GTK_TRUE@gaim_LDADD = \ - @ENABLE_GTK_TRUE@ @LIBOBJS@ \ -+@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \ - @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ - @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ - @ENABLE_GTK_TRUE@ $(STATIC_LINK_LIBS) \ -diff -Nru gaim-2.0.0beta4-old/gtk/gtkmain.c gaim-2.0.0beta4/gtk/gtkmain.c ---- gaim-2.0.0beta4-old/gtk/gtkmain.c 2006-10-18 12:37:48.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/gtkmain.c 2006-10-19 12:42:42.000000000 -0500 -@@ -65,6 +65,7 @@ - #include "gtkutils.h" - #include "gaimstock.h" - #include "gtkwhiteboard.h" -+#include - - #ifdef HAVE_SIGNAL_H - # include -@@ -675,6 +676,16 @@ - gtk_rc_add_default_file(search_path); - g_free(search_path); - -+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)) -+ /* Since threads can be yanked in all unawares by other libraries, -+ * and some libraries aren't smart enough to initialize the thread -+ * subsystem when they need it, we need to do this here. We also -+ * threadify dbus when that gets initialized. Ugh. */ -+ if (!g_thread_supported()) -+ g_thread_init(NULL); -+ gdk_threads_init(); -+#endif /* Glib has threads */ -+ - gui_check = gtk_init_check(&argc, &argv); - if (!gui_check) { - char *display = gdk_get_display(); -diff -Nru gaim-2.0.0beta4-old/libgaim/dbus-server.c gaim-2.0.0beta4/libgaim/dbus-server.c ---- gaim-2.0.0beta4-old/libgaim/dbus-server.c 2006-10-18 12:38:16.000000000 -0500 -+++ gaim-2.0.0beta4/libgaim/dbus-server.c 2006-10-19 12:34:57.000000000 -0500 -@@ -758,6 +758,8 @@ - void - gaim_dbus_init(void) - { -+ if(g_thread_supported()) -+ dbus_g_thread_init(); - gaim_dbus_init_ids(); - - g_free(init_error); diff --git a/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild deleted file mode 100644 index 85e158e9bb06..000000000000 --- a/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4-r1.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2 - -MY_PV=${P/_beta/beta} -#MY_PV="2.0.0beta3.1" -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://gaim.sourceforge.net/" -SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu" - -RDEPEND=" - bonjour? ( !avahi? ( net-misc/howl ) - avahi? ( net-dns/avahi ) ) - dbus? ( || ( - ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 ) - ( =sys-apps/dbus-0.35 ) - ) - >=dev-lang/python-2.4 ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - gstreamer? ( media-libs/gstreamer - media-libs/gst-plugins-good ) - nas? ( >=media-libs/nas-1.4.1-r1 ) - perl? ( >=dev-lang/perl-5.8.2-r1 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gadu? ( net-libs/libgadu ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - msn? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - startup-notification? ( >=x11-libs/startup-notification-0.5 ) - mono? ( dev-lang/mono ) - doc? ( app-doc/doxygen ) - xscreensaver? ( x11-libs/libXScrnSaver ) - dev-libs/libxml2" - -DEPEND="$RDEPEND - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )" - -S="${WORKDIR}/${MY_PV}" - -# Enable Default protocols -DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple" - -# List of plugins -# app-accessibility/festival-gaim -# net-im/gaim-blogger -# net-im/gaim-bnet -# net-im/gaim-meanwhile -# net-im/gaim-snpp -# x11-plugins/autoprofile -# x11-plugins/gaim-assistant -# x11-plugins/gaim-encryption -# x11-plugins/gaim-extprefs -# x11-plugins/gaim-latex -# x11-plugins/gaim-otr -# x11-plugins/gaim-rhythmbox -# x11-plugins/gaim-xmms-remote -# x11-plugins/gaimosd -# x11-plugins/guifications - - -print_gaim_warning() { - ewarn - ewarn "This is a beta release! Please back up everything in your .gaim" - ewarn "directory. We're looking for lots of feedback on this release" - ewarn "especially what you love about it and what you hate about it." - ewarn - ewarn "If you are merging ${MY_P} from an earlier version, you may need" - ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." - ewarn - ewarn "If you experience problems with gaim, file them as bugs with" - ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" - ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" - ewarn "seek help in #gaim." - ewarn - ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" - ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" - ewarn "backtraces." - ewarn - ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" - ewarn - einfo - if use custom-flags; then - einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS." - einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags" - einfo - else - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - fi - - if use silc; then - einfo "To be able to connect to silc network, you need to run" - einfo "\`usermod -c \"comment\"\` as user as which you are running gaim," - einfo "where \"comment\" is either your real name if you want show it" - einfo "on silc or any othe not empty string." - einfo - fi - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - - if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then - eerror - eerror You need to rebuild net-dns/avahi with USE=howl-compat in order - eerror to enable howl support for the bonjour protocol in gaim. - eerror - die "Configure failed" - fi - - if use gadu && built_with_use net-libs/libgadu ssl ; then - eerror - eerror You need to rebuild net-libs/libgadu with USE=-ssl in order - eerror enable gadu gadu support in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - gnome2_src_unpack - epatch "${FILESDIR}"/"${P}"-dbus.patch -} - -src_compile() { - # Stabilize things, for your own good - if ! use custom-flags; then - strip-flags - fi - replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - - if use gadu; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" - myconf="${myconf} --with-gadu-includes=." - myconf="${myconf} --with-gadu-libs=." - fi - - if use silc; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc" - fi - - if use qq; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq" - fi - - if use meanwhile; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime" - fi - - if use bonjour; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour" - fi - - - if use ssl || use msn ; then - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no --enable-gnutls=yes" - myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls" - myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf="${myconf} --enable-gnutls=no --enable-nss=yes" - fi - else - einfo "No SSL support selected" - myconf="${myconf} --enable-gnutls=no --enable-nss=no" - fi - - if use xscreensaver ; then - myconf="${myconf} --x-includes=/usr/include/X11" - fi - - G2CONF=" \ - $(use_enable nls) \ - $(use_enable perl) \ - $(use_enable spell gtkspell) \ - $(use_enable startup-notification) \ - $(use_enable tcl) \ - $(use_enable tk) \ - $(use_enable mono) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable nas) \ - $(use_enable eds gevolution) \ - $(use_enable gstreamer) \ - $(use_enable doc doxygen) \ - "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \ - ${myconf} " || die "Configuration failed" - - # This is a tempory fix until Makefile is fixed!! - if use mono; then - MAKEOPTS="-j1" gnome2_src_compile || die "Make failed" - else - gnome2_src_compile || die "Make failed" - fi -} - -src_install() { - gnome2_src_install || die "Install failed" - use perl && fixlocalpod - dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog -} - -pkg_postinst() { - gnome2_gconf_install - print_gaim_warning -} diff --git a/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild deleted file mode 100644 index 90cd313c37cf..000000000000 --- a/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4-r2.ebuild,v 1.2 2006/11/18 07:42:50 cardoe Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2 - -MY_PV=${P/_beta/beta} -#MY_PV="2.0.0beta3.1" -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://gaim.sourceforge.net/" -SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu" - -RDEPEND=" - bonjour? ( !avahi? ( net-misc/howl ) - avahi? ( net-dns/avahi ) ) - dbus? ( || ( - ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 ) - ( =sys-apps/dbus-0.35 ) - ) - >=dev-lang/python-2.4 ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - gstreamer? ( media-libs/gstreamer - media-libs/gst-plugins-good ) - nas? ( >=media-libs/nas-1.4.1-r1 ) - perl? ( >=dev-lang/perl-5.8.2-r1 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gadu? ( net-libs/libgadu ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - msn? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - startup-notification? ( >=x11-libs/startup-notification-0.5 ) - mono? ( dev-lang/mono ) - doc? ( app-doc/doxygen ) - xscreensaver? ( x11-libs/libXScrnSaver ) - dev-libs/libxml2" - -DEPEND="$RDEPEND - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )" - -S="${WORKDIR}/${MY_PV}" - -# Enable Default protocols -DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple" - -# List of plugins -# app-accessibility/festival-gaim -# net-im/gaim-blogger -# net-im/gaim-bnet -# net-im/gaim-meanwhile -# net-im/gaim-snpp -# x11-plugins/autoprofile -# x11-plugins/gaim-assistant -# x11-plugins/gaim-encryption -# x11-plugins/gaim-extprefs -# x11-plugins/gaim-latex -# x11-plugins/gaim-otr -# x11-plugins/gaim-rhythmbox -# x11-plugins/gaim-xmms-remote -# x11-plugins/gaimosd -# x11-plugins/guifications - - -print_gaim_warning() { - ewarn - ewarn "This is a beta release! Please back up everything in your .gaim" - ewarn "directory. We're looking for lots of feedback on this release" - ewarn "especially what you love about it and what you hate about it." - ewarn - ewarn "If you are merging ${MY_P} from an earlier version, you may need" - ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." - ewarn - ewarn "If you experience problems with gaim, file them as bugs with" - ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" - ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" - ewarn "seek help in #gaim." - ewarn - ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" - ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" - ewarn "backtraces." - ewarn - ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" - ewarn - einfo - if use custom-flags; then - einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS." - einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags" - einfo - else - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - fi - - if use silc; then - einfo "To be able to connect to silc network, you need to run" - einfo "\`usermod -c \"comment\"\` as user as which you are running gaim," - einfo "where \"comment\" is either your real name if you want show it" - einfo "on silc or any othe not empty string." - einfo - fi - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - - if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then - eerror - eerror You need to rebuild net-dns/avahi with USE=howl-compat in order - eerror to enable howl support for the bonjour protocol in gaim. - eerror - die "Configure failed" - fi - - if use gadu && built_with_use net-libs/libgadu ssl ; then - eerror - eerror You need to rebuild net-libs/libgadu with USE=-ssl in order - eerror enable gadu gadu support in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - gnome2_src_unpack - epatch "${FILESDIR}"/"${P}"-dbus.patch - epatch "${FILESDIR}"/"${P}"-configure.patch - - eautoreconf -} - -src_compile() { - # Stabilize things, for your own good - if ! use custom-flags; then - strip-flags - fi - replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - - if use gadu; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" - myconf="${myconf} --with-gadu-includes=." - myconf="${myconf} --with-gadu-libs=." - fi - - if use silc; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc" - fi - - if use qq; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq" - fi - - if use meanwhile; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime" - fi - - if use bonjour; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour" - fi - - - if use ssl || use msn ; then - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no --enable-gnutls=yes" - myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls" - myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf="${myconf} --enable-gnutls=no --enable-nss=yes" - fi - else - einfo "No SSL support selected" - myconf="${myconf} --enable-gnutls=no --enable-nss=no" - fi - - if use xscreensaver ; then - myconf="${myconf} --x-includes=/usr/include/X11" - fi - - G2CONF=" \ - $(use_enable nls) \ - $(use_enable perl) \ - $(use_enable spell gtkspell) \ - $(use_enable startup-notification) \ - $(use_enable tcl) \ - $(use_enable tk) \ - $(use_enable mono) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable nas) \ - $(use_enable eds gevolution) \ - $(use_enable gstreamer) \ - $(use_enable doc doxygen) \ - "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \ - ${myconf} " || die "Configuration failed" - - # This is a tempory fix until Makefile is fixed!! - if use mono; then - MAKEOPTS="-j1" gnome2_src_compile || die "Make failed" - else - gnome2_src_compile || die "Make failed" - fi -} - -src_install() { - gnome2_src_install || die "Install failed" - use perl && fixlocalpod - dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog -} - -pkg_postinst() { - gnome2_gconf_install - print_gaim_warning -} diff --git a/net-im/gaim/gaim-2.0.0_beta4.ebuild b/net-im/gaim/gaim-2.0.0_beta4.ebuild deleted file mode 100644 index 12fd02fc7004..000000000000 --- a/net-im/gaim/gaim-2.0.0_beta4.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta4.ebuild,v 1.3 2006/11/18 07:42:50 cardoe Exp $ - -inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2 - -MY_PV=${P/_beta/beta} -#MY_PV="2.0.0beta3.1" -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK Instant Messenger client" -HOMEPAGE="http://gaim.sourceforge.net/" -SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="avahi audiofile bonjour cjk crypt dbus debug doc eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu" - -RDEPEND=" - audiofile? ( media-libs/libao - media-libs/audiofile ) - bonjour? ( !avahi? ( net-misc/howl ) - avahi? ( net-dns/avahi ) ) - dbus? ( || ( - ( >=dev-libs/dbus-glib-0.71 >=dev-python/dbus-python-0.71 ) - ( =sys-apps/dbus-0.35 ) - ) - >=dev-lang/python-2.4 ) - >=x11-libs/gtk+-2.0 - >=dev-libs/glib-2.0 - nas? ( >=media-libs/nas-1.4.1-r1 ) - perl? ( >=dev-lang/perl-5.8.2-r1 ) - spell? ( >=app-text/gtkspell-2.0.2 ) - gadu? ( net-libs/libgadu ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - msn? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-0.9.12-r3 ) - eds? ( gnome-extra/evolution-data-server ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - startup-notification? ( >=x11-libs/startup-notification-0.5 ) - mono? ( dev-lang/mono ) - doc? ( app-doc/doxygen ) - xscreensaver? ( x11-libs/libXScrnSaver ) - dev-libs/libxml2" - -DEPEND="$RDEPEND - dev-util/pkgconfig - nls? ( sys-devel/gettext )" - -PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )" - -S="${WORKDIR}/${MY_PV}" - -# Enable Default protocols -DYNAMIC_PRPLS="irc,jabber,msn,oscar,yahoo,zephyr,simple" - -# List of plugins -# app-accessibility/festival-gaim -# net-im/gaim-blogger -# net-im/gaim-bnet -# net-im/gaim-meanwhile -# net-im/gaim-snpp -# x11-plugins/autoprofile -# x11-plugins/gaim-assistant -# x11-plugins/gaim-encryption -# x11-plugins/gaim-extprefs -# x11-plugins/gaim-latex -# x11-plugins/gaim-otr -# x11-plugins/gaim-rhythmbox -# x11-plugins/gaim-xmms-remote -# x11-plugins/gaimosd -# x11-plugins/guifications - - -print_gaim_warning() { - ewarn - ewarn "This is a beta release! Please back up everything in your .gaim" - ewarn "directory. We're looking for lots of feedback on this release" - ewarn "especially what you love about it and what you hate about it." - ewarn - ewarn "If you are merging ${MY_P} from an earlier version, you may need" - ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." - ewarn - ewarn "If you experience problems with gaim, file them as bugs with" - ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" - ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" - ewarn "seek help in #gaim." - ewarn - ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" - ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" - ewarn "backtraces." - ewarn - ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" - ewarn - einfo - if use custom-flags; then - einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS." - einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags" - einfo - else - einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS." - einfo - fi - - if use silc; then - einfo "To be able to connect to silc network, you need to run" - einfo "\`usermod -c \"comment\"\` as user as which you are running gaim," - einfo "where \"comment\" is either your real name if you want show it" - einfo "on silc or any othe not empty string." - einfo - fi - ebeep 5 - epause 3 -} - -pkg_setup() { - print_gaim_warning - - if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then - eerror - eerror You need to rebuild net-dns/avahi with USE=howl-compat in order - eerror to enable howl support for the bonjour protocol in gaim. - eerror - die "Configure failed" - fi - - if use gadu && built_with_use net-libs/libgadu ssl ; then - eerror - eerror You need to rebuild net-libs/libgadu with USE=-ssl in order - eerror enable gadu gadu support in gaim. - eerror - die "Configure failed" - fi -} - -src_unpack() { - gnome2_src_unpack - epatch "${FILESDIR}"/"${P}"-dbus.patch -} - -src_compile() { - # Stabilize things, for your own good - if ! use custom-flags; then - strip-flags - fi - replace-flags -O? -O2 - - # -msse2 doesn't play nice on gcc 3.2 - [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 - - local myconf - - if use gadu; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" - fi - - if use silc; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc" - fi - - if use qq; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq" - fi - - if use meanwhile; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime" - fi - - if use bounjour; then - DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour" - fi - - - if use ssl || use msn ; then - if use gnutls ; then - einfo "Disabling NSS, using GnuTLS" - myconf="${myconf} --enable-nss=no --enable-gnutls=yes" - myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls" - myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf="${myconf} --enable-gnutls=no --enable-nss=yes" - fi - else - einfo "No SSL support selected" - myconf="${myconf} --enable-gnutls=no --enable-nss=no" - fi - - if use xscreensaver ; then - myconf="${myconf} --x-includes=/usr/include/X11" - fi - - G2CONF=" \ - $(use_enable nls) \ - $(use_enable perl) \ - $(use_enable spell gtkspell) \ - $(use_enable startup-notification) \ - $(use_enable tcl) \ - $(use_enable tk) \ - $(use_enable mono) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable meanwhile) \ - $(use_enable nas) \ - $(use_enable eds gevolution) \ - $(use_enable audiofile audio) \ - $(use_enable doc doxygen) \ - "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \ - ${myconf} " || die "Configuration failed" - - # This is a tempory fix until Makefile is fixed!! - if use mono; then - gnome2_src_compile -j1 || die "Make failed" - else - gnome2_src_compile || die "Make failed" - fi -} - -src_install() { - gnome2_src_install || die "Install failed" - use perl && fixlocalpod - dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog -} - -pkg_postinst() { - gnome2_gconf_install - print_gaim_warning -} -- 2.26.2