Version bump, remove old version

Package-Manager: portage-2.1.2.11

9 files changed, 42 insertions, 96 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 7e50c2e623ce..7beffbf324ba 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.20 2007/08/07 02:19:41 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.21 2007/08/22 02:50:21 tester Exp $
+
+*pidgin-2.1.1 (22 Aug 2007)
+
+  22 Aug 2007; Olivier Crête <tester@gentoo.org>
+  -files/pidgin-2.0.0-cchar_t-undeclared.patch,
+  -files/pidgin-2.0.1-desktop.patch,
+  -files/pidgin-2.0.1-purple-remote-syntax-fix.patch, -pidgin-2.0.2.ebuild,
+  pidgin-2.1.0.ebuild, +pidgin-2.1.1.ebuild:
+  Version bump, remove old version
 
 *pidgin-2.1.0 (07 Aug 2007)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f66f7a62b3fa..c5d1e4004341 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,46 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pidgin-2.0.0-cchar_t-undeclared.patch 278 RMD160 f126c8410896bb7933cc81e05ebae9f5b83af0c7 SHA1 ce923b83bb27faeaf272a3eb7a740008c50f2742 SHA256 a0c33e57f509bc87a84903689ef7ce4a33b615e79658e5bbf83bf9cc7077efea
-MD5 64f45de10775a81453340b4f9aae2b5d files/pidgin-2.0.0-cchar_t-undeclared.patch 278
-RMD160 f126c8410896bb7933cc81e05ebae9f5b83af0c7 files/pidgin-2.0.0-cchar_t-undeclared.patch 278
-SHA256 a0c33e57f509bc87a84903689ef7ce4a33b615e79658e5bbf83bf9cc7077efea files/pidgin-2.0.0-cchar_t-undeclared.patch 278
-AUX pidgin-2.0.1-desktop.patch 510 RMD160 dc7d5d1f55aa7382aa0b7ff6a9df16f6cd3bbb35 SHA1 aa840cdc76248b5a24079f842fd5ceade28c4143 SHA256 cd8856376b12e7178cc874cc4d7f22d85cb2f411bb1a45faccccb3ce13ad5369
-MD5 3ca950c8f2d71d8830340517577cc55f files/pidgin-2.0.1-desktop.patch 510
-RMD160 dc7d5d1f55aa7382aa0b7ff6a9df16f6cd3bbb35 files/pidgin-2.0.1-desktop.patch 510
-SHA256 cd8856376b12e7178cc874cc4d7f22d85cb2f411bb1a45faccccb3ce13ad5369 files/pidgin-2.0.1-desktop.patch 510
-AUX pidgin-2.0.1-purple-remote-syntax-fix.patch 403 RMD160 e2f3a38a25b9a1a5493c7ef94e86f5467cd522f1 SHA1 e0ba9a09feaf047d8d9d7d379bcca437a1b22470 SHA256 0ba68c5452a18bb25c1d4b60bd66d836313b22ed00eb357ad4004dca869c54da
-MD5 1afebb41f11e4fa398bc4212a7229f2c files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
-RMD160 e2f3a38a25b9a1a5493c7ef94e86f5467cd522f1 files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
-SHA256 0ba68c5452a18bb25c1d4b60bd66d836313b22ed00eb357ad4004dca869c54da files/pidgin-2.0.1-purple-remote-syntax-fix.patch 403
-DIST pidgin-2.0.2.tar.bz2 7838262 RMD160 d1b6d30b5c8e68c55c8ef8b8118c7041b6d67348 SHA1 7f5cdc3e8fb8b8af9646bb0635b2852c24f7e059 SHA256 e2d8d48b00d42cf935e3a7c8ed2d83d559be65cf3eca7cc88a8d0b7e4ba15a41
 DIST pidgin-2.1.0.tar.bz2 7772942 RMD160 d04437251fbea8a1902621ebdf98f6fdc826a6d4 SHA1 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3 SHA256 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
-EBUILD pidgin-2.0.2.ebuild 7609 RMD160 79fd4d85770cfb08d9b2938a7ed16be74b033b1b SHA1 621de16931e4a7384a8621dfd9fea74288abdc18 SHA256 dfa0074c758a481c9b58709b02da776c512eddd0edf7cb2b91f51e36838ca303
-MD5 5eb3a3938d0832043fe95a444a7c3ed3 pidgin-2.0.2.ebuild 7609
-RMD160 79fd4d85770cfb08d9b2938a7ed16be74b033b1b pidgin-2.0.2.ebuild 7609
-SHA256 dfa0074c758a481c9b58709b02da776c512eddd0edf7cb2b91f51e36838ca303 pidgin-2.0.2.ebuild 7609
-EBUILD pidgin-2.1.0.ebuild 7484 RMD160 6ed978930ebebcbd16b50f502d32077181cea121 SHA1 fc0729e3b4447c20db121e141789c64e065c4592 SHA256 742d05ab2375be97577a782999d9929902d439b2f333ed39f6828b7eaf909c9b
-MD5 a8fddc5f627bb26090916e86baf41277 pidgin-2.1.0.ebuild 7484
-RMD160 6ed978930ebebcbd16b50f502d32077181cea121 pidgin-2.1.0.ebuild 7484
-SHA256 742d05ab2375be97577a782999d9929902d439b2f333ed39f6828b7eaf909c9b pidgin-2.1.0.ebuild 7484
-MISC ChangeLog 2970 RMD160 1cf3fdcffdf2e232cf7e87927fd2cb894705a3ec SHA1 93f2447fb8e55de455bcc86cd5442d2b2eea49be SHA256 f297c62a4c5cf288e1ec63d9c3bb9d1b6c69a28e4404e218fb6a911661ad587b
-MD5 9e6da752d60b665faa067cbcc9da992a ChangeLog 2970
-RMD160 1cf3fdcffdf2e232cf7e87927fd2cb894705a3ec ChangeLog 2970
-SHA256 f297c62a4c5cf288e1ec63d9c3bb9d1b6c69a28e4404e218fb6a911661ad587b ChangeLog 2970
+DIST pidgin-2.1.1.tar.bz2 7829592 RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e SHA1 da6b7dda67b14aa1837ca48895eedcee215f0818 SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
+EBUILD pidgin-2.1.0.ebuild 7478 RMD160 73f0d2429742fc7cb5423c5aecd971830569eb14 SHA1 e58f9a23b3c5066dd5513e0423a54819e77f556d SHA256 660baf067081c0e9f6388b8f0bd1ec0cc6e343ba1b9aee2265821dfe17de0996
+MD5 f6d174182995d082590002f9e071eb97 pidgin-2.1.0.ebuild 7478
+RMD160 73f0d2429742fc7cb5423c5aecd971830569eb14 pidgin-2.1.0.ebuild 7478
+SHA256 660baf067081c0e9f6388b8f0bd1ec0cc6e343ba1b9aee2265821dfe17de0996 pidgin-2.1.0.ebuild 7478
+EBUILD pidgin-2.1.1.ebuild 7104 RMD160 19906ec908f907c99e7b2dda9d425c2966df9c78 SHA1 9195bfcee21b97457c587859b17d5f74786410a2 SHA256 5f869d0fca5f634d3088bc91b41fb46334b0a72a74c45676ae21d29e3cd4e4ec
+MD5 c5fafab498bbbc44a2158c9aab21c92e pidgin-2.1.1.ebuild 7104
+RMD160 19906ec908f907c99e7b2dda9d425c2966df9c78 pidgin-2.1.1.ebuild 7104
+SHA256 5f869d0fca5f634d3088bc91b41fb46334b0a72a74c45676ae21d29e3cd4e4ec pidgin-2.1.1.ebuild 7104
+MISC ChangeLog 3291 RMD160 506ae105a4e7b4ff8ac51d8c7e60d0c4e2d79552 SHA1 c11695f848c70ee1d1789a51ea9723ac8f9991c1 SHA256 001851a96487a893c42f7ac05304819b4479f0568a6df893e32ff92f071a9877
+MD5 98ed8ded1cb0ee8833f25dfe7810883d ChangeLog 3291
+RMD160 506ae105a4e7b4ff8ac51d8c7e60d0c4e2d79552 ChangeLog 3291
+SHA256 001851a96487a893c42f7ac05304819b4479f0568a6df893e32ff92f071a9877 ChangeLog 3291
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9 metadata.xml 458
-MD5 20d2e5c31a250ab41decc02c3ca57fe2 files/digest-pidgin-2.0.2 244
-RMD160 1ea26f933a03474796cd0606dbaa89fadcc9fbdc files/digest-pidgin-2.0.2 244
-SHA256 27d66066811cc55863a0fa30b3fdb0d94ab65f7a3dae2c1b1062a4893b6f91bb files/digest-pidgin-2.0.2 244
 MD5 04dff9a5dba46adcbf2b44ec303833fd files/digest-pidgin-2.1.0 244
 RMD160 a8781e42e65cef1475de205b50bce09002e323f9 files/digest-pidgin-2.1.0 244
 SHA256 5dee037d90f0e13e1a9c2995d0a8ea52774390806556bac19bfe9c954797b098 files/digest-pidgin-2.1.0 244
+MD5 5dcf5b507a82d0cc88669a0dac91904e files/digest-pidgin-2.1.1 244
+RMD160 c0984ecbdaec90bcf0d0c6c52dcd392c7750bbe3 files/digest-pidgin-2.1.1 244
+SHA256 0a3d5ab03c4a5242d59126e3a25a885b6a2477c0441aac396afc77ea52bcfa24 files/digest-pidgin-2.1.1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGt9kP+IXOQtHLm/gRAi3rAJ4yfn6lRFe2KHftPGrQTd0AHCIJfACfZ3Dv
-YdqGejTjmaoLpIVT0y+rC8w=
-=0eJ6
+iD8DBQFGy6SP+IXOQtHLm/gRAj0dAJ9ZsmKZttCm8WnEhUR5WQY9KuRBHgCcDPfs
+Pwr94xScktGMqa5reYsXx+A=
+=AUyK
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/digest-pidgin-2.0.2 b/net-im/pidgin/files/digest-pidgin-2.0.2
deleted file mode 100644
index e73e4abb143e..000000000000
--- a/net-im/pidgin/files/digest-pidgin-2.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 613a357b2b1e030433fdfa680483d00f pidgin-2.0.2.tar.bz2 7838262
-RMD160 d1b6d30b5c8e68c55c8ef8b8118c7041b6d67348 pidgin-2.0.2.tar.bz2 7838262
-SHA256 e2d8d48b00d42cf935e3a7c8ed2d83d559be65cf3eca7cc88a8d0b7e4ba15a41 pidgin-2.0.2.tar.bz2 7838262
diff --git a/net-im/pidgin/files/digest-pidgin-2.1.1 b/net-im/pidgin/files/digest-pidgin-2.1.1
new file mode 100644
index 000000000000..1833ee3bf74b
--- /dev/null
+++ b/net-im/pidgin/files/digest-pidgin-2.1.1
@@ -0,0 +1,3 @@
+MD5 eb29fecb2f3a6d4790f47ce8e658c07c pidgin-2.1.1.tar.bz2 7829592
+RMD160 77a9f06446c1056c3ad54018e78e450cda3ac66e pidgin-2.1.1.tar.bz2 7829592
+SHA256 cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de pidgin-2.1.1.tar.bz2 7829592
diff --git a/net-im/pidgin/files/pidgin-2.0.0-cchar_t-undeclared.patch b/net-im/pidgin/files/pidgin-2.0.0-cchar_t-undeclared.patch
deleted file mode 100644
index 0d77691e76c8..000000000000
--- a/net-im/pidgin/files/pidgin-2.0.0-cchar_t-undeclared.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- finch/libgnt/gntwm.c	5d51dec5c38fd91291465a55516f1c386ee237c2
-+++ finch/libgnt/gntwm.c	6272fa78c7a3cb952e8dc9943e2e99cd6997f629
-@@ -1,5 +1,5 @@
- #define _GNU_SOURCE
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__unix__)
- #define _XOPEN_SOURCE_EXTENDED
- #endif
diff --git a/net-im/pidgin/files/pidgin-2.0.1-desktop.patch b/net-im/pidgin/files/pidgin-2.0.1-desktop.patch
deleted file mode 100644
index 4de3bff28347..000000000000
--- a/net-im/pidgin/files/pidgin-2.0.1-desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.am.orig	2007-05-29 18:26:31.000000000 +0200
-+++ Makefile.am	2007-05-29 18:26:58.000000000 +0200
-@@ -29,12 +29,12 @@
- distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/Pidgin.pm
- #	cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
- 
-+if ENABLE_GTK
- appsdir = $(datadir)/applications
- apps_in_files = pidgin.desktop.in
- apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
- 
--if ENABLE_GTK
- GTK_DIR=pidgin
- endif
\ No newline at end of file
diff --git a/net-im/pidgin/files/pidgin-2.0.1-purple-remote-syntax-fix.patch b/net-im/pidgin/files/pidgin-2.0.1-purple-remote-syntax-fix.patch
deleted file mode 100644
index f410eab53d53..000000000000
--- a/net-im/pidgin/files/pidgin-2.0.1-purple-remote-syntax-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libpurple/purple-remote.orig	2007-05-27 01:16:26.000000000 -0400
-+++ ./libpurple/purple-remote	2007-05-27 01:16:34.000000000 -0400
-@@ -94,7 +94,7 @@
- def execute(uri):
-     match = re.match(urlregexp, uri)
-     protocol = match.group(2)
--    if protocol == "xmpp"
-+    if protocol == "xmpp":
-         protocol = "jabber"
-     if protocol == "aim" or protocol == "icq":
-         protocol = "oscar"
diff --git a/net-im/pidgin/pidgin-2.1.0.ebuild b/net-im/pidgin/pidgin-2.1.0.ebuild
index ac529f956c85..9a00b9564b02 100644
--- a/net-im/pidgin/pidgin-2.1.0.ebuild
+++ b/net-im/pidgin/pidgin-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.0.ebuild,v 1.1 2007/08/07 02:19:41 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.0.ebuild,v 1.2 2007/08/22 02:50:21 tester Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
+IUSE="avahi bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
 IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
diff --git a/net-im/pidgin/pidgin-2.0.2.ebuild b/net-im/pidgin/pidgin-2.1.1.ebuild
index 020ee1cc5829..36c080190264 100644
--- a/net-im/pidgin/pidgin-2.0.2.ebuild
+++ b/net-im/pidgin/pidgin-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.2.ebuild,v 1.5 2007/08/03 14:19:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.1.1.ebuild,v 1.1 2007/08/22 02:50:21 tester Exp $
 
 WANT_AUTOMAKE=1.9
 
@@ -15,12 +15,11 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
+IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell qq gadu"
 IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
+	bonjour? ( net-dns/avahi )
 	dbus? ( >=dev-libs/dbus-glib-0.71
 		>=dev-python/dbus-python-0.71
 		>=sys-apps/dbus-0.90
@@ -63,9 +62,7 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn"
 
 # List of plugins yet to be ported (will be removed at some point)
 #   net-im/gaim-bnet
-#   net-im/gaim-snpp (will soon be net-im/pidgin-snpp)
 #   x11-plugins/autoprofile
-#   x11-plugins/gaim-otr
 #   x11-plugins/gaim-xfire
 #   x11-plugins/gaim-galago
 #   x11-themes/gaim-smileys (get liquidx to fix it)
@@ -81,17 +78,19 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn"
 #   app-accessibility/festival-gaim
 # Merged into something else
 #   net-im/gaim-meanwhile (integrated in gaim)
-#   x11-plugins/gaim-libnotify (integrated into pidgin)
+#   net-im/gaim-snpp (merged into the plugin pack)
 #   x11-plugins/gaim-slashexec (integrated into plugin pack)
 
 # List of plugins
 #   net-im/librvp
-#   x11-plugins/gaim-rhythmbox
 #   x11-plugins/guifications
 #   x11-plugins/pidgin-encryption
 #   x11-plugins/pidgin-extprefs
 #   x11-plugins/pidgin-hotkeys
 #   x11-plugins/pidgin-latex
+#   x11-plugins/pidgin-libnotify
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
 #   x11-plugins/purple-plugin_pack
 
 print_pidgin_warning() {
@@ -103,8 +102,7 @@ print_pidgin_warning() {
 	ewarn "other external files not properly being found."
 	ewarn
 	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption or"
-	ewarn " gaim-snpp (when they are ported to pidgin!)."
+	ewarn "you may need to re-merge any plugins like gaim-encryption."
 	ewarn
 	ewarn "If you experience problems with pidgin, file them as bugs with"
 	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
@@ -122,14 +120,6 @@ print_pidgin_warning() {
 pkg_setup() {
 	print_pidgin_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 pidgin."
-	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"
@@ -163,13 +153,6 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.0-cchar_t-undeclared.patch"
-}
-
 src_compile() {
 	# Stabilize things, for your own good
 	strip-flags