Net::DNS nextid() changed to be id(). Ensure that we are patched for it.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64

7 files changed, 135 insertions, 40 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 4549fdddb5eb..efa88e85622e 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/qpsmtpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.18 2013/02/15 14:25:49 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.19 2013/04/15 23:19:22 robbat2 Exp $
+
+*qpsmtpd-0.84-r2 (15 Apr 2013)
+
+  15 Apr 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/qpsmtpd-0.84-Net-DNS-id.patch, +qpsmtpd-0.84-r2.ebuild,
+  qpsmtpd-0.84-r1.ebuild, qpsmtpd-0.84.ebuild, qpsmtpd-9999.ebuild:
+  Net::DNS nextid() changed to be id(). Ensure that we are patched for it.
 
   15 Feb 2013; Eray Aslan <eras@gentoo.org>
   -files/qpsmtpd-0.40-badhelo_disconnect.patch,
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 82f1af92d7e8..bb6db03776d9 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX qpsmtpd-0.40-badrcptto_allowrelay.patch 498 SHA256 f0bc5f9d4865084ef673e5271725dd01ec1d3fbfcf4ea47988d728c5acd14acf SHA512 542a36cc410386873fb1eeb39debc443615f39dd0cdfc0e21e914542515ae75294904778f78324e5e5ce03c39542a1e00be0b4d3c7a114b14591f343078ec8c7 WHIRLPOOL 237eb12e95ba61e0a511c42a0e51184eb7dbc6c059008952226fff5c0484509f6d3ad1899fdbf62de98cb798e3bcfec5c4f8e7de2ac62370160c41e14be89062
 AUX qpsmtpd-0.83-accept-empty-email.patch 1599 SHA256 036d280a67da1b737b16cb56ab4acb5fa03b2ade2d38399262c63583ee6874a7 SHA512 859235361dd238a2d1b1fc5d34e951ae184b4c66031b3ffee4c7e33aefc0fbcaa0987aab290b95d08e576da47f69769aa403ba4965f2a20fcaf431412e2a6428 WHIRLPOOL de0599c97f89ea7501ae871b968723c04d8bc7a433f5942b1b28a442e50b1221e2800de5ec716141fe54ec9a1bce0bbecd0e913290f3620cd12410dc53c3b37c
 AUX qpsmtpd-0.83-clamd_conf.patch 706 SHA256 ead4226d7037bbeac5ca66b162a8858da520ef6be73604cfe0e86c9aa51aa6f3 SHA512 644daac5c73a0997707a4195bd70faff436205b274fc2d89043ba2d07b76a2b97462a5bcbbd7146f3a6914f6243e973a0a168740dc97068dfda28eecd3ce2366 WHIRLPOOL eb5a1ed14d73d9d24c967cd79093f4a1f8bbb36b84149dae1488fb5bd448b651e842cf3f5f2526a7ee753e795429a48a7db610b7c0360686ade37ded64c00f7b
+AUX qpsmtpd-0.84-Net-DNS-id.patch 1069 SHA256 e5967b9d43bebd8e7491e40458b83cac0d9e8994d8d9c23d97db6554b134d627 SHA512 daf8e3c03c80f926cd0e94519945941dcd5b376ab5a1e99c3d83d26f800f0d1b69d4bb5c739483916f038fd7c1190746a2114f72416550f01d9a05c62e63d9bb WHIRLPOOL 04b52894701f8253e40f3f8cb6376908f9f19842240d6ad2f4263a4b749828a215b9c4fb5c7268c440ae9bb7eabce91eaef6d28e4c5b72ce910e6990e0d8824b
 AUX qpsmtpd.confd 617 SHA256 7748b525d9c3a3e8cbeec66b8b5df48510a44a1d624168278ce71720e7de8bc0 SHA512 d6dae42a493de7ac7c00e5b1aa2ccb7e1f3b3a2f23011ce854252d1e988d029adcb46407f2aff78cf8c4b832ef38e25a6fa2ddac4512acf7a455ab5f031201a2 WHIRLPOOL 7290cf8d7220e34208250a456b4dc244c9dd2eaf2e4041e201c078a396657c59724653be5a98cf206b7335c6b8378b3e7b0efd0d85cdf39a7276f178d526b089
 AUX qpsmtpd.envd 74 SHA256 bbf8f40198e8a87ff6103b5dc98cae561f0dc9738a6cda3492b00468fbfdfd8e SHA512 2fe8e49d55df9216249fda126cf632c82b19740878f3f8aa3044b4f98d435ebd37933fa786dd89e9f538486251239f87f42942f3e12673d096aca9f5b9cb3ea8 WHIRLPOOL 1d4944de0731b4a2b00da1a9092fa0f995fad80df95a3852307f5eeba19345cf0e2456c436011e1363d7ce91df736ae8e742a4146ee8d93e1687e97cfe195764
 AUX qpsmtpd.initd 2057 SHA256 035db169b79760e2259e0562acca23f16b6cf108edd965c687c47ddd2d6916c1 SHA512 09f4db3f9baf8baa1b930a32aaa547a01797a3523f4184695beefb1f5cade5c886e8da387e73df9f8091e3e699c97bcf511ea3662591d2b251d9327f024fc578 WHIRLPOOL 363f42b1d6527e7abf676a02ac9d070b5dbebba840a0d98a563eaf5a0806f206acdc43d4f63407754c33701b90a94e429301312fb65f8e74624eccecd9be3a4f
 AUX qpsmtpd.initd-r1 2053 SHA256 6a9f3779b2fab20b9600e1b47c92e4f0d7890b28568d3f2fd7ab1f0bc214799e SHA512 5ce5e45d4b0e78cfdadb51be37b074e59bbba492428626dd81ef526f20f398d4ec31828870a1205aef3de8b4441994c7fb605981864cf56e693e6eabbd073507 WHIRLPOOL 94dc4f3d0935e5f38ff4609ce3ab380a439e82e15767487291455cd769f2437cfa254977602c94679723f966935281fc0de9d1a3c4ab240257850cc2d13efac7
 AUX qpsmtpd.xinetd 526 SHA256 45729911251be13007d95bb9e25b6c9c951a6419b8badae4e4097dfc603edcdd SHA512 b02331ea352573ea6bb1a46b1df343d2819ebe39dc4a42ec750c9a59f49a653f01bc933d7a2ee32e86fd386395137309de8202970465a2a2d8668fa35ae03994 WHIRLPOOL 1d483d3053cc72de09b6ea70cc6ed458caf92c6b9cb051f82454f1cb238cfbf1a8163e9161ffcafb002333a681c62f11aa947b635d2d1aeedce555ddbc8815b6
 DIST qpsmtpd-0.84.tar.gz 178260 SHA256 a09865816322531edd59d6fecd4bda35a9d583610b69d69a86e44038da841c98 SHA512 a12491c123d21b4e3965105bbe88ad7e7e61551a3ff4e96eee78c83dcb2afae62239fa24d710092a7ccf60097699901c42d70df8183de6454bef4fb26843358d WHIRLPOOL dfc0049faebbbe203949b24fc6d49213c606f5fbe24b4df35b2be8c8cc77d2350719f304a9c7f16782a67d64a5101debb03baa204d91f97adeaa072bf942a3fb
-EBUILD qpsmtpd-0.84-r1.ebuild 2216 SHA256 217caf807575b766e038ab1c3bfdc60bd4a6925730e89994ed7fd414594bbb11 SHA512 4dd060c53d6b08f1349b394df9f48bd5dc093add4a77bf61850e8027824a673f0b32142b1a15d69f009044fc708996504630853ae45e9fe4438b280add934e62 WHIRLPOOL 4e0306b4bb8aeecb9d6dd35bb816345bb754d212607f5a4a5d8b317b1dd0ab32be7c025d6f61eeb869bd9d9d72e5ce23338db56994789522c8d84c87254b9a22
-EBUILD qpsmtpd-0.84.ebuild 2249 SHA256 995d17b7d9245a6d9d78436ce2eedbe0f07db2be4013e4d8348a3fbfcbed8625 SHA512 6e8e5df1f1588ad9c0ac3c3462eaa0c361f521499b99acf6875491d49c992fb636ad203cb99fbf940a374c829b2c1851fd3310b8a05cbc922c7cf9c8eb41a42a WHIRLPOOL 572c9da5b6451704bd02b54f8b4f7596f37a736f5dabc2ef1c3d37b0ef3706559c0c83807fa454d40d2ced65153cb0e0cea66793a657ac5c95bbb7440aa4b5eb
-EBUILD qpsmtpd-9999.ebuild 2149 SHA256 5bc20e0375fdbac3081ff4fb66583d8a9fc070a126a79ed46dd2d3659fc3c696 SHA512 3fe7d5953d49807c9d55878071474c84c258e4a3d20708604493d409b77c3dfa36b28f9cffe8aadb91c2d5bed833a31c492fef97861b2f595c5d0b3c27af6b9e WHIRLPOOL f8cc0ee137018321d4f15fbf34da73898228298459e1b5ed2c1653e0cac5e5c49396c605b458d62c88ab3e533880c91540d27436551a400d7ef6912a00711dd2
-MISC ChangeLog 4024 SHA256 92ec8901c8f9257f1b7b635b5a1b8fa122feb3fd1a9d5c8ce829c3845674d754 SHA512 3e44c2164eb0e37bc394ecbce4649ae610a8aa5b3aa0e90b99b7ffc3a1ba111ba87ed936b4117d1a522b863ea1ab1e9f9142494ce85c68af94661411481cd77e WHIRLPOOL 1615b6e99d0e037d256053a0f37a172d65aa9f5abe1b71ec30d4037c8802e8b3657546de3dedfc31d019e4c2b7db32642c5bc12f07595a8cdde1758a6d0bd099
+EBUILD qpsmtpd-0.84-r1.ebuild 2228 SHA256 5425d59b92285d28b454fe428f8dbe26dc0c73d7679a20387e83691079ca41fc SHA512 1d222ce2f63491a2bc69b5fda5e6fe8a9f2b31fe7b939f79cc75819056d6cb4017abf56fa2b13584ed8d3cd14f8d57cbba7ae8f04675083779874257649a76ee WHIRLPOOL be3d75b3746a68b75908e65ed737c1cbf107e8b1de264631bb8e510b23208260136962ac2cd72fc1d919b7fdd20136e8ab5c2d11c39b666bbc1d47897c4090e7
+EBUILD qpsmtpd-0.84-r2.ebuild 2279 SHA256 0de82c6a152a325686d4affac834805470d219e05ca291a4b2f0f8979860bc34 SHA512 a42851c0fc8f82b91f04fda0d57e869d3e8ca3d51d8c356a359dc65049721d4a9ec8ccbeebe44adac08e9f912041d51118f9dd7fdc8729b607e4ac0defc7eb19 WHIRLPOOL 86b008a66ac3a6436d8f276938ac118f22f4d440fd4813b4b7b46be26ec1dd4ddbe7305be6af5f01ad945f534243bf8cbcd51e60defbaea43079742213c8b086
+EBUILD qpsmtpd-0.84.ebuild 2256 SHA256 a273f0341aecd56779175e2af87451d23c6189bffe0dae252677abec6ec39ad9 SHA512 ee782bdbc01f045e30a3de543446a2caff4ca49ee86446247252d04404b9a37161a54f7984645782a085c755af604d74f53c3dc1bde391d911114795da37ea5a WHIRLPOOL e727661a3bbbb9f412a06ed1c011aa3c62d11c7bb322c0b8e141e1f229ddc6d7dfbe028a0b6b202825f55ca0e3767887b49dc1851547156f77bf4037346c5a0f
+EBUILD qpsmtpd-9999.ebuild 2140 SHA256 67ac1a6d528ff9b4dabb3df5ba2fbdd2617f0d3c9c8e6e4b234a7de9a78ab803 SHA512 684a8af4db954980985da55eadaebabf6b168af365c2de8d68f81ebd83b9017784de9277064cb01970f28598ec06ab210fdda57ce1196de8e7862ffb0ff5b3ad WHIRLPOOL 34781e056aa091227500aad2fd96880ebb41625653ef86f2c04aecb2ea69bfbba82f294bcb39ad50693237d4c9f00a16dc8e83e488a244636966ad183ae62100
+MISC ChangeLog 4321 SHA256 74dde1dcd7bf75a051072d3b389b90607735bd59e27653c27431a8a0f29bc95e SHA512 8d5fd39e3d561f28c6ababfb7aa9783ac33e2b05331a94c37e843ad266fef0af14f44da7ac99903e24c99bfa6d8b84b1eb2ef565f741ca3ad5ca3d2de23300b1 WHIRLPOOL fe9b509bb6585b51ffa3aceff530ac5bd9aa5ee61d62ad5c7b3dd859ac1b29c3cfbc0b7f40ff23c0ecd41c571371c299ebd13152ca3b0463d35ded8098943a27
 MISC metadata.xml 394 SHA256 e66a36bb1b7e977b0735441bff4dd579d2ffe2e811d4db16128d4473c052c694 SHA512 3782543e8a1d4c9afc1b42cf2d7921092108c2a111f7531a54787dc5d2fbbaf50f6036e41a73073962ddb3a8f5ed3f6b6d2c14ee332195f2721a881417f26de7 WHIRLPOOL 4ff5e507d1c6ec81e50adc139fe15f58fc294104adb612004699f8b9cb05ce6f0d5fc5f2bc77b92c667d30f4cb1b20a2af9d7bc0da0992e4bbde84d4d6018333
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRHkVuAAoJEHfx8XVYajsfwcEP/iCD02Wx6ZkFkVjKvs0bnIwz
-1R6zbTmKgc3ubPmDmL1PRPh/IVM46+ZzVp6H150raphd93MQZuur4HNdK88lNuLU
-iNDScVt0Xg2tDJGPj0/oUo1hyvjo4zflEl/W8jWunFGSbrJKogtroDiGs0/fGjaY
-yEEHAvANmMEKwxQC/tMHQ661n5fmCmxKZm4RQ/EjCLujOi/Ma/v9VR9g3Nn2PYIt
-9JlnXmeTRPOYnpOIZ3CagHB8qVfWUL5W0BesqYGLSUHPeQG5iGiX/hV6+V98CZP5
-MXAq78U4LyLWe9r8Zlmx8qzDFb+xAwp2w3Ds4iINfzXWw7C36zN4PCpD167o9m74
-+l5GTXyuO7Lf028YwSXzEC837RE61q9oBl8kj4Xqp7KL5tHfdCxHidWjMCYfrPeH
-UyizbGr/wDsrSvgKjuD0zxbVm1A3BWVIJOIck1T57vmNzJ/v4JArswrxzqr+On9u
-L8ugvOCntXxyrExqLr1gP+wpW5jEZlzxeBxQ0W3QQPM2Hmm1hVnWJFW4YoVupesk
-uZjOvuIM5dxKwWvrywkekiD6a74lUpW5ONxrse+iNyK8sr0mtspGfqjlDSrxAFN7
-I8+qyDB11DB/sGjMyo6j4MlQbdqJ9BMQTfQpIkTbSvRSgjLhSQSBhaFPjbiPJnPr
-fXXGkCFVjCF5M6Tf+u/K
-=llwI
------END PGP SIGNATURE-----
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
new file mode 100644
index 000000000000..6331e98cb48b
--- /dev/null
+++ b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
@@ -0,0 +1,28 @@
+Net::DNS function nextid() changed to id().
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
+--- qpsmtpd-0.84.orig/qpsmtpd-async	2009-04-03 05:48:34.000000000 +0000
++++ qpsmtpd-0.84/qpsmtpd-async	2013-04-15 23:01:49.952857659 +0000
+@@ -145,7 +145,7 @@
+         # print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
+     };
+     if ($@) {
+-        # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
++        # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
+     }
+     
+     # Fixup lost kqueue after fork
+diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
+--- qpsmtpd-0.84.orig/qpsmtpd-forkserver	2010-04-08 05:29:52.000000000 +0000
++++ qpsmtpd-0.84/qpsmtpd-forkserver	2013-04-15 23:01:49.952857659 +0000
+@@ -285,7 +285,7 @@
+     # all children should have different seeds, to prevent conflicts
+     srand();
+     for (0 .. rand(65536)) {
+-	Net::DNS::Header::nextid();
++	Net::DNS::Header::id();
+     }
+   
+     close $_ for $select->handles;
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
index 496b7d2b6260..2b11ecc8fdbc 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild,v 1.1 2013/02/15 14:19:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r1.ebuild,v 1.2 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	<dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
new file mode 100644
index 000000000000..715fc6c534c9
--- /dev/null
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild,v 1.1 2013/04/15 23:19:22 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils perl-app user
+
+DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
+HOMEPAGE="http://smtpd.develooper.com"
+SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postfix ipv6 syslog"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	>=dev-perl/Net-DNS-0.690.0
+	virtual/perl-MIME-Base64
+	dev-perl/MailTools
+	dev-perl/IPC-Shareable
+	dev-perl/Socket6
+	dev-perl/Danga-Socket
+	dev-perl/ParaDNS
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	syslog? ( virtual/perl-Sys-Syslog )
+	virtual/inetd"
+
+pkg_setup() {
+	enewgroup smtpd
+	local additional_groups
+	if use postfix; then
+		additional_groups="${additional_groups},postdrop"
+	fi
+	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
+	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
+	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
+	epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
+}
+
+src_install() {
+	perl-module_src_install
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
+
+	dodir /usr/share/qpsmtpd
+	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+
+	insinto /etc/qpsmtpd
+	doins config.sample/*
+
+	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
+	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
+		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
+		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
+	EOF
+	if use syslog; then
+		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	else
+		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	fi
+
+	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
+
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
+	newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd || die "Installing init.d file"
+
+	dodoc CREDITS Changes README README.plugins STATUS
+
+	diropts -m 0755 -o smtpd -g smtpd
+	dodir /var/spool/qpsmtpd /var/log/qpsmtpd
+	keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
+
+}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
index b144b8c0e857..c40211810f01 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.3 2012/11/30 23:10:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.4 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	<dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index bae9d0210824..2e11f1f1ae34 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.5 2013/02/15 14:19:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild,v 1.6 2013/04/15 23:19:22 robbat2 Exp $
 
 EAPI=2
 
-inherit eutils git-2 perl-app user
+inherit eutils perl-app user git-2
 
 DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
 HOMEPAGE="http://smtpd.develooper.com"
-EGIT_REPO_URI="git://git.develooper.com/qpsmtpd.git
-	http://git.develooper.com/qpsmtpd.git"
+# This is a spotted development fork with many improvements
+EGIT_REPO_URI="git://github.com/qpsmtpd-dev/qpsmtpd-dev.git
+       https://github.com/qpsmtpd-dev/qpsmtpd-dev.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,13 +18,14 @@ KEYWORDS=""
 IUSE="postfix ipv6 syslog"
 
 RDEPEND=">=dev-lang/perl-5.8.0
-	dev-perl/Net-DNS
+	>=dev-perl/Net-DNS-0.690.0
 	virtual/perl-MIME-Base64
 	dev-perl/MailTools
 	dev-perl/IPC-Shareable
 	dev-perl/Socket6
 	dev-perl/Danga-Socket
 	dev-perl/ParaDNS
+	dev-perl/UNIVERSAL-isa
 	ipv6? ( dev-perl/IO-Socket-INET6 )
 	syslog? ( virtual/perl-Sys-Syslog )
 	virtual/inetd"
@@ -37,11 +39,6 @@ pkg_setup() {
 	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
-	epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
-}
-
 src_install() {
 	perl-module_src_install