old

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64

4 files changed, 13 insertions, 126 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/Manifest b/media-libs/raptor/Manifest
index 90cbf4615f48..9ebd68bb6831 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,25 +3,22 @@ Hash: SHA1
 
 AUX raptor-2.0.3-curl-headers.patch 358 RMD160 7c92c938cf15dd126782aeeff93bce9aed8a5bdf SHA1 2e87d3881395a8541a5aa2d0b62b879b33b5080b SHA256 5018c8568f4a69465bc91584af00c896c02df57510b2f31d73c8e3758f77cb82
 AUX raptor-2.0.4-fix_math_test.patch 807 RMD160 2f6e675fc27e69975c28a95ee444e1aa6f84d7e1 SHA1 9dad69c6c07485be315e4b5ce79748439a14d38c SHA256 0dcf1d3263cf5c3e0af45d7e736b8af3bd20b54d17c7491ef55069d7c7f05ce9
-AUX raptor-2.0.5-expat.patch 1662 RMD160 a76f52c219e9d674e675d8c55df0d789738243b1 SHA1 fe7176f885a0b60fdc4c5fbccd13b565c11f556c SHA256 d750971b5f443e58f53712fcbd7cebed96ea8c0861c6c14248bd470c1ce0babd
 DIST raptor-1.4.21.tar.gz 1651843 RMD160 f2ee591e3e9e008b496d6b7bf78f1293173bf7ed SHA1 f8a82c6e9a342d0cc9772a02562c5e29c2c9b737 SHA256 db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
 DIST raptor2-2.0.4.tar.gz 1660320 RMD160 643ea2a36c4dd07a5b15a25df926d795c0243d4a SHA1 79e1289f480cb0fe75f49ec29d9f49189a8a58c2 SHA256 34f49d3afa35f5433d8779dede62e4a6567783ee05ab2d6aec1a36054c552a6e
-DIST raptor2-2.0.5.tar.gz 1681311 RMD160 fa810a61de230e6e660364a5e99d7ab56c5b0c42 SHA1 a75ec7890eaa22db86d9456ac1794dad89721099 SHA256 d4d3f09af5f1f1f7fe6894463f6c2d035a617f11eba26c16d13a2be815ab45bc
 DIST raptor2-2.0.6.tar.gz 1683963 RMD160 c17ce938792a79802400a43a1c6ea3441ca02118 SHA1 978f61579370914f22e162407539b8faa9891ed0 SHA256 46831fbe5470d6ae22bde466fbb6ed281830116b6a427a617a73ff3e558d7aa4
 EBUILD raptor-1.4.21-r1.ebuild 1652 RMD160 9ef3422d630aac250e6c36b3e5bb645d5a7a0e06 SHA1 28f614c698ec4ac1d55c12aae405f17da0dc0999 SHA256 c61a474d36504c0dcdc2c31f91b90d25641353348d7cdf2b488a00dc649652b8
 EBUILD raptor-2.0.4.ebuild 1799 RMD160 7ca6873ff8f14229979c48155b6daebafe21fc98 SHA1 2846ae787db23d269cf49678379494a872bf5b77 SHA256 7394a3e3fca95740fe6bc68c15fd77634445d9926886262e7395e7531e6b1fbb
-EBUILD raptor-2.0.5.ebuild 1742 RMD160 d1c5fbeffca357f0537b10d1abc9f30aaf503bec SHA1 eaea6818adaf549c67a1ef6307a34ff7ff1e19a1 SHA256 cdc2d74c78c0e561ede2d5ba469e9fe835e03bbb05863d4d6dae30d30368124f
 EBUILD raptor-2.0.6.ebuild 1648 RMD160 78218c0d2f4f807cc2c7df6e49b4fe3b1016fcae SHA1 f745aa5c0c3307165154e5c4cab3df95e6e18963 SHA256 e16ca3ec10b699854a5a2de7ddc2ad6697784d08a44de9586b327ec5613786a0
-MISC ChangeLog 13695 RMD160 98efeaa2faef3099b3d974ea01774f7be3b55b44 SHA1 465d5092992553129fdd84661901f72b281d731b SHA256 16af1e4c23abea9a6d27f0814f4636e114f9d2ef8ce150b43443baf99b7aabba
+MISC ChangeLog 13813 RMD160 1c1a6d704fd84bc92bac7c0a553bfad7b1b563dc SHA1 e2333d5bb524758832157536dc33ca6c5b09d438 SHA256 f7e4f99571574773b5b60b71a5c6e7c80b642411bb9dfbe3520a5b2b8f006928
 MISC metadata.xml 238 RMD160 a0d305ec6bd1653212d168b6e61cee0c00702d01 SHA1 508ad5cf65139bb32cf6caffb035ccbbe2f387ac SHA256 e9088dff670aeaaff724dfd30b8f35090c97131a5dbb310b06b943740510bf36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO0736AAoJEEdUh39IaPFNswMH/jx+UQxzVHoX6NOesatGHe0t
-i11jMdPiX5tab27GHYBJlqciAaL7vcyfU6awYpZKUQeKKnrZWpNcHfi204mvRQS8
-EX+ZevcXbvdQQM+EhrfzgIgBa8B+842gChVDQJj1vXfCcTvyUHI4ZAHspY1Au2WQ
-YokNfqrA2T4p/aVIfG0Mzt1T6z5zWZOkrZXZj1BkzCP9M8uBHqyJHOApN/H+C/5i
-dGzLY0itxzY1Of2wSpCJ8LCyEYFUGScSjougmwk1W73zAvN8S/c0PsFJIJpkPuM8
-cyP4lwhZvfLQrFVRvOCtDbxGW6imZaqkKvPwbVsINprv6VqU1w6CqNnUunPMOMw=
-=Xofz
+iQEcBAEBAgAGBQJO074qAAoJEEdUh39IaPFNmNcH+wUT6bIXmeKW09U71yg8PFtw
+u63VcPyX6n3tI1F8uRwODgszn1eHoCM7HQCoPeW2kJaYj2HjO2aqWCk5hzsIuSUd
+pBbRC9YphKV30lyegVmei+EYXOsGlJAfzoXdD9VxhTHxO08zgWuKOSv2HaF+tH80
+zp792XjU+OW3Xqq8YqTi1KPkebhaJA2WF/mX0FtI62Vry7GD0jO8N1IZSCj/wO3j
+DHSVK8eWHSdL8aOWzo2JfnEf5WoMqTtzG+qtsNZIEgSx+rUipvGEca3pDrZ0L459
+hNonFWrWZyGI281Dp55XrOGhDYoNdevWkc/O5VrvbyV1oBQc9EGJ3zeLsg7O3K0=
+=OC6g
 -----END PGP SIGNATURE-----
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 {} +
-}