Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/redland/, dev-libs/redland/files/
Date: Fri, 29 Jul 2022 18:00:59
Message-Id: 1659117646.50ff91c46c7b545e958440f95d8dc307e4c1ca55.soap@gentoo
1 commit: 50ff91c46c7b545e958440f95d8dc307e4c1ca55
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 29 18:00:46 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 29 18:00:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ff91c4
7
8 dev-libs/redland: update EAPI 7 -> 8
9
10 Bug: https://bugs.gentoo.org/382691
11 Bug: https://bugs.gentoo.org/843074
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../files/redland-1.0.17-ldflags-pc-leak.patch | 24 +++++++
15 dev-libs/redland/redland-1.0.17-r3.ebuild | 83 ++++++++++++++++++++++
16 2 files changed, 107 insertions(+)
17
18 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
19 new file mode 100644
20 index 000000000000..6fbb121c29a7
21 --- /dev/null
22 +++ b/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch
23 @@ -0,0 +1,24 @@
24 +From: Julian Ospald <hasufell@g.o>
25 +Date: Thu May 2 14:25:04 UTC 2013
26 +Subject: ldflags have no place in pkgconfig files
27 +
28 +--- a/redland.pc.in
29 ++++ b/redland.pc.in
30 +@@ -14,5 +14,5 @@
31 + Requires.private: raptor2 >= @RAPTOR_MIN_VERSION@, rasqal >= @RASQAL_MIN_VERSION@, rasqal <= @RASQAL_MAX_VERSION@
32 + Version: @VERSION@
33 + Libs: -L${libdir} -lrdf
34 +-Libs.private: @LIBRDF_LDFLAGS@ @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
35 ++Libs.private: @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
36 + Cflags: -I${includedir}
37 +--- a/configure.ac
38 ++++ b/configure.ac
39 +@@ -366,7 +366,7 @@
40 + AC_MSG_RESULT($bdb_include_dir)
41 +
42 + if test "$bdb_prefix" != no; then
43 +- nLDFLAGS=$LDFLAGS
44 ++ nLDFLAGS=
45 + nCPPFLAGS=
46 +
47 + if test "$bdb_lib_dir" != /usr/lib; then
48
49 diff --git a/dev-libs/redland/redland-1.0.17-r3.ebuild b/dev-libs/redland/redland-1.0.17-r3.ebuild
50 new file mode 100644
51 index 000000000000..ad254761c6cd
52 --- /dev/null
53 +++ b/dev-libs/redland/redland-1.0.17-r3.ebuild
54 @@ -0,0 +1,83 @@
55 +# Copyright 1999-2022 Gentoo Authors
56 +# Distributed under the terms of the GNU General Public License v2
57 +
58 +EAPI=8
59 +
60 +inherit db-use libtool
61 +
62 +DESCRIPTION="High-level interface for the Resource Description Framework"
63 +HOMEPAGE="http://librdf.org/"
64 +SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
65 +
66 +LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
67 +SLOT="0"
68 +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
69 +IUSE="berkdb iodbc mysql odbc postgres sqlite"
70 +
71 +RDEPEND="
72 + dev-libs/libltdl:0
73 + mysql? ( dev-db/mysql-connector-c:0= )
74 + sqlite? ( =dev-db/sqlite-3* )
75 + berkdb? ( sys-libs/db:* )
76 + >=media-libs/raptor-2.0.14
77 + >=dev-libs/rasqal-0.9.32
78 + postgres? ( dev-db/postgresql:* )
79 + iodbc? ( dev-db/libiodbc )
80 + odbc? ( dev-db/unixODBC )"
81 +DEPEND="${RDEPEND}"
82 +BDEPEND="virtual/pkgconfig"
83 +
84 +PATCHES=(
85 + "${FILESDIR}"/${P}-mysql-8-my_bool.patch
86 + # bug 468298
87 + "${FILESDIR}"/${P}-ldflags-pc-leak.patch
88 +)
89 +
90 +src_prepare() {
91 + default
92 + elibtoolize # NOTE: this is for fbsd .so version
93 +}
94 +
95 +src_configure() {
96 + local myconf=( --without-virtuoso )
97 + if use iodbc; then
98 + myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
99 + elif use odbc; then
100 + myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
101 + fi
102 +
103 + if use berkdb; then
104 + myconf+=(
105 + --with-bdb-include="$(db_includedir)"
106 + --with-bdb-lib="${ESYSROOT}"/usr/$(get_libdir)
107 + --with-bdb-dbname="$(db_libname)"
108 + )
109 + fi
110 +
111 + # FIXME: upstream doesn't test with --with-threads and testsuite fails
112 + econf \
113 + $(use_with berkdb bdb) \
114 + $(use_with mysql) \
115 + $(use_with sqlite) \
116 + $(use_with postgres postgresql) \
117 + --without-threads \
118 + --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html/ \
119 + "${myconf[@]}"
120 +}
121 +
122 +src_test() {
123 + if ! use berkdb; then
124 + export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
125 + export REDLAND_TEST_CLONING_STORAGE_NAME=test
126 + export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
127 + fi
128 +
129 + default
130 +}
131 +
132 +src_install() {
133 + HTML_DOCS=( {FAQS,NEWS,README,RELEASE,TODO}.html )
134 + default
135 +
136 + find "${ED}" -name '*.la' -delete || die
137 +}