gentoo resync : 11.05.2018

3 files changed, 13 insertions, 78 deletions

diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 6113096dec67..ca865a99f54b 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -5,8 +5,6 @@ AUX donutsd.service 152 BLAKE2B 4663f200f1f5194b0a2d5c94938640d2c621cdf93faef534
 AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f79bf0e9df3bfb99a9f355c916b5e93f90327fff7e3cb7098d19171dc037675d283fab74106572e SHA512 a368b1f288c382d265a437798ffd0d09adc1898caf00d5eff63487f0551a19d023d3a5dda514b574a8cd723b6fb657ea588f5ca206321535a3e3b99a90af3a65
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
-DIST dnssec-tools-2.1.tar.gz 4430320 BLAKE2B 53f4ed09d5a1c1237933b9ad8aa51411f8bd9b95aab7bfbee0149618bb038814de3ebf12115fde818b535bd8f09b58d9e780162b293ae5d697eb634e2a9e0fe5 SHA512 61119837320bf9a7c2d64a593fc3ed6b84ee7683b7e4ba5de380b0fd1be70e44bf73825ea5395cc1d3ddc729eaef17823a230b44b68fbc5fca988f8fb080f66b
 DIST dnssec-tools-2.2.tar.gz 4430138 BLAKE2B 52683f19d66066b2938ef3667d066a6ab59b4579cb2cbba87c79b42700d3f70bfe84c0f712bca607ee3023d152b16b0ba1a9635e7779cc61aab7a2c8f9d05830 SHA512 5d0d936a2dabc648033cbd74ff6f1b309ae66bf3f2ab1223c8be5879fa4385bfdfd8cee2b4005b0d0e7ed85eeb1b81a9a4092d300fa725d4b19a84bf2619a280
-EBUILD dnssec-tools-2.1.ebuild 1710 BLAKE2B 82ce6b58798cac2cc6ba83406601f05e3ca0aa24d21a2889295dced29aaaf7b197749e3d34e20fd12dd3103cede0e147a82a5550d223c7020612236b787c88d3 SHA512 eeda38dcf6cef55c85c1eca35c64e4a98bb8ae012ce86ccc17b8a060aff27680a172c91e94e13ec51c92fe4610136e2cdff3fa4a41bb8710321f446f20fe77bb
-EBUILD dnssec-tools-2.2.ebuild 1710 BLAKE2B 82ce6b58798cac2cc6ba83406601f05e3ca0aa24d21a2889295dced29aaaf7b197749e3d34e20fd12dd3103cede0e147a82a5550d223c7020612236b787c88d3 SHA512 eeda38dcf6cef55c85c1eca35c64e4a98bb8ae012ce86ccc17b8a060aff27680a172c91e94e13ec51c92fe4610136e2cdff3fa4a41bb8710321f446f20fe77bb
+EBUILD dnssec-tools-2.2-r1.ebuild 1738 BLAKE2B 9076088f0c4cec7ba5780d032b127faa0d2b6d493543daafcaec4ae8bd140baa713d6ba06a2e7c93396be36d5a1a2e4e3fa99e6988630ff8158143df45d29552 SHA512 47d8c2b6941a91b400cad6920c3ce582154dbe48d15108a63ff7c5b65fed3b38e393a909c0a6f0f4ca50662e142a748b73e6e380f68110528b63dd52dfb2059e
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
index bb63dd7c5455..6b83d1c27fd7 100644
--- a/net-dns/dnssec-tools/dnssec-tools-2.1.ebuild
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils qt4-r2 systemd readme.gentoo
+inherit readme.gentoo-r1 systemd
 
-DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
+DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
+HOMEPAGE="https://www.dnssec-tools.org/"
+SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
 	dev-perl/Crypt-OpenSSL-Random
 	dev-perl/Getopt-GUI-Long
 	dev-perl/GraphViz
@@ -24,7 +25,10 @@ RDEPEND="dev-lang/perl
 	dev-perl/XML-Simple"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
+
 src_prepare() {
+	default
 	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
 		-i Makefile.in || die
 	sed -e 's:/usr/local/etc:/etc:g' \
@@ -32,7 +36,6 @@ src_prepare() {
 		-i tools/donuts/donuts \
 		-i tools/etc/dnssec-tools/dnssec-tools.conf \
 		-i tools/scripts/genkrf || die
-	epatch "${FILESDIR}"/${PN}-2.0-dtinitconf.patch
 }
 
 src_configure() {
@@ -54,7 +57,7 @@ src_install() {
 	newconfd "${FILESDIR}"/donutsd.confd donutsd
 	systemd_dounit "${FILESDIR}"/donutsd.service
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 	readme.gentoo_create_doc
 }
 
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild
deleted file mode 100644
index bb63dd7c5455..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2 systemd readme.gentoo
-
-DESCRIPTION="tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-	epatch "${FILESDIR}"/${PN}-2.0-dtinitconf.patch
-}
-
-src_configure() {
-	econf \
-		--disable-bind-checks \
-		--without-validator \
-		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	prune_libtool_files
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"