From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/apr-util/Manifest | 10 ++ dev-libs/apr-util/apr-util-1.5.4-r1.ebuild | 115 +++++++++++++++++ dev-libs/apr-util/apr-util-1.5.4-r3.ebuild | 139 +++++++++++++++++++++ dev-libs/apr-util/apr-util-1.5.4.ebuild | 112 +++++++++++++++++ dev-libs/apr-util/apr-util-1.6.0.ebuild | 135 ++++++++++++++++++++ .../apr-util/files/apr-util-1.5.3-sysroot.patch | 36 ++++++ dev-libs/apr-util/metadata.xml | 14 +++ 7 files changed, 561 insertions(+) create mode 100644 dev-libs/apr-util/Manifest create mode 100644 dev-libs/apr-util/apr-util-1.5.4-r1.ebuild create mode 100644 dev-libs/apr-util/apr-util-1.5.4-r3.ebuild create mode 100644 dev-libs/apr-util/apr-util-1.5.4.ebuild create mode 100644 dev-libs/apr-util/apr-util-1.6.0.ebuild create mode 100644 dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch create mode 100644 dev-libs/apr-util/metadata.xml (limited to 'dev-libs/apr-util') diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest new file mode 100644 index 000000000000..5e6423eab95c --- /dev/null +++ b/dev-libs/apr-util/Manifest @@ -0,0 +1,10 @@ +AUX apr-util-1.5.3-sysroot.patch 1234 SHA256 752ee44d3e9e39e4cba824556f829776a46e4f5e64d4f359de781d3bfd3a414f SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 WHIRLPOOL 2017ccccfade6e99a490781100a7ca2ee1901a93b791db78291e3d7850e9916d183084abc6f46b2a80ffb451dfb5f1e999189f9ce6f994b51146563bef52a7af +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 +EBUILD apr-util-1.5.4-r1.ebuild 3351 SHA256 9d1e9007dcce45d0e9d0325f4bcb3b28bc540c7c63b07e2767d8a6d1cac1053e SHA512 d56ced2e56d2dcb9b1aa53b426f3e0ba03d4f12076731e808630d9d58917f31320c2d2435bee645be8768b3663ba2af8664f0824a17e90a26f7927a0fae37732 WHIRLPOOL a76001edc4d72768a6c1cb096821ac76139138e75f2f60a8378daf86beee3bcd4d324de0f00d03669b33bde0afd43ca7b1526548d0bb192bc41a08352f4d7b66 +EBUILD apr-util-1.5.4-r3.ebuild 3705 SHA256 e70cda306e07030e975e11e99d3f62e29a93d25dc75647dcd6bb9a48155ae53d SHA512 6fcb294154753d569e3cad05c6e293c85ea49aab64f8fa2542577624b6c4349f80e06376f021d953b22e59ff8bd6b97c5e6e31106971a1333594572a8ef759c0 WHIRLPOOL 24d6411cde7b0926950952b999b37869ef152fd5444361d6faa2aa8e78fe4bdbce7d79af8d2108ee419605ccec1ed384443e3ea89eebd4c346f95a5a1ac61ae0 +EBUILD apr-util-1.5.4.ebuild 3238 SHA256 b5dd4d0dd26da87d7167edbadff9ac9d2d6c3cd4919572bc7aa0471dbd29229f SHA512 c018c7088ffac68d91aa0c8e8089dd7a0dd9219b21cbd95db63c8a9980067e1f841a64bb4a1de6fbd3438b4a95edaca838284b85c20095e138fc92f6fbd9d664 WHIRLPOOL bdff04ea43a4c4fc4f4872e41d581c415c00d532267c449a3a68e23b7a5f071401423834b273cdbc188dc9f79c81181088eb6fd68b51aab448213e452a3c2612 +EBUILD apr-util-1.6.0.ebuild 3611 SHA256 cc06598079caf57e6c580c1b2f66bf2d137bbfc27d321ae6710693b8186127ca SHA512 9cfd1e467bf2ead57335c561de29851a3bc72e759c0d515223a35b60acebf90ee473846862942c86e5d921acbb9f04e2654a33d27c36ffa6568d354bab871ad8 WHIRLPOOL 2e7da9047abbcbd1cd3a9af434677f6525a7da23276ce3e9eb469b36dd3122199b9412d3bb6d701f01b21a17291205f2c2d6e16b501772a0350ace25777be421 +MISC ChangeLog 2789 SHA256 7545011cfeb5878c8cf91df048ab98a188e0afbfbb9e6f3b551d7d064abac5c4 SHA512 17c82c556c5c82adbbedd8483c499892adf7d5f6835cc08aa436b6de1d88ce4713c37b08ff1142f15a0d00914cca548447fde08773c58fa8ce56aac3882ab125 WHIRLPOOL 32a8df43ce713e721bac5c6f5c412ef41145d268f5f281dfa3181aa7d3492cd0f4ad1b8ebcb72fd248da07071b594adf0e13eca9afc3b5b0bc1d22048d016d3c +MISC ChangeLog-2015 28596 SHA256 4bf952fa4e066f230ef1d23955c7854a88560e3888938a1e8ef83823adde249b SHA512 87078eb359eff08fc32b698a4c9a43003b83e2f501b0728a2e16978e38c80621a9279624489260c813732281ef59c851e8a2130736cde0eacdf16bb804cafc66 WHIRLPOOL ac08e462b2b6288e93e7a882205acfbe164e28126aea0fcd3f7e293f7c35f5ca1e43b85e7a8222a5905a83d2521c5627b1ebca5b7e9f5191dbbbc7a09062ec93 +MISC metadata.xml 515 SHA256 d5226f9f0b532aa0adf1cbc7e4b5333dae3411f0c12e6df483a4036d7150133a SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158 WHIRLPOOL 0d9a6906df5f22918414a41f8a0806e502ef38696d9c5fc5c9949c13c988fa57d3acae1c99ef1ca2279ca7ec970044bf3e1c704c460cd397262b1a6e34f0de7b 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 000000000000..9fa270a7f21f --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild @@ -0,0 +1,115 @@ +# 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" +} 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 new file mode 100644 index 000000000000..91a41d6598db --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild @@ -0,0 +1,139 @@ +# 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 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=() + + 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-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[@]}" + ) + 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 + if [[ -d "${ED}usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then + find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die + fi + + if use doc ; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + rm "${ED}usr/$(get_libdir)/aprutil.exp" || die +} diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild new file mode 100644 index 000000000000..f9d3cc97354a --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild @@ -0,0 +1,112 @@ +# 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} + >=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/apr-util-1.6.0.ebuild b/dev-libs/apr-util/apr-util-1.6.0.ebuild new file mode 100644 index 000000000000..ec528c173dd8 --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.6.0.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 libdir because otherwise it'd simply be the normal + # system libdir. That's pointless as the compiler will search it for + # us already. This makes cross-compiling and such easier. + --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}" + ) + else + myconf+=( --without-berkeley-db ) + fi + + if use nss || use openssl ; then + myconf+=( --with-crypto ) # 518708 + fi + + econf "${myconf[@]}" + # Use the current env build settings rather than whatever apr was built with. + sed -i -r \ + -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \ + -e "/^CC=/s:=.*:=$(tc-getCC):" \ + -e '/^(C|CPP|CXX|LD)FLAGS=/d' \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk || die +} + +src_compile() { + emake + use doc && emake dox +} + +src_install() { + default + + find "${ED}" -name "*.la" -delete || die + if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then + find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die + fi + if ! use static-libs ; then + find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die + fi + + if use doc ; then + docinto html + dodoc -r docs/dox/html/* + fi + + # This file is only used on AIX systems, which Gentoo is not, + # and causes collisions between the SLOTs, so remove it. + rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die +} diff --git a/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch new file mode 100644 index 000000000000..ce07b1470525 --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-1.5.3-sysroot.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/385775 + +utilize $SYSROOT to find the right includedir tree + +drop the -L/-R paths since we know our libdir is the standard path which +the compiler already knows how to locate + +--- a/apu-config.in ++++ b/apu-config.in +@@ -25,7 +25,7 @@ prefix="@prefix@" + exec_prefix="@exec_prefix@" + bindir="@bindir@" + libdir="@libdir@" +-includedir="@includedir@" ++includedir="${SYSROOT}@includedir@" + + LIBS="@APRUTIL_EXPORT_LIBS@" + INCLUDES="@APRUTIL_INCLUDES@" +@@ -166,7 +166,7 @@ while test $# -gt 0; do + --link-ld) + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" ++ flags="$flags -l$APRUTIL_LIBNAME" + else + flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME" + fi +@@ -182,7 +182,7 @@ while test $# -gt 0; do + ### avoid using -L if libdir is a "standard" location like /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME" ++ flags="$flags -l$APRUTIL_LIBNAME" + else + flags="$flags $LA_FILE" + fi diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml new file mode 100644 index 000000000000..fbfc99a2fedd --- /dev/null +++ b/dev-libs/apr-util/metadata.xml @@ -0,0 +1,14 @@ + + + + + polynomial-c@gentoo.org + Lars Wendler + + + Use dev-libs/libressl instead of + dev-libs/openssl for 'openssl' USE flag + Install apr_crypto_nss module + Install apr_crypto_openssl module + + -- cgit v1.2.3