Fixing compilation against >db-4.4, as mentioned by Roy in #190682.

Package-Manager: portage-2.1.3.7

5 files changed, 89 insertions, 8 deletions

diff --git a/dev-libs/redland/ChangeLog b/dev-libs/redland/ChangeLog
index a56881f56533..08c8f7b41c5e 100644
--- a/dev-libs/redland/ChangeLog
+++ b/dev-libs/redland/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/redland
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.23 2007/09/01 09:40:39 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.24 2007/09/01 10:01:36 phreak Exp $
+
+*redland-1.0.6-r1 (01 Sep 2007)
+
+  01 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +files/redland-1.0.6-db4.5.patch, +redland-1.0.6-r1.ebuild:
+  Fixing compilation against >db-4.4, as mentioned by Roy in #190682.
 
   01 Sep 2007; Christian Heim <phreak@gentoo.org>
   +files/redland-1.0.6-fbsd.patch, redland-1.0.6.ebuild:
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index afa2d4fe9059..bbbc4d27789a 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -9,6 +9,10 @@ AUX redland-1.0.4-CFLAGS.patch 1444 RMD160 ec8fe4f5bbc24933b974256df465df052b80e
 MD5 3d04595f30267f04e23987d8fdeaf3b5 files/redland-1.0.4-CFLAGS.patch 1444
 RMD160 ec8fe4f5bbc24933b974256df465df052b80e8ef files/redland-1.0.4-CFLAGS.patch 1444
 SHA256 e5c302a0a790da6b243239ee81412caba73a3aaca371d783e5e4f7dcca716f53 files/redland-1.0.4-CFLAGS.patch 1444
+AUX redland-1.0.6-db4.5.patch 472 RMD160 88cb3b83ee6ce4eb49716b1a0498904d724a83eb SHA1 fdbaa025b94a069711bcc917497823f84b66f4fd SHA256 fdc696e3f6badc228f9933f5fb0d5ba021b03e002f30d2db9fb377e0f29724cd
+MD5 630576cd9f3b7f0b4f58066bb0e7b721 files/redland-1.0.6-db4.5.patch 472
+RMD160 88cb3b83ee6ce4eb49716b1a0498904d724a83eb files/redland-1.0.6-db4.5.patch 472
+SHA256 fdc696e3f6badc228f9933f5fb0d5ba021b03e002f30d2db9fb377e0f29724cd files/redland-1.0.6-db4.5.patch 472
 AUX redland-1.0.6-fbsd.patch 322 RMD160 db4dee51669724ae11f75e231caa27547f296328 SHA1 5c5ea79a4c3470520e2a119d88a0c5989f760bc4 SHA256 7747650f866bbd8d1a8557084408327265c2ea3525737a971c0eac5ed2270ee8
 MD5 a151a98391e978f8cdae2462e2b3ead8 files/redland-1.0.6-fbsd.patch 322
 RMD160 db4dee51669724ae11f75e231caa27547f296328 files/redland-1.0.6-fbsd.patch 322
@@ -24,14 +28,18 @@ EBUILD redland-1.0.5.ebuild 1113 RMD160 ce607f5b80692b71e8b6576247c39b17e8bbbdf8
 MD5 96a442005e0d9770f1590727fcacd939 redland-1.0.5.ebuild 1113
 RMD160 ce607f5b80692b71e8b6576247c39b17e8bbbdf8 redland-1.0.5.ebuild 1113
 SHA256 c1cbba4d73e8226975df61e799f774f97b5019cc48f8e6a8ae16226ded9596fe redland-1.0.5.ebuild 1113
+EBUILD redland-1.0.6-r1.ebuild 1274 RMD160 71d8e7f58c524399863ef844e6523a7cddf4399d SHA1 58b1362a8dac266154aa755f8b4af5cadb3039db SHA256 f4ce31e3a40488c22a0f4540f9b40d8db7cd42ff95a41777aa1085e5ac3e5f5c
+MD5 1de3345dfb66013e9726bd5bdb9c6265 redland-1.0.6-r1.ebuild 1274
+RMD160 71d8e7f58c524399863ef844e6523a7cddf4399d redland-1.0.6-r1.ebuild 1274
+SHA256 f4ce31e3a40488c22a0f4540f9b40d8db7cd42ff95a41777aa1085e5ac3e5f5c redland-1.0.6-r1.ebuild 1274
 EBUILD redland-1.0.6.ebuild 1206 RMD160 6351df791a4629fb86c69d54164d9442891ff126 SHA1 031fe877ec3e83fc0906e7cc8ac4650212bccefa SHA256 b534ca078700175b64cdc89c68d689e899794ec7f3710a552807bec4085cb3e2
 MD5 8fe38050b444daa64b088058253027af redland-1.0.6.ebuild 1206
 RMD160 6351df791a4629fb86c69d54164d9442891ff126 redland-1.0.6.ebuild 1206
 SHA256 b534ca078700175b64cdc89c68d689e899794ec7f3710a552807bec4085cb3e2 redland-1.0.6.ebuild 1206
-MISC ChangeLog 3222 RMD160 d63f5c654e3a7ebeadcf29632f633cbb89af5428 SHA1 b10811df44b8c5676bf63fa112c446e2b9f7867c SHA256 a3be72a10943a5b9878636ff23fe8ba2a9fd8ae01a487b2d97de2a1e2f612371
-MD5 78f7666a0a57f4ee2cd82c19138029b0 ChangeLog 3222
-RMD160 d63f5c654e3a7ebeadcf29632f633cbb89af5428 ChangeLog 3222
-SHA256 a3be72a10943a5b9878636ff23fe8ba2a9fd8ae01a487b2d97de2a1e2f612371 ChangeLog 3222
+MISC ChangeLog 3438 RMD160 2786cbd570ce4e43cad450d11931053dc988ab47 SHA1 463b7ba3098131c57cbebf478876390556a1d589 SHA256 75c424ec783691975b3aa3a0a2e307ae7f7c5987862b9d8f11ab04141a2279d7
+MD5 b5d5b62a796710d11560d7bbaadd89f6 ChangeLog 3438
+RMD160 2786cbd570ce4e43cad450d11931053dc988ab47 ChangeLog 3438
+SHA256 75c424ec783691975b3aa3a0a2e307ae7f7c5987862b9d8f11ab04141a2279d7 ChangeLog 3438
 MISC metadata.xml 254 RMD160 9a58d756aa694a26f34b5edb16ddceec400dbe54 SHA1 e0893014c4486f687317deee49cb1de7af5c41b0 SHA256 a3b5e690060f3eb7bae993a98b414e33f0863b3106ee9993c9130759f1ec167c
 MD5 8a9821f2d4bcf6486cda49faa33c0286 metadata.xml 254
 RMD160 9a58d756aa694a26f34b5edb16ddceec400dbe54 metadata.xml 254
@@ -45,10 +53,13 @@ SHA256 8073c2276088eebd18263b5f6c21e38f67ce8c7e0c28916dad953fd9b1d9440d files/di
 MD5 56564254e2a5b2fa20bb0de790096cb1 files/digest-redland-1.0.6 244
 RMD160 79edef602056d4010c87ce96197567ab59182d42 files/digest-redland-1.0.6 244
 SHA256 cd2d721f25416642a83e21300a4ae5a4316f53490fd59d35f4de6e6064067345 files/digest-redland-1.0.6 244
+MD5 56564254e2a5b2fa20bb0de790096cb1 files/digest-redland-1.0.6-r1 244
+RMD160 79edef602056d4010c87ce96197567ab59182d42 files/digest-redland-1.0.6-r1 244
+SHA256 cd2d721f25416642a83e21300a4ae5a4316f53490fd59d35f4de6e6064067345 files/digest-redland-1.0.6-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG2TOiyuNVb5qfaOYRAoazAJ9LPLww8iq2ic1ONeMShS2lW1R5MACglrmD
-z14gX+9dhpwPEzrvgdoEvOI=
-=caIG
+iD8DBQFG2TiLyuNVb5qfaOYRAmyZAJ9KmL7e76HEBd+bv7eyy1myepdAFACgyMke
+cXO5l8sr6AilV1EncZ0rrLA=
+=LZhK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/redland/files/digest-redland-1.0.6-r1 b/dev-libs/redland/files/digest-redland-1.0.6-r1
new file mode 100644
index 000000000000..aa852a3d124e
--- /dev/null
+++ b/dev-libs/redland/files/digest-redland-1.0.6-r1
@@ -0,0 +1,3 @@
+MD5 901bf87252658c8b247dc6eda00f8724 redland-1.0.6.tar.gz 3558222
+RMD160 3f57b2646ec73f89fb93c22062ad7e8d2ad01665 redland-1.0.6.tar.gz 3558222
+SHA256 bcbf026735faf805b692820a2870d39f7fdf8425076bd689df6a10cf8d46159a redland-1.0.6.tar.gz 3558222
diff --git a/dev-libs/redland/files/redland-1.0.6-db4.5.patch b/dev-libs/redland/files/redland-1.0.6-db4.5.patch
new file mode 100644
index 000000000000..d6d148995a38
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.6-db4.5.patch
@@ -0,0 +1,11 @@
+--- redland-1.0.6/configure.ac
++++ redland-1.0.6/configure.ac
+@@ -237,7 +237,7 @@ if test "x$bdb_prefix" != "xno" ; then
+     fi
+ 
+     # Sigh!  And this still might not be good enough.
+-    for bdbc_version in 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do
++    for bdbc_version in 4.6 4.5 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do
+       bdbc_major=`echo $bdbc_version | sed -e 's/^\(.\).*$/\1/'`;
+       bdbc_version2=`echo $bdbc_version | sed -e 's/^\(.\).\(.\)$/\1\2/'`
+ 
diff --git a/dev-libs/redland/redland-1.0.6-r1.ebuild b/dev-libs/redland/redland-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..8e1581eaaae3
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.6-r1.ebuild,v 1.1 2007/09/01 10:01:36 phreak Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="High-level interface for the Resource Description Framework"
+HOMEPAGE="http://librdf.org/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="berkdb mysql sqlite ssl threads"
+
+DEPEND="mysql? ( virtual/mysql )
+	sqlite? ( =dev-db/sqlite-3* )
+	berkdb? ( sys-libs/db )
+	dev-libs/libxml2
+	ssl? ( dev-libs/openssl )
+	>=media-libs/raptor-1.4.4
+	>=dev-libs/rasqal-0.9.14"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -rf {raptor,rasqal}
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+	epatch "${FILESDIR}"/${P}-db4.5.patch
+	eautoconf
+}
+
+src_compile() {
+	econf \
+		--with-raptor=system \
+		--with-rasqal=system \
+		$(use_with berkdb bdb) \
+		$(use_with ssl openssl-digests) \
+		$(use_with mysql) \
+		$(use_with threads) \
+		$(use_with sqlite) \
+		|| die "econf failed!"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed!"
+	dodoc AUTHORS ChangeLog* INSTALL NEWS README TODO
+	dohtml *.html
+}