Move restartcmd to new 'helpers' subdirectory, bug 468506 by Michał Bartoszkiewicz. Use /lib instead of /$(get_libdir); scripts are abi-agnostic. Drop base.eclass.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 61 insertions, 5 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index e2c9723c110a..2f545473b2d3 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.73 2013/04/30 14:21:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.74 2013/05/04 15:36:48 floppym Exp $
+
+*openresolv-3.5.4-r2 (04 May 2013)
+
+  04 May 2013; Mike Gilbert <floppym@gentoo.org> +openresolv-3.5.4-r2.ebuild:
+  Move restartcmd to new 'helpers' subdirectory, bug 468506 by Michał
+  Bartoszkiewicz. Use /lib instead of /$(get_libdir); scripts are abi-agnostic.
+  Drop base.eclass.
 
 *openresolv-3.5.4-r1 (30 Apr 2013)
 
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index fa2e68fe6304..1ff349b6263f 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -16,12 +16,13 @@ EBUILD openresolv-3.4.6.ebuild 1163 SHA256 7e85bd05b0e146592b638ac153c62010c13a8
 EBUILD openresolv-3.5.2.ebuild 1163 SHA256 c34f2ebc326fa5ca1a5f797d4531da96335bca8bef05bf1c10369b6ac669b3df SHA512 a617751cf4129e2a755201889a5a2f509563e014b99dbef3cbb8a12d073b2e53bc4fb846adf03e6dfbb51918fed90a1cc6deb2e73e2af3c01242ede9611c46df WHIRLPOOL 34c53c505c5082d4b5852878cc05d704e138dfd53e4b3306386aedd69e06994b3f15ba4eee3e7887417c2ba602dabb2ab59c0ccd5094e7bdef93b8ac172958f4
 EBUILD openresolv-3.5.3.ebuild 1163 SHA256 6378405c0ad4f5c54ade4d9cb7dfe2b83e7cbed27ef306c838bc0268f88a5017 SHA512 d75a19d364bfa86f82be9bfb673960cdc4d23028f961865b230093b13f9258935c29baaeb7e5a11c8cac422985d6ce373caa0b237bd0baaba790df23cf691cba WHIRLPOOL 1ad2f4cac1cf80f638457a4aa180c74519092da74648897cf1bed9f3aac1d2ebafd94c09ef3bc78efe03ac4f93c91471d8d5082b102348f8d753c9593e28927d
 EBUILD openresolv-3.5.4-r1.ebuild 1315 SHA256 5c1e688f56771316268a36603d507ec958f07fbdc2144b36fe6d422eced87d41 SHA512 19bbc8bc408b30140ef6fe45b8d34d04c195a6fac20303316365a55bfdcbab0e52e6c108dc88697fa596236064288718589aa7804753cf16f84dc855865eb1fb WHIRLPOOL ecabf1597222412a79f417223c7eb7054c70b72bc2b6cb2a74249aeb5b9c7d405797e642e30dc89d445bb1942912e628d0119fa08d8cca9a7f91982bc1065430
-MISC ChangeLog 9990 SHA256 b2d7861c65e46aa88ed69a78f61b048cc33de318635558dc8d8e58fa5ebf5363 SHA512 d894b2efeb3c4726eb959d6c900eda10ec39be75f474e880d00f4319613a37168b2050c1518712474c23ebd270e35be521f6f8e83d060aae1634a6f3c47d9279 WHIRLPOOL 885aeb94eee799e2acc58644df243cecae46a92b836345f15720616e7fb74b44e9eccf2aa5247d2c38779557bcbd68f1f9cc271895a33c4d175f57274c92ef52
+EBUILD openresolv-3.5.4-r2.ebuild 1278 SHA256 a58050bf29f34f89cd9c4b4326c152735be24226c233312bf40d4f7f0ed991cc SHA512 f31240e5e8e5d394d7e3e3aacaf12bf8a74c0fb8c642e0613d7591fee7e037ba2ae1f2318970afe6a72daf2d024b9adc594d74ca2a893de0dbd5020ea5d4e2da WHIRLPOOL 53d6a45c54d8a2616644c89d833c89d58020c4ba79fc32eec6b0f9a1bdebbd06d530fd1cb21065169371dbb1dbb68eb66812d0d24663b667d2fd7fbb34f357e4
+MISC ChangeLog 10276 SHA256 6bd602c066b3a97dc8c2d7dd0d8a39cb11ec966d94f893c7c413a55065ab05ed SHA512 b65651e8e559c58f55be39b373225cb7109fbfcd24871d59d343cf0d71ed79fccb3b327b55920f3b1596ef3c6d296cb0265835148e8c4c23f05d71cd89cdeab1 WHIRLPOOL 1aba7f606f6690f4f52a57f9ac20a9b80a8368e05ef63620761327f6afac576ffd6bff518b1868d983c9dafa34e0cf87493d285ba01a4277800a4c4320c17fde
 MISC metadata.xml 319 SHA256 fc85594d02d846f63a1c00b842b393d2cc9bb8f09ede665e7d7e468fff38c011 SHA512 8f25a804a96586af9d5370ca77939fb72df20db034e0749e355759252a78ac271da573e8f0665c6f029c3c498e1c73f8319e494dc349811dc4322b72a439407d WHIRLPOOL 613242aef682edd2076dd1bb5ed3604938dab615eeff739ca465065904df8abf6d0e1694aa827289765b7f875bbe3d93cbdc3afdc89fc9a190b30f246a05f06b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlF/01QACgkQC77qH+pIQ6QaVAD9Ep6Wx0pJv2OFfVa5E1EUPDay
-ANiJOQ+cLGYg7b6Z3WMA/1be7mYwjTDwX1U+/f3ycQcWAqn/hzSx5Cb3dcLfF0pW
-=+4Zz
+iF4EAREIAAYFAlGFKxEACgkQC77qH+pIQ6SccwD/abDCUOckrRb1THwYQpaNbm0+
+mgLP6FKCFdHIlYX6gXwBAJd4Xhjaa/Qo2VIg5OmecSFemvGprGPTeNFE0goE5xaK
+=NxuE
 -----END PGP SIGNATURE-----
diff --git a/net-dns/openresolv/openresolv-3.5.4-r2.ebuild b/net-dns/openresolv/openresolv-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..a994e836b611
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.5.4-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.5.4-r2.ebuild,v 1.1 2013/05/04 15:36:48 floppym Exp $
+
+EAPI=5
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="http://roy.marples.name/projects/openresolv"
+SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!net-dns/resolvconf-gentoo
+	!<net-dns/dnsmasq-2.40-r1"
+RDEPEND=""
+
+src_configure() {
+	econf \
+		--prefix= \
+		--rundir=/var/run \
+		--libexecdir=/lib/resolvconf \
+		--restartcmd="/lib/resolvconf/helpers/restartcmd \1"
+}
+
+src_install() {
+	default
+	exeinto /lib/resolvconf/helpers
+	doexe "${FILESDIR}"/restartcmd
+}
+
+pkg_config() {
+	if [ "${ROOT}" != "/" ]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	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
+}