Patch it properly this time... Bug 209423

Package-Manager: portage-2.1.4.4

3 files changed, 17 insertions, 46 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 25a7dce970bb..0cb6502cfa68 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.2 2008/02/18 19:54:54 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.3 2008/02/20 21:01:08 welp Exp $
+
+  20 Feb 2008; <welp@gentoo.org> openresolv-1.3.ebuild:
+  Patch it properly this time... Bug 209423
 
 *openresolv-1.3 (18 Feb 2008)
 
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 4608e46c211e..94ea7b33b0b9 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,6 @@
 DIST openresolv-1.1.tar.bz2 8765 RMD160 d0051abd8877f025014e9a2ab14211a615d64a59 SHA1 73cc6331e992f54d2621046b6b049362f057644c SHA256 979e7af497c69f03d9ae70134ae11e5338b42bdca06fecab5b297a1f16f381f5
 DIST openresolv-1.3.tar.bz2 8906 RMD160 7c3a4202cde07c3a8d4064799d9a174d2c92b249 SHA1 3ccf6c98a4559a573877a34cf873545f821cd533 SHA256 4730ec71d95f44ea2f50415edded6011a7be40de9b93123fdec3173ab2f2e26b
 EBUILD openresolv-1.1.ebuild 2215 RMD160 c8884878af51432c8744263d8d5104d77b30dc0b SHA1 f4402a0e674bc226ce92998f212a052c3dc2537f SHA256 6df3888c257f9fd0366d3146f5b31fb4203769d9ed00cbe3560034a4081d8b16
-EBUILD openresolv-1.3.ebuild 2215 RMD160 fd35c67fc3b1131951107cf2dd0ee55e0cf1cbd8 SHA1 cfb61a15f67a6aca52b9353a04b767a5d7aff4a4 SHA256 875af613e342adb8071c44cc619c04fbc6adca0497a415d97bdb780c6a8a33b3
-MISC ChangeLog 465 RMD160 898d41aa2caa602022baf9550021500d6cbc5ac7 SHA1 f17342e23dd0706a45a8d79a09d6a823a68b3953 SHA256 3d11e33ba78852ff9bc10016f21fbbccfe3ef1c4871f836f3db653d8918159d0
+EBUILD openresolv-1.3.ebuild 1073 RMD160 1a8b2636cba9174b2f90896b8dd2242141133c31 SHA1 4e56f023547271e389fec9da3e7db705da89ddbd SHA256 4dad4a91f173d9ae928ac92461c835b42814b1299dcfb5f79fc1889de4ef3a98
+MISC ChangeLog 566 RMD160 4bb74a059136d72d560c3b5f140f146f92a6f155 SHA1 c66a671e3f21079cf2052cfdd593e18f92c1b8ae SHA256 b68d89a023e0cc09685256f1f8ef5672c3c17f8e93e463c15d549a537347ed1d
 MISC metadata.xml 315 RMD160 22169f34ce4339237cd154625165db8392a2625e SHA1 c577e94a97b82c2d67790e2b3f65a9f4bc1c919e SHA256 535c23e2542894c12240ece5716ec2138be18fb8a116c9b5e538ce6b41bce28a
diff --git a/net-dns/openresolv/openresolv-1.3.ebuild b/net-dns/openresolv/openresolv-1.3.ebuild
index 953fbd5f8b04..4a4cbd42702f 100644
--- a/net-dns/openresolv/openresolv-1.3.ebuild
+++ b/net-dns/openresolv/openresolv-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-1.3.ebuild,v 1.1 2008/02/18 19:54:54 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-1.3.ebuild,v 1.2 2008/02/20 21:01:08 welp Exp $
 
 inherit eutils
 
@@ -21,50 +21,18 @@ src_install() {
 	make DESTDIR="${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}"
+	if [ "${ROOT}" != "/" ]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
 	fi
-}
 
-pkg_postrm() {
-	# If we are totally removed but still configured, then replace
-	# /etc/resolv.conf with a real file
-	cd "${ROOT}"/etc
-	[ -L resolv.conf ] || return 0
-	if [ -e resolv.conf ]; then
-		[ "$(readlink resolv.conf)" = "resolvconf/run/resolv.conf" ] || return 0
-		rm resolv.conf
-		cp resolvconf/run/resolv.conf .
-	elif [ -e /var/run/resolvconf/resolv.conf ]; then
-		rm resolv.conf
-		cp /var/run/resolvconf/resolv.conf .
+	if [ -n "$(resolvconf -l)" ]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
 	fi
 }