From c61c7c178a090754414d16684b87b136b4d58d77 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sat, 15 Dec 2007 14:26:32 +0000 Subject: version bump; #200947 (Portage version: 2.1.4_rc8) --- dev-libs/apr-util/ChangeLog | 8 ++- dev-libs/apr-util/apr-util-1.2.12.ebuild | 81 ++++++++++++++++++++++++ dev-libs/apr-util/apr-util-1.2.8-r1.ebuild | 80 ----------------------- dev-libs/apr-util/apr-util-1.2.8.ebuild | 66 ------------------- dev-libs/apr-util/files/digest-apr-util-1.2.12 | 6 ++ dev-libs/apr-util/files/digest-apr-util-1.2.8 | 3 - dev-libs/apr-util/files/digest-apr-util-1.2.8-r1 | 9 --- 7 files changed, 94 insertions(+), 159 deletions(-) create mode 100644 dev-libs/apr-util/apr-util-1.2.12.ebuild delete mode 100644 dev-libs/apr-util/apr-util-1.2.8-r1.ebuild delete mode 100644 dev-libs/apr-util/apr-util-1.2.8.ebuild create mode 100644 dev-libs/apr-util/files/digest-apr-util-1.2.12 delete mode 100644 dev-libs/apr-util/files/digest-apr-util-1.2.8 delete mode 100644 dev-libs/apr-util/files/digest-apr-util-1.2.8-r1 (limited to 'dev-libs/apr-util') diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 7e0961fcbc66..0dfe4afaf9fd 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/apr-util # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.104 2007/11/16 20:40:31 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.105 2007/12/15 14:26:31 hollow Exp $ + +*apr-util-1.2.12 (15 Dec 2007) + + 15 Dec 2007; Benedikt Böhm -apr-util-1.2.8.ebuild, + -apr-util-1.2.8-r1.ebuild, +apr-util-1.2.12.ebuild: + version bump; #200947 16 Nov 2007; nixnut apr-util-1.2.10.ebuild: Stable on ppc wrt bug 198866 diff --git a/dev-libs/apr-util/apr-util-1.2.12.ebuild b/dev-libs/apr-util/apr-util-1.2.12.ebuild new file mode 100644 index 000000000000..35d10255b92e --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.2.12.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2007 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.2.12.ebuild,v 1.1 2007/12/15 14:26:31 hollow Exp $ + +inherit autotools eutils flag-o-matic libtool db-use + +DESCRIPTION="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.gz + mirror://apache/apr/apr-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3" +RESTRICT="test" + +DEPEND="dev-libs/expat + >=dev-libs/apr-${PV} + berkdb? ( =sys-libs/db-4* ) + doc? ( app-doc/doxygen ) + gdbm? ( sys-libs/gdbm ) + ldap? ( =net-nds/openldap-2* ) + mysql? ( =virtual/mysql-5* ) + postgres? ( dev-db/libpq ) + sqlite? ( =dev-db/sqlite-2* ) + sqlite3? ( =dev-db/sqlite-3* )" + +src_unpack() { + unpack ${A} + cd "${S}" + + ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" + elibtoolize || die "elibtoolize failed" +} + +src_compile() { + local myconf="" + + use ldap && myconf="${myconf} --with-ldap" + + if use berkdb; then + dbver="$(db_findver sys-libs/db)" || die "Unable to find db version" + dbver="$(db_ver_to_slot "$dbver")" + dbver="${dbver/\./}" + myconf="${myconf} --with-dbm=db${dbver} + --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" + else + myconf="${myconf} --without-berkeley-db" + fi + + econf --datadir=/usr/share/apr-util-1 \ + --with-apr=/usr \ + --with-expat=/usr \ + $(use_with gdbm) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with sqlite sqlite2) \ + $(use_with sqlite3) \ + ${myconf} + + emake || die "emake failed!" + + if use doc; then + emake dox || die "emake dox failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc CHANGES NOTICE + + if use doc; then + dohtml 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 kill it + rm "${D}"/usr/$(get_libdir)/aprutil.exp +} diff --git a/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild b/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild deleted file mode 100644 index 6763479748d9..000000000000 --- a/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2007 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.2.8-r1.ebuild,v 1.3 2007/07/31 10:35:02 phreak Exp $ - -inherit autotools eutils flag-o-matic libtool db-use - -DBD_MYSQL=84 - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz - mirror://apache/apr/apr-${PV}.tar.gz - mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="berkdb gdbm ldap mysql postgres sqlite sqlite3" -RESTRICT="test" - -DEPEND="dev-libs/expat - >=dev-libs/apr-${PV} - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* ) - mysql? ( =virtual/mysql-5* ) - postgres? ( dev-db/libpq ) - sqlite? ( =dev-db/sqlite-2* ) - sqlite3? ( =dev-db/sqlite-3* )" - -src_unpack() { - unpack ${A} - cd "${S}" - - if use mysql ; then - cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \ - "${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver" - fi - - ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - - use ldap && myconf="${myconf} --with-ldap" - - if use berkdb; then - dbver="$(db_findver sys-libs/db)" || die "Unable to find db version" - dbver="$(db_ver_to_slot "$dbver")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} || die "econf failed!" - - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/apr-util-1.2.8.ebuild b/dev-libs/apr-util/apr-util-1.2.8.ebuild deleted file mode 100644 index abf30f4ded86..000000000000 --- a/dev-libs/apr-util/apr-util-1.2.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2007 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.2.8.ebuild,v 1.11 2007/06/27 19:59:06 pylon Exp $ - -inherit eutils flag-o-matic libtool db-use - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="berkdb gdbm ldap postgres sqlite sqlite3" -RESTRICT="test" - -DEPEND="dev-libs/expat - ~dev-libs/apr-${PV} - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* ) - postgres? ( dev-db/libpq ) - sqlite? ( =dev-db/sqlite-2* ) - sqlite3? ( =dev-db/sqlite-3* )" - -# NOTE: This package in theory can support mysql, -# but in reality the build system is broken for it.... - -src_compile() { - local myconf="" - - elibtoolize || die "elibtoolize failed" - - use ldap && myconf="${myconf} --with-ldap" - - if use berkdb; then - dbver="$(db_findver sys-libs/db)" || die "Unable to find db version" - dbver="$(db_ver_to_slot "$dbver")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} || die "econf failed!" - - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.12 b/dev-libs/apr-util/files/digest-apr-util-1.2.12 new file mode 100644 index 000000000000..fb67cd4539f2 --- /dev/null +++ b/dev-libs/apr-util/files/digest-apr-util-1.2.12 @@ -0,0 +1,6 @@ +MD5 020ea947446dca2d1210c099c7a4c837 apr-1.2.12.tar.gz 1127522 +RMD160 912c34e412b42e678288727b811ba35f03d07b6b apr-1.2.12.tar.gz 1127522 +SHA256 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead apr-1.2.12.tar.gz 1127522 +MD5 e292942e22edd21b68609086352212e4 apr-util-1.2.12.tar.gz 668292 +RMD160 438528fe4d207dc2290de80ccbd2973266853f8a apr-util-1.2.12.tar.gz 668292 +SHA256 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f apr-util-1.2.12.tar.gz 668292 diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.8 b/dev-libs/apr-util/files/digest-apr-util-1.2.8 deleted file mode 100644 index bf335ad4a8f2..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-1.2.8 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a2e2e54d65e9eae961f7171335cf2550 apr-util-1.2.8.tar.gz 646379 -RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 apr-util-1.2.8.tar.gz 646379 -SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6 apr-util-1.2.8.tar.gz 646379 diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.8-r1 b/dev-libs/apr-util/files/digest-apr-util-1.2.8-r1 deleted file mode 100644 index cf3d8328fa26..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-1.2.8-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 814f19528d9cfc79aef188dd752e04d8 apr-1.2.8.tar.gz 1107189 -RMD160 299e1ddb1f7c9b0169a410e120c30abea38557c5 apr-1.2.8.tar.gz 1107189 -SHA256 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7 apr-1.2.8.tar.gz 1107189 -MD5 a2e2e54d65e9eae961f7171335cf2550 apr-util-1.2.8.tar.gz 646379 -RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 apr-util-1.2.8.tar.gz 646379 -SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6 apr-util-1.2.8.tar.gz 646379 -MD5 a9914273d9f27b3c1fbf9bb50e10627f apr_dbd_mysql-r84.c 49110 -RMD160 9d665f2e964b09f58b182829563a203f59e16640 apr_dbd_mysql-r84.c 49110 -SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919 apr_dbd_mysql-r84.c 49110 -- cgit v1.2.3-65-gdbad