diff options
Diffstat (limited to 'dev-libs/redland')
| -rw-r--r-- | dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch | 24 | ||||
| -rw-r--r-- | dev-libs/redland/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-libs/redland/redland-1.0.17-r3.ebuild (renamed from dev-libs/redland/redland-1.0.17-r2.ebuild) | 54 |
3 files changed, 49 insertions, 31 deletions
diff --git a/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch b/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch new file mode 100644 index 000000000000..6fbb121c29a7 --- /dev/null +++ b/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch @@ -0,0 +1,24 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu May 2 14:25:04 UTC 2013 +Subject: ldflags have no place in pkgconfig files + +--- a/redland.pc.in ++++ b/redland.pc.in +@@ -14,5 +14,5 @@ + Requires.private: raptor2 >= @RAPTOR_MIN_VERSION@, rasqal >= @RASQAL_MIN_VERSION@, rasqal <= @RASQAL_MAX_VERSION@ + Version: @VERSION@ + Libs: -L${libdir} -lrdf +-Libs.private: @LIBRDF_LDFLAGS@ @LIBRDF_PKGCONFIG_PRIVATE_LIBS@ ++Libs.private: @LIBRDF_PKGCONFIG_PRIVATE_LIBS@ + Cflags: -I${includedir} +--- a/configure.ac ++++ b/configure.ac +@@ -366,7 +366,7 @@ + AC_MSG_RESULT($bdb_include_dir) + + if test "$bdb_prefix" != no; then +- nLDFLAGS=$LDFLAGS ++ nLDFLAGS= + nCPPFLAGS= + + if test "$bdb_lib_dir" != /usr/lib; then diff --git a/dev-libs/redland/metadata.xml b/dev-libs/redland/metadata.xml index c870d0eef0ab..b69a849fd57e 100644 --- a/dev-libs/redland/metadata.xml +++ b/dev-libs/redland/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sound@gentoo.org</email> diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r3.ebuild index aa29fc1a6f4c..cb23383246a5 100644 --- a/dev-libs/redland/redland-1.0.17-r2.ebuild +++ b/dev-libs/redland/redland-1.0.17-r3.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit db-use libtool DESCRIPTION="High-level interface for the Resource Description Framework" -HOMEPAGE="http://librdf.org/" -SRC_URI="http://download.librdf.org/source/${P}.tar.gz" +HOMEPAGE="https://librdf.org/" +SRC_URI="https://download.librdf.org/source/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="berkdb iodbc mysql odbc postgres sqlite" -RDEPEND="dev-libs/libltdl:0 +RDEPEND=" + dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) - berkdb? ( sys-libs/db ) + berkdb? ( sys-libs/db:* ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 - postgres? ( dev-db/postgresql ) + postgres? ( dev-db/postgresql:* ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.17-mysql-8-my_bool.patch ) +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install() +PATCHES=( + "${FILESDIR}"/${P}-mysql-8-my_bool.patch + # bug 468298 + "${FILESDIR}"/${P}-ldflags-pc-leak.patch +) src_prepare() { default @@ -45,20 +49,20 @@ src_configure() { if use berkdb; then myconf+=( --with-bdb-include="$(db_includedir)" - --with-bdb-lib="${EPREFIX}"/usr/$(get_libdir) + --with-bdb-lib="${ESYSROOT}"/usr/$(get_libdir) --with-bdb-dbname="$(db_libname)" ) fi # FIXME: upstream doesn't test with --with-threads and testsuite fails econf \ - $(use_enable static-libs static) \ + --cache-file="${S}"/config.cache \ $(use_with berkdb bdb) \ $(use_with mysql) \ $(use_with sqlite) \ $(use_with postgres postgresql) \ --without-threads \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ + --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html/ \ "${myconf[@]}" } @@ -68,23 +72,13 @@ src_test() { export REDLAND_TEST_CLONING_STORAGE_NAME=test export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'" fi + default } src_install() { + HTML_DOCS=( {FAQS,NEWS,README,RELEASE,TODO}.html ) default - docinto html - dodoc {FAQS,NEWS,README,RELEASE,TODO}.html - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - # !!! REMOVE THIS ON VERSION BUMP, see bug 468298 for proper fix !!! - if [[ -n ${LDFLAGS} ]]; then - sed -i \ - -e "s:${LDFLAGS} ::g" \ - "${ED}"/usr/$(get_libdir)/pkgconfig/${PN}.pc || die - fi - # https://bugs.gentoo.org/467768 - local _rdocdir=/usr/share/doc/${PF}/html/${PN} - [[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} /usr/share/gtk-doc/html/${PN} + find "${ED}" -name '*.la' -delete || die } |