New version appends a backup extension when using sed -i as there is no

portable way to to specify one, causing added_order-e to appear on
FreeBSD.
Package-Manager: portage-2.1.2_rc2-r2

diff --git a/net-dns/resolvconf-gentoo/ChangeLog b/net-dns/resolvconf-gentoo/ChangeLog
index 583c74792c94f3f2aa0462475ea7d93f61ed0caa..dd86697e93adf19c5c30757a1acb72f5de5a0182 100644 (file)
--- a/net-dns/resolvconf-gentoo/ChangeLog
+++ b/net-dns/resolvconf-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/resolvconf-gentoo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/resolvconf-gentoo/ChangeLog,v 1.15 2006/10/17 14:15:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/resolvconf-gentoo/ChangeLog,v 1.16 2006/11/28 13:43:46 uberlord Exp $
+
+*resolvconf-gentoo-1.2 (28 Nov 2006)
+
+  28 Nov 2006; Roy Marples <uberlord@gentoo.org>
+  +resolvconf-gentoo-1.2.ebuild:
+  New version appends a backup extension when using sed -i as there is no
+  portable way to to specify one, causing added_order-e to appear on
+  FreeBSD.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org>
   resolvconf-gentoo-1.1.ebuild:

diff --git a/net-dns/resolvconf-gentoo/Manifest b/net-dns/resolvconf-gentoo/Manifest
index 7ad02654ee3a6b32975f5b1cf93eb6d8e0b347b9..d9eb51e0f3ccbd2e2d239ace008e94609a91c85b 100644 (file)
--- a/net-dns/resolvconf-gentoo/Manifest
+++ b/net-dns/resolvconf-gentoo/Manifest
@@ -1,5 +1,6 @@
 DIST resolvconf-gentoo-1.0.tar.bz2 5320 RMD160 2c607df95bf240d41e511ca68203e9ca452068fe SHA1 7a25d091232bfa6732ad14e52712f456f553aa20 SHA256 75e536ee19182c193655b46c3b7d6909cb0fe3899381a7b6a2692f6017f63db9
 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
 EBUILD resolvconf-gentoo-1.0.ebuild 2049 RMD160 ea18472a284e317b2c0eb0aebdc4f398000253b3 SHA1 4d71a8aab413e5d5f8b86362526ce222c8f0b73a SHA256 0df3b3caabd4447eb27d5fa7bafe339820ae7a385ea81bb3ad8e101e3a4c769c
 MD5 306dbb7d54b320eb8398b5b679c95d2f resolvconf-gentoo-1.0.ebuild 2049
 RMD160 ea18472a284e317b2c0eb0aebdc4f398000253b3 resolvconf-gentoo-1.0.ebuild 2049
@@ -8,10 +9,14 @@ EBUILD resolvconf-gentoo-1.1.ebuild 2083 RMD160 ecae7c922ad1547fd28c537901f396b1
 MD5 eae84e7a76129ed96792e9280c58b9a3 resolvconf-gentoo-1.1.ebuild 2083
 RMD160 ecae7c922ad1547fd28c537901f396b1ab6c5f84 resolvconf-gentoo-1.1.ebuild 2083
 SHA256 74fca19f2c982350f67605514d9f1baa75aac92959e69860a781728026d604ce resolvconf-gentoo-1.1.ebuild 2083
-MISC ChangeLog 3208 RMD160 1481d88cbce0719dc52482569200733006adc5a2 SHA1 dee579f9fa0829d22a781f22d5307bbbdee20b54 SHA256 505478754599f0ae500ff4e3e5198b2f6bd845c178dfaa94eac13524b621d428
-MD5 0a211ed59304f18c3ece3dd2912eb028 ChangeLog 3208
-RMD160 1481d88cbce0719dc52482569200733006adc5a2 ChangeLog 3208
-SHA256 505478754599f0ae500ff4e3e5198b2f6bd845c178dfaa94eac13524b621d428 ChangeLog 3208
+EBUILD resolvconf-gentoo-1.2.ebuild 2083 RMD160 bd5bafb50fda067b8e900bcf437a790e194a3119 SHA1 4059cb5c2b692f37fe8f1753f72716a03335acd8 SHA256 c3c950f561970b9f33b144f7a2c92ed40474b17e768e40070216805e46af3add
+MD5 6d209336a1b236b356b7863a57377b11 resolvconf-gentoo-1.2.ebuild 2083
+RMD160 bd5bafb50fda067b8e900bcf437a790e194a3119 resolvconf-gentoo-1.2.ebuild 2083
+SHA256 c3c950f561970b9f33b144f7a2c92ed40474b17e768e40070216805e46af3add resolvconf-gentoo-1.2.ebuild 2083
+MISC ChangeLog 3483 RMD160 105f0d80c7167865e1347a8a8091c60e48d80183 SHA1 f4dac7e490b992c712ff405cc2ea698e36d1456c SHA256 e4e7a489a29a5bb5ecd6b9817370fdb7df67eb2537d0478bdf815b180df433a4
+MD5 091c474c09f06d44f2e1b3bea2ce731b ChangeLog 3483
+RMD160 105f0d80c7167865e1347a8a8091c60e48d80183 ChangeLog 3483
+SHA256 e4e7a489a29a5bb5ecd6b9817370fdb7df67eb2537d0478bdf815b180df433a4 ChangeLog 3483
 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 9777e1d41247ca64cd416302c4616e5a2c64d83da986da1ff36c30f8da04c53d files/di
 MD5 0743505020e1e33c8faa49b7b3e6cabf files/digest-resolvconf-gentoo-1.1 262
 RMD160 cb13a221d3268035e2ef4c80d3d06a3ff87817d0 files/digest-resolvconf-gentoo-1.1 262
 SHA256 8f5332877f7ec1e482935ac71b11867b4af5da702e2f7b7837cfc7db6b4f8b2f files/digest-resolvconf-gentoo-1.1 262
+MD5 a389e753fce0e6bff738724ae46fd490 files/digest-resolvconf-gentoo-1.2 262
+RMD160 beb85eb1dce854e417aa138dc587f5de71f1793b files/digest-resolvconf-gentoo-1.2 262
+SHA256 f268e0f057a5402a3366bd447d0d1c881b7a041e12aef47b14fde54dca0a3e14 files/digest-resolvconf-gentoo-1.2 262

diff --git a/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.2 b/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.2
new file mode 100644 (file)
index 0000000..cc7b585
--- /dev/null
+++ b/net-dns/resolvconf-gentoo/files/digest-resolvconf-gentoo-1.2
@@ -0,0 +1,3 @@
+MD5 f9b98778d21b8095aed7935e3ecbc47d resolvconf-gentoo-1.2.tar.bz2 5339
+RMD160 703b1b524c6a808f18961e54575b5df3aeb28b7a resolvconf-gentoo-1.2.tar.bz2 5339
+SHA256 b73e090675822e52f0ca0a3f335aef19a0bf53bd56bff0c0caadc006cd9aec03 resolvconf-gentoo-1.2.tar.bz2 5339

diff --git a/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.2.ebuild b/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.2.ebuild
new file mode 100644 (file)
index 0000000..623e5fd
--- /dev/null
+++ b/net-dns/resolvconf-gentoo/resolvconf-gentoo-1.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 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.2.ebuild,v 1.1 2006/11/28 13:43:46 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="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
+}