gentoo resync : 15.01.2020

3 files changed, 3 insertions, 117 deletions

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 63f5adb9d242..f246e3a36f9a 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -4,6 +4,5 @@ AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.0-r2.ebuild 2243 BLAKE2B 94561febec20f04fc09a302128ffbedc2f513cb6213abb23337ac379f52b5457de24b91111640db37210db1d5f62eb816af219428608d1db00c4eeb2380b5df6 SHA512 32d49de2d194fd9e4b7de5689e4680c412dfe4b5cbd00216b3ac4f10a4421914652f35cf006d4ca9829571eed6c91a0714218a774e81ecfe35886fb3d51e8300
-EBUILD ldns-1.7.1-r1.ebuild 2756 BLAKE2B acc8c5366d2ed7cd315650f19b31c0a7a6a79e4c381d1bc791d4283260461df133276f9e50cb64ec1ca9c513175623116403216ac81ed0faae6aff7e7fa9c974 SHA512 25949ac065e8c734d3ae7fea6ab025104c009699a81acc806027a28d1309fb1157a52ce647490704cf3dc02de8d6f0549bd2f5acdba28fa60374bf68a30a788e
-EBUILD ldns-1.7.1.ebuild 2792 BLAKE2B 1834ed95664a2425d4f3706a7fdbed93951dadfa5424ef393c87528b9304b6546bde06dc268989e5d5714b9ba7d2455ff4d768f407563935afffbbc24f9dfc55 SHA512 23bd2aefe462744bd9b1e6db9ef3a1727e10eb3a0023e402eb242a282366f74418708c2a83ed15f4b914c15992592d706e803fc9b9e7c28db4ea1878b1a6cc2e
+EBUILD ldns-1.7.1-r1.ebuild 2754 BLAKE2B f687038d2ccc75792ffadef332b45a0195c819edf2d89f36e9422bfa804da3cca53338ec7ec76b448ada9317219f7e1e93bcda1907ff376bf332dc3abd68aa6e SHA512 11a66754492ed884682f0706aa5e2d175d8e949dd094f592ece054ab974e16b816edcec3b5acec9758ea87ed3b9769ce5ee2e7ad635f9c19f9628195ab553627
 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 119fd33b2256..84f58b7f4d90 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit eutils multilib-minimal python-single-r1
 
 DESCRIPTION="a library with the aim to simplify DNS programming in C"
diff --git a/net-libs/ldns/ldns-1.7.1.ebuild b/net-libs/ldns/ldns-1.7.1.ebuild
deleted file mode 100644
index dc73bf8b91f8..000000000000
--- a/net-libs/ldns/ldns-1.7.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit eutils multilib-minimal python-single-r1
-
-DESCRIPTION="a library with the aim to simplify DNS programming in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	ed25519? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	ed448? (
-		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0"; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable dane) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		--enable-sha2 \
-		--without-drill \
-		--without-examples \
-		$dane_ta_usage \
-		--disable-rpath
-}
-
-src_prepare() {
-	default
-	#epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
-	#epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
-	# remove non-existing dependency for target packaging/libldns.pc
-	sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-
-	einfo
-	elog "Install net-dns/ldns-utils if you want drill and examples"
-	einfo
-}