Version bump, fixes gentoo bug 295467. Remove old versions & add myself to maintainer

(Portage version: 2.1.7.16/cvs/Linux x86_64)

8 files changed, 22 insertions, 229 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index f9cf51101a1e..1e3f8092eaf9 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/openresolv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.52 2009/12/28 18:34:57 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.53 2010/01/09 23:56:18 darkside Exp $
+
+*openresolv-3.3.4 (09 Jan 2010)
+
+  09 Jan 2010; Jeremy Olexa <darkside@gentoo.org> -openresolv-2.0.ebuild,
+  -openresolv-2.0-r1.ebuild, -openresolv-2.0.1.ebuild,
+  -openresolv-3.0.ebuild, -openresolv-3.1.1.ebuild, -openresolv-3.2.ebuild,
+  +openresolv-3.3.4.ebuild, metadata.xml:
+  Version bump, fixes gentoo bug 295467. Remove old versions & add myself to
+  maintainer
 
   28 Dec 2009; Raúl Porcel <armin76@gentoo.org> openresolv-3.3.2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #294510
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index 0a9d1ce3388a..517968db2b2f 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -6,6 +6,9 @@
 		<email>lack@gentoo.org</email>
 		<name>Jim Ramsay</name>
 	</maintainer>
+	<maintainer>
+		<email>darkside@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		A framework for managing DNS information
 	</longdescription>
diff --git a/net-dns/openresolv/openresolv-2.0-r1.ebuild b/net-dns/openresolv/openresolv-2.0-r1.ebuild
deleted file mode 100644
index 1b4a907f1a43..000000000000
--- a/net-dns/openresolv/openresolv-2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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-2.0-r1.ebuild,v 1.1 2009/05/06 15:57:23 lack Exp $
-
-inherit eutils
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	exeinto /etc/resolvconf/update.d/
-	doexe "${FILESDIR}/pdnsd"
-}
-
-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-2.0.1.ebuild b/net-dns/openresolv/openresolv-2.0.1.ebuild
deleted file mode 100644
index 71f5320ee4ea..000000000000
--- a/net-dns/openresolv/openresolv-2.0.1.ebuild
+++ /dev/null
@@ -1,40 +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-2.0.1.ebuild,v 1.2 2009/05/06 15:57:23 lack Exp $
-
-inherit eutils
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	exeinto /etc/resolvconf/update.d/
-	doexe "${FILESDIR}/pdnsd"
-}
-
-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-2.0.ebuild b/net-dns/openresolv/openresolv-2.0.ebuild
deleted file mode 100644
index ab0d2e053173..000000000000
--- a/net-dns/openresolv/openresolv-2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-2.0.ebuild,v 1.8 2008/12/07 11:46:29 vapier Exp $
-
-inherit eutils
-
-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 ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-}
-
-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.0.ebuild b/net-dns/openresolv/openresolv-3.0.ebuild
deleted file mode 100644
index 97df05cc7475..000000000000
--- a/net-dns/openresolv/openresolv-3.0.ebuild
+++ /dev/null
@@ -1,51 +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.0.ebuild,v 1.2 2009/05/06 15:57:23 lack Exp $
-
-inherit eutils
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-pkg_setup() {
-	export PREFIX=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	exeinto /libexec/resolvconf/
-	doexe "${FILESDIR}/pdnsd"
-}
-
-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.1.1.ebuild b/net-dns/openresolv/openresolv-3.1.1.ebuild
deleted file mode 100644
index b16be3a406b2..000000000000
--- a/net-dns/openresolv/openresolv-3.1.1.ebuild
+++ /dev/null
@@ -1,51 +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.1.1.ebuild,v 1.8 2009/05/28 17:05:20 armin76 Exp $
-
-inherit eutils
-
-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=
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	exeinto /libexec/resolvconf/
-	doexe "${FILESDIR}/pdnsd"
-}
-
-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.2.ebuild b/net-dns/openresolv/openresolv-3.3.4.ebuild
index 79a48d8aba27..4e99866c47c4 100644
--- a/net-dns/openresolv/openresolv-3.2.ebuild
+++ b/net-dns/openresolv/openresolv-3.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.2.ebuild,v 1.2 2009/05/06 15:57:23 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.3.4.ebuild,v 1.1 2010/01/09 23:56:18 darkside Exp $
 
-inherit eutils
+EAPI=2
 
 DESCRIPTION="A framework for managing DNS information"
 HOMEPAGE="http://roy.marples.name/projects/openresolv"
@@ -10,7 +10,7 @@ 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="!net-dns/resolvconf-gentoo
@@ -19,12 +19,13 @@ RDEPEND=""
 
 pkg_setup() {
 	export PREFIX=
+	export LIBEXECDIR="${PREFIX}/lib/resolvconf"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	exeinto /libexec/resolvconf/
-	doexe "${FILESDIR}/pdnsd"
+	emake DESTDIR="${D}" install || die
+	exeinto /lib/resolvconf/
+	doexe "${FILESDIR}/pdnsd" || die
 }
 
 pkg_postinst() {