Fix hesiod not reading /etc/hesiod.conf; thanks to Jacob Welsh for reporting; bug 157555

(Portage version: 2.1.2_rc2-r2)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 63 deletions

diff --git a/net-dns/hesiod/Manifest b/net-dns/hesiod/Manifest
index f7bd5bb4b4af..36aee414e8a1 100644
--- a/net-dns/hesiod/Manifest
+++ b/net-dns/hesiod/Manifest
@@ -14,19 +14,19 @@ AUX hesiod-3.0.2-str.patch 2039 RMD160 6b6b38779dbf37bbb9b742a04a636883468f3894
 MD5 30c1105fc1f037d97d0dfae4f4f0e065 files/hesiod-3.0.2-str.patch 2039
 RMD160 6b6b38779dbf37bbb9b742a04a636883468f3894 files/hesiod-3.0.2-str.patch 2039
 SHA256 8df1362404df4d381e77f2a6bbacb8f01c8ea8120e7f45e836f907199feea7f7 files/hesiod-3.0.2-str.patch 2039
-DIST hesiod-3.0.2.tar.gz 31974 RMD160 b2abfdebc9874a4d111748c687b63e275220316b SHA256 ee0ff39ad2445728360e1550de3c18d48813b3f9359ea3ad8a49f71ffb314c25
-EBUILD hesiod-3.0.2-r1.ebuild 1317 RMD160 9a0a7e5e462ca7f025213f5a470967aabc73a109 SHA1 a290a519940f81d3bd074dc6938dbe3a0baaf68d SHA256 f5721361b4be54e2695944b21f081ee2e307815cc5bf45feb33daf1c89234fc1
-MD5 152047584d6f108e3d81333dcedb6af6 hesiod-3.0.2-r1.ebuild 1317
-RMD160 9a0a7e5e462ca7f025213f5a470967aabc73a109 hesiod-3.0.2-r1.ebuild 1317
-SHA256 f5721361b4be54e2695944b21f081ee2e307815cc5bf45feb33daf1c89234fc1 hesiod-3.0.2-r1.ebuild 1317
+DIST hesiod-3.0.2.tar.gz 31974 RMD160 b2abfdebc9874a4d111748c687b63e275220316b SHA1 bc88fc2ae3e7cf96af26d041ec113ab28f112d1d SHA256 ee0ff39ad2445728360e1550de3c18d48813b3f9359ea3ad8a49f71ffb314c25
+EBUILD hesiod-3.0.2-r2.ebuild 1427 RMD160 7c8281763b30703b09d48f5435243e4fd44abb45 SHA1 16949962d8f6cc0ac2c27012a1602fb07b5140d0 SHA256 6d352aba37c34dee9b37a65027f96e6122065a01d03f58a4728001934e0b87f0
+MD5 f55a0c367164536494d37c7609644596 hesiod-3.0.2-r2.ebuild 1427
+RMD160 7c8281763b30703b09d48f5435243e4fd44abb45 hesiod-3.0.2-r2.ebuild 1427
+SHA256 6d352aba37c34dee9b37a65027f96e6122065a01d03f58a4728001934e0b87f0 hesiod-3.0.2-r2.ebuild 1427
 EBUILD hesiod-3.0.2.ebuild 1570 RMD160 ad25b810e43e9ffdbb341c3e5673210e35404ae6 SHA1 09d0bf3858ac75f1e33789d7452afb6e18888dca SHA256 c8ab5f2748b3ab8383b97907e4a5216444595b7023813e531784c0d3c2987b90
 MD5 c2560b4653b2ee5b141e8e67138885d1 hesiod-3.0.2.ebuild 1570
 RMD160 ad25b810e43e9ffdbb341c3e5673210e35404ae6 hesiod-3.0.2.ebuild 1570
 SHA256 c8ab5f2748b3ab8383b97907e4a5216444595b7023813e531784c0d3c2987b90 hesiod-3.0.2.ebuild 1570
-MISC ChangeLog 3096 RMD160 eaa9af7fd3cd558729128b64fc508fb4038471a1 SHA1 f59fdbf30910091021608bd870b143bcc141c5ae SHA256 3236b2b8b24d915b2d318dcaea5d0911811fa3d704a2d5d8636e835df9f1b127
-MD5 6becb6ec37373803f13fea1167391929 ChangeLog 3096
-RMD160 eaa9af7fd3cd558729128b64fc508fb4038471a1 ChangeLog 3096
-SHA256 3236b2b8b24d915b2d318dcaea5d0911811fa3d704a2d5d8636e835df9f1b127 ChangeLog 3096
+MISC ChangeLog 3340 RMD160 7d82118b5776ab2792361a45b4ec225cc84ecc7e SHA1 4fb78986eb667c1abe15fec692e36c682b414ce3 SHA256 3a4277a078e609e45444e43c404196408c7a22cfeb34d57d50ab6af99a8186c9
+MD5 f199da598dcc727b2ad8f4a604d3c05b ChangeLog 3340
+RMD160 7d82118b5776ab2792361a45b4ec225cc84ecc7e ChangeLog 3340
+SHA256 3a4277a078e609e45444e43c404196408c7a22cfeb34d57d50ab6af99a8186c9 ChangeLog 3340
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -34,6 +34,6 @@ SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata
 MD5 e9e12bd601ca41720bbe20141b8f8bb5 files/digest-hesiod-3.0.2 235
 RMD160 7c812c70504de9f6ecf08b7ab9e68edbb26d7be5 files/digest-hesiod-3.0.2 235
 SHA256 601871a53df689cbae102d60d0039b5432fd129b54d2b163b8d59c57b76153f4 files/digest-hesiod-3.0.2 235
-MD5 e9e12bd601ca41720bbe20141b8f8bb5 files/digest-hesiod-3.0.2-r1 235
-RMD160 7c812c70504de9f6ecf08b7ab9e68edbb26d7be5 files/digest-hesiod-3.0.2-r1 235
-SHA256 601871a53df689cbae102d60d0039b5432fd129b54d2b163b8d59c57b76153f4 files/digest-hesiod-3.0.2-r1 235
+MD5 e9e12bd601ca41720bbe20141b8f8bb5 files/digest-hesiod-3.0.2-r2 235
+RMD160 7c812c70504de9f6ecf08b7ab9e68edbb26d7be5 files/digest-hesiod-3.0.2-r2 235
+SHA256 601871a53df689cbae102d60d0039b5432fd129b54d2b163b8d59c57b76153f4 files/digest-hesiod-3.0.2-r2 235
diff --git a/net-dns/hesiod/files/digest-hesiod-3.0.2-r1 b/net-dns/hesiod/files/digest-hesiod-3.0.2-r1
deleted file mode 100644
index 36e651e3d639..000000000000
--- a/net-dns/hesiod/files/digest-hesiod-3.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0362311e80fb1e029a1588cbbd09ad57 hesiod-3.0.2.tar.gz 31974
-RMD160 b2abfdebc9874a4d111748c687b63e275220316b hesiod-3.0.2.tar.gz 31974
-SHA256 ee0ff39ad2445728360e1550de3c18d48813b3f9359ea3ad8a49f71ffb314c25 hesiod-3.0.2.tar.gz 31974
diff --git a/net-dns/hesiod/hesiod-3.0.2-r1.ebuild b/net-dns/hesiod/hesiod-3.0.2-r1.ebuild
deleted file mode 100644
index 6c1323e67469..000000000000
--- a/net-dns/hesiod/hesiod-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/hesiod/hesiod-3.0.2-r1.ebuild,v 1.20 2006/10/09 21:26:29 drizzt Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="system which uses existing DNS functionality to provide access to databases of information that changes infrequently"
-HOMEPAGE="ftp://athena-dist.mit.edu/pub/ATHENA/hesiod"
-SRC_URI="ftp://athena-dist.mit.edu/pub/ATHENA/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	filter-flags -fstack-protector
-
-	#Patches stolen from RH
-	epatch ${FILESDIR}/hesiod-${PV}-redhat.patch
-	autoconf || die "autoconf failed"
-
-	for manpage in *.3
-	do
-		if grep -q '^\.so man3/hesiod.3' ${manpage}
-		then
-			echo .so hesiod.3 > ${manpage}
-		elif grep -q '^\.so man3/hesiod_getmailhost.3' ${manpage}
-		then
-			echo .so hesiod_getmailhost.3 > ${manpage}
-		elif grep -q '^\.so man3/hesiod_getpwnam.3' ${manpage}
-		then
-			echo .so hesiod_getpwnam.3 > ${manpage}
-		elif grep -q '^\.so man3/hesiod_getservbyname.3' ${manpage}
-		then
-			echo .so hesiod_getservbyname.3 > ${manpage}
-		fi
-	done
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}