From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59FA3139694 for ; Wed, 31 May 2017 06:56:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE30921C091; Wed, 31 May 2017 06:56:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C3AF21C091 for ; Wed, 31 May 2017 06:56:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6060F3416D7 for ; Wed, 31 May 2017 06:56:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6DD9746D for ; Wed, 31 May 2017 06:56:39 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1496213793.078f0d4bc59ce8793a39c5404733500c371b74b1.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr-util/Manifest dev-libs/apr-util/apr-util-1.5.2.ebuild dev-libs/apr-util/apr-util-1.5.3-r2.ebuild X-VCS-Directories: dev-libs/apr-util/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 078f0d4bc59ce8793a39c5404733500c371b74b1 X-VCS-Branch: master Date: Wed, 31 May 2017 06:56:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c2614d7-c897-4a40-bfe9-e0e922ba9bba X-Archives-Hash: 438b51841fb41f4274241ceefef3f811 commit: 078f0d4bc59ce8793a39c5404733500c371b74b1 Author: Lars Wendler gentoo org> AuthorDate: Wed May 31 06:54:28 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 31 06:56:33 2017 +0000 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..00000000000 --- 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 "${ED}" -name "*.la" -exec rm -f {} + - find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -exec rm -f {} + - - if use doc; then - dohtml -r docs/dox/html/* - fi - - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - rm -f "${ED}usr/$(get_libdir)/aprutil.exp" -} diff --git a/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild b/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild deleted file mode 100644 index dd48875a878..00000000000 --- a/dev-libs/apr-util/apr-util-1.5.3-r2.ebuild +++ /dev/null @@ -1,113 +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} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${P}-berkdb6.patch #476374 - 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" -}