Version bump to fix location of libexecdir (bug #437146). Removed old versions

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 38 insertions, 82 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 0c926f4fbd90..1cb985661a58 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.66 2012/06/27 17:24:12 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.67 2012/11/26 08:20:23 polynomial-c Exp $
+
+*openresolv-3.4.6 (26 Nov 2012)
+
+  26 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -openresolv-3.3.2.ebuild,
+  -openresolv-3.4.1.ebuild, openresolv-3.4.1-r1.ebuild,
+  +openresolv-3.4.6.ebuild:
+  non-maintainer commit: Version bump to fix location of libexecdir (bug
+  #437146). Removed old versions.
 
 *openresolv-3.4.1-r1 (27 Jun 2012)
 
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 401604705c3b..de5fdedddb18 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,31 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX pdnsd 19161 RMD160 6cd5e5202f24d6102b38f37bfc5a8d665cf99962 SHA1 83bfb3589ed542a6cf1c0d41ca0c563220095127 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed
-DIST openresolv-3.3.2.tar.bz2 9485 RMD160 85d5678b5c4f591985ac9c00e7d0df456f52a1e7 SHA1 4a1a8c7127fe2dac44c6faedaca7ca2c2a2a4823 SHA256 f1996cddcaa9014455c225f93654eead9524416e882c3a08f44aa68c3fb5e9b1
-DIST openresolv-3.3.4.tar.bz2 10495 RMD160 d87fdae8426b928fdf414cd335cbf0c2f70df9d1 SHA1 99532b1cb34922d139a827437f23cf9a0e843776 SHA256 8288e436c67e0f85bdda25916f6daba78009af353529944eb9fa6cdeb5c38e48
-DIST openresolv-3.4.1.tar.bz2 12741 RMD160 30a86a0f16b7de24a773a37ad86d7f76b623e339 SHA1 956c4109c82c9cd93c0d365f7230c18848811747 SHA256 c01c7fee00f8582658753cc15af421b00106e9d7c6ba6c777b535814b2c02e69
-EBUILD openresolv-3.3.2.ebuild 1444 RMD160 4f735fe8c6961be0c8aa327192bcf03f6259535b SHA1 5f064a758b543f83cfad3e59751fa3eff1d3b831 SHA256 9557df0ab4361606d00a76ed4ee88120e44f1506687e857af4f37ce34c3e1b89
-EBUILD openresolv-3.3.4-r1.ebuild 1456 RMD160 c4424a56abea47363b178be17045e101dd31df8d SHA1 cf8093417d332ca51bdc7c876ab34d8712bd9ae4 SHA256 79dbf4f3a9c8c606fcbb0136c96ecc3faace9b9a66b50b8afa9b68f2f66b000b
-EBUILD openresolv-3.3.4.ebuild 1443 RMD160 d3b12af4d096b21bd5461c90d9fc5665052bd7de SHA1 bdd4b50f63cf8ca1b8fec71dc0d7ad101aac9db0 SHA256 b92146dddb8a959e6f0a6ac25df4bf7eee4653ff19ecfb672c8f050599311bc0
-EBUILD openresolv-3.4.1-r1.ebuild 1147 RMD160 eaaa7a8c5387e8baa91db769bd02afe6452e3bdf SHA1 5eed0ca4f3de4b3cfc4f21298a106662c64eaf91 SHA256 3e518c5722b80f28079e4794a0da364d4c7624a4fac46dc02838569d35eb66bc
-EBUILD openresolv-3.4.1.ebuild 1126 RMD160 8dd3c7cc3909e02e382830a1991e458cc87994e6 SHA1 0317ef02ce7fdd6bed4ca5377d7bd3d33096a636 SHA256 db400b93c0c103ff2d12667a81106d047eadb50c0cbb145fc42db6eb6ff00554
-MISC ChangeLog 8733 RMD160 4417384dab0611ed997fc706037db297f9e37046 SHA1 f136c0e42ab5391e96c2d838dbc0c515af66bdcf SHA256 9cfc9ff2549762b136f56b952febb8ff882c389b0c511d823e3a244430f4726f
-MISC metadata.xml 319 RMD160 cb88523b59cba233ab2f84ef5cf011fe9d46cfaf SHA1 a287e26a5d8e3c34e725f9c66709f618c2bc47f1 SHA256 fc85594d02d846f63a1c00b842b393d2cc9bb8f09ede665e7d7e468fff38c011
+AUX pdnsd 19161 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed SHA512 44c59eac111053ff90452421e0e2776dfb801edcd4a31c1cb1ac381286757b780b5408a67a934b71f97aadbf906e2d94d9ab34e59c34ba6a140cb09625fa0730 WHIRLPOOL 1c8224d9c60bf4b0946d3b2ae4696465e596f5f1352a6e7db123d2f43eb9d7f8cf4313059c6fbb690e0bd362905dbdc548bd89455a6677b42564ee9a78cdda38
+DIST openresolv-3.3.4.tar.bz2 10495 SHA256 8288e436c67e0f85bdda25916f6daba78009af353529944eb9fa6cdeb5c38e48
+DIST openresolv-3.4.1.tar.bz2 12741 SHA256 c01c7fee00f8582658753cc15af421b00106e9d7c6ba6c777b535814b2c02e69
+DIST openresolv-3.4.6.tar.bz2 13446 SHA256 6a41cba441f036045b73c8850715f10431dfbd2bb69acc54b97883354e22df08 SHA512 ca3c583c978e72aba4b635aac176800bfd58ebad005c605a854e8a06430f85b542f2c48e5aef0fcb82571b7e74ce10fb4ff5b1c3929b2d9c9bc1cf9560f5cc01 WHIRLPOOL 3a0de837861a84a485895103d87feaa75f8e0d545f2e7f507ac974f58a6d8b804c1f580876b69ec56ddade5d963ae223673e12397d1988ca952c071a91f19fdb
+EBUILD openresolv-3.3.4-r1.ebuild 1456 SHA256 79dbf4f3a9c8c606fcbb0136c96ecc3faace9b9a66b50b8afa9b68f2f66b000b SHA512 fee339f691ed85e49aa51260f70c5c06bf4cab1411ce4ac273a3a2659516610a6bb4002ac591bf893dc3d0ba49f8f21cac8a46c383bd94a234314fe918f38f76 WHIRLPOOL aeffdc5706e54ef29e1b75f99823a27b508d348077bb00432b2e997bbe7b3b92c92317deec045f6c280a0cc190b1066af069579e81b9cc0ee7ca675f71168212
+EBUILD openresolv-3.3.4.ebuild 1443 SHA256 b92146dddb8a959e6f0a6ac25df4bf7eee4653ff19ecfb672c8f050599311bc0 SHA512 5fd9a8358d33548635fcf6d00bc62f55e71223b6d4a87cb219bb3c4c73f846ec04da26b8d8ec4422561829fbff28234314761ceceb8dc60eb24d3d4a8e308099 WHIRLPOOL 4e7ad2c4e4c6fd89e922a2bdd867d92e80fec67729f9027da31efde914b4dea3b6a586693ed43d13ee0ba2c9273c783ae841cd80566e1037c1d4ae43d143f411
+EBUILD openresolv-3.4.1-r1.ebuild 1166 SHA256 77133614bf277df0a828eeb87f46676f2e51011b272a3e9532beca7ff876df33 SHA512 f8b1277b99e42bf94daced0c924bfe0afed16b0de06e354a45460dc1002b564f66b4da2d86c05ee7e9d102c3207321b695522721d8d2d93aff2fb97b1a42a64c WHIRLPOOL 8d0d8f9e7a376d462aa1f6ac57ee7b268352003ec502d338c9c08976323a967a77a4e4a8e92afdb6d94b7c3bdba6d789c63ad72ca8c28e132ba323c9ffb68f49
+EBUILD openresolv-3.4.6.ebuild 1163 SHA256 7e85bd05b0e146592b638ac153c62010c13a8ede82412a9a2a2aeb1ea27c58c3 SHA512 6308d49c3159e3e282026d56850899e60984ffe1efcc6b696ae1adb0ed2545f1a3e86a70d421622540dc8ba6e1d7611a9cae32d0753d4b11856c5f33baf42e61 WHIRLPOOL 2e0539c0c3eab5cf69cf3f3b84b386e8043201176422b996ea93ad1a4a2f2af22b1273440e8017e8b1c26ccba30b5118dab4cbf925336ab4609b31d5923c34e2
+MISC ChangeLog 9046 SHA256 8ec86b8a13da04c11b6b2c44717702b7c3b76ae96962c881497f19c8602875f7 SHA512 a554c2f4e58ecaeebc3a09744b887f25e1daabfbb432ec45a587da24b2f3160f95d5ac3f46b6d75ece0ffee0fa377b8a8b19b8c6d59efb95ce998179241c264a WHIRLPOOL c8e6dd584914eaf6997cca507a64efa0c55615b02abc251b0deb63fb2c5088d4ff83427f0be3ab089b17e7291598ba367918b5d133729d7166202314cbd2f79a
+MISC metadata.xml 319 SHA256 fc85594d02d846f63a1c00b842b393d2cc9bb8f09ede665e7d7e468fff38c011 SHA512 8f25a804a96586af9d5370ca77939fb72df20db034e0749e355759252a78ac271da573e8f0665c6f029c3c498e1c73f8319e494dc349811dc4322b72a439407d WHIRLPOOL 613242aef682edd2076dd1bb5ed3604938dab615eeff739ca465065904df8abf6d0e1694aa827289765b7f875bbe3d93cbdc3afdc89fc9a190b30f246a05f06b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP60HHAAoJEA8o5SF9Rr6qLxMP/RaS0tuGmJNNoK7YTcjUg63e
-xmeSv2yIZcidyNAyAxfiXrq/YLrFhotj7IosLkhI6dM8+Z51Xjrjiq9/DWW/VzLw
-2++dAQ6m06sfd+gAmSsvWE7AeLHBqV5dOUDL8iKPAlmWy1ubUu3rkDq6/jAtWgJF
-KJpUvFvMT1UB7NEzWRF9cRC2WyLjKrnKAYQF8p5/3wEX7iTsOtNikAe1/6oG34Wl
-EPue7TpOCLCuJLiUoX+31b1MdwfgWVEdhu+Zs82ExBJz/LB0qX/lyzo5W3dVJocC
-NEXKRmXc4sLzIKCswQgZgTWK6Zf3MaZ+nLbpxxphoJ9A90RyaoGCMHzvFjg8bUEp
-8BMmQQRNaGRbKZaJF1ViUFXJ4V/lHsODpsv9axiWpRyO3oIac8QaXi5u2E54bcsr
-TO31BHEk0vCkykCn0HMn2Bow/iHm7geN0vPOkcAr7isBDHtID/S9qewp0y1znMJp
-mCVw+/zhraCqCHqrod4dlQAPJfgQdPA9ntQVHOYr3XByfZjFN7p0R4C/SZ14sO0q
-/VHDZco7aBHs3FTB1+kCswCrQfOgwu77nVCwpcyAM8OerjaQAIeHb3CI8edLC5LN
-H1gq/78GL/CyKcjttCzup1Bl80K9lyztaAUIpQ1XYHvz6TjcYyzsPSKY1FMV5VzH
-k2T9GglYB+3bEED5hi8Q
-=3EKc
+iQIcBAEBCAAGBQJQsyZIAAoJEPiazRVxLXTFemcQANiNQT0Hm+RasmNohRfyqXp9
+JHB4dR8m//GneNLtsufi6/Mli4OpXyIz5kWrBb0GMtDIYoaoCS08TEuitDM89Lyi
+oGfWpkd2ISYE99JZnw8XQPfyscg6mNj79xsxx6XvcEZ2EyKnMsoJHpSLRV0tsn0W
+HXvzEqBmiqcJ1t4cod+Zmtbghao1lBAu1KlAFXbilT2WMJYdlxnkOsGd3Irv1H3k
+99v+eEnJWKMmncLwM0vLOwsnWfFsYkiQhfNPhE5JVTRLK0+ZSBas+R4l+Pf+1BUi
+dliqjFahb7HUY5zUVXfgPNCEByBq3Ba2u6OFJaq9GM9XCWM3yTnW6L5h1CygKrQ+
+p5OXtNLCenmalrdhhGPitW5ObC8cJKnMbejnwnNomAMQ+BStmivyHzmW3iUyJUOJ
+9rc0kWzC8shWcPkBkK8999mLY167wUBlZ0TjyPDg5IjfVsUF13UlWax59RWgs5RI
+VG8w02dl0Qs9o4dQe6OptyV8WRcaLxRptqX8I+Oc/Z1svP9f5yVUotGC3N8YiC3x
+fkMwZ6ICX5M+v6T8xtQA+oycZnmA8ikYpWb+zoUtVv6t88P91GKUTTu8T6YAAbZw
+n7oIF+LCX9Uei310F5nAEHG45lZHr/DC3J5cYqn/0ibl7+rbrIbeL8+mIHWTa6XE
+aljxYrU5iborBI8UAliZ
+=4TOD
 -----END PGP SIGNATURE-----
diff --git a/net-dns/openresolv/openresolv-3.3.2.ebuild b/net-dns/openresolv/openresolv-3.3.2.ebuild
deleted file mode 100644
index be81dd91f087..000000000000
--- a/net-dns/openresolv/openresolv-3.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.3.2.ebuild,v 1.9 2009/12/28 18:34:57 armin76 Exp $
-
-EAPI=2
-
-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 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-pkg_setup() {
-	export PREFIX=
-	export LIBEXECDIR="${PREFIX}/lib/resolvconf"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	exeinto /lib/resolvconf/
-	doexe "${FILESDIR}/pdnsd" || die
-}
-
-pkg_postinst() {
-	einfo "${PN}-3.0 has a new configuration file /etc/resolvconf.conf"
-	einfo "instead of mini files in different directories."
-	einfo "You should configure /etc/resolvconf.conf if you use a resolver"
-	einfo "other than libc."
-}
-
-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
-}
diff --git a/net-dns/openresolv/openresolv-3.4.1-r1.ebuild b/net-dns/openresolv/openresolv-3.4.1-r1.ebuild
index c5af55f2a28a..cce99e0ed63a 100644
--- a/net-dns/openresolv/openresolv-3.4.1-r1.ebuild
+++ b/net-dns/openresolv/openresolv-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.4.1-r1.ebuild,v 1.1 2012/06/27 17:24:12 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.4.1-r1.ebuild,v 1.2 2012/11/26 08:20:23 polynomial-c Exp $
 
 EAPI=2
 
@@ -23,7 +23,7 @@ src_configure() {
 	econf \
 		--prefix= \
 		--rundir=/var/run \
-		--libexecdir=/$(get_libdir)
+		--libexecdir=/$(get_libdir)/resolvconf
 }
 
 pkg_config() {
diff --git a/net-dns/openresolv/openresolv-3.4.1.ebuild b/net-dns/openresolv/openresolv-3.4.6.ebuild
index 6df9ae3bb854..923650a4d8f2 100644
--- a/net-dns/openresolv/openresolv-3.4.1.ebuild
+++ b/net-dns/openresolv/openresolv-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.4.1.ebuild,v 1.2 2012/05/12 14:25:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.4.6.ebuild,v 1.1 2012/11/26 08:20:23 polynomial-c Exp $
 
 EAPI=2
 
@@ -22,7 +22,8 @@ RDEPEND=""
 src_configure() {
 	econf \
 		--prefix= \
-		--libexecdir=/$(get_libdir)
+		--rundir=/var/run \
+		--libexecdir=/$(get_libdir)/resolvconf
 }
 
 pkg_config() {