From 22262ade2b169f4786c12125b2d0d9705f99c5a6 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 31 May 2017 14:54:43 +0200 Subject: dev-libs/apr-util: Reintroduced 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 --------------------------- dev-libs/apr-util/apr-util-1.5.4-r3.ebuild | 137 +++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 130 deletions(-) delete mode 100644 dev-libs/apr-util/apr-util-1.5.4-r2.ebuild create mode 100644 dev-libs/apr-util/apr-util-1.5.4-r3.ebuild (limited to 'dev-libs/apr-util') 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 deleted file mode 100644 index 3bb7a167d639..000000000000 --- a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild +++ /dev/null @@ -1,130 +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.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 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-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild new file mode 100644 index 000000000000..db5d7e6c1f09 --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.5.4-r3.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.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 + 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 is not, + # and causes collisions between the SLOTs, so remove it. + rm "${ED}usr/$(get_libdir)/aprutil.exp" || die +} -- cgit v1.2.3-65-gdbad