From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/
Date: Sat, 18 Mar 2023 16:29:10 +0000 (UTC) [thread overview]
Message-ID: <1679156946.2003ec0bfbd2d130e55f49362bd8b587883d8bee.graaff@gentoo> (raw)
commit: 2003ec0bfbd2d130e55f49362bd8b587883d8bee
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:28:47 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:29:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2003ec0b
dev-libs/apr-util: drop 1.6.1-r10
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-libs/apr-util/Manifest | 1 -
dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 148 ----------------------------
2 files changed, 149 deletions(-)
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 5f545419d548..55721b0e12da 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,2 +1 @@
-DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
deleted file mode 100644
index ff0412e3d5fc..000000000000
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.7.0-r6"
-
-inherit autotools db-use libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/apr-${APR_PV}:1=
- dev-libs/expat
- virtual/libcrypt:=
- berkdb? ( >=sys-libs/db-4:= )
- gdbm? ( sys-libs/gdbm:= )
- ldap? ( net-nds/openldap:= )
- mysql? ( || (
- dev-db/mariadb-connector-c
- >=dev-db/mysql-connector-c-8
- ) )
- nss? ( dev-libs/nss )
- odbc? ( dev-db/unixODBC )
- openssl? (
- dev-libs/openssl:0=
- )
- 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
- "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
- "${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
- "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
- "${FILESDIR}"/${PN}-1.6.1-my_bool.patch
- "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
-)
-
-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="${ESYSROOT}"/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="$(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_test() {
- # Building tests in parallel is broken
- emake -j1 check
-}
-
-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
-}
next reply other threads:[~2023-03-18 16:29 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-18 16:29 Hans de Graaff [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 5:11 [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/ Eli Schwartz
2023-03-13 19:16 Arthur Zamarin
2023-02-16 5:22 Sam James
2023-02-14 23:05 Sam James
2023-02-14 21:43 Sam James
2023-02-14 21:43 Sam James
2023-02-14 21:43 Sam James
2023-02-14 7:05 Sam James
2023-02-14 6:37 Sam James
2023-01-26 5:20 Sam James
2022-12-18 14:00 James Le Cuirot
2022-12-17 19:33 Arthur Zamarin
2022-12-17 19:33 Arthur Zamarin
2022-12-14 11:45 Sam James
2022-12-11 0:26 Sam James
2022-11-26 17:12 Arthur Zamarin
2022-11-25 14:34 Arthur Zamarin
2022-11-18 7:07 Jakov Smolić
2022-11-16 7:05 Arthur Zamarin
2022-10-31 1:26 WANG Xuerui
2022-10-20 19:00 Jakov Smolić
2022-10-16 21:47 Sam James
2022-10-14 6:56 Agostino Sarubbo
2022-10-14 6:56 Agostino Sarubbo
2022-10-14 4:14 Arthur Zamarin
2022-10-13 23:01 Sam James
2022-10-13 23:01 Sam James
2022-10-13 22:37 Sam James
2022-07-28 13:31 Sam James
2022-07-03 9:51 Hans de Graaff
2022-05-14 0:47 Sam James
2022-03-23 0:45 Sam James
2021-07-28 11:28 Marek Szuba
2021-04-30 18:01 Mikle Kolyada
2020-01-01 11:50 Lars Wendler
2019-05-22 2:52 Aaron Bauman
2019-04-08 6:50 Sergei Trofimovich
2018-10-02 10:58 Tobias Klausmann
2018-09-24 18:17 Markus Meier
2018-09-19 17:35 Thomas Deutschmann
2018-09-16 19:52 Matt Turner
2018-09-16 19:52 Matt Turner
2018-09-15 12:10 Sergei Trofimovich
2018-09-14 18:48 Sergei Trofimovich
2018-09-14 9:20 Agostino Sarubbo
2018-09-13 13:47 Lars Wendler
2018-09-13 13:47 Lars Wendler
2018-08-17 1:38 Mikle Kolyada
2018-04-02 11:42 Pacho Ramos
2018-03-16 22:50 Lars Wendler
2018-01-04 10:31 Lars Wendler
2018-01-04 10:31 Lars Wendler
2017-10-23 8:55 Lars Wendler
2017-10-23 8:55 Lars Wendler
2017-06-18 8:59 Lars Wendler
2017-06-17 21:36 Lars Wendler
2017-06-01 7:42 Lars Wendler
2017-05-31 12:56 Lars Wendler
2017-05-31 6:56 Lars Wendler
2017-05-31 6:56 Lars Wendler
2017-03-22 11:10 Lars Wendler
2017-03-21 15:46 Michael Haubenwallner
2015-10-02 16:16 Julian Ospald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1679156946.2003ec0bfbd2d130e55f49362bd8b587883d8bee.graaff@gentoo \
--to=graaff@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox