gentoo auto-resync : 29:07:2022 - 21:08:17

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 58d37c1f570a..963e74049a59 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,6 @@
+AUX redland-1.0.17-ldflags-pc-leak.patch 716 BLAKE2B 1f8b458270dba77a0ef87355dcaea697ed1c34ce2a23ec7306c5e9d5fe88163570c607bb22710e3ead38999acf629c4f0958db74077e1c3c3f4717477d73b798 SHA512 7aad38f953e4d8744f4804038f972a9520f61c28e57f8b92e5c44f554f8017eae22a2d5b07b65caf0908407ccfeab5835190376a3c9ef125517fd6f9e75805f6
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
 EBUILD redland-1.0.17-r2.ebuild 2538 BLAKE2B b319b82ab865d47ca3217177ec3ec82d86d8d4f98f36b495ca607015f3ba4aadcefc8502a50b490f472cf420c096683fc9ad353ad846845c811ab632c0d135f7 SHA512 9391a54cbee61d1ee54f2a04f2dc1604e0b837d247c9b629b71ac35f4225156cec9bed62236c1cdf407fb0ac1951a7fc534ab167c231f780b676cbfb439e16aa
+EBUILD redland-1.0.17-r3.ebuild 2066 BLAKE2B 832df593c604319eed0c0ce975bb4c86f5bb3a017a2f4e801295c6c73b11d73376a101e526d8b07519ded684767024798ea1dedc25c9c563a87d50f4fe5640ce SHA512 0b8024ec807bf0e91e671735f8f92178c56c84b8ab221b096ca75d52af52754179f263a94fe2bf54092fb561ccb9984bc10dea2a63cb2947e9f3f3afa6aa1daa
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
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/redland-1.0.17-r3.ebuild b/dev-libs/redland/redland-1.0.17-r3.ebuild
new file mode 100644
index 000000000000..ad254761c6cd
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.17-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb iodbc mysql odbc postgres sqlite"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	mysql? ( dev-db/mysql-connector-c:0= )
+	sqlite? ( =dev-db/sqlite-3* )
+	berkdb? ( sys-libs/db:* )
+	>=media-libs/raptor-2.0.14
+	>=dev-libs/rasqal-0.9.32
+	postgres? ( dev-db/postgresql:* )
+	iodbc? ( dev-db/libiodbc )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mysql-8-my_bool.patch
+	# bug 468298
+	"${FILESDIR}"/${P}-ldflags-pc-leak.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize # NOTE: this is for fbsd .so version
+}
+
+src_configure() {
+	local myconf=( --without-virtuoso )
+	if use iodbc; then
+		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
+	elif use odbc; then
+		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
+	fi
+
+	if use berkdb; then
+		myconf+=(
+			--with-bdb-include="$(db_includedir)"
+			--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_with berkdb bdb) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		$(use_with postgres postgresql) \
+		--without-threads \
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html/ \
+		"${myconf[@]}"
+}
+
+src_test() {
+	if ! use berkdb; then
+		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
+		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
+
+	find "${ED}" -name '*.la' -delete || die
+}