vapier      14/11/05 16:16:06

  Modified:             redland-1.0.17.ebuild redland-1.0.16.ebuild
                        redland-1.0.15.ebuild ChangeLog
  Added:                redland-1.0.17-r1.ebuild
  Log:
  Depend on libltdl rather than libtool #528294 by Pacho Ramos.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.3                  dev-libs/redland/redland-1.0.17.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild?r1=1.2&r2=1.3

Index: redland-1.0.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redland-1.0.17.ebuild       3 Nov 2014 11:47:39 -0000       1.2
+++ redland-1.0.17.ebuild       5 Nov 2014 16:16:06 -0000       1.3
@@ -1,6 +1,6 @@
 # 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.17.ebuild,v 
1.2 2014/11/03 11:47:39 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild,v 
1.3 2014/11/05 16:16:06 vapier Exp $
 
 EAPI=5
 inherit db-use libtool
@@ -14,8 +14,7 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
-# NOTE: libtool is required for libltdl at runtime
-RDEPEND=">=sys-devel/libtool-2.2.6b
+RDEPEND="dev-libs/libltdl
        mysql? ( virtual/mysql )
        sqlite? ( =dev-db/sqlite-3* )
        berkdb? ( sys-libs/db )



1.16                 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.16&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild?rev=1.16&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild?r1=1.15&r2=1.16

Index: redland-1.0.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- redland-1.0.16.ebuild       3 Nov 2014 11:47:39 -0000       1.15
+++ redland-1.0.16.ebuild       5 Nov 2014 16:16:06 -0000       1.16
@@ -1,6 +1,6 @@
 # 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.15 2014/11/03 11:47:39 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v 
1.16 2014/11/05 16:16:06 vapier Exp $
 
 EAPI=4
 inherit db-use libtool
@@ -14,8 +14,7 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd 
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs +xml"
 
-# NOTE: libtool is required for libltdl at runtime
-RDEPEND=">=sys-devel/libtool-2.2.6b
+RDEPEND="dev-libs/libltdl
        mysql? ( virtual/mysql )
        sqlite? ( =dev-db/sqlite-3* )
        berkdb? ( sys-libs/db )



1.15                 dev-libs/redland/redland-1.0.15.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild?rev=1.15&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild?rev=1.15&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild?r1=1.14&r2=1.15

Index: redland-1.0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- redland-1.0.15.ebuild       3 Nov 2014 11:47:39 -0000       1.14
+++ redland-1.0.15.ebuild       5 Nov 2014 16:16:06 -0000       1.15
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 
1.14 2014/11/03 11:47:39 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild,v 
1.15 2014/11/05 16:16:06 vapier Exp $
 
 EAPI=4
 inherit libtool
@@ -14,8 +14,7 @@
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
 
-# NOTE: libtool is required for libltdl at runtime
-RDEPEND=">=sys-devel/libtool-2.2.6b
+RDEPEND="dev-libs/libltdl
        mysql? ( virtual/mysql )
        sqlite? ( =dev-db/sqlite-3* )
        berkdb? ( sys-libs/db )



1.125                dev-libs/redland/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?rev=1.125&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?rev=1.125&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/ChangeLog?r1=1.124&r2=1.125

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog   3 Nov 2014 11:47:39 -0000       1.124
+++ ChangeLog   5 Nov 2014 16:16:06 -0000       1.125
@@ -1,6 +1,12 @@
 # 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.124 
2014/11/03 11:47:39 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/ChangeLog,v 1.125 
2014/11/05 16:16:06 vapier Exp $
+
+*redland-1.0.17-r1 (05 Nov 2014)
+
+  05 Nov 2014; Mike Frysinger <[email protected]> +redland-1.0.17-r1.ebuild,
+  redland-1.0.15.ebuild, redland-1.0.16.ebuild, redland-1.0.17.ebuild:
+  Depend on libltdl rather than libtool #528294 by Pacho Ramos.
 
   03 Nov 2014; Aaron W. Swenson <[email protected]> redland-1.0.15.ebuild,
   redland-1.0.16.ebuild, redland-1.0.17.ebuild:



1.1                  dev-libs/redland/redland-1.0.17-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.17-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/redland/redland-1.0.17-r1.ebuild?rev=1.1&content-type=text/plain

Index: redland-1.0.17-r1.ebuild
===================================================================
# 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.17-r1.ebuild,v 
1.1 2014/11/05 16:16:06 vapier Exp $

EAPI=5
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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"

RDEPEND="dev-libs/libltdl
        mysql? ( virtual/mysql )
        sqlite? ( =dev-db/sqlite-3* )
        berkdb? ( sys-libs/db )
        >=media-libs/raptor-2.0.14
        >=dev-libs/rasqal-0.9.32
        postgres? ( virtual/postgresql )
        iodbc? ( dev-db/libiodbc )
        odbc? ( dev-db/unixODBC )"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and 
src_install()

src_prepare() {
        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="${EPREFIX}"/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) \
                $(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 \
                "${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() {
        default
        dohtml {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

        # http://bugs.gentoo.org/467768
        local _rdocdir=/usr/share/doc/${PF}/html/${PN}
        [[ -d ${ED}/${_rdocdir} ]] && dosym ${_rdocdir} 
/usr/share/gtk-doc/html/${PN}
}




Reply via email to