[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2017-10-23 Thread Lars Wendler
commit: 9219ff7e9396b135e14e2d3c8152af1fe04a80d0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct 23 08:53:00 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct 23 08:54:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9219ff7e

dev-libs/apr: Bump to version 1.6.3

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.6.3.ebuild | 146 ++
 2 files changed, 147 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index a71e04f592d..144b1c63d82 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,2 +1,3 @@
 DIST apr-1.5.2.tar.bz2 826885 SHA256 
7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 
d1156ad16abf0788779b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 WHIRLPOOL 
3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b
 DIST apr-1.6.2.tar.bz2 853363 SHA256 
09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd SHA512 
20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 WHIRLPOOL 
4fd43497ed091f9da2a8c8a57017344dc7492b18793e8a16eae480ddbba8f18ebc66925418d8b5fa8fa6fa023b59a482d62c8ba1ee49a575aa6f7918b703ea30
+DIST apr-1.6.3.tar.bz2 854100 SHA256 
131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172 SHA512 
f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 WHIRLPOOL 
b17edd2b8fed082f8e25e56728fec3d3629debdb7bcc78dab94aa6665371a97ece5b321d37caf717106abd03740b5724108364553106055ce7fa7c9b50a196ed

diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
new file mode 100644
index 000..cc08f293430
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
+   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+)
+
+src_prepare() {
+   default
+
+   AT_M4DIR="build" eautoreconf
+   elibtoolize
+
+   eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   )
+
+   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+   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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_process_

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2017-08-22 Thread Lars Wendler
commit: b555f57f9d33e18600c6d68a3403cadbdab1f1b9
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 22 12:15:13 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 22 12:23:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b555f57f

dev-libs/apr: Re-added prune_libtool_files (bug #628590).

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/apr/apr-1.6.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
index d7265882579..cc08f293430 100644
--- a/dev-libs/apr/apr-1.6.2.ebuild
+++ b/dev-libs/apr/apr-1.6.2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit autotools libtool multilib toolchain-funcs
+inherit autotools libtool ltprune multilib toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/";
+HOMEPAGE="https://apr.apache.org/";
 SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
@@ -132,7 +132,7 @@ src_install() {
# Prallel install breaks since apr-1.5.1
#make -j1 DESTDIR="${D}" install || die
 
-   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+   prune_libtool_files --all
 
if use doc; then
docinto html



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2017-02-28 Thread Michael Weber
commit: 15170f8e10307b940fc498bbd45559f39ad83243
Author: Michael Weber  gentoo  org>
AuthorDate: Wed Mar  1 00:34:25 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Wed Mar  1 00:34:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15170f8e

dev-libs/apr: arm64 stable for layman

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"

 dev-libs/apr/apr-1.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 0c346516965..f5ecf7fa609 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -11,7 +11,7 @@ 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 ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~ppc-aix ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-24 Thread Markus Meier
commit: c6e064e7ff302714018fca748960961ebbb494d0
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Sep 24 18:14:33 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Sep 24 18:14:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e064e7

dev-libs/apr: arm stable, bug #635272

Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="arm"

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 8086cd28e6c..f086e372b33 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-01 Thread Mikle Kolyada
commit: 4d0687599c0559dcc279753ee5f04a40dd4aa9ce
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep  1 22:21:28 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep  1 22:21:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d068759

dev-libs/apr: amd64 stable wrt bug #665002

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 72598592663..f0c64aa0602 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-02 Thread Sergei Trofimovich
commit: 9e23bcd81ead5a6bd4df3fa4e5487edd4a5864da
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Sep  3 05:50:09 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  3 06:19:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e23bcd8

dev-libs/apr: stable 1.6.3-r3 for sparc, bug #665002

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index f0c64aa0602..30889e24550 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-07 Thread Sergei Trofimovich
commit: b1a371e37da826f2060c6a1d2ed05d235b0d8c5c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep  7 22:42:07 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  7 22:43:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a371e3

dev-libs/apr: stable 1.6.3-r3 for ia64, bug #665002

Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 30889e24550..fd6717d9db7 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-08 Thread Mart Raudsepp
commit: b742a12a208cb5f82bfdcab077ce8611d39593ed
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Sep  8 12:48:16 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Sep  8 12:53:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b742a12a

dev-libs/apr-1.6.3-r3: arm64 stable (bug #665002)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index fd6717d9db7..13503627a63 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-14 Thread Tobias Klausmann
commit: c898418d9312cd4f4f8e1d9aee457d67594db94e
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Sep 14 12:13:11 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Sep 14 12:17:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c898418d

dev-libs/apr-1.6.3-r3: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/665002

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 13503627a63..d3d18b3be33 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-15 Thread Lars Wendler
commit: a90820cbfae0b792704ed348306b5074eba5f886
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 15 19:06:56 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 15 19:08:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90820cb

dev-libs/apr: Bump to version 1.6.5

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.6.5.ebuild | 156 ++
 2 files changed, 157 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 9a8c0b80b91..68b370da892 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,3 +1,4 @@
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 
62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3
 SHA512 
d1156ad16abf0788779b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 
99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446
 SHA512 
20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B 
ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c
 SHA512 
f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
+DIST apr-1.6.5.tar.bz2 855393 BLAKE2B 
ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6
 SHA512 
d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc

diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5.ebuild
new file mode 100644
index 000..40fc1cbca28
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
+   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+   elibtoolize
+
+   eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   --with-installbuilddir=/usr/share/${PN}/build
+   )
+
+   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+   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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-15 Thread Lars Wendler
commit: 16b949a0c3bc1c3e9888cf5f97a3ae60ce215f56
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Sep 15 19:08:10 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep 15 19:08:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b949a0

dev-libs/apr: Removed old.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/apr/Manifest|   1 -
 dev-libs/apr/apr-1.6.2.ebuild| 146 --
 dev-libs/apr/apr-1.6.3-r1.ebuild | 147 ---
 dev-libs/apr/apr-1.6.3.ebuild| 146 --
 4 files changed, 440 deletions(-)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 68b370da892..67aab0480ef 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,4 +1,3 @@
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 
62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3
 SHA512 
d1156ad16abf0788779b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
-DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 
99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446
 SHA512 
20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B 
ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c
 SHA512 
f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B 
ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6
 SHA512 
d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc

diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
deleted file mode 100644
index 67376760d71..000
--- a/dev-libs/apr/apr-1.6.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool ltprune multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://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 ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-apache )"
-DEPEND="${CDEPEND}
-   >=sys-devel/libtool-2.4.2
-   doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.5.0-mint.patch
-   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-)
-
-src_prepare() {
-   default
-
-   AT_M4DIR="build" eautoreconf
-   elibtoolize
-
-   eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   )
-
-   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-   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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1=

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-16 Thread Matt Turner
commit: 691df58a3d0c12fe05702669ee79882e78171fe1
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Sep 16 19:45:28 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Sep 16 19:52:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691df58a

dev-libs/apr-1.6.3-r3: ppc64 stable, bug 635272

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index b4a0941932e..8086cd28e6c 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-16 Thread Matt Turner
commit: ef103ef14fd850b23a027971fcea41f2af153aca
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Sep 16 19:45:26 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Sep 16 19:52:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef103ef1

dev-libs/apr-1.6.3-r3: ppc stable, bug 635272

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index d3d18b3be33..b4a0941932e 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2019-02-28 Thread Mikle Kolyada
commit: 033ce84364d84ae8d360aff59bf12d4d289a0812
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb 28 16:47:39 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb 28 16:53:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033ce843

dev-libs/apr: mark s390 stable

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/apr/apr-1.5.2.ebuild| 4 ++--
 dev-libs/apr/apr-1.6.3-r3.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 32175989515..a3288dfe3f6 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index f086e372b33..78beeba65ab 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-11-26 Thread Benda XU
commit: 59fe7001da0d15950d552c636a8e9651125b9a5b
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Nov 26 12:14:28 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Nov 26 12:15:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fe7001

dev-libs/apr: support Prefix.

Suggested-By: Olivier Huber
Closes: https://bugs.gentoo.org/669396
Signed-off-by: Benda Xu  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-libs/apr/apr-1.6.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5.ebuild
index 40fc1cbca28..904427dc046 100644
--- a/dev-libs/apr/apr-1.6.5.ebuild
+++ b/dev-libs/apr/apr-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_configure() {
--enable-posix-shm
--enable-threads
$(use_enable static-libs static)
-   --with-installbuilddir=/usr/share/${PN}/build
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
)
 
[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-04-02 Thread Pacho Ramos
commit: d927829b165fe2da80e501861e1ac0326d5baf7c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Apr  2 11:25:33 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Apr  2 11:42:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d927829b

dev-libs/apr: Setting a subslot is needed (#525222)

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 dev-libs/apr/apr-1.6.3-r1.ebuild | 147 +++
 1 file changed, 147 insertions(+)

diff --git a/dev-libs/apr/apr-1.6.3-r1.ebuild b/dev-libs/apr/apr-1.6.3-r1.ebuild
new file mode 100644
index 000..ba7eb74e48b
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
+   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+   elibtoolize
+
+   eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   )
+
+   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+   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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_process_shared_works="yes" \
+   apr_cv_pthreads_lib="-pthread" \
+   apr_cv_sock_cloexec="yes" \
+   apr_cv_tcp_nodelay_with_cork="yes"
+   fi
+
+   if use urandom; then
+   myconf+=( --with-devrandom=/dev/urandom )
+   elif (( ${CHOST#*-hpux11.} <= 11 )); then
+   : # no /dev/*random on hpux11.11 and before, $PN detects this.
+   else
+   myconf+=( --with-devrandom=/dev/random )
+   fi
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   # shl_load does not search runpath, but hpux11 supports dlopen
+   [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+   if [[ ${CHOST} == *-solaris2.10 ]]; then
+   case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo 
"${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+   *atomic_cas_ptr*) ;;
+   *)
+   elog "You do not have Solaris Patch ID "$(
+   [[ ${CHOST} == sparc* ]] && echo 118884 || echo 
118885
+   )" (Problem 4954703) installed on your host 
($(hostname)),"
+   elog "using generic atomic operations instead."
+   myconf+=( --disable-nonportable-ato

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-01 Thread Thomas Deutschmann
commit: 6c0ee0a94b36ed0fe9b9e65b457ff798a6f5dff4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  1 17:44:27 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  1 17:54:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0ee0a9

dev-libs/apr: drop ltprune eclass

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-libs/apr/apr-1.6.3-r2.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r2.ebuild
index e1f58f62ed5..5333edec323 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools libtool ltprune multilib toolchain-funcs
+inherit autotools libtool multilib toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/";
@@ -140,7 +140,9 @@ src_install() {
# Prallel install breaks since apr-1.5.1
#make -j1 DESTDIR="${D}" install || die
 
-   prune_libtool_files --all
+   if ! use static-libs; then
+   find "${ED%/}" -name '*.la' -delete || die
+   fi
 
if use doc; then
docinto html



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-01 Thread Thomas Deutschmann
commit: a1ccf1857fe7fb7e6decd1511b8e6a27b5464995
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  1 17:54:21 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  1 17:54:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ccf185

dev-libs/apr: move builddir to /usr/share/$PN

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --force

 dev-libs/apr/{apr-1.6.3-r2.ebuild => apr-1.6.3-r3.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
similarity index 98%
rename from dev-libs/apr/apr-1.6.3-r2.ebuild
rename to dev-libs/apr/apr-1.6.3-r3.ebuild
index 5333edec323..72598592663 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -50,6 +50,7 @@ src_configure() {
--enable-posix-shm
--enable-threads
$(use_enable static-libs static)
+   --with-installbuilddir=/usr/share/${PN}/build
)
 
[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2018-09-01 Thread Thomas Deutschmann
commit: 91a0e60dd711be86f28d7fc3a7f37f29283dac71
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  1 17:25:19 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  1 17:54:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a0e60d

dev-libs/apr: x86 stable (bug #665002)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-libs/apr/apr-1.6.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r2.ebuild
index a65df23cc46..e1f58f62ed5 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2019-04-05 Thread Lars Wendler
commit: c2bffccb9f65cfe37894a290634c4e90a7f7b643
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Apr  5 10:58:01 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Apr  5 11:09:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bffccb

dev-libs/apr: Bump to version 1.7.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.7.0.ebuild | 153 ++
 2 files changed, 154 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 67aab0480ef..e664da23c52 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,3 +1,4 @@
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 
62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3
 SHA512 
d1156ad16abf0788779b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B 
ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c
 SHA512 
f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B 
ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6
 SHA512 
d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
+DIST apr-1.7.0.tar.bz2 872238 BLAKE2B 
a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7
 SHA512 
3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148

diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0.ebuild
new file mode 100644
index 000..1a7fe29b7a2
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
+   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+   elibtoolize
+
+   eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+   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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+  

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2019-04-07 Thread Sergei Trofimovich
commit: 325947030cade1eee42b0395d56843bdd2cdc3e2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Apr  8 06:48:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr  8 06:49:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32594703

dev-libs/apr: stable 1.6.3-r3 for hppa, bug #635272

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/apr/apr-1.6.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 78beeba65ab..bf354b41d13 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2019-04-29 Thread Lars Wendler
commit: f9aaa3a61b209b36cb7457a98bcd9477ce0cb7c4
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 29 07:58:32 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 29 07:58:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aaa3a6

dev-libs/apr: Revbumps to fix selinux dependency

Closes: https://bugs.gentoo.org/560576
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/apr/{apr-1.6.3-r3.ebuild => apr-1.6.3-r4.ebuild} | 2 +-
 dev-libs/apr/{apr-1.6.5.ebuild => apr-1.6.5-r1.ebuild}| 4 ++--
 dev-libs/apr/{apr-1.7.0.ebuild => apr-1.7.0-r1.ebuild}| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
similarity index 98%
rename from dev-libs/apr/apr-1.6.3-r3.ebuild
rename to dev-libs/apr/apr-1.6.3-r4.ebuild
index bf354b41d13..35740d4ef04 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-apache )"
+   selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
>=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )"

diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
similarity index 98%
rename from dev-libs/apr/apr-1.6.5.ebuild
rename to dev-libs/apr/apr-1.6.5-r1.ebuild
index 904427dc046..5d7c7debd7d 100644
--- a/dev-libs/apr/apr-1.6.5.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-apache )"
+   selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
>=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )"

diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
similarity index 98%
rename from dev-libs/apr/apr-1.7.0.ebuild
rename to dev-libs/apr/apr-1.7.0-r1.ebuild
index 1a7fe29b7a2..fc563997651 100644
--- a/dev-libs/apr/apr-1.7.0.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-apache )"
+   selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
>=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2019-04-20 Thread Lars Wendler
commit: 3ba92259e954426118d8f238ff53e7d632e852a1
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Apr 20 23:57:25 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 20 23:57:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba92259

dev-libs/apr: Security cleanup

Bug: https://bugs.gentoo.org/635272
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/apr/Manifest |   1 -
 dev-libs/apr/apr-1.5.2.ebuild | 143 --
 2 files changed, 144 deletions(-)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e664da23c52..d237c17a11d 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,4 +1,3 @@
-DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 
62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3
 SHA512 
d1156ad16abf0788779b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B 
ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c
 SHA512 
f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B 
ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6
 SHA512 
d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B 
a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7
 SHA512 
3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148

diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
deleted file mode 100644
index a3288dfe3f6..000
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool multilib toolchain-funcs
-
-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 arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 selinux static-libs 
+urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-apache )"
-DEPEND="${CDEPEND}
-   >=sys-devel/libtool-2.4.2
-   doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch
-   epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-   epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-   epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-
-   epatch_user #449048
-
-   AT_M4DIR="build" eautoreconf
-   elibtoolize
-
-   epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-   local myconf=()
-
-   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-   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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-   apr_cv_mutex_robust_shared="yes" \
-   apr_cv_process_shared_works="yes" \
-   apr_cv_pthreads_lib="-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2021-04-28 Thread Sam James
commit: fe3bd7025617c5abe102d0c11665002b4cbd4616
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 29 01:44:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 29 01:52:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3bd702

dev-libs/apr: fix variable reference style

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.6.3-r4.ebuild | 2 +-
 dev-libs/apr/apr-1.6.5-r1.ebuild | 2 +-
 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index ab6c44d8052..ce047e457b5 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -88,7 +88,7 @@ src_configure() {
if use urandom; then
myconf+=( --with-devrandom=/dev/urandom )
elif (( ${CHOST#*-hpux11.} <= 11 )); then
-   : # no /dev/*random on hpux11.11 and before, $PN detects this.
+   : # no /dev/*random on hpux11.11 and before, ${PN} detects this.
else
myconf+=( --with-devrandom=/dev/random )
fi

diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 6c6e45c005e..2e6c0d4627e 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -87,7 +87,7 @@ src_configure() {
if use urandom; then
myconf+=( --with-devrandom=/dev/urandom )
elif (( ${CHOST#*-hpux11.} <= 11 )); then
-   : # no /dev/*random on hpux11.11 and before, $PN detects this.
+   : # no /dev/*random on hpux11.11 and before, ${PN} detects this.
else
myconf+=( --with-devrandom=/dev/random )
fi

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 59a34b5aa71..ec551265391 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -88,7 +88,7 @@ src_configure() {
if use urandom; then
myconf+=( --with-devrandom=/dev/urandom )
elif (( ${CHOST#*-hpux11.} <= 11 )); then
-   : # no /dev/*random on hpux11.11 and before, $PN detects this.
+   : # no /dev/*random on hpux11.11 and before, ${PN} detects this.
else
myconf+=( --with-devrandom=/dev/random )
fi



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2021-05-11 Thread Lars Wendler
commit: 8a3c82d2c1bac689e848c65dc0ad53e4cdd6fc7a
Author: Sam James  gentoo  org>
AuthorDate: Sun May  9 07:16:06 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May 11 08:44:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3c82d2

dev-libs/apr: fix underlinking for atomics on ppc, sparc

Fixes errors in the produced library like:
> undefined reference to `__sync_val_compare_and_swap_8'

Forcing linkage against libatomic didn't work. May be worth
investigation in future but need to get ppc and sparc working
again.

Closes: https://bugs.gentoo.org/740464
Signed-off-by: Sam James  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/20735
Signed-off-by: Lars Wendler  gentoo.org>

 dev-libs/apr/{apr-1.6.3-r4.ebuild => apr-1.6.3-r5.ebuild} | 8 
 dev-libs/apr/{apr-1.6.5-r1.ebuild => apr-1.6.5-r2.ebuild} | 8 
 dev-libs/apr/{apr-1.7.0-r1.ebuild => apr-1.7.0-r2.ebuild} | 8 
 3 files changed, 24 insertions(+)

diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r5.ebuild
similarity index 93%
rename from dev-libs/apr/apr-1.6.3-r4.ebuild
rename to dev-libs/apr/apr-1.6.3-r5.ebuild
index ce047e457b5..977176aee5c 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r5.ebuild
@@ -109,6 +109,14 @@ src_configure() {
myconf+=( --disable-nonportable-atomics )
;;
esac
+   else
+   if use ppc || use sparc; then
+   # Avoid libapr containing undefined references 
(underlinked)
+   # undefined reference to `__sync_val_compare_and_swap_8'
+   # (May be possible to fix via libatomic linkage in 
future?)
+   # bug #740464
+   myconf+=( --disable-nonportable-atomics )
+   fi
fi
 
econf "${myconf[@]}"

diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r2.ebuild
similarity index 93%
rename from dev-libs/apr/apr-1.6.5-r1.ebuild
rename to dev-libs/apr/apr-1.6.5-r2.ebuild
index 2e6c0d4627e..c7f60001d87 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r2.ebuild
@@ -108,6 +108,14 @@ src_configure() {
myconf+=( --disable-nonportable-atomics )
;;
esac
+   else
+   if use ppc || use sparc; then
+   # Avoid libapr containing undefined references 
(underlinked)
+   # undefined reference to `__sync_val_compare_and_swap_8'
+   # (May be possible to fix via libatomic linkage in 
future?)
+   # bug #740464
+   myconf+=( --disable-nonportable-atomics )
+   fi
fi
 
econf "${myconf[@]}"

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild
similarity index 93%
rename from dev-libs/apr/apr-1.7.0-r1.ebuild
rename to dev-libs/apr/apr-1.7.0-r2.ebuild
index ec551265391..8a231aa627f 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r2.ebuild
@@ -109,6 +109,14 @@ src_configure() {
myconf+=( --disable-nonportable-atomics )
;;
esac
+   else
+   if use ppc || use sparc; then
+   # Avoid libapr containing undefined references 
(underlinked)
+   # undefined reference to `__sync_val_compare_and_swap_8'
+   # (May be possible to fix via libatomic linkage in 
future?)
+   # bug #740464
+   myconf+=( --disable-nonportable-atomics )
+   fi
fi
 
econf "${myconf[@]}"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-01-02 Thread David Seifert
commit: 45eb73a2afe320d294cd686acdf3537e4f8462cf
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  2 09:13:20 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  2 09:13:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eb73a2

dev-libs/apr: remove mintlib

Signed-off-by: David Seifert  gentoo.org>

 dev-libs/apr/apr-1.6.3-r7.ebuild | 7 ++-
 dev-libs/apr/apr-1.6.5-r4.ebuild | 7 ++-
 dev-libs/apr/apr-1.7.0-r4.ebuild | 7 ++-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r7.ebuild b/dev-libs/apr/apr-1.6.3-r7.ebuild
index c75f62684321..b40da1231ded 100644
--- a/dev-libs/apr/apr-1.6.3-r7.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -55,8 +54,6 @@ src_configure() {
--with-installbuilddir=/usr/share/${PN}/build
)
 
-   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
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"

diff --git a/dev-libs/apr/apr-1.6.5-r4.ebuild b/dev-libs/apr/apr-1.6.5-r4.ebuild
index 23b1b8827b30..f21c146c5bfc 100644
--- a/dev-libs/apr/apr-1.6.5-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -54,8 +53,6 @@ src_configure() {
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
)
 
-   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
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"

diff --git a/dev-libs/apr/apr-1.7.0-r4.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
index f8831c4a5562..307db0bc65b4 100644
--- a/dev-libs/apr/apr-1.7.0-r4.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux 
static-libs +urandom
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-   elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
@@ -55,8 +54,6 @@ src_configure() {
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
)
 
-   [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
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"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-01-02 Thread David Seifert
commit: ddbfbff4b80b2dcc6427db9719084c341206b530
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  2 17:48:47 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  2 17:48:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbfbff4

dev-libs/apr: remove freebsd-libc

Signed-off-by: David Seifert  gentoo.org>

 dev-libs/apr/apr-1.6.3-r7.ebuild | 2 +-
 dev-libs/apr/apr-1.6.5-r4.ebuild | 2 +-
 dev-libs/apr/apr-1.7.0-r4.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r7.ebuild b/dev-libs/apr/apr-1.6.3-r7.ebuild
index b40da1231ded..ab54bd385307 100644
--- a/dev-libs/apr/apr-1.6.3-r7.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=

diff --git a/dev-libs/apr/apr-1.6.5-r4.ebuild b/dev-libs/apr/apr-1.6.5-r4.ebuild
index f21c146c5bfc..47fc612f3ec9 100644
--- a/dev-libs/apr/apr-1.6.5-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=

diff --git a/dev-libs/apr/apr-1.7.0-r4.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
index 307db0bc65b4..deb46f4b9f16 100644
--- a/dev-libs/apr/apr-1.7.0-r4.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
+IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
 CDEPEND="virtual/libcrypt:=



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2021-12-28 Thread Sam James
commit: b72382bd0fa91cdfa39178ae2d662935bde1ebb1
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 29 01:48:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 29 01:48:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72382bd

dev-libs/apr: libatomic workaround needed for mips too

Bug: https://bugs.gentoo.org/815265
Reported-by: John Hansen  mrhansen.id.au>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/{apr-1.6.3-r6.ebuild => apr-1.6.3-r7.ebuild} | 2 +-
 dev-libs/apr/{apr-1.6.5-r3.ebuild => apr-1.6.5-r4.ebuild} | 2 +-
 dev-libs/apr/{apr-1.7.0-r3.ebuild => apr-1.7.0-r4.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r6.ebuild b/dev-libs/apr/apr-1.6.3-r7.ebuild
similarity index 99%
rename from dev-libs/apr/apr-1.6.3-r6.ebuild
rename to dev-libs/apr/apr-1.6.3-r7.ebuild
index 828c9a2b2e72..c75f62684321 100644
--- a/dev-libs/apr/apr-1.6.3-r6.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r7.ebuild
@@ -112,7 +112,7 @@ src_configure() {
;;
esac
else
-   if use ppc || use sparc; then
+   if use ppc || use sparc || use mips; then
# Avoid libapr containing undefined references 
(underlinked)
# undefined reference to `__sync_val_compare_and_swap_8'
# (May be possible to fix via libatomic linkage in 
future?)

diff --git a/dev-libs/apr/apr-1.6.5-r3.ebuild b/dev-libs/apr/apr-1.6.5-r4.ebuild
similarity index 99%
rename from dev-libs/apr/apr-1.6.5-r3.ebuild
rename to dev-libs/apr/apr-1.6.5-r4.ebuild
index 725836e73499..23b1b8827b30 100644
--- a/dev-libs/apr/apr-1.6.5-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r4.ebuild
@@ -111,7 +111,7 @@ src_configure() {
;;
esac
else
-   if use ppc || use sparc; then
+   if use ppc || use sparc || use mips; then
# Avoid libapr containing undefined references 
(underlinked)
# undefined reference to `__sync_val_compare_and_swap_8'
# (May be possible to fix via libatomic linkage in 
future?)

diff --git a/dev-libs/apr/apr-1.7.0-r3.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
similarity index 99%
rename from dev-libs/apr/apr-1.7.0-r3.ebuild
rename to dev-libs/apr/apr-1.7.0-r4.ebuild
index 70e3bd4db4b1..f8831c4a5562 100644
--- a/dev-libs/apr/apr-1.7.0-r3.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -112,7 +112,7 @@ src_configure() {
;;
esac
else
-   if use ppc || use sparc; then
+   if use ppc || use sparc || use mips; then
# Avoid libapr containing undefined references 
(underlinked)
# undefined reference to `__sync_val_compare_and_swap_8'
# (May be possible to fix via libatomic linkage in 
future?)



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-05-19 Thread WANG Xuerui
commit: 6c96a70ff09cc645cce6b0c8e97764ee424b3167
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 07:12:01 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 19 07:17:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c96a70f

dev-libs/apr: keyword 1.7.0-r4 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-libs/apr/apr-1.7.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r4.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
index deb46f4b9f16..3348d775384b 100644
--- a/dev-libs/apr/apr-1.7.0-r4.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2021-07-28 Thread Marek Szuba
commit: f01442007bcee3106f2dd39566e86bd3e941aa7d
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jul 28 09:27:19 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 28 11:26:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0144200

dev-libs/apr: keyword 1.7.0-r2 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 dev-libs/apr/apr-1.7.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r2.ebuild
index 8a231aa627f..36cf0552875 100644
--- a/dev-libs/apr/apr-1.7.0-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-12-19 Thread Sam James
commit: 0e8b9356e786be537cbe9c561e85e136a2ad7d24
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 19 14:27:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 19 14:27:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8b9356

dev-libs/apr: Stabilize 1.7.0-r1 ppc, #725372

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 3eb682d0fc1..006d3ad6601 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2021-09-28 Thread Sam James
commit: 1879cb6bf7e627f3667ab3b7d564cc11c5380e10
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 28 19:14:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 28 19:14:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1879cb6b

dev-libs/apr: add libcrypt subslot dependency to force rebuilds

Needed to ensure our pkgconfig files we install aren't stale.

Closes: https://bugs.gentoo.org/815265
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/{apr-1.6.3-r5.ebuild => apr-1.6.3-r6.ebuild} | 4 +++-
 dev-libs/apr/{apr-1.6.5-r2.ebuild => apr-1.6.5-r3.ebuild} | 4 +++-
 dev-libs/apr/{apr-1.7.0-r2.ebuild => apr-1.7.0-r3.ebuild} | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr/apr-1.6.3-r5.ebuild b/dev-libs/apr/apr-1.6.3-r6.ebuild
similarity index 97%
rename from dev-libs/apr/apr-1.6.3-r5.ebuild
rename to dev-libs/apr/apr-1.6.3-r6.ebuild
index 977176aee5c..828c9a2b2e7 100644
--- a/dev-libs/apr/apr-1.6.3-r5.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r6.ebuild
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
 
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"

diff --git a/dev-libs/apr/apr-1.6.5-r2.ebuild b/dev-libs/apr/apr-1.6.5-r3.ebuild
similarity index 97%
rename from dev-libs/apr/apr-1.6.5-r2.ebuild
rename to dev-libs/apr/apr-1.6.5-r3.ebuild
index c7f60001d87..725836e7349 100644
--- a/dev-libs/apr/apr-1.6.5-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r3.ebuild
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
 
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"

diff --git a/dev-libs/apr/apr-1.7.0-r2.ebuild b/dev-libs/apr/apr-1.7.0-r3.ebuild
similarity index 97%
rename from dev-libs/apr/apr-1.7.0-r2.ebuild
rename to dev-libs/apr/apr-1.7.0-r3.ebuild
index 36cf0552875..70e3bd4db4b 100644
--- a/dev-libs/apr/apr-1.7.0-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r3.ebuild
@@ -14,7 +14,9 @@ SLOT="1/${PV%.*}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs 
+urandom"
 
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+# See bug #815265 for libcrypt dependency
+CDEPEND="virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-base-policy )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-09-04 Thread Sam James
commit: a60878013129d72dbf4f88bf30c4c7f3c874c52b
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  5 03:05:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  5 03:05:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6087801

dev-libs/apr: ppc64 stable (bug #725372)

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 0e9b63e9061..7fea1679865 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-09-06 Thread Sergei Trofimovich
commit: e8be807784a9321101982a459cde8d1d5d9a5fe6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  6 07:46:29 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  6 07:49:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8be8077

dev-libs/apr: stable 1.7.0-r1 for hppa

stable wrt bug #725372

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 7fea1679865..3eb682d0fc1 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-16 Thread Sam James
commit: 7911c6e28efd14796f24f3a5a58fd9601dabf485
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 17 04:31:08 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 17 04:33:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7911c6e2

dev-libs/apr: Stabilize 1.7.0-r1 arm64, #725372

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 078b517bdb3..1e151c71551 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-18 Thread Agostino Sarubbo
commit: 75ad27b5b808d4d763ec76f25365cf1e62de71e4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 11:15:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 11:15:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ad27b5

dev-libs/apr: amd64 stable wrt bug #725372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 1e151c71551..31dd398bafb 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-18 Thread Agostino Sarubbo
commit: 96fe3efeb8aa4186dd350c1794951b7263a3419b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 11:17:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 11:17:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fe3efe

dev-libs/apr: arm stable wrt bug #725372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 31dd398bafb..9c439452cf6 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-18 Thread Agostino Sarubbo
commit: af5398a93c7d7b356db24a5ee0d5e6a190bad81b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 11:21:38 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 11:21:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5398a9

dev-libs/apr: x86 stable wrt bug #725372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 9c439452cf6..8c231d77ff7 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-18 Thread Agostino Sarubbo
commit: aaffe720737324f7c10630ed0e87a466439960de
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 16:51:42 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 16:52:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaffe720

dev-libs/apr: s390 stable wrt bug #725372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 8c231d77ff7..0ab127a1bdc 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 
~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2020-08-18 Thread Agostino Sarubbo
commit: bf3cb5b30b22031abb7b1f4f4c1b7cf9140ee6c1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 16:52:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 16:52:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3cb5b3

dev-libs/apr: sparc stable wrt bug #725372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 0ab127a1bdc..0e9b63e9061 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 
~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 
~ppc-aix ~x64-cygwin ~amd64-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 selinux static-libs 
+urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-07-03 Thread Hans de Graaff
commit: e3b41dbc7bd8e175d7996822e0e76c6e168c7f0e
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jul  3 09:50:23 2022 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jul  3 09:51:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b41dbc

dev-libs/apr: update maintainers

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-libs/apr/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index e87dffa3fe49..783d7c06909f 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   apache-b...@gentoo.org
+   Apache project
+   

Enable binary 
compatibility with older kernels
Use /dev/urandom instead of 
/dev/random



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-07-28 Thread Sam James
commit: 2811ae9e11468a1fb3543676fffcdb2f50e461b5
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 28 13:26:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 13:31:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2811ae9e

dev-libs/apr: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 783d7c06909f..94b201450b4b 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -9,4 +9,7 @@
Enable binary 
compatibility with older kernels
Use /dev/urandom instead of 
/dev/random

+   
+   apache/apr
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-08-26 Thread Hans de Graaff
commit: 33d312077aae0b86bbc1b6614c5df2976bf5bbcb
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Aug 27 05:39:44 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Aug 27 05:40:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d31207

dev-libs/apr: add 1.7.5

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.7.5.ebuild | 163 ++
 2 files changed, 164 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 8018bcb43871..2f651ffe3950 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1 +1,2 @@
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B 
a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df
 SHA512 
2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
+DIST apr-1.7.5.tar.bz2 898264 BLAKE2B 
1feacb24e213843c4d3312806abf698e332c45557b7cfd74c9c654d4f9d835dd3a8bf4f9a3bb8328483dcc244948ca118ed6fab9655e482ac6fb53cc7fd92908
 SHA512 
d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b

diff --git a/dev-libs/apr/apr-1.7.5.ebuild b/dev-libs/apr/apr-1.7.5.ebuild
new file mode 100644
index ..a7f6b6d58e1d
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.5.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+   virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-base-policy )
+"
+DEPEND+=" valgrind? ( dev-debug/valgrind )"
+BDEPEND="
+   >=dev-build/libtool-2.4.2
+   doc? ( app-text/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
+   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+   "${FILESDIR}"/${PN}-1.7.4-config-cross.patch
+   "${FILESDIR}"/${PN}-1.7.4-config-libdir.patch
+   "${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+   tc-export AS CC CPP
+
+   # the libtool script uses bash code in it and at configure time, tries
+   # to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+   # cause problems for people who switch /bin/sh on the fly to other
+   # shells, so just force libtool to use /bin/bash all the time.
+   export CONFIG_SHELL="${EPREFIX}"/bin/bash
+   export ac_cv_path_SED="sed"
+   export ac_cv_path_EGREP="grep -E"
+   export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+   export ac_cv_path_FGREP="grep -F"
+   export ac_cv_path_GREP="grep"
+   export ac_cv_path_lt_DD="dd"
+
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   $(use_with valgrind)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   if use old-kernel; 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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_mmap__dev_zero="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accep

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-26 Thread Sam James
commit: 5cb81c1f63a4dcd927f8284e79d53718ead890f0
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 26 23:01:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 23:03:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb81c1f

dev-libs/apr: fix hardcoded paths to grep, sed, bash

Just like we did in dev-build/libtool (apr installs its own in /usr/share).

Closes: https://bugs.gentoo.org/927864
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r2.ebuild | 162 +++
 1 file changed, 162 insertions(+)

diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild
new file mode 100644
index ..9d6b528e15d3
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.4-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+   virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-base-policy )
+"
+DEPEND+=" valgrind? ( dev-debug/valgrind )"
+BDEPEND="
+   >=dev-build/libtool-2.4.2
+   doc? ( app-text/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
+   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+   "${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+   tc-export AS CC CPP
+
+   # the libtool script uses bash code in it and at configure time, tries
+   # to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+   # cause problems for people who switch /bin/sh on the fly to other
+   # shells, so just force libtool to use /bin/bash all the time.
+   export CONFIG_SHELL="${EPREFIX}"/bin/bash
+   export ac_cv_path_SED="$(basename "$(type -P sed)")"
+   export ac_cv_path_EGREP="$(basename "$(type -P grep)") -E"
+   export ac_cv_path_EGREP_TRADITIONAL="$(basename "$(type -P grep)") -E"
+   export ac_cv_path_FGREP="$(basename "$(type -P grep)") -F"
+   export ac_cv_path_GREP="$(basename "$(type -P grep)")"
+   export ac_cv_path_lt_DD="$(basename "$(type -P dd)")"
+
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   $(use_with valgrind)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   if use old-kernel; 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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_mmap__dev_zero="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_process_shared_works="yes" \
+   apr_cv_pthreads_lib="-pthread" \
+   apr_cv_sock_cloexec="yes" \
+   apr_cv_tcp_nodelay_with_cork="yes"
+   fi
+
+   if use ura

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-26 Thread Sam James
commit: b859f629b8a72f5e862a3a1d09b1d2f4bbc6a4b9
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 26 23:05:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 23:05:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b859f629

dev-libs/apr: drop 1.7.2, 1.7.2-r1, 1.7.3

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/Manifest|   2 -
 dev-libs/apr/apr-1.7.2-r1.ebuild | 147 ---
 dev-libs/apr/apr-1.7.2.ebuild| 146 --
 dev-libs/apr/apr-1.7.3.ebuild| 146 --
 4 files changed, 441 deletions(-)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 32e6e7e42c5e..8018bcb43871 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,3 +1 @@
-DIST apr-1.7.2.tar.bz2 890218 BLAKE2B 
a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15
 SHA512 
0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
-DIST apr-1.7.3.tar.bz2 901048 BLAKE2B 
effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d
 SHA512 
d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B 
a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df
 SHA512 
2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd

diff --git a/dev-libs/apr/apr-1.7.2-r1.ebuild b/dev-libs/apr/apr-1.7.2-r1.ebuild
deleted file mode 100644
index fc70d2ac4201..
--- a/dev-libs/apr/apr-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/";
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="doc old-kernel selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-DEPEND="
-   virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-"
-RDEPEND="
-   ${DEPEND}
-   selinux? ( sec-policy/selinux-base-policy )
-"
-BDEPEND="
-   >=dev-build/libtool-2.4.2
-   doc? ( app-text/doxygen )
-"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
-   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
-   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
-   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
-   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
-   "${FILESDIR}"/config.layout.patch
-)
-
-src_prepare() {
-   default
-
-   mv configure.in configure.ac || die
-   AT_M4DIR="build" eautoreconf
-}
-
-src_configure() {
-   tc-export AS CC CPP
-
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-   )
-
-   tc-is-static-only && myconf+=( --disable-dso )
-
-   if use old-kernel; 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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_mmap__dev_zero="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-  

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-26 Thread Sam James
commit: 1d47499088b22041acb05480ea4a411586cde5df
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 26 23:06:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 23:06:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d474990

dev-libs/apr: stabilize 1.7.4-r2

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild
index 9d6b528e15d3..43e9c23b749f 100644
--- a/dev-libs/apr/apr-1.7.4-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-26 Thread Sam James
commit: 8cbed16d6341202a99529619336c2bea24ff3465
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 26 23:07:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 23:07:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbed16d

dev-libs/apr: disable atomics on x86

Bug: https://bugs.gentoo.org/907736
Bug: https://bugs.gentoo.org/922137
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild
index 43e9c23b749f..d74a3b41b387 100644
--- a/dev-libs/apr/apr-1.7.4-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r2.ebuild
@@ -118,7 +118,7 @@ src_configure() {
# (May be possible to fix via libatomic linkage in future?)
# bug #740464
append-atomic-flags
-   if [[ ${LIBS} == *atomic* ]] ; then
+   if use x86 || [[ ${LIBS} == *atomic* ]] ; then
myconf+=( --disable-nonportable-atomics )
fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-26 Thread Sam James
commit: 4e3b8eaecca0d09babc909ad7488968265898518
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 26 23:06:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 26 23:06:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3b8eae

dev-libs/apr: drop 1.7.4, 1.7.4-r1

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r1.ebuild | 150 ---
 dev-libs/apr/apr-1.7.4.ebuild| 149 --
 2 files changed, 299 deletions(-)

diff --git a/dev-libs/apr/apr-1.7.4-r1.ebuild b/dev-libs/apr/apr-1.7.4-r1.ebuild
deleted file mode 100644
index 3b3f2bbff171..
--- a/dev-libs/apr/apr-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/";
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="doc old-kernel selinux static-libs +urandom valgrind"
-
-# See bug #815265 for libcrypt dependency
-DEPEND="
-   virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-"
-RDEPEND="
-   ${DEPEND}
-   selinux? ( sec-policy/selinux-base-policy )
-"
-DEPEND+=" valgrind? ( dev-debug/valgrind )"
-BDEPEND="
-   >=dev-build/libtool-2.4.2
-   doc? ( app-text/doxygen )
-"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
-   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
-   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
-   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
-   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
-   "${FILESDIR}"/config.layout.patch
-)
-
-src_prepare() {
-   default
-
-   mv configure.in configure.ac || die
-   AT_M4DIR="build" eautoreconf
-}
-
-src_configure() {
-   tc-export AS CC CPP
-
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   $(use_with valgrind)
-   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-   )
-
-   tc-is-static-only && myconf+=( --disable-dso )
-
-   if use old-kernel; 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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_mmap__dev_zero="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-   apr_cv_mutex_robust_shared="yes" \
-   apr_cv_process_shared_works="yes" \
-   apr_cv_pthreads_lib="-pthread" \
-   apr_cv_sock_cloexec="yes" \
-   apr_cv_tcp_nodelay_with_cork="yes"
-   fi
-
-   if use urandom; then
-   myconf+=( --with-devrandom=/dev/urandom )
-   else
-   myconf+=( --with-devrandom=/dev/random )
-   fi
-
-   # Avoid libapr containing undefined references (underlinked)
-   # undefined reference to `__sync_val_compare_and_swap_8'
-   # (May be possible to fix via libatomic linkage in future?)
-   # bug #740464
-   append-atomic-flags
-   if [[ ${LIBS} == *atomic* ]] ; then
-   myconf+=( --disable-nonportable-atomics )
-   fi
-
-   econf "${myconf[@]}"
-}
-
-src_compile() {
-   if tc-is-cross-compiler; then
-   # This header is the same across targets, so use the build 
compiler.
-   emake tools/gen_test_char
-
-   tc-export_build_env BUILD_CC
-   ${BUI

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2024-03-28 Thread Sam James
commit: 3db28eb5c6b781f5f24b2d15fcd40174bba4f7da
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Mar 27 18:08:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 29 02:28:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db28eb5

dev-libs/apr: simplify defining tool names to their basename

This logic is copied from dev-build/libtool. Sync it with the recent
change to libtool.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r2.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-libs/apr/apr-1.7.4-r2.ebuild b/dev-libs/apr/apr-1.7.4-r2.ebuild
index d74a3b41b387..1a50b553b4c1 100644
--- a/dev-libs/apr/apr-1.7.4-r2.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r2.ebuild
@@ -56,12 +56,12 @@ src_configure() {
# cause problems for people who switch /bin/sh on the fly to other
# shells, so just force libtool to use /bin/bash all the time.
export CONFIG_SHELL="${EPREFIX}"/bin/bash
-   export ac_cv_path_SED="$(basename "$(type -P sed)")"
-   export ac_cv_path_EGREP="$(basename "$(type -P grep)") -E"
-   export ac_cv_path_EGREP_TRADITIONAL="$(basename "$(type -P grep)") -E"
-   export ac_cv_path_FGREP="$(basename "$(type -P grep)") -F"
-   export ac_cv_path_GREP="$(basename "$(type -P grep)")"
-   export ac_cv_path_lt_DD="$(basename "$(type -P dd)")"
+   export ac_cv_path_SED="sed"
+   export ac_cv_path_EGREP="grep -E"
+   export ac_cv_path_EGREP_TRADITIONAL="grep -E"
+   export ac_cv_path_FGREP="grep -F"
+   export ac_cv_path_GREP="grep"
+   export ac_cv_path_lt_DD="dd"
 
local myconf=(
--enable-layout=gentoo



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Sam James
commit: 05ade4609472426610c644d4c2408bdf8b18f095
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 13 22:36:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 13 22:36:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ade460

dev-libs/apr: Stabilize 1.7.0-r5 x86, #877031

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index b3db9ef05212..258dba53c608 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Sam James
commit: 57d0d4e67e597ccb00ac8f41d9b9b4a70138f044
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 13 23:00:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 13 23:00:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d0d4e6

dev-libs/apr: Stabilize 1.7.0-r5 arm, #877031

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 258dba53c608..2d546116cbda 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Sam James
commit: 1ceb2e03c2e0b1959ef82c271518b08daa6471eb
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 13 23:00:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 13 23:00:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ceb2e03

dev-libs/apr: Stabilize 1.7.0-r5 arm64, #877031

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 2d546116cbda..398c08e06dae 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Arthur Zamarin
commit: 765c819e81c534a879f0c7404c25407585aabea9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct 14 04:13:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct 14 04:13:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765c819e

dev-libs/apr: Stabilize 1.7.0-r5 ppc, #877031

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 398c08e06dae..4d5d4eb4be38 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Agostino Sarubbo
commit: 7aaaefcaa9c949d106225577a63b6eb45cb8bb77
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 14 06:56:03 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 14 06:56:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaaefca

dev-libs/apr: Stabilize 1.7.0-r5 ppc64, #877031

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 4d5d4eb4be38..cac0a1123fc5 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-13 Thread Agostino Sarubbo
commit: 37fb99b31eefb94f3be011b6dc6ba53f7fcefc03
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 14 06:56:37 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 14 06:56:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fb99b3

dev-libs/apr: Stabilize 1.7.0-r5 sparc, #877031

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index cac0a1123fc5..0d8ee43698ce 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-10-20 Thread Jakov Smolić
commit: dfd7c2b28d4014c279db8374ce4bcd619bb78b99
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Oct 20 18:59:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct 20 18:59:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd7c2b2

dev-libs/apr: Stabilize 1.7.0-r5 amd64, #877031

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 0d8ee43698ce..28985b8993a8 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-12-10 Thread Sam James
commit: bffa130d11f1e1940fcadaa983b35ddf54fc150c
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 11 00:26:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 11 00:26:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffa130d

dev-libs/apr: Stabilize 1.7.0-r6 amd64, #880701

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 51ca2bf41a67..63196ddf6683 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-12-14 Thread Sam James
commit: 50ac2d837489a73d2962a669d146e300c6fd4caf
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 14 11:44:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 11:44:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ac2d83

dev-libs/apr: drop 1.7.0-r4

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r4.ebuild | 161 ---
 1 file changed, 161 deletions(-)

diff --git a/dev-libs/apr/apr-1.7.0-r4.ebuild b/dev-libs/apr/apr-1.7.0-r4.ebuild
deleted file mode 100644
index 3348d775384b..
--- a/dev-libs/apr/apr-1.7.0-r4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/";
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-   >=sys-devel/libtool-2.4.2
-   doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.5.0-mint.patch
-   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-   "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-)
-
-src_prepare() {
-   default
-
-   mv configure.in configure.ac || die
-   AT_M4DIR="build" eautoreconf
-   elibtoolize
-
-   eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-   )
-
-   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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-   apr_cv_mutex_robust_shared="yes" \
-   apr_cv_process_shared_works="yes" \
-   apr_cv_pthreads_lib="-pthread" \
-   apr_cv_sock_cloexec="yes" \
-   apr_cv_tcp_nodelay_with_cork="yes"
-   fi
-
-   if use urandom; then
-   myconf+=( --with-devrandom=/dev/urandom )
-   elif (( ${CHOST#*-hpux11.} <= 11 )); then
-   : # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-   else
-   myconf+=( --with-devrandom=/dev/random )
-   fi
-
-   tc-is-static-only && myconf+=( --disable-dso )
-
-   # shl_load does not search runpath, but hpux11 supports dlopen
-   [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-   if [[ ${CHOST} == *-solaris2.10 ]]; then
-   case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo 
"${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-   *atomic_cas_ptr*) ;;
-   *)
-   elog "You do not have Solaris Patch ID "$(
-   [[ ${CHOST} == sparc* ]] && echo 118884 || echo 
118885
-   )" (Problem 4954703) installed on your host 
($(hostname)),"
-   elog "using generic atomic operations instead."
-   mycon

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-12-17 Thread Arthur Zamarin
commit: ad643f7ac15036f6ea72ed585eef5002de399fad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 17 19:33:44 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 17 19:33:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad643f7a

dev-libs/apr: Stabilize 1.7.0-r6 ppc64, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 3edb1c3fe47d..855fd6a0da42 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-12-17 Thread Arthur Zamarin
commit: 34d9aae59b0c41c8d0022a050c9f9cf5690c2edb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 17 19:33:40 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 17 19:33:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d9aae5

dev-libs/apr: Stabilize 1.7.0-r6 ppc, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 63196ddf6683..3edb1c3fe47d 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-11-25 Thread Arthur Zamarin
commit: 3dc138504eba64bda1559e9354ae1540cdd86b88
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 14:34:17 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 14:34:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc13850

dev-libs/apr: Stabilize 1.7.0-r6 arm64, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index aee778cc43ae..61a91f10ea0f 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-11-26 Thread Arthur Zamarin
commit: be7c8e98b85228d50eb05d2f6d61320591468ab0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 26 17:11:57 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 26 17:11:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7c8e98

dev-libs/apr: Stabilize 1.7.0-r6 arm, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 61a91f10ea0f..51ca2bf41a67 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-09-23 Thread Sam James
commit: ad634152ee4e5b0d5fa1002c2fa1dc0cd7755351
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 23 15:58:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 23 15:59:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad634152

dev-libs/apr: more robustly check for dodgy atomics

Let's use append-atomic-libs, which is for this purpose, instead of hardcoding
a brittle list of arches which isn't so accurate.

Mariusz reported that armv6j at least suffered from this problem. Rather than
shoving in 'use arm', let's just use the proper test.

Bug: https://bugs.gentoo.org/740464
Tested-by: Mariusz Koniarz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r1.ebuild | 150 +++
 1 file changed, 150 insertions(+)

diff --git a/dev-libs/apr/apr-1.7.4-r1.ebuild b/dev-libs/apr/apr-1.7.4-r1.ebuild
new file mode 100644
index ..a3ca34616e31
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.4-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+   virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-base-policy )
+"
+DEPEND+=" valgrind? ( dev-util/valgrind )"
+BDEPEND="
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
+   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+   "${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+   tc-export AS CC CPP
+
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   $(use_with valgrind)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   if use old-kernel; 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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_mmap__dev_zero="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_process_shared_works="yes" \
+   apr_cv_pthreads_lib="-pthread" \
+   apr_cv_sock_cloexec="yes" \
+   apr_cv_tcp_nodelay_with_cork="yes"
+   fi
+
+   if use urandom; then
+   myconf+=( --with-devrandom=/dev/urandom )
+   else
+   myconf+=( --with-devrandom=/dev/random )
+   fi
+
+   # Avoid libapr containing undefined references (underlinked)
+   # undefined reference to `__sync_val_compare_and_swap_8'
+   # (May be possible to fix via libatomic linkage in future?)
+   # bug #740464
+   append-atomic-flags
+   if [[ ${LIBS} == *atomic* ]] ; then
+   myconf+=( --disable-nonportable-atomics )
+   fi
+
+   econf "${mycon

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-09-23 Thread Sam James
commit: b5e20a04b3b05153156eb03c5abe7492ca794b89
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 23 16:00:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 23 16:00:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e20a04

dev-libs/apr: destabilize 1.7.4-r1

Oops, ran the AT alias again. I need to make it commit on a separate branch
or use worktrees, I think.

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4-r1.ebuild b/dev-libs/apr/apr-1.7.4-r1.ebuild
index a3ca34616e31..b422544bfc7c 100644
--- a/dev-libs/apr/apr-1.7.4-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-05-15 Thread Sam James
commit: ffb384312357a71127161a1feecbe6d436269814
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 02:36:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:35:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb38431

dev-libs/apr: add Valgrind annotation support

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index 9ab51b0ca62a..d8b0bef35dd3 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc old-kernel selinux static-libs +urandom"
+IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency
 DEPEND="
@@ -23,6 +23,7 @@ RDEPEND="
${DEPEND}
selinux? ( sec-policy/selinux-base-policy )
 "
+DEPEND+=" valgrind? ( dev-util/valgrind )"
 BDEPEND="
>=sys-devel/libtool-2.4.2
doc? ( app-doc/doxygen )
@@ -57,6 +58,7 @@ src_configure() {
--enable-posix-shm
--enable-threads
$(use_enable static-libs static)
+   $(use_with valgrind)
--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
)
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-02 Thread Sam James
commit: e61cb2612511dfb0ecaf6fa20e63ed43a3534611
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 06:29:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 06:29:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61cb261

dev-libs/apr: Stabilize 1.7.4 ppc, #907736

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index e2253cffa218..f0820fbbc339 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-02 Thread Sam James
commit: 05a279e52f24c5b10f4c084a5222f4b2863a735e
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 06:29:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 06:29:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a279e5

dev-libs/apr: Stabilize 1.7.4 arm64, #907736

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index f0820fbbc339..e23c5d569bfd 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-02 Thread Sam James
commit: 832a5b23b5fc6ef3404d7390e12efccad78da4d3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 06:29:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 06:29:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832a5b23

dev-libs/apr: Stabilize 1.7.4 arm, #907736

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index e23c5d569bfd..b23d9e0b9871 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-03 Thread Sam James
commit: 1e4320492fcafd7f5cc4a66fa7651412c79c67a2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 17:25:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 17:25:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e432049

dev-libs/apr: Stabilize 1.7.4 amd64, #907736

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index b23d9e0b9871..2779b59d492b 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-03 Thread Sam James
commit: 7bdfa9d48176c789c5409e0ad5d680638854f069
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 17:25:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 17:25:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdfa9d4

dev-libs/apr: Stabilize 1.7.4 ppc64, #907736

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index 2779b59d492b..cc693dc3fddf 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-06-03 Thread Arthur Zamarin
commit: 93a86e72a3c2955865fa52d1961d2348a5dddfbb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  3 19:42:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  3 19:42:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a86e72

dev-libs/apr: Stabilize 1.7.4 sparc, #907736

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index cc693dc3fddf..7a36f8629dcf 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom valgrind"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-03-13 Thread Arthur Zamarin
commit: c297b4f1c2fff5f26468ffb90f26cc68724771e9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar 13 19:16:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Mar 13 19:16:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c297b4f1

dev-libs/apr: Stabilize 1.7.2 ppc, #894144

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 237e12f6197f..6f168c996b79 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-04-16 Thread Sam James
commit: 37930483ef252fd3820f70b63742d83f81b48eeb
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 17 00:58:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 17 00:58:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37930483

dev-libs/apr: add 1.7.4

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.7.4.ebuild | 170 ++
 2 files changed, 171 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index d20559caa519..32e6e7e42c5e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,2 +1,3 @@
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B 
a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15
 SHA512 
0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
 DIST apr-1.7.3.tar.bz2 901048 BLAKE2B 
effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d
 SHA512 
d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
+DIST apr-1.7.4.tar.bz2 894526 BLAKE2B 
a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df
 SHA512 
2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
new file mode 100644
index ..9ab51b0ca62a
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+   virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-base-policy )
+"
+BDEPEND="
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
+   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+   "${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+   tc-export AS CC CPP
+
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   if use old-kernel; 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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_mmap__dev_zero="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_proce

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-03-18 Thread Hans de Graaff
commit: 1bd17f5985ba24416f5b51ab817270e070d77f18
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Mar 18 16:28:15 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Mar 18 16:29:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd17f59

dev-libs/apr: drop unused USE flag from metadata

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-libs/apr/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index d898d5a8b907..b8d4a84e26af 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -7,7 +7,6 @@


Enable compatibility with older 
kernels
-   Enable binary 
compatibility with older kernels
Use /dev/urandom instead of 
/dev/random





[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-03-18 Thread Hans de Graaff
commit: 6b3bd257e60be095b45d7479b9081bbcfc543800
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Mar 18 16:27:42 2023 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Mar 18 16:29:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3bd257

dev-libs/apr: drop 1.7.0-r6

Signed-off-by: Hans de Graaff  gentoo.org>

 dev-libs/apr/Manifest|   1 -
 dev-libs/apr/apr-1.7.0-r6.ebuild | 164 ---
 2 files changed, 165 deletions(-)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 02b7c0352595..b0d3d6e02f01 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,2 +1 @@
-DIST apr-1.7.0.tar.bz2 872238 BLAKE2B 
a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7
 SHA512 
3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B 
a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15
 SHA512 
0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
deleted file mode 100644
index 855fd6a0da42..
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/";
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-   >=sys-devel/libtool-2.4.2
-   doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.5.0-mint.patch
-   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-   "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-   "${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
-   "${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004
-   "${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833
-)
-
-src_prepare() {
-   default
-
-   mv configure.in configure.ac || die
-   AT_M4DIR="build" eautoreconf
-   elibtoolize
-
-   eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-   )
-
-   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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-   apr_cv_mutex_robust_shared="yes" \
-   apr_cv_process_shared_works="yes" \
-   apr_cv_pthreads_lib="-pthread" \
-   apr_cv_sock_cloexec="yes" \
-   apr_cv_tcp_nodelay_with_cork="yes"
-   fi
-
-   if use urandom; then
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-03-31 Thread Sam James
commit: 072b022020778a38bbd3b07234be9efbea97a4f2
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 31 20:58:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 31 20:59:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072b0220

dev-libs/apr: add 1.7.3

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/Manifest |   1 +
 dev-libs/apr/apr-1.7.3.ebuild | 170 ++
 2 files changed, 171 insertions(+)

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b0d3d6e02f01..d20559caa519 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1 +1,2 @@
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B 
a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15
 SHA512 
0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
+DIST apr-1.7.3.tar.bz2 901048 BLAKE2B 
effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d
 SHA512 
d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124

diff --git a/dev-libs/apr/apr-1.7.3.ebuild b/dev-libs/apr/apr-1.7.3.ebuild
new file mode 100644
index ..9ab51b0ca62a
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/";
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+   virtual/libcrypt:=
+   elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-base-policy )
+"
+BDEPEND="
+   >=sys-devel/libtool-2.4.2
+   doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.5.0-mint.patch
+   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+   "${FILESDIR}"/${PN}-1.7.2-libtool.patch
+   "${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+   "${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+   "${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+   "${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+   "${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+   tc-export AS CC CPP
+
+   local myconf=(
+   --enable-layout=gentoo
+   --enable-nonportable-atomics
+   --enable-posix-shm
+   --enable-threads
+   $(use_enable static-libs static)
+   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+   )
+
+   tc-is-static-only && myconf+=( --disable-dso )
+
+   if use old-kernel; 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 tc-is-cross-compiler; then
+   # The apache project relies heavily on AC_TRY_RUN and doesn't
+   # have any sane cross-compiling fallback logic.
+   export \
+   ac_cv_file__dev_zero="yes" \
+   ac_cv_func_sem_open="yes" \
+   ac_cv_mmap__dev_zero="yes" \
+   ac_cv_negative_eai="yes" \
+   ac_cv_o_nonblock_inherited="no" \
+   ac_cv_struct_rlimit="yes" \
+   ap_cv_atomic_builtins="yes" \
+   apr_cv_accept4="yes" \
+   apr_cv_dup3="yes" \
+   apr_cv_epoll="yes" \
+   apr_cv_epoll_create1="yes" \
+   apr_cv_gai_addrconfig="yes" \
+   apr_cv_mutex_recursive="yes" \
+   apr_cv_mutex_robust_shared="yes" \
+   apr_cv_process_shared_works="yes" \
+   apr_cv_pthreads_lib="-pthread" \
+   apr_cv_sock_cloexec="yes" \
+   apr_cv_tcp_nodelay_with_cork="yes"
+   fi
+
+   if use urandom; then
+   myconf+=( --with-devrandom=/dev/urandom )
+   elif (( $

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-13 Thread Sam James
commit: aabd182f30135ef2f823886e347cfeb649917fc9
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 13 08:38:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 13 22:44:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabd182f

dev-libs/apr: respect CC

I tried with all the normal techniques to get this to happen and couldn't,
but maybe I'm just tired and missing something. Anyway, with these,
a few more things start respecting the env, but I couldn't actually get
CC to fail like it did in the bug.

Closes: https://bugs.gentoo.org/894150
Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 771d24bf8a2e..0c6d2fae88d5 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -48,6 +48,8 @@ src_prepare() {
 }
 
 src_configure() {
+   tc-export AS CC CPP
+
local myconf=(
--enable-layout=gentoo
--enable-nonportable-atomics



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-13 Thread Sam James
commit: 73f832b147a4081ccaa8154e176f0344ac7868f7
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 07:05:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 07:05:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f832b1

dev-libs/apr: Stabilize 1.7.2 amd64, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 0c6d2fae88d5..09477bdb040b 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-14 Thread Sam James
commit: 7bc3cb19ddb448bcf6c7f2c87365c53e2a92c8b2
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 21:42:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 21:42:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc3cb19

dev-libs/apr: Stabilize 1.7.2 arm, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index a550cf0c430e..89953579c408 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-14 Thread Sam James
commit: 1582e2995a8eff73c099a693e617652ae87a4062
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 21:42:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 21:42:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1582e299

dev-libs/apr: Stabilize 1.7.2 sparc, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 89953579c408..82274744a90c 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-14 Thread Sam James
commit: 2c70ceccc21cf2a329759f48d397556b0835de3a
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 21:42:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 21:42:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c70cecc

dev-libs/apr: Stabilize 1.7.2 ppc64, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 09477bdb040b..a550cf0c430e 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-14 Thread Sam James
commit: 6043e6331cad05fe4b0df74baf3e1471458f10cb
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 14 23:05:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 14 23:05:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6043e633

dev-libs/apr: Stabilize 1.7.2 arm64, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 82274744a90c..0708e08e4374 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-02-15 Thread Sam James
commit: c66ba9cf367e30857bd8b3cd1e565987529fffb5
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 16 05:22:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 16 05:22:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66ba9cf

dev-libs/apr: Stabilize 1.7.2 x86, #894144

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 0708e08e4374..237e12f6197f 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc old-kernel selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2023-01-25 Thread Sam James
commit: a3fef8e5d7ab056b30c8bbad040301b9c48a3f71
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 26 05:17:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 26 05:17:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3fef8e5

dev-libs/apr: drop 1.7.0-r5

Signed-off-by: Sam James  gentoo.org>

 dev-libs/apr/apr-1.7.0-r5.ebuild | 162 ---
 1 file changed, 162 deletions(-)

diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
deleted file mode 100644
index 28985b8993a8..
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/";
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-   elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-   >=sys-devel/libtool-2.4.2
-   doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.5.0-mint.patch
-   "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-   "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-   "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-   "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-   "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-   "${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
-)
-
-src_prepare() {
-   default
-
-   mv configure.in configure.ac || die
-   AT_M4DIR="build" eautoreconf
-   elibtoolize
-
-   eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-   local myconf=(
-   --enable-layout=gentoo
-   --enable-nonportable-atomics
-   --enable-posix-shm
-   --enable-threads
-   $(use_enable static-libs static)
-   --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-   )
-
-   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 tc-is-cross-compiler; then
-   # The apache project relies heavily on AC_TRY_RUN and doesn't
-   # have any sane cross-compiling fallback logic.
-   export \
-   ac_cv_file__dev_zero="yes" \
-   ac_cv_func_sem_open="yes" \
-   ac_cv_negative_eai="yes" \
-   ac_cv_o_nonblock_inherited="no" \
-   ac_cv_struct_rlimit="yes" \
-   ap_cv_atomic_builtins="yes" \
-   apr_cv_accept4="yes" \
-   apr_cv_dup3="yes" \
-   apr_cv_epoll="yes" \
-   apr_cv_epoll_create1="yes" \
-   apr_cv_gai_addrconfig="yes" \
-   apr_cv_mutex_recursive="yes" \
-   apr_cv_mutex_robust_shared="yes" \
-   apr_cv_process_shared_works="yes" \
-   apr_cv_pthreads_lib="-pthread" \
-   apr_cv_sock_cloexec="yes" \
-   apr_cv_tcp_nodelay_with_cork="yes"
-   fi
-
-   if use urandom; then
-   myconf+=( --with-devrandom=/dev/urandom )
-   elif (( ${CHOST#*-hpux11.} <= 11 )); then
-   : # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-   else
-   myconf+=( --with-devrandom=/dev/random )
-   fi
-
-   tc-is-static-only && myconf+=( --disable-dso )
-
-   # shl_load does not search runpath, but hpux11 supports dlopen
-   [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-   if [[ ${CHOST} == *-solaris2.10 ]]; then
-   case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo 
"${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-   *atomic_cas_ptr*) ;;
-   *)
-   elog "You do not have Solaris Patch ID "$(
-   [[ ${CHOST} == sparc* ]] && echo 118884 || echo 
118885
-   )" (Problem 4954703) installed on your host 
($(hostname)),"
-   elog "using ge

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-11-15 Thread Arthur Zamarin
commit: 48dc45036c1f0b37f9f877a12c30419649f4bc66
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 16 07:04:53 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 16 07:04:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48dc4503

dev-libs/apr: Stabilize 1.7.0-r6 sparc, #880701

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 4d8630a847e9..17c82b043139 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

2022-11-17 Thread Jakov Smolić
commit: fef6ca204b94dfbb59ab3ee68291d9d9a4f622b9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Nov 18 07:07:17 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Nov 18 07:07:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef6ca20

dev-libs/apr: Stabilize 1.7.0-r6 x86, #880701

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-libs/apr/apr-1.7.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
index 17c82b043139..aee778cc43ae 100644
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2015-10-02 Thread Julian Ospald
commit: a03c50b93c3dd62e8b59a694656ac1d5e6652cb9
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct  2 16:09:13 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Fri Oct  2 16:16:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03c50b9

dev-libs/apr-util: add libressl support

 dev-libs/apr-util/apr-util-1.5.4-r1.ebuild | 116 +
 dev-libs/apr-util/metadata.xml |   2 +
 2 files changed, 118 insertions(+)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
new file mode 100644
index 000..75e9129
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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 )
+   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? (
+   !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)
+
+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"
+}

diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-06-17 Thread Lars Wendler
commit: 3f983ee14387c62281620cef0988b1d3e50881ce
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun 17 20:46:04 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun 17 21:36:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f983ee1

dev-libs/apr-util: Bump to version 1.6.0 (bug #622032).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/apr-util/Manifest  |   1 +
 dev-libs/apr-util/apr-util-1.6.0.ebuild | 137 
 2 files changed, 138 insertions(+)

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3e63c2acac5..e9d90f82b1f 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1 +1,2 @@
 DIST apr-util-1.5.4.tar.bz2 694427 SHA256 
a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e SHA512 
ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 WHIRLPOOL 
bc4ce82785513f4bf2207bb26758abc79e6bfef62a57d3e2ead570abc618b321c302390b9dcd8eab1ec44a9e5d398c2cc4d35af2549636e20d7c20678725ac2e
+DIST apr-util-1.6.0.tar.bz2 428750 SHA256 
8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c SHA512 
dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0
 WHIRLPOOL 
a41e90c781d6fd0792ba4d4941744d61bee2289b72529ccca92fbcb671234e80d7faee7e6fa8cf86e6f2d822e6429cff17721a96fdb6527f0802cbd6ed4c1284

diff --git a/dev-libs/apr-util/apr-util-1.6.0.ebuild 
b/dev-libs/apr-util/apr-util-1.6.0.ebuild
new file mode 100644
index 000..1805efb5b59
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.0.ebuild
@@ -0,0 +1,137 @@
+# 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 freetds 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:= )
+   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? (
+   !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 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)
+   )
+
+   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_includ

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-06-18 Thread Lars Wendler
commit: e1ee6de763403a1cd44731f95bbe626ce1b4c315
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jun 18 08:59:18 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jun 18 08:59:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ee6de7

dev-libs/apr-util: Version 1.6.0 no longer supports freetds (bug #622070).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/apr-util/apr-util-1.6.0.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-libs/apr-util/apr-util-1.6.0.ebuild 
b/dev-libs/apr-util/apr-util-1.6.0.ebuild
index 1805efb5b59..ec528c173dd 100644
--- a/dev-libs/apr-util/apr-util-1.6.0.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.0.ebuild
@@ -16,14 +16,13 @@ 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 freetds gdbm ldap libressl mysql nss odbc openssl postgres 
sqlite static-libs"
+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:= )
-   freetds? ( dev-db/freetds )
gdbm? ( sys-libs/gdbm )
ldap? ( =net-nds/openldap-2* )
mysql? ( =virtual/mysql-5* )
@@ -67,7 +66,6 @@ src_configure() {
--with-apr="${SYSROOT}${EPREFIX}"/usr
--with-expat="${EPREFIX}"/usr
--without-sqlite2
-   $(use_with freetds)
$(use_with gdbm)
$(use_with ldap)
$(use_with mysql)



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-05-30 Thread Lars Wendler
commit: 078f0d4bc59ce8793a39c5404733500c371b74b1
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 31 06:54:28 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 31 06:56:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078f0d4b

dev-libs/apr-util: Removed old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/apr-util/Manifest |   2 -
 dev-libs/apr-util/apr-util-1.5.2.ebuild| 102 --
 dev-libs/apr-util/apr-util-1.5.3-r2.ebuild | 113 -
 3 files changed, 217 deletions(-)

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 10dcdfeddf1..3e63c2acac5 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,3 +1 @@
-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

diff --git a/dev-libs/apr-util/apr-util-1.5.2.ebuild 
b/dev-libs/apr-util/apr-util-1.5.2.ebuild
deleted file mode 100644
index a99ea02195d..000
--- a/dev-libs/apr-util/apr-util-1.5.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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 )
-   sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-   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} 
--with-berkeley-db=$(db_includedir 2> /dev/null):${EPREFIX}/usr/$(get_libdir)"
-   else
-   myconf+=" --without-berkeley-db"
-   fi
-
-   econf \
-   --datadir="${EPREFIX}"/usr/share/apr-util-1 \
-   --with-apr="${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}
-}
-
-src_compile() {
-   emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-   if use doc; then
-   emake dox
-   fi
-}
-
-src_install() {
-   default
-
-   find "

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-05-30 Thread Lars Wendler
commit: 790b991cd3ae84f07f5b77fe32f42583bb5d57f5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 31 06:49:14 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 31 06:56:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790b991c

dev-libs/apr-util: Revbump to remove mysql support (bug #620230).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/apr-util/apr-util-1.5.4-r2.ebuild | 130 +
 1 file changed, 130 insertions(+)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild
new file mode 100644
index 000..3bb7a167d63
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild
@@ -0,0 +1,130 @@
+# 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.5.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 freetds gdbm ldap libressl 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* )
+   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
+   mv configure.{in,ac} || die
+   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
+
+   local myeconfargs=(
+   --datadir="${EPREFIX}"/usr/share/apr-util-1
+   --with-apr="${SYSROOT}${EPREFIX}"/usr
+   --with-expat="${EPREFIX}"/usr
+   --without-mysql
+   --without-sqlite2
+   $(use_with freetds)
+   $(use_with gdbm)
+   $(use_with ldap)
+   $(use_with nss)
+   $(use_with odbc)
+   $(use_with openssl)
+   $(use_with postgres pgsql)
+   $(use_with sqlite sqlite3)
+   "${myconf[@]}"
+   )
+   econf "${myeconfargs[@]}"
+   # 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
+   find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || 
die
+   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 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-05-31 Thread Lars Wendler
commit: 22262ade2b169f4786c12125b2d0d9705f99c5a6
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 31 12:54:43 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 31 12:56:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22262ade

dev-libs/apr-util: Reintroduced mysql support (bug #620230).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../{apr-util-1.5.4-r2.ebuild => apr-util-1.5.4-r3.ebuild}| 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
similarity index 91%
rename from dev-libs/apr-util/apr-util-1.5.4-r2.ebuild
rename to dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
index 3bb7a167d63..db5d7e6c1f0 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
@@ -16,7 +16,7 @@ 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 freetds gdbm ldap libressl nss odbc openssl postgres sqlite 
static-libs"
+IUSE="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres 
sqlite static-libs"
 #RESTRICT="test"
 
 RDEPEND="
@@ -26,6 +26,7 @@ RDEPEND="
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? (
@@ -49,6 +50,12 @@ PATCHES=(
 
 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
@@ -83,11 +90,11 @@ src_configure() {
--datadir="${EPREFIX}"/usr/share/apr-util-1
--with-apr="${SYSROOT}${EPREFIX}"/usr
--with-expat="${EPREFIX}"/usr
-   --without-mysql
--without-sqlite2
$(use_with freetds)
$(use_with gdbm)
$(use_with ldap)
+   $(use_with mysql)
$(use_with nss)
$(use_with odbc)
$(use_with openssl)



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-06-01 Thread Lars Wendler
commit: 1eb695ee7fa02bfd525bdbbb82729520b7848ecd
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jun  1 07:41:47 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jun  1 07:42:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb695ee

dev-libs/apr-util: Fixed broken find command (bug #620254).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/apr-util/apr-util-1.5.4-r3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 db5d7e6c1f0..91a41d6598d 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
@@ -121,7 +121,9 @@ src_install() {
default
 
find "${ED}" -name "*.la" -delete || die
-   find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -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



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2018-01-04 Thread Lars Wendler
commit: fe90a2f43173cfbaf71aa5717179f142c920b0b9
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan  4 10:31:39 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan  4 10:31:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe90a2f4

dev-libs/apr-util: Added sub-slot dep for sys-libs/gdbm

Closes: https://bugs.gentoo.org/643306
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/apr-util/apr-util-1.5.4-r3.ebuild | 4 ++--
 dev-libs/apr-util/apr-util-1.6.1.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 91a41d6598d..0902526be9a 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.1.ebuild 
b/dev-libs/apr-util/apr-util-1.6.1.ebuild
index ec528c173dd..97a0e1ac54c 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 )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2018-01-04 Thread Lars Wendler
commit: 00fa8db06931fb939b2eea091fbd66d057c19edf
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jan  4 10:28:28 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jan  4 10:28:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fa8db0

dev-libs/apr-util: Removed old.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/apr-util/Manifest  |   1 -
 dev-libs/apr-util/apr-util-1.6.0.ebuild | 135 
 2 files changed, 136 deletions(-)

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 326ea07a490..268dd4fa414 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,3 +1,2 @@
 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 
40eff8a37c0634f7f6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d

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 ec528c173dd..000
--- 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.
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-10-23 Thread Lars Wendler
commit: ad0cf28940401d3c38a6b4adc8727ae1e05b899f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct 23 08:54:32 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct 23 08:55:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0cf289

dev-libs/apr-util: Removed old.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 dev-libs/apr-util/apr-util-1.5.4-r1.ebuild | 115 -
 1 file changed, 115 deletions(-)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
deleted file mode 100644
index 9fa270a7f21..000
--- a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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 freetds 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 )
-   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? (
-   !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)
-
-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" -not -name 
"*$(get_libname)" -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"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-10-23 Thread Lars Wendler
commit: e595c0af13030970058ded742756fca058baefbe
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Oct 23 08:54:07 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Oct 23 08:54:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e595c0af

dev-libs/apr-util: Bump to version 1.6.1

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 dev-libs/apr-util/Manifest  |   1 +
 dev-libs/apr-util/apr-util-1.6.1.ebuild | 135 
 2 files changed, 136 insertions(+)

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index e9d90f82b1f..f91748731a6 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,2 +1,3 @@
 DIST apr-util-1.5.4.tar.bz2 694427 SHA256 
a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e SHA512 
ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 WHIRLPOOL 
bc4ce82785513f4bf2207bb26758abc79e6bfef62a57d3e2ead570abc618b321c302390b9dcd8eab1ec44a9e5d398c2cc4d35af2549636e20d7c20678725ac2e
 DIST apr-util-1.6.0.tar.bz2 428750 SHA256 
8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c SHA512 
dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0
 WHIRLPOOL 
a41e90c781d6fd0792ba4d4941744d61bee2289b72529ccca92fbcb671234e80d7faee7e6fa8cf86e6f2d822e6429cff17721a96fdb6527f0802cbd6ed4c1284
+DIST apr-util-1.6.1.tar.bz2 428595 SHA256 
d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b SHA512 
40eff8a37c0634f7f6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 WHIRLPOOL 
66ec9e7f5c596c0eba93329d61b565013bd16388e958bf50f947d977e11ef0a562cf72aa6cce3f24d0748f0f296a011ecbf2a61b6ee5333e0baf3e91ea429fa7

diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild 
b/dev-libs/apr-util/apr-util-1.6.1.ebuild
new file mode 100644
index 000..ec528c173dd
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild
@@ -0,0 +1,135 @@
+# 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 l

[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-03-21 Thread Michael Haubenwallner
commit: a8366f5acaf8a046b57ea67c37f6043d32665d9a
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Mar 21 15:21:29 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Mar 21 15:42:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8366f5a

dev-libs/apr-util: add ~x64-cygwin keyword

Package-Manager: portage-2.3.3

 dev-libs/apr-util/apr-util-1.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
index 7a4fc82e857..9abee1937cd 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 freetds gdbm ldap libressl mysql nss odbc openssl postgres 
sqlite static-libs"
 #RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2017-03-22 Thread Lars Wendler
commit: a6a6a2354c39682547fbed55340c2f8874d137c6
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Mon Mar 20 11:29:27 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar 22 11:10:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a6a235

dev-libs/apr-util: keep get_libname libs when .a

Cygwin uses .dll.a as shared library extension, do not remove along "*.a".

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/4254

 dev-libs/apr-util/apr-util-1.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild 
b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
index 9abee1937cd..9fa270a7f21 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
@@ -105,7 +105,7 @@ src_install() {
 
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 static-libs || find "${ED}" -name "*.a" -not -name 
"*$(get_libname)" -delete
 
use doc && dohtml -r docs/dox/html/*
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

2018-09-19 Thread Thomas Deutschmann
commit: 271ae1d0d07e5594561879608e3f7e190b7b8e38
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep 19 15:43:39 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep 19 17:34:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271ae1d0

dev-libs/apr-util: x86 stable (bug #635272)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-libs/apr-util/apr-util-1.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild 
b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index b3dc42fd7f9..1c7662e09e6 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ 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 ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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"
 



  1   2   >