diff options
-rw-r--r-- | media-libs/raptor/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/raptor/files/raptor-2.0.3-curl-headers.patch | 12 | ||||
-rw-r--r-- | media-libs/raptor/raptor-1.4.21-r1.ebuild | 67 | ||||
-rw-r--r-- | media-libs/raptor/raptor-2.0.6.ebuild | 69 |
4 files changed, 5 insertions, 149 deletions
diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog index bf72942a696d..09a78b0cdea0 100644 --- a/media-libs/raptor/ChangeLog +++ b/media-libs/raptor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/raptor # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.127 2012/04/06 18:59:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.128 2012/04/06 19:01:06 ssuominen Exp $ + + 06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -raptor-1.4.21-r1.ebuild, + -files/raptor-2.0.3-curl-headers.patch, -raptor-2.0.6.ebuild: + old 06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> raptor-2.0.7.ebuild: ppc/ppc64 stable wrt #409417 diff --git a/media-libs/raptor/files/raptor-2.0.3-curl-headers.patch b/media-libs/raptor/files/raptor-2.0.3-curl-headers.patch deleted file mode 100644 index 23ea4fe9f91d..000000000000 --- a/media-libs/raptor/files/raptor-2.0.3-curl-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/raptor_internal.h b/src/raptor_internal.h -index 772cbc8..83c69e6 100644 ---- a/src/raptor_internal.h -+++ b/src/raptor_internal.h -@@ -920,7 +920,6 @@ int raptor_unicode_check_utf8_nfc_string(const unsigned char *input, size_t leng - - #ifdef RAPTOR_WWW_LIBCURL - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #endif - diff --git a/media-libs/raptor/raptor-1.4.21-r1.ebuild b/media-libs/raptor/raptor-1.4.21-r1.ebuild deleted file mode 100644 index f4d0a0377cba..000000000000 --- a/media-libs/raptor/raptor-1.4.21-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-1.4.21-r1.ebuild,v 1.15 2011/11/16 18:32:49 ssuominen Exp $ - -EAPI=4 -inherit eutils libtool - -DESCRIPTION="The RDF Parser Toolkit" -HOMEPAGE="http://librdf.org/raptor" -SRC_URI="http://download.librdf.org/source/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+curl debug static-libs unicode +xml" - -RDEPEND="unicode? ( dev-libs/glib:2 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - !xml? ( dev-libs/expat ) - curl? ( net-misc/curl ) - dev-libs/libxslt" -DEPEND="${RDEPEND} - sys-devel/flex - dev-util/pkgconfig" - -src_prepare() { - sed -i -e '/CPPFLAGS/s:-g::' configure || die #376903 - epatch "${FILESDIR}"/${PN}-2.0.3-curl-headers.patch - epunt_cxx - elibtoolize -} - -src_configure() { - local myconf - - if use xml; then - myconf+=" --with-xml-parser=libxml" - else - myconf+=" --with-xml-parser=expat" - fi - - if use curl; then - myconf+=" --with-www=curl" - elif use xml; then - myconf+=" --with-www=xml" - else - myconf+=" --with-www=none" - fi - - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(use_enable unicode nfc-check) \ - $(use_enable debug) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - find "${ED}" -name '*.la' -exec rm -f {} + - - # Reduce installation of obsolete raptor1 to only mandatory files - rm -rf \ - "${ED}"usr/bin/rapper \ - "${ED}"usr/share -} diff --git a/media-libs/raptor/raptor-2.0.6.ebuild b/media-libs/raptor/raptor-2.0.6.ebuild deleted file mode 100644 index 9e8e58928a1e..000000000000 --- a/media-libs/raptor/raptor-2.0.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.6.ebuild,v 1.5 2012/03/05 21:10:08 maekke Exp $ - -EAPI=4 -inherit eutils libtool - -MY_P=${PN}2-${PV} - -DESCRIPTION="The RDF Parser Toolkit" -HOMEPAGE="http://librdf.org/raptor/" -SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2 LGPL-2.1" -SLOT="2" -KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+curl debug json static-libs unicode +xml" - -RDEPEND="unicode? ( dev-libs/glib:2 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - !xml? ( dev-libs/expat ) - curl? ( net-misc/curl ) - json? ( dev-libs/yajl ) - dev-libs/libxslt - !<media-libs/raptor-1.4.21-r1" -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/flex" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ChangeLog NEWS NOTICE README ) - -src_prepare() { - epunt_cxx - elibtoolize -} - -src_configure() { - local myconf - - if use xml; then - myconf+=" --with-xml-parser=libxml" - else - myconf+=" --with-xml-parser=expat" - fi - - if use curl; then - myconf+=" --with-www=curl" - elif use xml; then - myconf+=" --with-www=xml" - else - myconf+=" --with-www=none" - fi - - econf \ - $(use_enable static-libs static) \ - $(use_enable unicode nfc-check) \ - $(use_enable debug) \ - $(use_with json yajl) \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - ${myconf} -} - -src_install() { - default - dohtml {NEWS,README,RELEASE,UPGRADING}.html - find "${ED}" -name '*.la' -exec rm -f {} + -} |