mgorny 14/08/04 20:50:38 Modified: redland-1.0.16.ebuild ChangeLog Log: Utilize db-use.eclass to obtain proper include path & library for berkdb. Bugs #519002 and #476376. (Portage version: 2.2.11_p4/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.14 dev-libs/redland/redland-1.0.16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild?r1=1.13&r2=1.14 Index: redland-1.0.16.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- redland-1.0.16.ebuild 1 Aug 2014 05:16:41 -0000 1.13 +++ redland-1.0.16.ebuild 4 Aug 2014 20:50:38 -0000 1.14 @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v 1.13 2014/08/01 05:16:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v 1.14 2014/08/04 20:50:38 mgorny Exp $ EAPI=4 -inherit libtool +inherit db-use libtool DESCRIPTION="High-level interface for the Resource Description Framework" HOMEPAGE="http://librdf.org/"; @@ -37,11 +37,19 @@ local parser=expat use xml && parser=libxml - local myconf="--without-virtuoso" + local myconf=( --without-virtuoso ) if use iodbc; then - myconf="--with-virtuoso --with-iodbc --without-unixodbc" + myconf=( --with-virtuoso --with-iodbc --without-unixodbc ) elif use odbc; then - myconf="--with-virtuoso --with-unixodbc --without-iodbc" + myconf=( --with-virtuoso --with-unixodbc --without-iodbc ) + fi + + if use berkdb; then + myconf+=( + --with-bdb-include="$(db_includedir)" + --with-bdb-lib="${EPREFIX}"/usr/$(get_libdir) + --with-bdb-dbname="$(db_libname)" + ) fi # FIXME: upstream doesn't test with --with-threads and testsuite fails @@ -54,7 +62,7 @@ $(use_with postgres postgresql) \ --without-threads \ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - ${myconf} + "${myconf[@]}" } src_compile() { 1.122 dev-libs/redland/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?rev=1.122&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?rev=1.122&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?r1=1.121&r2=1.122 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- ChangeLog 1 Aug 2014 05:16:41 -0000 1.121 +++ ChangeLog 4 Aug 2014 20:50:38 -0000 1.122 @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/redland # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.121 2014/08/01 05:16:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.122 2014/08/04 20:50:38 mgorny Exp $ + + 04 Aug 2014; Michał Górny <[email protected]> redland-1.0.16.ebuild: + Utilize db-use.eclass to obtain proper include path & library for berkdb. Bugs + #519002 and #476376. 01 Aug 2014; Samuli Suominen <[email protected]> redland-1.0.16.ebuild: Punt unused USE="ssl" and dev-libs/openssl dependency wrt #518706 by
