gentoo resync : 10.04.2018

4 files changed, 2 insertions, 65 deletions

diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 9fee9f875057..267756ee2ccf 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,3 @@
-AUX 3.8.1-restore-newline.patch 508 BLAKE2B 932f891ed7372ba56058a364d0e8bab41972c82b43f7b4bcc61c68f5204f8121bc79e8641325cd6ffa9407b473d36097eefa81afaeaaa3c415feea17053cbb47 SHA512 ca2c79192f808e16d0aa876fbb35eb28330a86cc4f2bd7ef618bef16f623c127327b1ce16369aadfb73413b103aa5790d7b9e7f44a9c0b26131b17cab22c0552
-DIST openresolv-3.8.1.tar.xz 18396 BLAKE2B bddfb919728cb49baba6df6226abe2f893d36770643e735b41717dfd98edf17255d8b293f01b335d6ae31c7075884ea65aa150ebac9d34f252be724aa0a695ec SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.8.1.ebuild 1128 BLAKE2B 2805f40cacd880191c17650cc0e9a86352d12d29033459ba6dd429c7a83ad84a307683704ef61f52d0feffb136ef24da5795d6f15c418f9fcfeb811dafcfaf81 SHA512 1ed0222eb9131de79f17ff43ea9840ab6c2ecc055005be60dd129430b722e247bf28d25b0ff8aef2f73a37a9b7855f8c8c21840e68f30289c5ea6c543725f60c
-EBUILD openresolv-3.9.0.ebuild 1081 BLAKE2B 9362f10aa957318b03f281ff7e1a4e8529c9215a77db2a5d1052da7972a6c91bd8cf7085c38f0a2ca09a380eb648b7e402ff9adfcd60b74dae51a9a0f5d116d0 SHA512 d60f675b9f02239f2699dbb7d6b91946048aabf1dba3bdd7c3caf4b2f3299d4d6e89f36d517d5fce2d3f0c5550387f98da4cbabc0a7bdc3b25ef0d2d8229bcb2
+EBUILD openresolv-3.9.0.ebuild 1080 BLAKE2B 1bc8b82aaca13f391933df8a3353d17b9dce4c60a54ddfd71b41344493d24333b4c58a411e7beb1ba85dada006c8648f6059c0828c0d3c61251942ee891edbfb SHA512 9b3c5fec3e498e86892570f40382edce524b1067046a1c4361d3ed183b0e8788c6667128672bbb45773fc9c231685c262d6db2fe2db60e96914b8024c76beaf4
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/files/3.8.1-restore-newline.patch b/net-dns/openresolv/files/3.8.1-restore-newline.patch
deleted file mode 100644
index 2522710bf941..000000000000
--- a/net-dns/openresolv/files/3.8.1-restore-newline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libc.in
-+++ b/libc.in
-@@ -214,11 +214,11 @@
- # If the old file does not have our signature, back it up.
- # If the new file just has our signature, restore the backup.
- if $backup; then
- 	if [ "$newconf" = "$signature$NL" ]; then
- 		if [ -e "$resolv_conf.bak" ]; then
--			newconf="$(cat "$resolv_conf.bak")"
-+			newconf="$(cat "$resolv_conf.bak")$NL"
- 		fi
- 	elif [ -e "$resolv_conf" ]; then
- 		read line <"$resolv_conf"
- 		if [ "$line" != "$signature" ]; then
- 			cp "$resolv_conf" "$resolv_conf.bak"
-
diff --git a/net-dns/openresolv/openresolv-3.8.1.ebuild b/net-dns/openresolv/openresolv-3.8.1.ebuild
deleted file mode 100644
index cc55e3160f11..000000000000
--- a/net-dns/openresolv/openresolv-3.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for managing DNS information"
-HOMEPAGE="https://roy.marples.name/projects/openresolv"
-SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="selinux"
-
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
-RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
-
-PATCHES=(
-	"${FILESDIR}/3.8.1-restore-newline.patch"
-)
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}" \
-		--rundir="${EPREFIX}"/var/run \
-		--libexecdir="${EPREFIX}"/lib/resolvconf
-}
-
-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.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 31dbc8e92a39..529606d90b8c 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo