gentoo resync : 04.01.2018

4 files changed, 6 insertions, 143 deletions

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index d29cccbdb068..d836527f113e 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,9 +1,7 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
-DIST apr-util-1.6.0.tar.bz2 428750 BLAKE2B 71bb021b1a1a6f64547a7259d0d6aceecfe1dbe571de302e7b00b16ff1f656e088958408a584cf7968e81214ce69412f363f822faf177975f48ba8cd0909fd94 SHA512 dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.5.4-r3.ebuild 3705 BLAKE2B 40f3214f1201f744bb7bfdc021648090a4b43b1e37a498ee5b553a2732e99985ae9a61a2448a8cc683461ef54b9ad0c309d2aca1b0c9055fa236165287000c23 SHA512 6fcb294154753d569e3cad05c6e293c85ea49aab64f8fa2542577624b6c4349f80e06376f021d953b22e59ff8bd6b97c5e6e31106971a1333594572a8ef759c0
+EBUILD apr-util-1.5.4-r3.ebuild 3707 BLAKE2B d8518d0ca77753ddd33da8494020da2bae21b8bacd9c6ee68ded04b63b1214959c1b47c3b6c09d2c1dac61b88a93caa166e8dfc69dd09f3ca5283c284cca0303 SHA512 81538bae99e2ae48345d90e31aef32ccd89e0494e8e5db610f6ae80627c23f60e50662e375fd0a6177cf6f9637493f3423324985ad391a80f7d903c243925c69
 EBUILD apr-util-1.5.4.ebuild 3238 BLAKE2B 17fb78415e2e1ee0f46308edcfb09b9429dcc9d91746cc929119d2d675301364b93bcf40c08c2464a45522606f5110f8790c4100271b8f9066a20ec15becc08b SHA512 c018c7088ffac68d91aa0c8e8089dd7a0dd9219b21cbd95db63c8a9980067e1f841a64bb4a1de6fbd3438b4a95edaca838284b85c20095e138fc92f6fbd9d664
-EBUILD apr-util-1.6.0.ebuild 3611 BLAKE2B f730d7d3227c2b5601f81a173470ea404e30c11a970713203e2d3e6856dbd6b83e96174c633b2c07c8a5677a674b14dc18153a9b88a62a0cd89a2c330c185af8 SHA512 9cfd1e467bf2ead57335c561de29851a3bc72e759c0d515223a35b60acebf90ee473846862942c86e5d921acbb9f04e2654a33d27c36ffa6568d354bab871ad8
-EBUILD apr-util-1.6.1.ebuild 3611 BLAKE2B f730d7d3227c2b5601f81a173470ea404e30c11a970713203e2d3e6856dbd6b83e96174c633b2c07c8a5677a674b14dc18153a9b88a62a0cd89a2c330c185af8 SHA512 9cfd1e467bf2ead57335c561de29851a3bc72e759c0d515223a35b60acebf90ee473846862942c86e5d921acbb9f04e2654a33d27c36ffa6568d354bab871ad8
+EBUILD apr-util-1.6.1.ebuild 3613 BLAKE2B ce9b8afe1bbc703fbc98b38a09c7de33fa9d03386ce201214a87898c9968340cf73dcefd1ad78a69b6e5954c6ef113e4543edbe3e0075b4092832d16083c0270 SHA512 2b8acdc0e1773cefb930e1ab785224505d6a553d6f271a906d97e85cb948d737f3ad48fb81d4177ebbbe787c6577f4c7b345ee8a472d2856956382803182b447
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
index 91a41d6598db..0902526be9a9 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/apr-${APR_PV}:1
 	berkdb? ( >=sys-libs/db-4:= )
 	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( =virtual/mysql-5* )
 	nss? ( dev-libs/nss )
diff --git a/dev-libs/apr-util/apr-util-1.6.0.ebuild b/dev-libs/apr-util/apr-util-1.6.0.ebuild
deleted file mode 100644
index ec528c173dd8..000000000000
--- a/dev-libs/apr-util/apr-util-1.6.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.6.2"
-
-inherit autotools db-use eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="
-	dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(CHANGES NOTICE README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-)
-
-src_prepare() {
-	default
-
-	# Fix usage of libmysqlclient (bug #620230)
-	grep -lrF "libmysqlclient_r" "${S}" \
-		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
-		|| die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=(
-		--datadir="${EPREFIX}"/usr/share/apr-util-1
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-expat="${EPREFIX}"/usr
-		--without-sqlite2
-		$(use_with gdbm)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with nss)
-		$(use_with odbc)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_with sqlite sqlite3)
-	)
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	econf "${myconf[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
-	fi
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
-}
diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild b/dev-libs/apr-util/apr-util-1.6.1.ebuild
index ec528c173dd8..97a0e1ac54cb 100644
--- a/dev-libs/apr-util/apr-util-1.6.1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-libs/expat
 	>=dev-libs/apr-${APR_PV}:1
 	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	ldap? ( =net-nds/openldap-2* )
 	mysql? ( =virtual/mysql-5* )
 	nss? ( dev-libs/nss )