Version bump

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 135 insertions, 15 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index d67028e070c2..5aaccbd14a84 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.210 2014/08/01 04:47:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.211 2014/09/22 07:05:12 polynomial-c Exp $
+
+*apr-util-1.5.4 (22 Sep 2014)
+
+  22 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> +apr-util-1.5.4.ebuild:
+  Version bump.
 
 *apr-util-1.5.3-r2 (01 Aug 2014)
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index a8dc9c931875..f41af01f5108 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -6,24 +6,26 @@ AUX apr-util-1.5.3-berkdb6.patch 2364 SHA256 e93792ef143f29c3baf64dea277e9dc4850
 AUX apr-util-1.5.3-sysroot.patch 1234 SHA256 752ee44d3e9e39e4cba824556f829776a46e4f5e64d4f359de781d3bfd3a414f SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 WHIRLPOOL 2017ccccfade6e99a490781100a7ca2ee1901a93b791db78291e3d7850e9916d183084abc6f46b2a80ffb451dfb5f1e999189f9ce6f994b51146563bef52a7af
 DIST apr-util-1.5.2.tar.bz2 693258 SHA256 9ace3d2e3129d5c244ef695a88b3b47897695e8e6ca2b96e92e4a635d9ed12a7 SHA512 14e890aa1a34369ddf0d041d397231e21994c0a51d3a07dd126985699184ee59c2df32dd752339dd90278988a9461c714f0a157126229be57450259646a1d6df WHIRLPOOL 94972bf43b21527015a489e640d81087021a7818fb4435b60a0b753d214e53b05630976894c81a70a069bb6918150c22df7621c63a539082a8b90ca442adce0e
 DIST apr-util-1.5.3.tar.bz2 695303 SHA256 78edb174f13e25ee15ded2b849b741a248b879a93a77a2d31c20f7e225be3968 SHA512 b03588fd10c8705ea72cb35e821a99ba160c5a480d91d766969672c72a4db5bc2ec01b13cbe0eccc1cd1eadd96e8198994296bc2f0232b3fce4e82271a382db6 WHIRLPOOL 4e3d131c2fcb5818db76c2d663caf7ab193a020011d21a1b03238075ba1ddb9778aa3df1e165cb13833efc446c81d13893a126d91e8da6cc55a5431e50f3b797
+DIST apr-util-1.5.4.tar.bz2 694427 SHA256 a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1 WHIRLPOOL bc4ce82785513f4bf2207bb26758abc79e6bfef62a57d3e2ead570abc618b321c302390b9dcd8eab1ec44a9e5d398c2cc4d35af2549636e20d7c20678725ac2e
 EBUILD apr-util-1.5.2.ebuild 2862 SHA256 4bdc9190fe7425fd1788231143f28b46b107e7235a481adcdf3ae1639b4a1f25 SHA512 34034e675ac9e08d16949461c6a0a3678a1d9cf0593cb7344246defd34301077e316f1a4065ecceef4e3b2ac2492f3f01308a1f65832fd86037ad8d064e621f5 WHIRLPOOL 698f196e096ea0f47a8f0258f7d81f4b78ac102f4c5588252c955dd5cd7b402aa52e726c921b875c8c6129f97f363926e4aee4c43c7f1ebecaef8c2361bc054c
 EBUILD apr-util-1.5.3-r2.ebuild 3462 SHA256 fd5322c105615b95026dfe993cf0f90b0a7a277cd7fc08163af55f8eab29babd SHA512 c83238fb18a1e911e2c489f51b79ff7a02532862fc924451f12d5e290330d6ae880780d623472d972d0d12859aa8b43c849995cd0b8fb0acb2799c3cfee54b5e WHIRLPOOL b879fc02096f99002f68bf1b7b5b5aacb2374e881f9c265d3b487381996c0fd203adf7b88ad217bf05130876ac7abd94f0c0690c4a4f4732b869484b9f57856c
-MISC ChangeLog 27150 SHA256 ae0442aeb450954820f241d6d3122b25709b885ad0acbec1ec01da9d16ae8308 SHA512 88e3853cb27cf0871c9818fb2381ecf5cf19a0756dcd8933a72ce25dbc995dc9e34b6580973b560ebc9d6c10544df51cef46b8eff3e7ca8b5a186c421146a626 WHIRLPOOL 03ca959251de50b59bfd8fd773afdad7e201d1974b782f4d713630d3caf8828ed530ae531551e43d7bc14453de3684b48e948fbb9a01660acfc688fab6250df0
+EBUILD apr-util-1.5.4.ebuild 3420 SHA256 3f4b0a476f568024ac5b1c8d02b66c52306c03554669933343cb11a612bf8ba9 SHA512 efd814665ccbfcfb41669dda2371248d5426d2b368ed509f57f4e777af8156a4e5d61046ca4ba2873d3ebb631a966a49b7dc3269150a255acc1a95eb3c9c531d WHIRLPOOL df89b90e3e333b484c67a0b9901279eb9438944aface636cf0fbbee9f2adc1f10b8ffd2fe8eecd32577262264a8cbbb28f36615b005c541a6b635724f1ddf8b0
+MISC ChangeLog 27276 SHA256 ac1091f954c2b50895b22e75a4f05a818328833902c6e4a7490ab2c4f99517e7 SHA512 90f8a902be79cf227a3ef04080bb6e5fb3a70fe1aa8828d6488f492c4d55f39c0ff02b1135d11ec260b88749c2a571a029d125d8a9a597ceac6d62287ee0c24c WHIRLPOOL 7e8f689f1a10525f370b934f79c1e849bd97b2bce9fd9746487330de3e2e4c0ee35052adcc0fa75227a4e73833db2c015635cdb0aee02ae949c1c8d33615fe00
 MISC metadata.xml 372 SHA256 c3db9ca815acd997e631711bb6ee12890e3d667ce1d95cd1edde9864f8779e2a SHA512 b48d1ab1d4f101d84dddf8e1ef4f27c1c72ca4d803d109ea926c88519c5131b999a5bb5b019e279c624e1f927ad17fce93113d2a8881be124b26d2f7d326b5ec WHIRLPOOL b3976f55407630b7dcb7eadfbde382aa66579a97db1befb80a07e1565c10731c3f1183a396a4d360b801b4e216c7a0ca3a56f57680af1fd49ffdc23722933e6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT2xvtAAoJEPiazRVxLXTF5jsP/0kur0OcV5sGVxi7MEmmxXDt
-mLmBIYXRT3Sq/Z0Yj0pOcnFKB/D1iRF3czX/VpiThSCG9wJitX09Mg8hDhHAkJab
-xzt/f2AuxpP49aa8mZWztC06Aw87gC9YqNAALYjRyzrE9RcEwayymhjHAoOlmj+f
-7o0Imi6rExSXuvhQqrNDCpBC+L21+S/m3xlRCcJYa/VtxHn5CEs4s3ONa71IoHwd
-0th0WZlV5dJRunpW4yxI0w4t/7kvQjGLiaHhp+/Bdp9HpSiMKtJXXY7F53UMtzaE
-GnwW3g9vQtP2rGwsSwTp+qvsl5uwiBA2MQooS6td+h/vtX4Ms70TsYhuvhE8BYR9
-1P+a/HJdV+G5f7vi8XCrp/plVZTLH+vq91ffnIU15BLizTLW1DudioAJnVBWyAt7
-Dw2SruOYgU0DPinMO7YjW3An3oYsuT6S5S8xuCAGQ64wJjYxQfnW8JG+zp99Z3Zk
-UEGyhS+SEMXDbmE3CEodCvvxzsQCbz43rww9FHClc3T1c7dXhfi6eqcDQFyS0ZVc
-axaiUQITuHpkabvhE7KchisOuS6UEnK2vs4VVwc1kEKS7MVQBSrfJFCof9FVWJIx
-WZd7CkYtXQdC917P8E3KDYrlD2u96oQHHibMrG9CGzzMzfJ+FnGSjeqfuM7trZgD
-VWCqO8buJQUf3ohFphOV
-=ovHn
+iQIcBAEBCAAGBQJUH8opAAoJEPiazRVxLXTFCDoQAM/gV23ra8otGVRyX5Dm37Hi
+BZvp+MkY5Yk7oJxNqNOSWH3VXcceR3UWlJ7PffKU7XRg0RAaDsZEB3G+rdCjjP8S
+WMTyOrfYGytIX72do71/JuTu4W3Z0a3RAwhuJuOltRqFWsTrie7LHHR8npaLPB1y
+5KlDgCF3WP3iAhi9WjAplT1GQbTKsHgFLnfPMCRrTvhXLLhrq6IuTl63qcwYem69
+KYYAQdMR4tfZrZ6o/r+cSIAut8Fqw4xxlZyiFsB4q1ppJfI9fqf775L6MavpIPEk
+3CXxLt/zJfUN3o4pu2Cdh7G4PTW6O7cnQAgH+PYvG6UEAB3GyVXfNYCl/1FCTqtQ
+fc4bpG3BA86O9K0TdnBTMPGgure08T8B3GHAbadqQEKfGid8QNsdEG1wjbB39Sge
+HD4qGE5W5v2lyJ+9U2FlVwIjWeG74IifbgrHp0h1rz8SNYtNipj8f/3o987RcLKb
+OLbwAktjbe4mgnh7rg7nF7ohL7hhRAyr5Cn7D2HHlTYQvVCvFJiqygfKFr2glthi
+lqWyNbi2D0HnVAeDIbNVTJPigSVe2VC0yAb4EkedrPKR0hHuVBqp3M4lljbOYoWa
+vuzJcyOJzPhPCmuyQTWmdqibAzFFTDp6dHBizDoNVlobUNhogJlO+m7yDc0693us
+7tFCZtukRqWNNZ4jCuJr
+=4stG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
new file mode 100644
index 000000000000..4f80be910f6f
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.4.ebuild,v 1.1 2014/09/22 07:05:12 polynomial-c Exp $
+
+EAPI="4"
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.4.6"
+
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 freetds gdbm ldap 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 )
+	freetds? ( dev-db/freetds )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( =virtual/mysql-5* )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=()
+
+	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 \
+		--datadir="${EPREFIX}"/usr/share/apr-util-1 \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-expat="${EPREFIX}"/usr \
+		--without-sqlite2 \
+		$(use_with freetds) \
+		$(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) \
+		"${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
+	find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
+	use static-libs || find "${ED}" -name "*.a" -delete
+
+	use doc && dohtml -r docs/dox/html/*
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
+}