Transition to eapi 2 use deps

4 files changed, 30 insertions, 54 deletions

diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index a51372d6a992..bb538cb17425 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silc-plugin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.29 2008/05/30 07:09:33 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.30 2009/03/07 20:58:12 gentoofan23 Exp $
+
+  07 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  silc-plugin-1.1.2.ebuild, silc-plugin-1.1.2-r1.ebuild:
+  Transition to eapi 2 use deps
 
   30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986).
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index 6a2d62e42bee..e92f19faac60 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MISC ChangeLog 5769 RMD160 28a3998f46490c4bf497d80bb196f643c322cdda SHA1 ccf8c06f53465e730be962893f8dee1eeb53d277 SHA256 243cbde91068375902948acebf276fc395fdd6ed9fbc628806134c2921408797
 AUX 1.0.1-branch-update.patch 6717 RMD160 b6e422fdf91baf3fbe9313e83d3a37e6d771a131 SHA1 0720a7702cad83529003338f8b801e00fd9982db SHA256 fa270bbc65eb6a16cd628ece425b15b68ed6e752d4763a60286f13c1bd6efc5e
 AUX 1.0.1-gcc34.patch 471 RMD160 549d08e8ffa80a2ac2bb945b0a81a6b7d4cdb0ad SHA1 7f18c4d950e436a0eadbe5ca08d9c76d2e83fbf1 SHA256 6111df03ff5cb884bdce3566e3add9719c17894443644d40daee7967eaa3abe2
+MISC metadata.xml 160 RMD160 a6ad0c05d64e31840114207dd45b62f889cbbe59 SHA1 be796d9ed970ebab12c2e943b724542bec95a3fe SHA256 11f74b4a52d7818d4a23729cf0dafa198080e898f1fc34aa63f639975f892940
+EBUILD silc-plugin-1.0.1-r4.ebuild 3541 RMD160 1c02bfe2370529525377fda8cd2593be007af995 SHA1 b351a49ee2d4e750a94b6b4c32f93fe4d9f04d41 SHA256 8a49b846e31a875d5fd98689e3a303ea690625dc39ded24a573894ecc3e84ee5
+EBUILD silc-plugin-1.1.2-r1.ebuild 2264 RMD160 4c0d0af0fc178012e585bb50550c214087e3ef1a SHA1 654dee182c273fc7b12d0a1a2f0649a79f53a369 SHA256 e7097a0d099ea626adf79b05f11f5ab606cc872aba640ee805b2aac96af1bb97
+EBUILD silc-plugin-1.1.2.ebuild 2213 RMD160 b5cd08dc6a0592e9d1056c520936549456216293 SHA1 9f2056a682fe57d6e64d9d44d7c9fbd8df41002c SHA256 7115097d2b76cead53904819778a668f3d28f57ae5bfbbbabe59fb84a3af336f
+DIST silc-client-1.1.2.tar.bz2 1622496 RMD160 ac08152f7d49a0e14c2b900c3983d5e97992f29a SHA1 b529a48f8e21752e690c43e869ca7ff8ed3906ce SHA256 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4
 DIST irssi-0.8.9.tar.bz2 816465 RMD160 7a0a2a639c041802bfddd458c35bccaec8084013 SHA1 57799a1e99ac5f6694eb6fd049d39a4e2e51f576 SHA256 230ffa21a97f930000e0004f18cf5b709d5da5408d297e1567538a53cf91c32c
 DIST silc-client-1.0.1.tar.gz 1862493 RMD160 007ff291d9d7481a646b24161b75be3a963a27b2 SHA1 d41ccb47dfe1a415da7dc15010ef8b52e1b129f8 SHA256 e53961ac6b79d150e0d3a1fa3e0e6220831402c9c50d699add00d82309682426
-DIST silc-client-1.1.2.tar.bz2 1622496 RMD160 ac08152f7d49a0e14c2b900c3983d5e97992f29a SHA1 b529a48f8e21752e690c43e869ca7ff8ed3906ce SHA256 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4
 DIST silc-plugin-1.0.1.tar.gz 24789 RMD160 da196e12573032adcd22ed89de65e1f160a43ef3 SHA1 7a6f4999c5f2dceccf6fa351f416238133550fdd SHA256 af32e6bcd2b72dc2fb09c691c2be98f6c107845d45f47b34ac465b5d0ca7238f
-EBUILD silc-plugin-1.0.1-r4.ebuild 3541 RMD160 1c02bfe2370529525377fda8cd2593be007af995 SHA1 b351a49ee2d4e750a94b6b4c32f93fe4d9f04d41 SHA256 8a49b846e31a875d5fd98689e3a303ea690625dc39ded24a573894ecc3e84ee5
-EBUILD silc-plugin-1.1.2-r1.ebuild 2426 RMD160 1b036752313e858ec2ff1a9b1a08bc06adf7efcf SHA1 ccef98ab95841de265d6aed91561854dbba27e58 SHA256 209c5f2d7e22ecb30202683afda23d95be8b6c7b90d7a320dcc9a212b3cad749
-EBUILD silc-plugin-1.1.2.ebuild 2375 RMD160 920328d08e41bf28bd1b46b44e362d5370a052d7 SHA1 75326678a77bb8fd5581f427f660b31c7daa6789 SHA256 b9cbbd1420e589391c299d362c738c7352f8be03f4bae7a16df19a39a2dee82c
-MISC ChangeLog 5618 RMD160 170620a85e7a9b59b63d69403627e9f6d615fac3 SHA1 1369745921758aa1783a91a8e4fe1182a586cfc9 SHA256 33c1333bb457e9ba2d3f85dacb4c183e67e5b254279a62a7d261975b5bbef043
-MISC metadata.xml 160 RMD160 a6ad0c05d64e31840114207dd45b62f889cbbe59 SHA1 be796d9ed970ebab12c2e943b724542bec95a3fe SHA256 11f74b4a52d7818d4a23729cf0dafa198080e898f1fc34aa63f639975f892940
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg/qDIACgkQyuNVb5qfaOZo7wCfRTZR08vt17rQTKxPjbWT0LA6
-/7IAniLAvbghFs1UOiiwWpX4V/zBnmag
-=a4su
------END PGP SIGNATURE-----
diff --git a/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild b/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild
index 008ee6296437..c6bb23c8ec71 100644
--- a/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 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/silc-plugin/silc-plugin-1.1.2-r1.ebuild,v 1.1 2007/12/09 13:08:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild,v 1.2 2009/03/07 20:58:12 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils perl-module
 
 IRSSI_PV="0.8.10a"
@@ -18,19 +19,13 @@ IUSE=""
 # All necessary dependencies are pulled in by irssi.
 DEPEND="=dev-libs/glib-1.2*
 	www-client/lynx"	# this is for .html -> .txt docs convert
-RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}
+RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}[perl]
 	>=dev-perl/MIME-tools-5.413
 	dev-perl/File-MMagic
 	dev-perl/MailTools"
 
 S="${WORKDIR}/silc-client-${PV}"
 
-pkg_setup() {
-	if ! built_with_use net-irc/irssi perl ; then
-		die "Irssi was built without perl support, building a perl plugin makes no sense."
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -39,16 +34,12 @@ src_unpack() {
 	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
 }
 
-src_compile() {
-
+src_configure() {
 	econf \
-			${myflags} \
-			--with-silc-plugin \
-			--without-silc-includes \
-			--with-pic \
-			|| die
-
-	emake || die
+		${myflags} \
+		--with-silc-plugin \
+		--without-silc-includes \
+		--with-pic
 }
 
 src_install() {
diff --git a/net-im/silc-plugin/silc-plugin-1.1.2.ebuild b/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
index 87414cd03666..e86652bddb2a 100644
--- a/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 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/silc-plugin/silc-plugin-1.1.2.ebuild,v 1.5 2007/12/09 13:08:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.1.2.ebuild,v 1.6 2009/03/07 20:58:12 gentoofan23 Exp $
 
+EAPI="2"
 inherit eutils perl-module
 
 IRSSI_PV="0.8.10a"
@@ -18,19 +19,13 @@ IUSE=""
 # All necessary dependencies are pulled in by irssi.
 DEPEND="=dev-libs/glib-1.2*
 	www-client/lynx"	# this is for .html -> .txt docs convert
-RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}
+RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}[perl]
 	>=dev-perl/MIME-tools-5.413
 	dev-perl/File-MMagic
 	dev-perl/MailTools"
 
 S="${WORKDIR}/silc-client-${PV}"
 
-pkg_setup() {
-	if ! built_with_use net-irc/irssi perl ; then
-		die "Irssi was built without perl support, building a perl plugin makes no sense."
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -39,16 +34,12 @@ src_unpack() {
 	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
 }
 
-src_compile() {
-
+src_configure() {
 	econf \
-			${myflags} \
-			--with-silc-plugin \
-			--without-silc-includes \
-			--with-pic \
-			|| die
-
-	emake || die
+		${myflags} \
+		--with-silc-plugin \
+		--without-silc-includes \
+		--with-pic
 }
 
 src_install() {