From 9c21fd1fb2ac1fdfd40c8a8bb16069e3da9dcb59 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 1 Feb 2014 13:20:41 +0100 Subject: dev-libs/apr-util: Drop, fix upstream, bug #385775 --- dev-libs/apr-util/ChangeLog | 17 --- dev-libs/apr-util/Manifest | 5 - dev-libs/apr-util/apr-util-1.3.11.ebuild | 95 -------------- .../apr-util/files/apr-util-1.3.12-bdb-5.2.patch | 139 --------------------- dev-libs/apr-util/metadata.xml | 7 -- 5 files changed, 263 deletions(-) delete mode 100644 dev-libs/apr-util/ChangeLog delete mode 100644 dev-libs/apr-util/Manifest delete mode 100644 dev-libs/apr-util/apr-util-1.3.11.ebuild delete mode 100644 dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch delete mode 100644 dev-libs/apr-util/metadata.xml (limited to 'dev-libs') diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog deleted file mode 100644 index 775d5dc1..00000000 --- a/dev-libs/apr-util/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for dev-libs/apr-util -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 10 Jun 2013; Bertrand Jacquin metadata.xml: - Fix manifest - - 28 May 2013; Bertrand Jacquin +metadata.xml: - Add missing metadata.xml - -*apr-util-1.3.11 (27 May 2013) - - 27 May 2013; Bertrand Jacquin +apr-util-1.3.11.ebuild, - +files/apr-util-1.3.12-bdb-5.2.patch: - dev-libs/apr{,-util}: add support for crosscompile, still in work - - https://bugs.gentoo.org/show_bug.cgi?id=385775 diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest deleted file mode 100644 index d05aee3e..00000000 --- a/dev-libs/apr-util/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX apr-util-1.3.12-bdb-5.2.patch 5199 SHA256 81339f327727775bb88a4530a620b0fd1f94d3fc4c0e65a810931acb638b7913 WHIRLPOOL 711479f0dfea31e75acdcd4571880d59283b2b5ccbbcfaee22d2bf628230a085dd6319844a53c53dc18e1ed851c2004b4e3d1faa4c9f2e7a4911d67196a30883 -DIST apr-util-1.3.11.tar.bz2 607486 SHA256 13b8446c5ff96ed32293db77689992db18addb1a76d0f6dae29f132dc96dab59 WHIRLPOOL 4eb01c528884ddc9ff33250a277ea3bb3719d9eed387738f9048a9e47b06a9fbdfa54db475565789d4725e31f044dbb3bf81c6fca3846f0119632bc735a4c217 -EBUILD apr-util-1.3.11.ebuild 2576 SHA256 495e33d58f0f0b33c73871f1121d183b40ad7d150562c3a48766a42d5ea0c98c WHIRLPOOL 61b5ea95b3f4c942ea991aeea648645cf1ae75431043a531b3187317d2fe16b0b7a54f0d8c5969de1a35f967c9dee64660ddc1f546b05ac2853d2dd1cd9a0f8b -MISC ChangeLog 565 SHA256 5f777ed262dce2d657fe57e5e21d67431c1a756f7c6c103c8ed7f8be89cb8b7a WHIRLPOOL 7ad58befeafa1d3c5605f7d0e3e82c87aafdebbc20d467360f0fabe393af3b424455a8e9692b9d34f5cb35587c2e6004322ba0152729adc6ee3a9b4aff1734b1 -MISC metadata.xml 226 SHA256 001dd83398fedd830504aad0164630e45c5ed1badba3d50bda41b02321b688b7 WHIRLPOOL 4bbd8805d41cd3f27a0f9c51ed5ec6899324bb16775a1691edee90820a97906a4dcfa6c3fec51e9df4e6a8ffc38bad663a37a59332d68d5531cdd5e89f65d86d diff --git a/dev-libs/apr-util/apr-util-1.3.11.ebuild b/dev-libs/apr-util/apr-util-1.3.11.ebuild deleted file mode 100644 index 470c2e5f..00000000 --- a/dev-libs/apr-util/apr-util-1.3.11.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.11.ebuild,v 1.6 2011/05/14 20:50:36 armin76 Exp $ - -EAPI="3" - -# 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.4" - -inherit autotools db-use eutils libtool multilib - -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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3" -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* ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( dev-db/sqlite:0 ) - sqlite3? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - tc-export CC CPP - - eautoreconf - elibtoolize -} - -src_configure() { - local myconf - - 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):/usr/$(get_libdir)" - else - myconf+=" --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with freetds) \ - $(use_with gdbm) \ - $(use_with ldap) \ - $(use_with mysql) \ - $(use_with odbc) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} -} - -src_compile() { - emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - LIBTOOL="${ROOT}usr/bin/libtool" CC="${CC}" || die "emake failed" - - if use doc; then - emake dox || die "emake dox failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - find "${ED}" -name "*.la" -print0 | xargs -0 rm -f - find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -print0 | xargs -0 rm -f - - dodoc CHANGES NOTICE README - - if use doc; then - dohtml -r docs/dox/html/* || die "dohtml failed" - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - rm -f "${D}usr/$(get_libdir)/aprutil.exp" -} diff --git a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch b/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch deleted file mode 100644 index 5687a8e7..00000000 --- a/dev-libs/apr-util/files/apr-util-1.3.12-bdb-5.2.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- build/dbm.m4 -+++ build/dbm.m4 -@@ -579,6 +579,25 @@ - apu_db_version=5 - fi - ]) -+dnl -+dnl APU_CHECK_DB52: is DB5.2 present? -+dnl -+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version -+dnl -+AC_DEFUN([APU_CHECK_DB52], [ -+ places=$1 -+ if test -z "$places"; then -+ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config" -+ fi -+ APU_CHECK_BERKELEY_DB("5", "2", "-1", -+ "$places", -+ "db52/db.h db5/db.h db.h", -+ "db-5.2 db5-5.2 db52 db5 db" -+ ) -+ if test "$apu_have_db" = "1"; then -+ apu_db_version=5 -+ fi -+]) - - AC_DEFUN([APU_CHECK_DB], [ - requested=$1 -@@ -681,6 +700,12 @@ - AC_MSG_ERROR(Berkeley db5 not found) - fi - ;; -+ db52) -+ APU_CHECK_DB52("$check_places") -+ if test "$apu_db_version" != "5"; then -+ AC_MSG_ERROR(Berkeley db5 not found) -+ fi -+ ;; - default) - APU_CHECK_DB_ALL("$check_places") - ;; -@@ -688,40 +713,43 @@ - ]) - - dnl --dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. -+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1. - dnl - AC_DEFUN([APU_CHECK_DB_ALL], [ - all_places=$1 - -- APU_CHECK_DB51("$all_places") -+ APU_CHECK_DB52("$all_places") - if test "$apu_db_version" != "5"; then -- APU_CHECK_DB50("$all_places") -+ APU_CHECK_DB51("$all_places") - if test "$apu_db_version" != "5"; then -- APU_CHECK_DB48("$all_places") -- if test "$apu_db_version" != "4"; then -- APU_CHECK_DB47("$all_places") -+ APU_CHECK_DB50("$all_places") -+ if test "$apu_db_version" != "5"; then -+ APU_CHECK_DB48("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB46("$all_places") -+ APU_CHECK_DB47("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB45("$all_places") -+ APU_CHECK_DB46("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB44("$all_places") -+ APU_CHECK_DB45("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB43("$all_places") -+ APU_CHECK_DB44("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB42("$all_places") -+ APU_CHECK_DB43("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB41("$all_places") -+ APU_CHECK_DB42("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB4("$all_places") -+ APU_CHECK_DB41("$all_places") - if test "$apu_db_version" != "4"; then -- APU_CHECK_DB3("$all_places") -- if test "$apu_db_version" != "3"; then -- APU_CHECK_DB2("$all_places") -- if test "$apu_db_version" != "2"; then -- APU_CHECK_DB1("$all_places") -- if test "$apu_db_version" != "1"; then -- APU_CHECK_DB185("$all_places") -+ APU_CHECK_DB4("$all_places") -+ if test "$apu_db_version" != "4"; then -+ APU_CHECK_DB3("$all_places") -+ if test "$apu_db_version" != "3"; then -+ APU_CHECK_DB2("$all_places") -+ if test "$apu_db_version" != "2"; then -+ APU_CHECK_DB1("$all_places") -+ if test "$apu_db_version" != "1"; then -+ APU_CHECK_DB185("$all_places") -+ fi - fi - fi - fi -@@ -763,11 +791,11 @@ - apu_db_version=0 - - AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. -- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], -+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])], - [ - if test "$withval" = "yes"; then - AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. -- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) -+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) - fi - requested="$withval" - ], [ -@@ -978,6 +1006,10 @@ - apu_use_db=1 - apu_default_dbm=db5 - ;; -+ db52) -+ apu_use_db=1 -+ apu_default_dbm=db5 -+ ;; - default) - dnl ### use more sophisticated DBMs for the default? - apu_default_dbm="sdbm (default)" -@@ -985,7 +1017,7 @@ - ;; - *) - AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. -- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) -+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) - ;; - esac - diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml deleted file mode 100644 index 7d16b620..00000000 --- a/dev-libs/apr-util/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - maintainer-needed@gentoo.org - - -- cgit v1.2.3