Transition to eapi 2 use deps

3 files changed, 24 insertions, 38 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/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() {