Version bump. Removed old

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

6 files changed, 56 insertions, 127 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 7c53c7abca7b..e73b9cc11173 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.201 2013/08/18 13:28:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.202 2013/11/20 18:48:47 polynomial-c Exp $
+
+*apr-1.5.0 (20 Nov 2013)
+
+  20 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -apr-1.4.5.ebuild,
+  -apr-1.4.6-r1.ebuild, +apr-1.5.0.ebuild, +files/apr-1.5.0-mint.patch,
+  metadata.xml:
+  Version bump. Removed old.
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> apr-1.4.8-r1.ebuild:
   Stable for x86, wrt bug #477296
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index dea51cd59e36..991568ceb97f 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1
+AUX apr-1.5.0-mint.patch 872 SHA256 6ed43adba05db07f061d98f73c19aac0df3d9c0aafd86cf57c9ab4fdc851659a SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf WHIRLPOOL 60966adf15e5301600f870ece96d34d4dd26d3e7dc99bb447f2afc1a86f7a46ef3bdf24613027636707b2fd5ac2f2bdd956a8eeb3b088b27862d7e86090b5db1
 AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db
-DIST apr-1.4.5.tar.bz2 754763 SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e SHA512 090edd67ecb571cb6b3697a37fc25da9336c6345025b25a530eaa32d1d9906bc6b2eebde9cff8b7cb6a20a0b45d9c36a69c468657ae6c1dc372e4eb181be0344 WHIRLPOOL 5bf5d859528cc470bcade626cfb2a8f39c6ad093291c09128fbd96068b9b26aeb47ee8bef77aa06d41fa4c2cbebf4f21742f3cdb9c1ced3eca4eaa0928e719fd
-DIST apr-1.4.6.tar.bz2 785724 SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc SHA512 1842e2dfc9315d9dd39acd4545d80fad45dcb419c9bfb4423453ca8727aa78d864fd48f43e68a696345b4c0ee2e9eb50b3eddd96d3eaf6ed3c5d48211831b8e4 WHIRLPOOL 4d8a67dace2b7e1c41c778ad3d34f4a479f9885c0b11cd3c4be412da4e2e006765802f8756a52d97fbfe4e962302274fe0e67cd1b8ac1a673044e79fbec5dc6e
 DIST apr-1.4.8.tar.bz2 772927 SHA256 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 SHA512 48483647fd958cae6b27672cfe10d3905fd2d4280b686a64deb5e166c239aa7d9838d61a199b5db836c47e63acebee9fa95804d60543cb581fef87bcc150c15b WHIRLPOOL c0e3e17470970734cd36b1b72837b3ed39e0488ef4291eb3a3f9482dffabb72aab85b4d9a8482d9c4cc3a66ce530bd81e8076b98e1fa10b086089266fa9b2f0a
-EBUILD apr-1.4.5.ebuild 2131 SHA256 13c591ee66cdfef1d3da5fbcf18925b18f3415ede24255be1897156568d4d7e5 SHA512 392d57566c0e5ff44efcbcdc8a4a9825a0ecddc2bbd1df638a9e278a2ff9fb7d2186d5bf031a0bf5e2a7712a0df24bdc985af38e50ee8eda1983ad877e267a76 WHIRLPOOL d758fa4274a653b7a202526d2579a46978b8a0f144d5c693b3f0a7b3dd1553be4abbbc425780d5cd458d3bbb53405a7aaa2635a9cd12f02ee1ddf814da613e49
-EBUILD apr-1.4.6-r1.ebuild 3433 SHA256 1abc9204a89bf93f29679ee8e283d98ef35d91e5e2ddb4abc3b81181d0b83f1d SHA512 3286f96d5bada82ee63442c4b4f1c2984f6e7653e74a957a1e92a4cfa53147ec89f4f94165d0571e4e849f5bd7feac6a4286565740ba1caf3a486fcb2634869e WHIRLPOOL 92304dd3b3bbc2e2affc107e27e5c668046fdaf9d9dc03d27820ade7e6a5f7f07105aeedef00f081574963f8fc78c0309b3b4ebb6d9dc52c63c91d851e135d64
+DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7
 EBUILD apr-1.4.8-r1.ebuild 3334 SHA256 934483b3f1f69192c0aae243df745742cc3be050579840c484adefd2df5eae50 SHA512 1e9b49a404a36c4adb9f95f501df60169ac1fad99ab187e4e97dd5dd1bded12103708f9d6a9ef754e8918c707622c24c6f293f6fd822a33901beda4c2e212783 WHIRLPOOL a1e80e6879380971a44bdb19c21986ec7b705894d8443a98f7bcef2a7871893e125eadc17b947b5843a65bbfed21c281703ece2cf8f7775d985a6556a67430e9
-MISC ChangeLog 24089 SHA256 6addd99e1293cf5dea2e148d3a474727ba87a200c02358a46c49bede2c0ed76d SHA512 14b97e93cf2ddb87504ecb9ef33d1ed5d709dfb90762d905e788f199e0f9d986d5c6d935fcb67189a73fe339b017118f179d272cddca01d35cf1391655b4571f WHIRLPOOL 6ce6005e326651d41676b185c8443691a706b1303340603ecf111a812c876e1b7a97dd0dfe0a2e8d2d241858e1b8ff98d15d8e90c70190c12a9673aa22a73916
-MISC metadata.xml 466 SHA256 3e3cb358f6d61dfd16872d01e306923d787c3b13fad7e54a81a1ddf79ca6ae0f SHA512 12d44e3a00fc233793a42dcb1edcaffb5efa5cf9fdcf3ba06c2be9e85b41b84fe9ffab2e261b9066c878548538cb50b4a328c11c8f7b3817d25dba4055c304d7 WHIRLPOOL 37ca2ac185c882568e7d505e8aa21bcab2c4055b57b25ba4822f602e38bfe8b9241d3c7254eabbe532a8e0ebfc1c7fa03acbd0e78307d48579659e035c0d1404
+EBUILD apr-1.5.0.ebuild 3349 SHA256 5d538314ef0ba0dcf0973fafa5ee0be4e4fcb45b22581e28f07eb5856b2d8b85 SHA512 691805b964fd56f2809bc21061d154312abacfe005bdfdcbf41cc86538d52fd1b8d01b72d1ffb34db5b2954e1fcb67f19dc458eee6173581e628f75553f90621 WHIRLPOOL 90055d9d149762c05b7e565e21f6d6f3a2254731316244a0e3bb4c91aedc332c81eff344c9a1e40837ce0e48116d8a627f69a1df4b47f1cf6dee2bba119ebf38
+MISC ChangeLog 24315 SHA256 6c03fb926c67967601ba69cb731d250c529e3c8ab17419ba4503f44ba02b93b5 SHA512 8a1043a186114065d28ed860e550c9d427d1afef883b0bad3c36188b1ee34e080c5c44ecda09ed7d0e6d5544403bf5b3c9ce785823a6e9df09b9c7cf63a093e9 WHIRLPOOL 341ab9c00eb9145bc282a165840236e0c7d32b51dab97df8e9bdce479c8a66b67a21f4d72f0bbbad364076d6f93988bfebf2d0dd7c1ed22fdd76fe7325d33392
+MISC metadata.xml 419 SHA256 803186ba5a9a84cf3fdf02db9c8922c4e63d75608268b352da2d68ba0249d5ec SHA512 85d64dc3256516cb3a46e01861d684384a108035744cc34615b7de23aa09847f8eafeec198b6135a6df100be5d6de02f0cea65815c617af1e252e87f95002274 WHIRLPOOL 532f9e3d27dcbc0b521bab043487f13b2bf7daa9a49b11760b1aa0610d30c1d62d39c940f545a8a3754e8f08ec041d428b4b98b6ebea45579073d6c12a43c30b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSEMwMAAoJELp701BxlEWfw6YQAL6iB0EdRXfM8hcxWq7CNz13
-Hwx7yYRREcrZtupLOt5rGgs7N9Pywm+nKLjkaXBL+tWoeESIqU8z688O2wt6ZW6c
-O3vCadr1d0rVXvOkp8I/is974R3et97njCk8JfoR1hb7WAgUFpUbfi8rkkFxfDG2
-xo5HXZvXqWLuQZ8rYrDAlAHjbzF04R3cWCgAsWNFzfl5M58s7rJpQ1m/8ibap8c9
-SYQWajgA4EUSyF/s/3SKsKtiFhDBLEUcGcnkPo1BqAkfm/7kbpHej1kkZog2W2/p
-IX5bU8D7KJPCDkCkIR2eVRNgZB7KykbqiUJU65aY+scAgCLzM7HiNMc82gqtdXak
-RPohOSDtyrXEiWfA+vT7gh8zIdpPhHdyl2aApdXZlSFK0pmDv8zr7GoEfq0ZCwYX
-NBA97hiuPKnCkAAPgx7zmB1AC1KlKTeoQPlV1vegZStzIgO+hofYACIg9EfPWgoz
-MCrPR4icdBYkhq/Y7KApB2Ker86jeJWhfJ+6aIqfGAoLBAlRfZhsLAIMZ3sdAdeM
-NIaKYbHdeKPGaLAccdtcilFZayAwBPH7jxTSxdgSc53iFqPuqXuT82THm67idc6H
-G9t5rg00XEOopLnIdcMSNjkObgxCShS3xNuWk9qtaM6bKmqrUZ9+HOF9RRjm+AwQ
-IA1iNScycnxZBgikh3m0
-=mTZV
+iQIcBAEBCAAGBQJSjQQRAAoJEPiazRVxLXTFHbsP/RqvPk65WgwNhJeKdew/4Tw7
+X43mwO1PVIYY+RAFiPTHioJ31wZJgsXu0vg1QrhLnDskLkfu0EjMNn0yA0mftwO4
+BR84I00bWtFmcrLCVw30J58L1a8uKOdfrCi15r4suDNsIdIjQHmqPb8HaBPCVgpw
+OerFLyfNYk2vjVSoWfStepjzzk+MU9I0qlZs6bdjJNamlT9o87xvQ/E+4Q/YZsvJ
+e+KgWDaBfJLb/eYtb13chwQuq4utM9CM/qMk/H3J67mkNEUbExDhzCzxTfjslblq
+PDDdaxfx7eVTe1ZyV8DOt5lU30zX/nrg+fsxtEJch5syHuHNpn6xhyDlPUJDNnzO
+pWqanrLAlXPXW6mynz6fOc2zZuytZiGlucfgSpj72/wpcboYVWcHCjzTdyEr1SSs
+83GI64hMoeJ0wag3p+uPCVTwM5fEFoZW/EwAwSlW2B3kgY+wwwH9xElJzrNUA/eA
+jEHO3y63wZsE0rG59mM5MibtKU/lVZ02sM/6axwCzX5Ia2wfApDstNQNs6yK4XUW
+lju2nlWBN2d/mD4oPUihc2LNceZox1CbG6LW+VjGtGj9vTL8gnknXJHUVO0+44XR
+uVmCZu0r2VtpBZ9SSb58SBG5W8uTaeikBQME1ZqNJj5xZBsa5OR/FkjcBBbFNbw+
+NcuQv3zWxjr4ZIc+3FXO
+=r6FH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.5.ebuild b/dev-libs/apr/apr-1.4.5.ebuild
deleted file mode 100644
index 8a243ad11bd9..000000000000
--- a/dev-libs/apr/apr-1.4.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.5.ebuild,v 1.8 2011/11/11 19:17:50 hwoarang Exp $
-
-EAPI="4"
-
-inherit autotools eutils libtool multilib
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
-RESTRICT="test"
-
-RDEPEND="uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-	# Ensure that system libtool is used.
-	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
-	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
-
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-
-	if use urandom; then
-		myconf+=" --with-devrandom=/dev/urandom"
-	else
-		myconf+=" --with-devrandom=/dev/random"
-	fi
-
-	if ! use uuid; then
-		local apr_cv_osuuid
-		export apr_cv_osuuid="no"
-	fi
-
-	CONFIG_SHELL="/bin/bash" econf \
-		--enable-layout=gentoo \
-		--enable-nonportable-atomics \
-		--enable-threads \
-		${myconf}
-
-	rm -f libtool
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -exec rm -f {} +
-
-	if use doc; then
-		dohtml -r docs/dox/html/*
-	fi
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -exec rm -f {} +
-	fi
-
-	# 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)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.4.6-r1.ebuild b/dev-libs/apr/apr-1.5.0.ebuild
index c733820e04db..58753efaac3e 100644
--- a/dev-libs/apr/apr-1.4.6-r1.ebuild
+++ b/dev-libs/apr/apr-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.3 2013/02/20 22:59:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.5.0.ebuild,v 1.1 2013/11/20 18:48:47 polynomial-c Exp $
 
 EAPI="4"
 
@@ -12,20 +12,18 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~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="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
+KEYWORDS="~alpha ~amd64 ~arm ~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="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom"
 
-RDEPEND="uuid? (
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )
-)"
+RDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 DOCS=(CHANGES NOTICE README)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-mint.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch
 
 	# Ensure that system libtool is used.
 	local g=
@@ -83,11 +81,6 @@ src_configure() {
 		esac
 	fi
 
-	if ! use uuid; then
-		local apr_cv_osuuid
-		export apr_cv_osuuid="no"
-	fi
-
 	CONFIG_SHELL="${EPREFIX}"/bin/bash econf \
 		--enable-layout=gentoo \
 		--enable-nonportable-atomics \
diff --git a/dev-libs/apr/files/apr-1.5.0-mint.patch b/dev-libs/apr/files/apr-1.5.0-mint.patch
new file mode 100644
index 000000000000..cfe039e962c6
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.5.0-mint.patch
@@ -0,0 +1,22 @@
+--- apr-1.5.0/build/apr_hints.m4
++++ apr-1.5.0/build/apr_hints.m4
+@@ -45,6 +45,8 @@
+   case "$host" in
+     *mint)
+ 	APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE])
++	apr_cv_pthreads_cflags="none"
++	apr_cv_pthreads_lib="-lpthread"
+ 	;;
+     *MPE/iX*)
+ 	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
+--- apr-1.5.0/build/apr_threads.m4
++++ apr-1.5.0/build/apr_threads.m4
+@@ -198,7 +198,7 @@
+ AC_DEFUN([APR_CHECK_SIGWAIT_ONE_ARG], [
+   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
+   AC_TRY_COMPILE([
+-#if defined(__NETBSD__) || defined(DARWIN)
++#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT)
+     /* When using the unproven-pthreads package, we need to pull in this
+      * header to get a prototype for sigwait().  Else things will fail later
+      * on.  XXX Should probably be fixed in the unproven-pthreads package.
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index d828a17e49df..35b4bf8186fd 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="older-kernels-compatibility">Enable binary compatibility with older kernels</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
-		<flag name="uuid">Enable UUID support</flag>
 	</use>
 </pkgmetadata>