Fix perl dependency - bug #341981. EAPI bump. Remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 29 insertions, 102 deletions

diff --git a/net-mail/pop-before-smtp/ChangeLog b/net-mail/pop-before-smtp/ChangeLog
index 6693da5eb271..d3337de23592 100644
--- a/net-mail/pop-before-smtp/ChangeLog
+++ b/net-mail/pop-before-smtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/pop-before-smtp
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/ChangeLog,v 1.18 2009/01/04 10:15:01 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/ChangeLog,v 1.19 2011/06/06 11:33:40 eras Exp $
+
+  06 Jun 2011; Eray Aslan <eras@gentoo.org> -pop-before-smtp-1.34.ebuild,
+  -pop-before-smtp-1.36.ebuild, pop-before-smtp-1.42.ebuild:
+  Fix perl dependency - bug #341981. EAPI bump. Remove old.
 
 *pop-before-smtp-1.42 (04 Jan 2009)
 
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index 55a4eb61f5ea..fe46b0fa990a 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pop-before-smtp.init 722 RMD160 3517a70344e0183f50ac3237cb5133202b3344f0 SHA1 5d9b1bb8c5cbbc8d113898dbd9ffec980a77c5bc SHA256 46206b1d4c91aec38798afc86765b48060eefe8f85d0bb687832aa90d05983c5
-DIST pop-before-smtp-1.34.tar.gz 30809 RMD160 1093b07346d076367155d51c2a5503c76d141ef7 SHA1 1d576c90d77d2364cacfaad8f441de8e62288f20 SHA256 b1064122ea34663fb19d5371a2e837a3c5be68de1c9e66d07a90a8df6898f338
-DIST pop-before-smtp-1.36.tar.gz 34563 RMD160 93364935693a6fd1c7c1189fed019e5a83e90e90 SHA1 6f1fa77d434b350042484103f6cbffdecd960b20 SHA256 5f2a439fa95196e3d3817879225514fae2a46d285ac79879f47f54bb93d5342e
 DIST pop-before-smtp-1.41.tar.gz 39944 RMD160 46c69f073433a3f957b5d34481b6e5a00b58ae79 SHA1 1069fb22c7f861e82d8254df7b4d82fb99aad1dc SHA256 e9f7fc2b1771c6e962f8ad840cdbd37b8423bd39eaed7f8f84511e2630d56f83
 DIST pop-before-smtp-1.42.tar.gz 40612 RMD160 03103a84d9ef0fc29a4faa8bfbb323d7adb55d55 SHA1 a65eb094e7adf5845a0411ce6eafb2255889c6b6 SHA256 cfa9e1b24b185c1f7bd9a5f076d39d9b4e50f92d68a1463ec937e7c1526aaa41
-EBUILD pop-before-smtp-1.34.ebuild 1258 RMD160 c81f0b97102734f694e65364f7f458ebae4ee611 SHA1 1ba695799350c8531e27e9ce8f20912dacfad178 SHA256 5156956277d36d4ce74deb4dc3ce70629316922d7688de4249f2a36ad8cfe5f2
-EBUILD pop-before-smtp-1.36.ebuild 1258 RMD160 2ebd9790d1ee4afaafa54c63ce99cc08833df733 SHA1 91da98c725bbc94429549648876efcffd50ac172 SHA256 ac343331728daebee441e20d017b09a83f6549e01982f7ff194a7b9181453768
 EBUILD pop-before-smtp-1.41.ebuild 1257 RMD160 4d35992cddcac7c4371e48b6d7033c6f5d7cbd2a SHA1 3d5958811f18183044f08f52ea342c0d87e5b399 SHA256 a73d39eb38b3ac6b0f506bcdb630ac76402e6faa69291f602bd030612eb97c50
-EBUILD pop-before-smtp-1.42.ebuild 1181 RMD160 4238d01d3f7ebfee2baddea7cff6fe2683d14c8f SHA1 8843ee70e9b5da42eb9cb11ab243c06835ed15b2 SHA256 5d669577746786ac511362cfe7f260ef7fa46a25c5af6a79b9246affc698a9fb
-MISC ChangeLog 2462 RMD160 e1ffa25036eed9da99a1df683db4757b506bb682 SHA1 e3b635a14f504f31df08a3e56a95daf7b57d4ebd SHA256 cb563a00e13a7af817b124a161dd76efb19eb1655108f1a4d671a8c7e54d9816
+EBUILD pop-before-smtp-1.42.ebuild 1173 RMD160 044207281e7e3a506a29f7a848ecc277f3abaf2f SHA1 31d8941a7f87327570d9e2ba521ebe7d1f34def2 SHA256 4cc0059204ae8ab961a79ea70146450838c3f579402350c5b49cfddd02d65399
+MISC ChangeLog 2658 RMD160 7c79b43c5d4680a2446c4bcf927755a9014a77c1 SHA1 f8fe6b915b1c65469ef09c3b828970a1536c618d SHA256 d4e4896da3b5e5c51fc50781840935ad0f73e8de34d2c8c24d9338c0de8000f5
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAklgjBEACgkQV3J2n04EauyFOQCcDcC1E4ds3b3Ynxe2CqtoRqnb
-SKEAnit3jy1IGlrxoXvkzOpa36Ln3PWa
-=u8zk
+iQIcBAEBCAAGBQJN7LshAAoJEHfx8XVYajsfy5sP/2I4N459E4OVSyToaNg0KBi6
+xju9NYSdMRiNguzoYtwle3REoZ9iuIE2taA+2Ah1rUB7sxOs7b/5JG/sp54odwsG
+zm8xv7bLLeWYmCWCGjInggTxikvh8kcubYlBoum44faKUSzhmpavJeneSxepBm8T
+gyCQakrw1C/WPrMq9s9DcuD611GVq8QqMHcZUJEAMrl6/+7VbIMJXz3MTUmrbIk0
+7N1/z1qs13vIORV/HwLnn6Ml+4EFv0sKHpBL88oWzimsd/Y4NJo9NEKSkr0yKPOO
+oM1PW7/+99w9uncdVxaPNCJnkFw8MFWWrcm0YVDaKx1k1cgnAQyR7GNjQS3kMKsU
+H4sqQHRRcI4k58rHUh3+8WHQQh1cGAWCCLwvocUk3c4jkVvI/GeKeUgLKQxKcSc5
+WT26RDFdSrSeSJArNRpLusvjewN6+ocp7NnbkFeZAP2raERlN2p2+AVqU3p2qBcR
+p23MkQWm1V9RO+ICYK435hqmJ3/fOP5Efu7j5sL9sQZ7LROErTbj/3xSOBEPgsT1
+B09cyrz6WFYthUTzM07IK3sYZz95RqDWpSCl9KFZc3xNcCD3ZPTVt9QfPoVpfr7n
+zSH7ZbaewLebkABsuiJFfC5E56nkppbdVHnz9DlxEwhtcUstjQJw0iyPNCJpUTGV
+/fkvXapLTnWylqJNfu5E
+=WSYM
 -----END PGP SIGNATURE-----
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.34.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.34.ebuild
deleted file mode 100644
index d9c4f9d2a13f..000000000000
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.34.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/pop-before-smtp-1.34.ebuild,v 1.8 2007/04/28 22:23:55 swegener Exp $
-
-DESCRIPTION="a simple daemon to allow email relay control based on successful POP or IMAP logins"
-HOMEPAGE="http://popbsmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/popbsmtp/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD Artistic"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-perl/File-Tail
-	virtual/perl-Time-HiRes
-	dev-perl/Net-Netmask
-	dev-perl/TimeDate
-	dev-perl/Unix-Syslog"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# enable syslog
-	sed -i \
-		-e "/^=cut #============================= syslog ===========================START=$/d" \
-		-e "/^=cut #============================= syslog =============================END=$/d" \
-		pop-before-smtp-conf.pl \
-			|| die "sed pop-before-smtp-conf.pl failed"
-}
-
-src_install() {
-	dosbin pop-before-smtp || die "dosbin failed"
-	dodoc README ChangeLog TODO contrib/README.QUICKSTART
-	insinto /etc
-	doins pop-before-smtp-conf.pl || die "doins failed"
-	newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \
-		|| die "newinitd failed"
-}
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.36.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.36.ebuild
deleted file mode 100644
index 0e4755af5899..000000000000
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.36.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/pop-before-smtp-1.36.ebuild,v 1.7 2007/04/28 22:23:55 swegener Exp $
-
-DESCRIPTION="a simple daemon to allow email relay control based on successful POP or IMAP logins"
-HOMEPAGE="http://popbsmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/popbsmtp/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD Artistic"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-perl/File-Tail
-	virtual/perl-Time-HiRes
-	dev-perl/Net-Netmask
-	dev-perl/TimeDate
-	dev-perl/Unix-Syslog"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# enable syslog
-	sed -i \
-		-e "/^=cut #============================= syslog ===========================START=$/d" \
-		-e "/^=cut #============================= syslog =============================END=$/d" \
-		pop-before-smtp-conf.pl \
-			|| die "sed pop-before-smtp-conf.pl failed"
-}
-
-src_install() {
-	dosbin pop-before-smtp || die "dosbin failed"
-	dodoc README ChangeLog TODO contrib/README.QUICKSTART
-	insinto /etc
-	doins pop-before-smtp-conf.pl || die "doins failed"
-	newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \
-		|| die "newinitd failed"
-}
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
index dcb14be37f49..97fbe15843a7 100644
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild,v 1.1 2009/01/04 10:15:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild,v 1.2 2011/06/06 11:33:40 eras Exp $
+
+EAPI=4
 
 DESCRIPTION="a simple daemon to allow email relay control based on successful POP or IMAP logins"
 HOMEPAGE="http://popbsmtp.sourceforge.net"
@@ -11,14 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl[berkdb]
 	dev-perl/Net-Netmask
 	dev-perl/TimeDate"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# enable syslog
 	sed -i \
 		-e "/^=cut #============================= syslog ===========================START=$/d" \