Append \n to the head file when reading it, thanks to Eric Lenio.

Package-Manager: portage-2.1_rc4

4 files changed, 84 insertions, 5 deletions

diff --git a/net-misc/resolvconf-gentoo/ChangeLog b/net-misc/resolvconf-gentoo/ChangeLog
index 9a084b9e6390..098450059ab7 100644
--- a/net-misc/resolvconf-gentoo/ChangeLog
+++ b/net-misc/resolvconf-gentoo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/resolvconf-gentoo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/ChangeLog,v 1.6 2006/05/25 18:40:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/ChangeLog,v 1.7 2006/06/04 17:33:16 uberlord Exp $
+
+*resolvconf-gentoo-1.0 (04 Jun 2006)
+
+  04 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  +resolvconf-gentoo-1.0.ebuild:
+  Append \n to the head file when reading it, thanks to Eric Lenio.
+  Stable candidate :)
 
 *resolvconf-gentoo-0.6 (25 May 2006)
 
diff --git a/net-misc/resolvconf-gentoo/Manifest b/net-misc/resolvconf-gentoo/Manifest
index aefb2592693a..5a856dae1624 100644
--- a/net-misc/resolvconf-gentoo/Manifest
+++ b/net-misc/resolvconf-gentoo/Manifest
@@ -1,5 +1,6 @@
 DIST resolvconf-gentoo-0.5.tar.bz2 5351 RMD160 63054a6af09c858150ebd1d50923e9a630c92972 SHA1 84097ecccac122d41a981697f5767130efcf7c71 SHA256 38dc2d73a616710f320a1918475904a5ad48fe8f180f23ff229a3c9a4448ee03
 DIST resolvconf-gentoo-0.6.tar.bz2 5325 RMD160 47d0ab0e0a579ab49bef76c8abe2ef1e712e7d1b SHA1 a64b4d3f9f2cf0f6f8154c0a8dfb98f2bec3ce59 SHA256 67a8921dcf9c522f3bed30ff2990883c3bb4b9d51944e2dbc23799f840119983
+DIST resolvconf-gentoo-1.0.tar.bz2 5320 RMD160 2c607df95bf240d41e511ca68203e9ca452068fe SHA1 7a25d091232bfa6732ad14e52712f456f553aa20 SHA256 75e536ee19182c193655b46c3b7d6909cb0fe3899381a7b6a2692f6017f63db9
 EBUILD resolvconf-gentoo-0.5.ebuild 2046 RMD160 f873bbe3e3c9c4feb6399b3f29927a2171b6f5b6 SHA1 b33a7fbbd963c848a8d099efab4fc74c69e26ece SHA256 4aa8a3c4b332c229f18fb9e7ec74783de594e75204642b658ae3793ae0a3efaf
 MD5 3d9f6a715954e5f67f127f2e98b5dc57 resolvconf-gentoo-0.5.ebuild 2046
 RMD160 f873bbe3e3c9c4feb6399b3f29927a2171b6f5b6 resolvconf-gentoo-0.5.ebuild 2046
@@ -8,10 +9,14 @@ EBUILD resolvconf-gentoo-0.6.ebuild 2046 RMD160 7b2f1f94051548c20c77f8a17270f444
 MD5 ca337e92c30b223853fad2f2e2374a91 resolvconf-gentoo-0.6.ebuild 2046
 RMD160 7b2f1f94051548c20c77f8a17270f44407316342 resolvconf-gentoo-0.6.ebuild 2046
 SHA256 50d6effe0b78c2993f57b92e0fbb11d3564d8e9fe7a3a477b0af678048ad305a resolvconf-gentoo-0.6.ebuild 2046
-MISC ChangeLog 1387 RMD160 8e93d008592932e9b99503fae58f266a5ff4de94 SHA1 ce60ec6737ca418c036fcd2d3cbbb4a196ea6010 SHA256 bf497ed3644029af23e2e38dbae3c9a5b12f33273a353853d3c505c11f4b61af
-MD5 3e02b33d86899588644bfb48261ffa1b ChangeLog 1387
-RMD160 8e93d008592932e9b99503fae58f266a5ff4de94 ChangeLog 1387
-SHA256 bf497ed3644029af23e2e38dbae3c9a5b12f33273a353853d3c505c11f4b61af ChangeLog 1387
+EBUILD resolvconf-gentoo-1.0.ebuild 2046 RMD160 b6a2084ab8eed074bfc18d2d3accb7c164b19f31 SHA1 3db86498914b030261c3357e44323c8286e8a373 SHA256 b3988101f972209c0f6af9fcfd75b163e2f8d70a62706ba32f40d6a8126cca3d
+MD5 e21d11a0c98c1c2169a1ad65942031aa resolvconf-gentoo-1.0.ebuild 2046
+RMD160 b6a2084ab8eed074bfc18d2d3accb7c164b19f31 resolvconf-gentoo-1.0.ebuild 2046
+SHA256 b3988101f972209c0f6af9fcfd75b163e2f8d70a62706ba32f40d6a8126cca3d resolvconf-gentoo-1.0.ebuild 2046
+MISC ChangeLog 1598 RMD160 c5a753149cf74f46b882dd696946c5ea61e2895b SHA1 9c09f7614eedeeb18d440c440b4b1d501bd21be3 SHA256 3de869753a8738fa3bfa8a26a9c3351975f1a61b42ea5487ed6ebac66207f057
+MD5 f46f8612fbc03c7b52039cca5acf3716 ChangeLog 1598
+RMD160 c5a753149cf74f46b882dd696946c5ea61e2895b ChangeLog 1598
+SHA256 3de869753a8738fa3bfa8a26a9c3351975f1a61b42ea5487ed6ebac66207f057 ChangeLog 1598
 MISC metadata.xml 307 RMD160 5321ae1f8b9fe5ee81be83b1777595452c229714 SHA1 77507bd8344b40d7cd1157710a26080f1beeb99c SHA256 e579b678a12cbfb3e9f2ff9ba1d9e5c56adb3017a459b35472cbf2d7969a3ab0
 MD5 23df2027bac4a8ecc8fbf018701239b5 metadata.xml 307
 RMD160 5321ae1f8b9fe5ee81be83b1777595452c229714 metadata.xml 307
@@ -22,3 +27,6 @@ SHA256 1a58a648c1e1111ab0efc3d4472fe3f12e63e75d0761f9bd628d1b75a816bd08 files/di
 MD5 de73cd1d2d45f59240c97020044c0a72 files/digest-resolvconf-gentoo-0.6 262
 RMD160 d14e4e9ef581f17ab30b89f5d3144999b33bdb5e files/digest-resolvconf-gentoo-0.6 262
 SHA256 8f393ce10d4b05b9de566797ba0f240674340b4bd29cbc3bbe615d0c00de16cd files/digest-resolvconf-gentoo-0.6 262
+MD5 7bd829720e722c4b3ab0057bd70f8d6d files/digest-resolvconf-gentoo-1.0 262
+RMD160 daeeab143d18de493fd3a71fe810658f2dc6ad71 files/digest-resolvconf-gentoo-1.0 262
+SHA256 9777e1d41247ca64cd416302c4616e5a2c64d83da986da1ff36c30f8da04c53d files/digest-resolvconf-gentoo-1.0 262
diff --git a/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.0 b/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.0
new file mode 100644
index 000000000000..a989d5c5d20c
--- /dev/null
+++ b/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.0
@@ -0,0 +1,3 @@
+MD5 f8d6e6dcd5050b788bb7f80885ebab4e resolvconf-gentoo-1.0.tar.bz2 5320
+RMD160 2c607df95bf240d41e511ca68203e9ca452068fe resolvconf-gentoo-1.0.tar.bz2 5320
+SHA256 75e536ee19182c193655b46c3b7d6909cb0fe3899381a7b6a2692f6017f63db9 resolvconf-gentoo-1.0.tar.bz2 5320
diff --git a/net-misc/resolvconf-gentoo/resolvconf-gentoo-1.0.ebuild b/net-misc/resolvconf-gentoo/resolvconf-gentoo-1.0.ebuild
new file mode 100644
index 000000000000..fac3f551d216
--- /dev/null
+++ b/net-misc/resolvconf-gentoo/resolvconf-gentoo-1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/resolvconf-gentoo-1.0.ebuild,v 1.1 2006/06/04 17:33:16 uberlord Exp $
+
+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 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+pkg_setup() {
+	if ! grep -q "^uniqify()" "${ROOT}"/etc/init.d/functions.sh ; then
+		eerror "/etc/init.d/functions.sh does not supply the uniqify function"
+		eerror "Please upgrade to a baselayout that support it"
+		eerror "(baselayout-1.12.0_pre17 and later versions do)"
+		die "function uniqify does not exist"
+	fi
+}
+
+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"
+		einfo "To set this up automatically type"
+		einfo "   emerge --config =${PF}"
+	fi
+}
+
+pkg_config() {
+	cd "${ROOT}/etc"
+	if [[ -L resolv.conf && $(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
+}