gentoo resync : 18.12.2017

4 files changed, 17 insertions, 42 deletions

diff --git a/net-dns/dnssec-lookup/Manifest b/net-dns/dnssec-lookup/Manifest
index 5b6a9484fcd3..341290806698 100644
--- a/net-dns/dnssec-lookup/Manifest
+++ b/net-dns/dnssec-lookup/Manifest
@@ -1,5 +1,4 @@
-DIST dnssec-lookup-2.1.tar.gz 36243 BLAKE2B bb37bd0e4f6b61ddfa1f18ab1757104f63afe1a38f1960e24942d9dca8a37685dc0c9e9db4e9661e5fe8481989f86519098e62ed241fcb1e172056843698eea1 SHA512 c1a90a354411904f5905cd343c30cccca215b60584fcd5ba0cf9643555b56bfb948a8f55a48dc7bc45bf14c1cc945694d308a684d71cc6b5ba8deae8716b7068
+AUX dnssec-lookup-2.2-unused-libs.patch 491 BLAKE2B 8518f18aec8f228e4643d37259fd696b47913b4b47112083e015963dabf6bb4d8dafa690c562bd7d4e8caf32024ead8a419b782b5e711b62eb859f4dfcf361fa SHA512 7e6e23766498f518792702723205ccb67bb51b86f59138d807bb099ca45389c15baebc02dbb3dce6801c238c800b5d54198a5e84c985b2db14f8c90214998b82
 DIST dnssec-lookup-2.2.tar.gz 36181 BLAKE2B 761624b695b895fe9eb72108623631e9f9a21693a3d386052e43a1ee0686ec808346ca5e162df15c99ac067cf0518bddc8280842650aeeb7e5a03a72897c75c4 SHA512 195af13b69681394b6de6ae77b7401f81e6c4005e81e3d95bb97d6821ccdefbd3a119f2c331e7016728fda5b45ce364c9240fffd7623276042c666e5c5d05cba
-EBUILD dnssec-lookup-2.1.ebuild 766 BLAKE2B 84c168ca8d5ba2c4839f2cd58e7f48561c7d7d8cf39b82dfe51c8287fcbd5cdbb7b2fd2feb6104943d6307f958c97ecfefb916d891d19767e3df6794e38a2ef1 SHA512 f67ad7b87af5202cde00303d4c312159b6a8e862448c2b9f1f091a5130b681dc5943488eb2d00edb7a612e589a1b78579c1544cbd6908d053c688774b1275fc5
-EBUILD dnssec-lookup-2.2.ebuild 766 BLAKE2B da38b2a6fa15830834e552f743aae9a1ec9a5c539cdd558c600370a86fe67e6dd95d6bf73fe37f256b5e50061643b14d5c08bcd32d23333c1293a77b153e2501 SHA512 3c09776154f010a4f0915b063d5bb5eb045a8cd324d41f14285a62f218d725fbd34ac7e6a0f4fe28294c65072cf7623bf637a7f869b3c81c94e1cbb141dfb0a7
+EBUILD dnssec-lookup-2.2.ebuild 819 BLAKE2B ab15f22a35db1244cf07356aa0ff9789d4467d9e7ac2b25da41ddc11c7d3c26e1ce06ec49aba3c18423536c9b5e19734a41c73e8ed02e9c02ee0a4553d992c69 SHA512 a248043b178b2e1c3a9c8a4b9a864178d63f1be20f132a37a2ced5ebc071868106c848cd65bc51d573903c3d46f5faf15d22fea2209559b8d46c9d247640680f
 MISC metadata.xml 594 BLAKE2B 3ad1d9cd548ba0849f607819f11de99a029ffa49d92659a0a00f4fe071cbf94409a1e761fee183872ac78d748594d6c98c23f99d19858e5850cf2c3ff93f5dfb SHA512 04df4471ca57b3e9200d8cf46820dca6932db7e1087084add9e2faa5726fa6e4bede034f685d5b0853761be0d441a00823276e82baa8d36b50189da4f81a7c00
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-2.1.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-2.1.ebuild
deleted file mode 100644
index 152849fa8280..000000000000
--- a/net-dns/dnssec-lookup/dnssec-lookup-2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-MY_PN=${PN/dnssec-/}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="DNS lookup utility that supports DNSSEC validation"
-HOMEPAGE="http://www.dnssec-tools.org"
-SRC_URI="http://www.dnssec-tools.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	newbin src/build/${MY_PN} ${PN}
-
-	newicon data/64x64/${MY_PN}.png ${PN}.png
-	newicon data/maemo/${MY_PN}.xpm ${PN}.xpm
-	make_desktop_entry ${PN}
-
-	newman man/${MY_PN}.1 ${PN}.1
-}
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
index 0dc819c75f32..c79848fe5e59 100644
--- a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
+++ b/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,12 +16,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
+RDEPEND="=net-dns/dnssec-validator-${PV}-r1[threads]
 	dev-qt/qtgui:4"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-unused-libs.patch )
+
 src_configure() {
 	eqmake4 ${MY_PN}.pro PREFIX=/usr
 }
diff --git a/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch b/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
new file mode 100644
index 000000000000..bcefe0f20364
--- /dev/null
+++ b/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
@@ -0,0 +1,11 @@
+--- lookup-2.2/src/src.pro
++++ lookup-2.2/src/src.pro
+@@ -11,7 +11,7 @@
+ INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
+ 
+ isEmpty(ANDROID_PLATFORM) {
+-    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
++    LIBS        += -lval-threads -lsres -lssl -lcrypto -lpthread
+ } else {
+     LIBS        += -L/opt/android-external-openssl/lib/
+     LIBS        += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/