old

(Portage version: 2.2.0_alpha78/cvs/Linux x86_64)

3 files changed, 5 insertions, 115 deletions

diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index 732612f9541e..bc02af139af7 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raptor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.115 2011/11/28 17:02:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.116 2011/11/28 17:02:50 ssuominen Exp $
+
+  28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -raptor-2.0.5.ebuild,
+  -files/raptor-2.0.5-expat.patch:
+  old
 
 *raptor-2.0.6 (28 Nov 2011)
 
diff --git a/media-libs/raptor/files/raptor-2.0.5-expat.patch b/media-libs/raptor/files/raptor-2.0.5-expat.patch
deleted file mode 100644
index adaef31b1652..000000000000
--- a/media-libs/raptor/files/raptor-2.0.5-expat.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-06:21 < GitHub196> [raptor] dajobe pushed 1 new commit to master: http://git.io/-dmhKw
-06:21 < GitHub196> [raptor/master] Fix expat support - Dave Beckett
-
-http://github.com/dajobe/raptor/commit/2c4d76240b70e9c794d983ca856ceaea8fe7ee5b
-
-http://bugs.gentoo.org/show_bug.cgi?id=391737
-
---- src/raptor_expat.c
-+++ src/raptor_expat.c
-@@ -83,9 +83,9 @@
- raptor_expat_update_document_locator(raptor_sax2* sax2,
-                                      raptor_locator* locator)
- {
--  locator->line = XML_GetCurrentLineNumber(sax2->xp);
--  locator->column = XML_GetCurrentColumnNumber(sax2->xp);
--  locator->byte = XML_GetCurrentByteIndex(sax2->xp);
-+  locator->line = RAPTOR_BAD_CAST(int, XML_GetCurrentLineNumber(sax2->xp));
-+  locator->column = RAPTOR_BAD_CAST(int, XML_GetCurrentColumnNumber(sax2->xp));
-+  locator->byte = RAPTOR_BAD_CAST(int, XML_GetCurrentByteIndex(sax2->xp));
- }
- 
- /* end if RAPTOR_XML_EXPAT */
---- src/raptor_sax2.c
-+++ src/raptor_sax2.c
-@@ -551,7 +551,7 @@
- 
- 
- #ifdef RAPTOR_XML_EXPAT
--  rc = XML_Parse(xp, (char*)buffer, len, is_end);
-+  rc = XML_Parse(xp, (char*)buffer, RAPTOR_BAD_CAST(int, len), is_end);
-   if(!rc) /* expat: 0 is failure */
-     goto handle_error;
-   if(is_end)
-@@ -627,8 +627,7 @@
-     char *error_buffer;
- 
-     error_length = strlen(error_message);
--    error_buffer = (char*)RAPTOR_MALLOC(cstring, 
--                                      ERROR_PREFIX_LEN + error_length+1);
-+    error_buffer = RAPTOR_MALLOC(char*, ERROR_PREFIX_LEN + error_length + 1);
-     if(error_buffer) {
-       memcpy(error_buffer, error_prefix, ERROR_PREFIX_LEN);
-       memcpy(error_buffer + ERROR_PREFIX_LEN, error_message, error_length + 1);
diff --git a/media-libs/raptor/raptor-2.0.5.ebuild b/media-libs/raptor/raptor-2.0.5.ebuild
deleted file mode 100644
index 85560543c5a2..000000000000
--- a/media-libs/raptor/raptor-2.0.5.ebuild
+++ /dev/null
@@ -1,71 +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-2.0.5.ebuild,v 1.2 2011/11/26 17:43:36 ssuominen 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
-	dev-util/gtk-doc-am" # remove once eautoreconf is gone
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-expat.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 \
-		$(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 {} +
-}