cleanup

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

5 files changed, 10 insertions, 170 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 24b0ecbbf8fe..873754e360cc 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.97 2015/01/18 08:35:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.98 2015/01/18 10:54:26 alonbl Exp $
+
+  18 Jan 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/openresolv-3.5.4-config-conflict.patch, -openresolv-3.5.4-r3.ebuild,
+  -openresolv-3.5.6.ebuild:
+  cleanup
 
   18 Jan 2015; Agostino Sarubbo <ago@gentoo.org> openresolv-3.6.1.ebuild:
   Stable for ppc64, wrt bug #535556
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 7af593a78d0a..68b0f7c9a6ba 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,31 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openresolv-3.5.4-config-conflict.patch 1378 SHA256 6439ea2b3a2466761739def69af6d67d15085ba3d601f5c02e34a2f7ac64ef16 SHA512 e041771766eb025be6ae9314e951b36218beedf6d4ac9a11815c4512dfbf9d012a0eaadcf2574071f70c94c6726977368cb31ea07ac6cca6f5cc1538b9df7a97 WHIRLPOOL be68f2a8696d116681d27dd301f4cd349a8c808bad8c2417e16d8dbbae1aca0a0d0a035cf9a090a366916c59d3fe908b5b631a54013a07fe57a135a21a37d1fb
 AUX pdnsd 19161 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed SHA512 44c59eac111053ff90452421e0e2776dfb801edcd4a31c1cb1ac381286757b780b5408a67a934b71f97aadbf906e2d94d9ab34e59c34ba6a140cb09625fa0730 WHIRLPOOL 1c8224d9c60bf4b0946d3b2ae4696465e596f5f1352a6e7db123d2f43eb9d7f8cf4313059c6fbb690e0bd362905dbdc548bd89455a6677b42564ee9a78cdda38
 AUX restartcmd 400 SHA256 ae104531eded1e33bea6267c7422f6c22da3440ab790051182cdd9b2e9ae9e4f SHA512 5d44a9f5814104395cb09b573a03dc70ab15e1a953299df36d072f5189a3954dca05b201d6aa84283f69c4a93d5b2cde6790381718a8a453462329e7f2d1806d WHIRLPOOL 200393aeb8970c0b6679609f7437e34cbcf34d71e2217266ad5c160a1940f97a55a4408f023df9d5cbef0835b9e025a1075606bca1f99c63c61993a51a4e24b1
-DIST openresolv-3.5.4.tar.bz2 14662 SHA256 ab91fce9053ac653379155aaa6f1b912c0e117d8c55c91a908133ea26004c446 SHA512 9933ee8cd3f9a54fa76871a72b9a6a234cff9d97d56f753063b26283af91cee34298b43fd412c233e7968e3affa275ad22ffd1040230ea343bd6a004ff430a3b WHIRLPOOL b3ce0caf028a7112ab6e70c50b3799848547048b35c7f11847fe21817caa0b3c1b9d5c780bd4a27fa2e67ffc66ddab2eac597dffa80b3841b68cb41de0da9b07
-DIST openresolv-3.5.6.tar.bz2 14746 SHA256 db4671277ee137cf23bac15c5d4cbdc3e55c856d1f4e5f522bb09eba76e06cd8 SHA512 202d12224627a4f88bad114c1f48b3d9a9a0008f2bd672c355d2f80db44c4d07b12fe2b757715d7f88fdfb7c39d05a20782d3fa80df695f03a251af823705bb1 WHIRLPOOL e1013a1fbe78bc2f6f51b375c78cc0d7d24c1f6ee18af2f8bd1419d67b76b54b8964285e1718cfaaa92e65f75b794ee001e52e5fb0d088bca774760302340ffa
 DIST openresolv-3.6.1.tar.bz2 16803 SHA256 38a6908c07b8474cf489095026808d1c5ea5c53bb299beaecd23c05593b09eab SHA512 9735eba662a2b1299db5bfb7ae3bf19b32ca4eb349883011c3752af3bb3becd2f58ede5743d32bc38b17dcae7b0cfa28dc8a57079de90cb141412bd01033637f WHIRLPOOL d589bb982bb3c68077b70498ddb57a23a44a1a4e33235bb92f092f89b450cd10ebab55283e78c7c7bf012d1470f41e2702f5fecd8ff0730c17f9b6e163abc387
-EBUILD openresolv-3.5.4-r3.ebuild 1348 SHA256 c9bdeade8cff5bfc016e12ff399598ab7a083af968ac2b34fc86af5d5eb2e1ad SHA512 12da3bc452e668d9480d1bc2c73e2b2b2b9449dfd8feb599fd8c0002c791ce10b8cfeb9dfb3c7980dbe3b3944c91967b0493a02e4b4f33ec7f694e7cf9dc8fa2 WHIRLPOOL b0d47fe512675afb3d5d13f83c2e682b337c16ed17465f1a35987bd18b048b64a6da28563ed8b2c30a963e7408ee8b5af15ac9fc5561bfe8b80ac57c382c2fe5
-EBUILD openresolv-3.5.6.ebuild 1290 SHA256 b90c2320fe07c8385c1cd4f606a687e349695021afbdb72d24298a9b789e5f59 SHA512 89862f3b978f3327be5a9c41249f5dea3ecc009a364cb87282a013413a4f40c27cab8cef330fdb68bbbe66a30354502a2166a8fafade3e0bec6b463dcd0f963b WHIRLPOOL 631441a15f238890d517f2c198bf9da3ac43f8b067565774a5e7f8138a7c1d7b0724a3d8c3ea02ac8b9c2efe74fecba97d263b67d87820bca4c52c1b2a8015be
 EBUILD openresolv-3.6.1.ebuild 1276 SHA256 1dd3550b463a914bd88206c52d3662f2d12492abe3a65f4d183962867b37e6b0 SHA512 8b8d1afc037627c89bd83db1fda905b2a71788a4965e0b1d475f6ee8f21fda2c73d6ca0b631b41e50be13ab9d266e510dc3e086041fd68441025f8eae33bcefe WHIRLPOOL ab886d5475b4bf24995270e8a81513bf7389875db754f8ee31161751c1c6f7fe26ed6260fa196373fbaad9f04e8ffaf65650a9898649e39b5850632e791a3a03
-MISC ChangeLog 13112 SHA256 892a401d8648fbafa8fd48c5f48b979fd3d4004a3f38e60b16d0f955779195aa SHA512 cc7c679ab41cf6b69acf6030ffac2aad68e58707490ff08d5a7f9d6d6714888650941c60992738243a71d910dfd5b84f7af7446d02dcad3968bcf322c885c1ee WHIRLPOOL d7c3d4fd3ad7d9f40765ec59574972bd70ff1bb91194e30725eca3e49b42a8ae02b6928371260b8a0c2332d5d998ec3c86b3423ec1514d129ecf4db63c30942c
+MISC ChangeLog 13280 SHA256 ca335acb9a41db1f86fb3a6b1ee1cf1affc33e011242d7d33cc3528efff6f198 SHA512 8eebb179a9a8017a27c4cd5b0e6d36def999242055e818afae30a90e4d9a441b145271f38210f1338012f82aade038d92b998cd95a36d6b0f28c552897aefca7 WHIRLPOOL 83c6b9293ec020fd58442737f6b7b5b5d81d67452783de78d8fccb298966496edc4e5a0bdbb3a97efb37306b367963d7252372fbe39a00d47c90ef5569fd01c7
 MISC metadata.xml 295 SHA256 a24fceeb21c2b231a5a9257219445ea354b2c80d19df0e9e603c62eee8fe963d SHA512 41313b1bd10f5988dcc1578fef58bc92ecc65f3558e4bf1b2044ee013167b233ca2b123a22f6be67372523f74b505af9c0ff322bd19c86d18f08fe4048d48d70 WHIRLPOOL cf2dfe75d0811d0173fb76e683306b6377d7a7aec7700d17a6a98e8130d20ba86a8804f1d4884ea226d71691916469215955ff018ad1d6f6bf085f9ee04d1c93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUu3BGAAoJELp701BxlEWfKRcP/2VqaCTFFUCkeNA0gmjJ52Tq
-GjZx46CB9lOJ1QOxyda3vTI7pJfPNJeEhHSzPWxWPIi5atAkW2RiIIRIvdTAg2ub
-oHQyQnn5g0t1uGaEl7ZUOq4rNPjhsY5K8EqsQaR/2oCP4oJ11y/mlgQaAuXUO1Ml
-kZcHZPtC+xy2LGIGpW1UVgULa8TlMmUtFVcL/S0F7rkhr3FOxewvMOJUPKI8/Gqe
-zf4NSPBlc585Lu8tIp1QlU43OXGJEDKbOBj8KqN3oGQhbCrNuaPpUFrAyXVg4oKI
-KyvnfLEUVkytUHmv1dgAEPoccJngjLAWYg31rmhUgh5EncyapdUR1LFuIB5+tF3J
-JSBWLfCUilMFToBbNCMBsWqdCmw8scqwd8KOsqvXvQ8WzjtMQMzLLlGHn2Wbz7nR
-PlVvNYs6fHR1ncQegZzF6LfqiSr6HQfw1CLrPQ7rcQAn24rZBgPCI+07cHIiHEnh
-bFIZkJCARXJc7cxxMWtyXz2Vqxu+er6142yZuLfhhqrk2Z01fB4Qeg1U/P1J1nIv
-BOWt5OOZ/VWl50at2we7XncViSqqerwaZXWqb84ysG6JeszdqqAewKKWcBVv4Y9v
-HGwP4seftpCD/UTZVuDTidgZOJPHNMAWfdIVhBKyI/LAq1I/KKafIjKe1m/1ghLf
-jvm9HSf+qhlOlFrbhnCS
-=u1x1
+iF4EAREIAAYFAlS7kOkACgkQXYk9GL8g3FG7hAD+PqXdRRWlNtMjXgi/cDVd/6gN
+RnmqVcxFppnvUFg4obcBAKWomwijNowbRv2VIH8Veq88SCbjGBVleWWU5JSXV4Ql
+=ZL8p
 -----END PGP SIGNATURE-----
diff --git a/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch b/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch
deleted file mode 100644
index 489d00e441f9..000000000000
--- a/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 406964b59113109d3f7bef2681aaf9362b10d661 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 12 May 2013 18:24:57 +0300
-Subject: [PATCH] resolvconf: enforce configuration defaults to avoid conflict
-
-dhcpcd, for example, uses interface_order environment variable
-which creates a conflict with resolv conf setting, as it takes
-that value as default configuration.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- resolvconf.in | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/resolvconf.in b/resolvconf.in
-index 5015222..82b8b55 100644
---- a/resolvconf.in
-+++ b/resolvconf.in
-@@ -28,6 +28,13 @@ RESOLVCONF="$0"
- SYSCONFDIR=@SYSCONFDIR@
- LIBEXECDIR=@LIBEXECDIR@
- VARDIR=@VARDIR@
-+
-+# set configuration defaults
-+dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*"
-+interface_order="lo lo[0-9]*"
-+name_server_blacklist="0.0.0.0"
-+state_dir=""
-+
- # Support original resolvconf configuration layout
- # as well as the openresolv config file
- if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
-@@ -43,10 +50,6 @@ IFACEDIR="$VARDIR/interfaces"
- METRICDIR="$VARDIR/metrics"
- PRIVATEDIR="$VARDIR/private"
- 
--: ${dynamic_order:=tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*}
--: ${interface_order:=lo lo[0-9]*}
--: ${name_server_blacklist:=0.0.0.0}
--
- error_exit()
- {
- 	echo "$*" >&2
--- 
-1.8.1.5
-
diff --git a/net-dns/openresolv/openresolv-3.5.4-r3.ebuild b/net-dns/openresolv/openresolv-3.5.4-r3.ebuild
deleted file mode 100644
index 0e202193dd15..000000000000
--- a/net-dns/openresolv/openresolv-3.5.4-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-r3.ebuild,v 1.12 2013/07/07 10:18:41 ago Exp $
-
-EAPI=5
-
-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-config-conflict.patch"
-}
-
-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
-}
diff --git a/net-dns/openresolv/openresolv-3.5.6.ebuild b/net-dns/openresolv/openresolv-3.5.6.ebuild
deleted file mode 100644
index dc20128a2996..000000000000
--- a/net-dns/openresolv/openresolv-3.5.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.6.ebuild,v 1.1 2013/07/12 21:09:06 alonbl Exp $
-
-EAPI=5
-
-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 ~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
-}