New version, fixes #187340 thanks to Oliver Koch

Package-Manager: portage-2.1.3_rc9

4 files changed, 76 insertions, 5 deletions

diff --git a/net-dns/resolvconf-gentoo/ChangeLog b/net-dns/resolvconf-gentoo/ChangeLog
index d3dc77501441..54c9a5233863 100644
--- a/net-dns/resolvconf-gentoo/ChangeLog
+++ b/net-dns/resolvconf-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/resolvconf-gentoo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/resolvconf-gentoo/ChangeLog,v 1.29 2007/05/19 17:14:26 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/resolvconf-gentoo/ChangeLog,v 1.30 2007/08/01 09:09:03 uberlord Exp $
+
+*resolvconf-gentoo-1.4 (01 Aug 2007)
+
+  01 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +resolvconf-gentoo-1.4.ebuild:
+  New version, fixes #187340 thanks to Oliver Koch
 
   19 May 2007; Joshua Kinard <kumba@gentoo.org>
   resolvconf-gentoo-1.2.ebuild:
diff --git a/net-dns/resolvconf-gentoo/Manifest b/net-dns/resolvconf-gentoo/Manifest
index 305c35bf7ddc..014b8b8c1f9a 100644
--- a/net-dns/resolvconf-gentoo/Manifest
+++ b/net-dns/resolvconf-gentoo/Manifest
@@ -2,6 +2,7 @@ DIST resolvconf-gentoo-1.0.tar.bz2 5320 RMD160 2c607df95bf240d41e511ca68203e9ca4
 DIST resolvconf-gentoo-1.1.tar.bz2 5322 RMD160 8fcc6fbd9cfc0acf8f47dd7371356f7f56f694e2 SHA1 69652f9218c65c7b7ded8be3c9be259dbcbba33e SHA256 3c1f667fc6681816f22780051432e6e3727b49aad32a840be07988e73bc55ec0
 DIST resolvconf-gentoo-1.2.tar.bz2 5339 RMD160 703b1b524c6a808f18961e54575b5df3aeb28b7a SHA1 8f4a2285a80c63dd988d70e40ddd4b04185922a0 SHA256 b73e090675822e52f0ca0a3f335aef19a0bf53bd56bff0c0caadc006cd9aec03
 DIST resolvconf-gentoo-1.3.tar.bz2 5397 RMD160 e129e8c9ce61ce7a9dd7faa763444c3b3899c2b8 SHA1 0ade92f4548aea486e45d08ee75497ac62c79acd SHA256 0b1b36dd221bdd82d952ed66c5accfdbf8ff2287d5d5d599b5e83a3339ecc56e
+DIST resolvconf-gentoo-1.4.tar.bz2 5394 RMD160 712c2e0d52f48c0e2eb79476cd74d172a4a13243 SHA1 dd6f3ec8c8576927bb50670df00d4c95decd0298 SHA256 037a66a5058cde291d98999a126c82cb3d4c64d4a9dfa0bcb1d8f39694ce3763
 EBUILD resolvconf-gentoo-1.0.ebuild 1728 RMD160 f7ddfa9eb8485a95111b6625b87c08c323322f22 SHA1 5ff33eeb0f641277da6fcda2efbe9c6e93111ca8 SHA256 44d8dd3eb2b043187e466730efd670339e65e1873aa7d9e792fc75b95f813981
 MD5 3d17546f261c7fb77357c2a0fe85a1fe resolvconf-gentoo-1.0.ebuild 1728
 RMD160 f7ddfa9eb8485a95111b6625b87c08c323322f22 resolvconf-gentoo-1.0.ebuild 1728
@@ -18,10 +19,14 @@ EBUILD resolvconf-gentoo-1.3.ebuild 1738 RMD160 6ea66729d452b7b82f3b442471916de9
 MD5 3419865a03f09f8b028e4d8f30c8ab92 resolvconf-gentoo-1.3.ebuild 1738
 RMD160 6ea66729d452b7b82f3b442471916de9c5ce3bcd resolvconf-gentoo-1.3.ebuild 1738
 SHA256 c84bec2b5d3ce4b53cf1499d2062a87a8fc48837d7e7d822e8b17df9e6c657f1 resolvconf-gentoo-1.3.ebuild 1738
-MISC ChangeLog 5179 RMD160 01973a3ce18aa20a976ead16c3da7a21e0967c2b SHA1 792531044e69a68cc2620d5acfd57f598a63194a SHA256 40cfd848a1e31a9c0ac50871cb8f220bde3f7c7821d59eb27252f316308f1a78
-MD5 1440238970bf4bc804c45cf4effc8acf ChangeLog 5179
-RMD160 01973a3ce18aa20a976ead16c3da7a21e0967c2b ChangeLog 5179
-SHA256 40cfd848a1e31a9c0ac50871cb8f220bde3f7c7821d59eb27252f316308f1a78 ChangeLog 5179
+EBUILD resolvconf-gentoo-1.4.ebuild 1740 RMD160 ecd5a849901ca07febdc3e0eab552d7eaa1064ff SHA1 60365803951461a47b6032c43201157a4af883f6 SHA256 53ffe4f90d2ea01b4b8ed3e4e44db578cd2f9393a5daa3b5bec55b0463c3ac0d
+MD5 88787149f9a2dd194951d2b89be0e69f resolvconf-gentoo-1.4.ebuild 1740
+RMD160 ecd5a849901ca07febdc3e0eab552d7eaa1064ff resolvconf-gentoo-1.4.ebuild 1740
+SHA256 53ffe4f90d2ea01b4b8ed3e4e44db578cd2f9393a5daa3b5bec55b0463c3ac0d resolvconf-gentoo-1.4.ebuild 1740
+MISC ChangeLog 5354 RMD160 6d9ff429ae7e720e5fd153ee5acc0a6ec85b1965 SHA1 cd4025412a3024a7415ab37a96041a49c1f9524a SHA256 ce654efefb4c27ee95f089c12605e9bb75a346266fd9704626737075631773c0
+MD5 b30713d7fc179ecda3c302f423a4eaf1 ChangeLog 5354
+RMD160 6d9ff429ae7e720e5fd153ee5acc0a6ec85b1965 ChangeLog 5354
+SHA256 ce654efefb4c27ee95f089c12605e9bb75a346266fd9704626737075631773c0 ChangeLog 5354
 MISC metadata.xml 328 RMD160 425651aac2c912e7c4fe7ab560f364034dce0177 SHA1 93afcb11c1444f71bc520ec8f72fa47e9637b830 SHA256 2e82a757cdab3b26134114018f00f6693d201e9810ddf9112c3df159ce2e5555
 MD5 07363df215529052ce20a02f298cf5a1 metadata.xml 328
 RMD160 425651aac2c912e7c4fe7ab560f364034dce0177 metadata.xml 328
@@ -38,3 +43,6 @@ SHA256 f268e0f057a5402a3366bd447d0d1c881b7a041e12aef47b14fde54dca0a3e14 files/di
 MD5 58a97939ba19dc8cfa24bc4d5fdc0e16 files/digest-resolvconf-gentoo-1.3 262
 RMD160 8bf729b2115e2dd4dd62b28212f928299d844db7 files/digest-resolvconf-gentoo-1.3 262
 SHA256 f03489ebd7a8cbc66b6dd1fe33bb82c68c86991bb3d962efb99171b1e95950a8 files/digest-resolvconf-gentoo-1.3 262
+MD5 06e94591ec7e41d7f097baebe4d17119 files/digest-resolvconf-gentoo-1.4 262
+RMD160 6fdf3c0a35f08b665ecbc0f0d804fffee4e5f917 files/digest-resolvconf-gentoo-1.4 262
+SHA256 cb3e5a07463c3a2ade4f124d36114db9b395750dee22f99f2eb699ec0ce3cdec files/digest-resolvconf-gentoo-1.4 262
diff --git a/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.4 b/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.4
new file mode 100644
index 000000000000..c533f54ad740
--- /dev/null
+++ b/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.4
@@ -0,0 +1,3 @@
+MD5 e88dc5d5415937ce5eb2c0fa75839393 resolvconf-gentoo-1.4.tar.bz2 5394
+RMD160 712c2e0d52f48c0e2eb79476cd74d172a4a13243 resolvconf-gentoo-1.4.tar.bz2 5394
+SHA256 037a66a5058cde291d98999a126c82cb3d4c64d4a9dfa0bcb1d8f39694ce3763 resolvconf-gentoo-1.4.tar.bz2 5394
diff --git a/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.4.ebuild b/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.4.ebuild
new file mode 100644
index 000000000000..00931dbaa7cc
--- /dev/null
+++ b/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.4.ebuild,v 1.1 2007/08/01 09:09:03 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~uberlord/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	make ROOT="${D}" install || die "Failed to install"
+}
+
+pkg_postinst() {
+	if [ ! -"L ${ROOT}/etc/resolv.conf" ] \
+		|| [ "$(readlink "${ROOT}/etc/resolv.conf")" != \
+		"resolvconf/run/resolv.conf" ] ; then
+		ewarn "resolvconf requires ${ROOT}etc/resolv.conf to be a symbolic"
+		ewarn "to resolvconf/run/resolv.conf"
+		ewarn "To set this up automatically type"
+		ewarn "   emerge --config =${PF}"
+	fi
+}
+
+pkg_config() {
+	cd "${ROOT}/etc"
+	if [ -L resolv.conf -a "$(readlink resolv.conf)" = \
+		"resolvconf/run/resolv.conf" ] ; then
+		einfo "${ROOT}etc/resolv.conf is already configured for ${PN}"
+	else
+		if [ -e resolv.conf ] ; then
+			einfo "Your existing resolv.conf is will be mapped to an"
+			einfo "interface called \"dummy\" in resolvconf. This will"
+			einfo "disappear when you reboot."
+			cp resolv.conf resolvconf/run/resolv.conf
+			[ ! -d resolvconf/run/interfaces ] \
+				&& mkdir resolvconf/run/interfaces
+			cp resolv.conf resolvconf/run/interfaces/dummy
+			echo "dummy" > resolvconf/run/add_order
+		fi
+		rm -f resolv.conf
+		ln -snf resolvconf/run/resolv.conf .
+		einfo "${ROOT}etc/resolv.conf is now correctly configured for ${PN}"
+	fi
+}