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

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 14 insertions, 57 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/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() {