punt vulnerable

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

5 files changed, 13 insertions, 162 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/Manifest b/media-libs/raptor/Manifest
index 6e7395dab342..2d5d300dc8fb 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX raptor-2.0.3-curl-headers.patch 358 RMD160 7c92c938cf15dd126782aeeff93bce9aed8a5bdf SHA1 2e87d3881395a8541a5aa2d0b62b879b33b5080b SHA256 5018c8568f4a69465bc91584af00c896c02df57510b2f31d73c8e3758f77cb82
-DIST raptor-1.4.21.tar.gz 1651843 RMD160 f2ee591e3e9e008b496d6b7bf78f1293173bf7ed SHA1 f8a82c6e9a342d0cc9772a02562c5e29c2c9b737 SHA256 db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
-DIST raptor2-2.0.6.tar.gz 1683963 RMD160 c17ce938792a79802400a43a1c6ea3441ca02118 SHA1 978f61579370914f22e162407539b8faa9891ed0 SHA256 46831fbe5470d6ae22bde466fbb6ed281830116b6a427a617a73ff3e558d7aa4
 DIST raptor2-2.0.7.tar.gz 1651457 RMD160 3a52b6dfc8c528be356e308a751f988800c8112b SHA1 b9a8ce3e2c30c3318b402667f3d7573771ae731d SHA256 d546588f2fc7d1f7c8da7865cec6d9b7d0a95ef6a4393cc9136f3eeb55f28442
-EBUILD raptor-1.4.21-r1.ebuild 1652 RMD160 9ef3422d630aac250e6c36b3e5bb645d5a7a0e06 SHA1 28f614c698ec4ac1d55c12aae405f17da0dc0999 SHA256 c61a474d36504c0dcdc2c31f91b90d25641353348d7cdf2b488a00dc649652b8
-EBUILD raptor-2.0.6.ebuild 1639 RMD160 651264ca07fc72d3af4388c4bdcc75bd5f31b815 SHA1 494ac60916d081eb9bbe2f82a5a156fa28939b68 SHA256 1be6fcad695b63e07bbeb20721fd0cc0d4815663c7d0db770f0e59c793552e46
 EBUILD raptor-2.0.7.ebuild 1503 RMD160 7c47f2b781cff6d0463e36c64b9d0a9e8b731f52 SHA1 50c05cca979998f094e772d7e6f4600b67a0e83c SHA256 9d60fdaa7fd37affbffbeaf18c57b2fafff2056a1ad99655a3a03b48d305f03d
-MISC ChangeLog 15026 RMD160 3721eda181d309724d4fee488d8a5b7b5bd088af SHA1 66ac4e0f9f61e46d870e5552578eb9bf789ee261 SHA256 16917587d6f64037594092849789e5b256e80856812cdeef98c5cf801ec2aaa3
+MISC ChangeLog 15177 RMD160 e52687ac8d4b4f3069c7579a3ce4148440852679 SHA1 3efef91028417adc3001060147e08ea32c634970 SHA256 dd44df25936e9803ae6e104a0c1cff261ebc16c24e88ac2d4de58ca5b2d71dc0
 MISC metadata.xml 238 RMD160 a0d305ec6bd1653212d168b6e61cee0c00702d01 SHA1 508ad5cf65139bb32cf6caffb035ccbbe2f387ac SHA256 e9088dff670aeaaff724dfd30b8f35090c97131a5dbb310b06b943740510bf36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPfz0EAAoJEEdUh39IaPFNjDAH/iFcPYOJEYGjdB0lvlOgIXYY
-1nspC+YCmBnUYGpUZvHJvN3mJek9A3dboDfEoLlfu+PIbvSff65rjold9LXz3SIK
-iT6L9t4yufGDGUCbgY4YvSSu9b7Eb5F9/DY9e/WjcIlDPsPtrgxMzVhFwCE4zSio
-FRiItXwmaraDTI22nbGUbTbMD3dvSRF0W+LSdnCcX9ay9Y4oPgv/CMXrd9BKZu6t
-64PtWNhbTFxGGQttLzueJugRDGqJB839BcOeXDbdmgjlxq2dqTsYUaghYE3pHIQ5
-e7dSXE5/lW7MbcXBjgxR1z2bxVmq3bw+CDBfAIAzrT32DyFdIQEnqdNolke8hYg=
-=oViU
+iQEcBAEBAgAGBQJPfz1UAAoJEEdUh39IaPFNuYEH/3xsEkJ5UzU/roLp9xHTFxSk
+i3qhC2onCgRkXEmKRCoIu0j9Z/Sea0O6Dc8wawAVwuXYdINeUVLiMYMW1Ut0rJC6
+yQrlM1aBLxkJP2JhrF4OHKxgfuJk7B7V3V4RxMMF2i0YesnxTwAk49plUJxsTDDZ
+RK+UcxkUV+QHZ7Cd5QoRaimWrNaSe+VUkGEDXbVoPEDtJn9lueGeeE5+6RXN+ru4
+PS9N/t3hf/zPsbKEOqgyczEftG8UhoeShndwlgMjJKD8OgTO4TUfN+iFuQ2eiwZ/
+AscWyX2S4mlrLJ4CNmCNdcDobU6d8N0w7XR8dhAlkKDraPUg/TS9saonUExJ69A=
+=obq3
 -----END PGP SIGNATURE-----
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 {} +
-}