Transition to eapi 2 use deps

5 files changed, 38 insertions, 121 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 1229b4d5e5cf..36d5bd85fdec 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.86 2009/03/04 23:53:29 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.87 2009/03/07 20:36:17 gentoofan23 Exp $
+
+  07 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> pidgin-2.5.1.ebuild,
+  pidgin-2.5.2.ebuild, pidgin-2.5.3.ebuild:
+  Transition to eapi 2 use deps
 
 *pidgin-2.5.5 (04 Mar 2009)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index daeaabab41fa..ffb4fdc66e8a 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MISC ChangeLog 12099 RMD160 18719060a6bcbabd56d8e983526cf65ae4fc7930 SHA1 36c67db2e8540c05fb07cd4ca2307077ba6a6449 SHA256 44c8d7e80e194fa8391ebf8d3280952ba796e0aac9ae7cdd7bf76d0c8e56dc90
 AUX pidgin-2.5.2-asneeded.patch 381 RMD160 e00a6f9c275e0d845f80b1a61b4483ddef13a14a SHA1 4bf4ff9da6b10ddc0038087f6003dd2b6fcf26c4 SHA256 ebc882a6d188803cd74484b9d4bffd52c853e49c652ed4a818acf8f0b7004a29
 AUX pidgin-2.5.4-icq-messages-magic.patch 2978 RMD160 fa89104830608f368ed8fa23013d936e1b5e2fab SHA1 88e03f43981376858530d048568af8a67788377c SHA256 d05c053a994911028fc04fd9557f3dec82c43d5291ca14389260a7ee13322cf3
 AUX pidgin-2.5.4-icq.patch 833 RMD160 fa1813c84006d0e6f10c37b84a51bb856797e01b SHA1 d57523cfe93ac77964e347ce418ebd796997c879 SHA256 816a80b180bb1ea51a9332777620f99e1539d7373e5e0f3c653908f20e381487
-DIST pidgin-2.5.1.tar.bz2 8952067 RMD160 d9f927db55ecc55a2e66b064612774575b82b062 SHA1 8b7be1be4d549d9c0e34c820c8a285aab5e116d7 SHA256 13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
-DIST pidgin-2.5.2.tar.bz2 8059006 RMD160 fe27ecce5ada1664de9e260b863b9b4940de75a8 SHA1 aa555099806cc3e9019a9e9bb9f05c5c11c43641 SHA256 2013410352bbbab949cbaa71b0b751a39597b3710845a34e62fcb0e1f9b669dc
-DIST pidgin-2.5.3.tar.bz2 8393073 RMD160 c139b2746f2557f5f132e6460f5bff7009fd8259 SHA1 bd3f6eca0a0c9b221be8a664e904450db8589314 SHA256 912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
-DIST pidgin-2.5.4.tar.bz2 8398610 RMD160 13f9e27e00e73a02b18f967fcf722a0c511569e5 SHA1 80f7a9e311d4ed6f2438f2ee16a4bdc66edcc2ad SHA256 c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63
-DIST pidgin-2.5.5.tar.bz2 8357209 RMD160 b7d37b73b9cced0f399cbc233c7ee0cdcf33e582 SHA1 a99ef50504b2b5f4014bfad232957322829d568f SHA256 cb5a13b99c2868b61d7f790678e1b3d3055eb9bf56c369a0eab90aa3fa7723e8
-EBUILD pidgin-2.5.1.ebuild 5257 RMD160 191422a18058b1b2f946f2e7cfc50f94c8d13444 SHA1 d815a51713a185e999ef9a8f9c72c3b6019532a3 SHA256 ed49ce3c83b90c2faae18ddafeb5f72777872dc6c815d019b9a13d3bac92d17d
-EBUILD pidgin-2.5.2.ebuild 5384 RMD160 a8921cf29b4756294748577561c0afd8a89ee65d SHA1 6dc295f3313107a1e1018eb49ee3d684fe23ae1d SHA256 62b847ce460b8c0f14e232b64fde73ac99e1d30512e7d4b396fab6710d885acf
-EBUILD pidgin-2.5.3.ebuild 5298 RMD160 2d150a98536012118834f60eed3fd189be341886 SHA1 7ce7cd9c1e6eef07692827d5b4185d6568410733 SHA256 f9036f9177f7d2bd16e2153a92fc6861a5a023e286f46ca5eb37f7550c21113d
+MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
+EBUILD pidgin-2.5.1.ebuild 4546 RMD160 bd9a3f79ec99b15c156c942eae6f14bf466791ec SHA1 6d57acfdbbffb47536b8b515566681a6449b06e0 SHA256 ecbf2de96742dfdd105c389e63680292af828f2104444f64c6369e4baa8614d7
+EBUILD pidgin-2.5.2.ebuild 4672 RMD160 bd15d2bc5f154e03fa27c3a8c072acb2cf53e980 SHA1 6fbfa921fd6a4d653b321a91b935ea713b40cde9 SHA256 d832ff7ce4eaa75208aa13db34f2227b3f543f98c3756fa2a365550a616d2051
+EBUILD pidgin-2.5.3.ebuild 4583 RMD160 0479032e9306fc109f3cb2830e1018279af1a994 SHA1 3ad3e1ff65b1aa25528e921d9a50066d019aea87 SHA256 c6c04043d90f43f6e906a374fb1a8b298a1e8345deae22347667c236a7a2449d
 EBUILD pidgin-2.5.4-r1.ebuild 4612 RMD160 ad5c6bbe11cf93a5c4cc7bbc61c24bb2037b5849 SHA1 4fe399f49276d3a06027f31924418f36d22ad625 SHA256 a543b76bd2c3948d0c54a50a563395cc2cbc65cd225df191f05fb1416b4edd86
 EBUILD pidgin-2.5.4.ebuild 4501 RMD160 f52da936e00c5aafd7953150ed4fad32b1cdb956 SHA1 b3f88e58da2b84129e6972fa5270f54dac16c200 SHA256 ffed4027dccd26c7b5e622615355288a75893fabee380b2cdb01ea74cf119231
 EBUILD pidgin-2.5.5.ebuild 4564 RMD160 73dc3b19d35ee08d25bce08d28a3414efe925685 SHA1 464a004a650be5503a69753672fd82da963f446f SHA256 71a406c92efe3ba5daa8a4be93b9ef74f5faccbd5b512038e0f61c2bc43256fb
-MISC ChangeLog 11940 RMD160 6f496079711fad4fcea218cadd3daab94ab89d82 SHA1 ebde84398e284de49f9b747b3430518a62c00907 SHA256 20d51005ca6311cef1d38faa16a5da7e6f0e309e0a820474c5ccac53b028779a
-MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmvFIIACgkQmOfEJZHYOKczEgCg4UGy0T8Nq4H+cSYkM9pzM0Qw
-4YMAn2vQhtrLbUgCeK+m0XrDh3ITM041
-=LwqZ
------END PGP SIGNATURE-----
+DIST pidgin-2.5.4.tar.bz2 8398610 RMD160 13f9e27e00e73a02b18f967fcf722a0c511569e5 SHA1 80f7a9e311d4ed6f2438f2ee16a4bdc66edcc2ad SHA256 c6bebef97b8b337cd2bc8107b3714dedf60d02db70487d0aafdd8b5b7ada1b63
+DIST pidgin-2.5.3.tar.bz2 8393073 RMD160 c139b2746f2557f5f132e6460f5bff7009fd8259 SHA1 bd3f6eca0a0c9b221be8a664e904450db8589314 SHA256 912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
+DIST pidgin-2.5.2.tar.bz2 8059006 RMD160 fe27ecce5ada1664de9e260b863b9b4940de75a8 SHA1 aa555099806cc3e9019a9e9bb9f05c5c11c43641 SHA256 2013410352bbbab949cbaa71b0b751a39597b3710845a34e62fcb0e1f9b669dc
+DIST pidgin-2.5.5.tar.bz2 8357209 RMD160 b7d37b73b9cced0f399cbc233c7ee0cdcf33e582 SHA1 a99ef50504b2b5f4014bfad232957322829d568f SHA256 cb5a13b99c2868b61d7f790678e1b3d3055eb9bf56c369a0eab90aa3fa7723e8
+DIST pidgin-2.5.1.tar.bz2 8952067 RMD160 d9f927db55ecc55a2e66b064612774575b82b062 SHA1 8b7be1be4d549d9c0e34c820c8a285aab5e116d7 SHA256 13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
diff --git a/net-im/pidgin/pidgin-2.5.1.ebuild b/net-im/pidgin/pidgin-2.5.1.ebuild
index bc947307180b..3d0f1ddb5ffa 100644
--- a/net-im/pidgin/pidgin-2.5.1.ebuild
+++ b/net-im/pidgin/pidgin-2.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.1.ebuild,v 1.6 2008/09/08 03:12:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.1.ebuild,v 1.7 2009/03/07 20:36:17 gentoofan23 Exp $
 
+EAPI="2"
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
 
 DESCRIPTION="GTK Instant Messenger client"
@@ -30,17 +31,18 @@ RDEPEND="
 	gstreamer? ( =media-libs/gstreamer-0.10*
 		=media-libs/gst-plugins-good-0.10* )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
+	gadu?  ( net-libs/libgadu[-ssl] )
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( >=dev-libs/nss-3.11 )
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	dev-libs/libxml2
 	networkmanager? ( net-misc/networkmanager )
+	ncurses? ( sys-libs/ncurses[unicode] )
 	prediction? ( =dev-db/sqlite-3* )"
 	# Mono support crashes pidgin
 	#mono? ( dev-lang/mono )"
@@ -71,40 +73,15 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 #   x11-themes/pidgin-smileys
 
 pkg_setup() {
-	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 pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
 	if ! use gtk && ! use ncurses ; then
 		einfo
 		elog "You did not pick the ncurses or gtk use flags, only libpurple"
 		elog "will be built."
 		einfo
 	fi
-
-	if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-		eerror "enable krb4 support for the zephyr protocol in pidgin"
-		eerror
-		die "Configure failed"
-	fi
-
 }
 
-src_compile() {
+src_configure() {
 	# Stabilize things, for your own good
 	strip-flags
 	replace-flags -O? -O2
@@ -179,10 +156,8 @@ src_compile() {
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		--disable-mono \
 		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
+		${myconf}
 		#$(use_enable mono) \
-
-		emake || die "make failed"
 }
 
 src_install() {
diff --git a/net-im/pidgin/pidgin-2.5.2.ebuild b/net-im/pidgin/pidgin-2.5.2.ebuild
index 678125fafb20..568914fbd40b 100644
--- a/net-im/pidgin/pidgin-2.5.2.ebuild
+++ b/net-im/pidgin/pidgin-2.5.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.2.ebuild,v 1.8 2009/01/04 08:41:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.2.ebuild,v 1.9 2009/03/07 20:36:17 gentoofan23 Exp $
 
 WANT_AUTOMAKE="1.9"
-
+EAPI="2"
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 autotools
 
 DESCRIPTION="GTK Instant Messenger client"
@@ -32,17 +32,18 @@ RDEPEND="
 	gstreamer? ( =media-libs/gstreamer-0.10*
 		=media-libs/gst-plugins-good-0.10* )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
+	gadu?  ( net-libs/libgadu[-ssl] )
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( >=dev-libs/nss-3.11 )
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	dev-libs/libxml2
 	networkmanager? ( net-misc/networkmanager )
+	ncurses? ( sys-libs/ncurses[unicode] )
 	prediction? ( =dev-db/sqlite-3* )"
 	# Mono support crashes pidgin
 	#mono? ( dev-lang/mono )"
@@ -73,37 +74,12 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 #   x11-themes/pidgin-smileys
 
 pkg_setup() {
-	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 pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
 	if ! use gtk && ! use ncurses ; then
 		einfo
 		elog "You did not pick the ncurses or gtk use flags, only libpurple"
 		elog "will be built."
 		einfo
 	fi
-
-	if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-		eerror "enable krb4 support for the zephyr protocol in pidgin"
-		eerror
-		die "Configure failed"
-	fi
-
 }
 
 src_unpack() {
@@ -114,7 +90,7 @@ src_unpack() {
 	eautomake
 }
 
-src_compile() {
+src_configure() {
 	# Stabilize things, for your own good
 	strip-flags
 	replace-flags -O? -O2
@@ -189,10 +165,8 @@ src_compile() {
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		--disable-mono \
 		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
+		${myconf}
 		#$(use_enable mono) \
-
-		emake || die "make failed"
 }
 
 src_install() {
diff --git a/net-im/pidgin/pidgin-2.5.3.ebuild b/net-im/pidgin/pidgin-2.5.3.ebuild
index c3304c0860f4..6ba868a194ba 100644
--- a/net-im/pidgin/pidgin-2.5.3.ebuild
+++ b/net-im/pidgin/pidgin-2.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.3.ebuild,v 1.1 2008/12/26 07:36:41 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.3.ebuild,v 1.2 2009/03/07 20:36:17 gentoofan23 Exp $
 
 WANT_AUTOMAKE="1.9"
-
+EAPI="2"
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 autotools
 
 DESCRIPTION="GTK Instant Messenger client"
@@ -32,17 +32,18 @@ RDEPEND="
 	gstreamer? ( =media-libs/gstreamer-0.10*
 		=media-libs/gst-plugins-good-0.10* )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
+	gadu?  ( net-libs/libgadu[-ssl] )
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( >=dev-libs/nss-3.11 )
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	dev-libs/libxml2
 	networkmanager? ( net-misc/networkmanager )
+	ncurses? ( sys-libs/ncurses[unicode] )
 	prediction? ( =dev-db/sqlite-3* )"
 	# Mono support crashes pidgin
 	#mono? ( dev-lang/mono )"
@@ -73,40 +74,15 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 #   x11-themes/pidgin-smileys
 
 pkg_setup() {
-	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 pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
 	if ! use gtk && ! use ncurses ; then
 		einfo
 		elog "You did not pick the ncurses or gtk use flags, only libpurple"
 		elog "will be built."
 		einfo
 	fi
-
-	if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-		eerror
-		eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-		eerror "enable krb4 support for the zephyr protocol in pidgin"
-		eerror
-		die "Configure failed"
-	fi
-
 }
 
-src_compile() {
+src_configure() {
 	# Stabilize things, for your own good
 	strip-flags
 	replace-flags -O? -O2
@@ -181,10 +157,8 @@ src_compile() {
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
 		--disable-mono \
 		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
+		${myconf}
 		#$(use_enable mono) \
-
-		emake || die "make failed"
 }
 
 src_install() {