gentoo resync : 30.06.2019

4 files changed, 2 insertions, 320 deletions

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index c390b3ecf02a..bd6cc4d34d6b 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,11 +1,7 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.10.tar.bz2 1117663 BLAKE2B 9c1b8c608862b42019c6b753af950f940455538b439824e10d28a79a4f04fe926decf86f286d79c850f39e0df345d646ba774e5557cce1d44f6c120d8b2892a3 SHA512 59a7a52468f6daae8de01bb2b08d812906ef58047026369895341cfff253a5b9ba29d6a6b43a822f1632641eec34fa1afa6fbb5b0ba5e72ecce8e61787892136
-DIST pdns-4.1.8.tar.bz2 1116996 BLAKE2B df32e1e239f65a37570b1f3f6b7fd2384ea9ea4d60ecf6dc520441e7f004c9e17c1cb35358e1cd9b5080c85b6366354ae4b3e5eaeda20af18c6e411bb119bbc1 SHA512 1113745cdaa8fba591c176721893fb478e976861beee0cb6c0240e5afa6b68c9afae286579036b2ed77fffe76ca1e6f103cda915f8b7b875bcdc1253931ad935
-DIST pdns-4.1.9.tar.bz2 1117241 BLAKE2B 899cf7e3be2ddbc1d78b321f807306f5ffd17dfe272442738bfd88869bb052d6b44aed34b0f4345e194f8916659a43a3634e258e9b47ad954ab3b49e12cad2d0 SHA512 d415f5f7cb13c6fcb31ee13184201e986850e533c580b657183592552d04631bc3334696cbf8fbb549869a559aebd4a6cbd742a7e7dfbaf6997232116e356f56
 DIST pdns-4.2.0-rc2.tar.bz2 1245187 BLAKE2B 30ee03752dafa02f5618ba26def1cb8d49b0f7f004b54fcb8d7640b0d60897ac9a9b13e918ab3aaee1d679af772aacd0591e9c9cd3bf6b1af79305e06cac1cdb SHA512 695589980fc35e73fc0e72f57034e2cfefd7b046100dc6f8740ac94dd50ee068453c72aa2ee5626e6cccfca1eeb5e3f036b844039db52d5c45f070d291002122
-EBUILD pdns-4.1.10.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
-EBUILD pdns-4.1.8.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
-EBUILD pdns-4.1.9.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
+EBUILD pdns-4.1.10.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
 EBUILD pdns-4.2.0_rc2.ebuild 4194 BLAKE2B d69bc3cdba723d7868a0f6db2f34a92bd814a677290a4f666288b1e4325820f62f554489916934721fcbf3a273385a257345eba1177660db99d55bb7aae878ff SHA512 6ca852f4554024df407f26f1908a9fb41b4d1f6c31d5d54d0a58071ffdc68890ddf1ae203f0f46dac49e5895b1a214b0f878f8ec72ea565af0dc0396067e035f
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.1.10.ebuild b/net-dns/pdns/pdns-4.1.10.ebuild
index 9c4996e63d3b..ad05ab448209 100644
--- a/net-dns/pdns/pdns-4.1.10.ebuild
+++ b/net-dns/pdns/pdns-4.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/pdns/pdns-4.1.8.ebuild b/net-dns/pdns/pdns-4.1.8.ebuild
deleted file mode 100644
index ad05ab448209..000000000000
--- a/net-dns/pdns/pdns-4.1.8.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib user
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( dev-libs/botan:2= )
-	lua? (
-		!luajit? ( dev-lang/lua:= )
-		luajit? ( dev-lang/luajit:= )
-	)
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use lua && dynmodules+=" lua"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	use opendbx && dynmodules+=" opendbx"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
-			'--without-lua --without-luajit') \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 3.2 || continue
-
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-}
diff --git a/net-dns/pdns/pdns-4.1.9.ebuild b/net-dns/pdns/pdns-4.1.9.ebuild
deleted file mode 100644
index 9c4996e63d3b..000000000000
--- a/net-dns/pdns/pdns-4.1.9.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib user
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( dev-libs/botan:2= )
-	lua? (
-		!luajit? ( dev-lang/lua:= )
-		luajit? ( dev-lang/luajit:= )
-	)
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use lua && dynmodules+=" lua"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	use opendbx && dynmodules+=" opendbx"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
-			'--without-lua --without-luajit') \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 3.2 || continue
-
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-}