Fix compilation with curl-7.21.7 (bug #376001)

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

9 files changed, 34 insertions, 217 deletions

diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index 39565123726b..a34055a8a94b 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.95 2011/07/09 07:57:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.96 2011/07/24 08:56:50 angelos Exp $
+
+  24 Jul 2011; Christoph Mende <angelos@gentoo.org> raptor-1.4.20.ebuild,
+  -raptor-1.4.21.ebuild, raptor-1.4.21-r1.ebuild, -raptor-2.0.0.ebuild,
+  -raptor-2.0.2.ebuild, raptor-2.0.3.ebuild,
+  +files/raptor-2.0.3-curl-headers.patch:
+  Fix compilation with curl-7.21.7 (bug #376001)
 
 *raptor-2.0.3 (09 Jul 2011)
 
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 9d5afc85e055..13f3a03e742c 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX raptor-2.0.3-curl-headers.patch 358 RMD160 7c92c938cf15dd126782aeeff93bce9aed8a5bdf SHA1 2e87d3881395a8541a5aa2d0b62b879b33b5080b SHA256 5018c8568f4a69465bc91584af00c896c02df57510b2f31d73c8e3758f77cb82
 DIST raptor-1.4.20.tar.gz 1717426 RMD160 f0b1ad050fb41208ebd699578b0327344a0bad9b SHA1 b50279944f7a3573c331183bd03f6140f670442d SHA256 4fa1f98361e935b3802122f5c9d874384bc861d2ad4658de016933e11938a89b
 DIST raptor-1.4.21.tar.gz 1651843 RMD160 f2ee591e3e9e008b496d6b7bf78f1293173bf7ed SHA1 f8a82c6e9a342d0cc9772a02562c5e29c2c9b737 SHA256 db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
-DIST raptor2-2.0.0.tar.gz 1635566 RMD160 e81eb4b2129e3ade855aa41a7dbd4900d0380522 SHA1 c20b50a47be358b4b748e6bb72d79ec38b4812d6 SHA256 b53d2a5b4493f0e5b2ca5fd3a18b3728b9470f7c39d8ea59eb84330ebf3fb3b1
-DIST raptor2-2.0.2.tar.gz 1633744 RMD160 5debd5fac8f99b210698970c3d3c040f1de6bd4d SHA1 b476e3f1ce9cff8ad5912ca805ab156887b229eb SHA256 7e3e3a3d9c19ebe6bfe13fdecb15ff47d63a7fcf80a8b54a74c1c654ce3bea47
 DIST raptor2-2.0.3.tar.gz 1652679 RMD160 bffa247579c17948c08c94423b568353ae8b5338 SHA1 996f532b059397f96a9b0cc231f6b2362f0b1184 SHA256 e221e62dd0df01eb4bdcbf7844444d0a5d5babc88a9cf3f167a38dfe03788ec5
-EBUILD raptor-1.4.20.ebuild 1461 RMD160 06c572f08f157acd1c543c39572468cba8f48540 SHA1 043c66be1117ee0f1d94cb233548fdc63625be19 SHA256 ff9de784f4881983588efa0e4b9081296a169605aa7d1c664af5ec9e4954e7c1
-EBUILD raptor-1.4.21-r1.ebuild 1673 RMD160 aa8f1c260aead2fb1979a776252014748d888497 SHA1 78504c0ac330ac907c9b07926e9e74b412a17840 SHA256 5b1a712ed004bc6ce0d2d0f55aff8b663f86889be7b6ee7982752b55d9e438dc
-EBUILD raptor-1.4.21.ebuild 1590 RMD160 30b2f9ab0f4d7e8ec227306cad2836c402a850ac SHA1 dcf926952a9bbc17c8b47140a626fb8c4f4f004c SHA256 0eaaa88fb7d60e0953e5c05b9b761f2f15ab425d08399059a8acb86ccd451d76
-EBUILD raptor-2.0.0.ebuild 1696 RMD160 a6531fa32586b21d6f149e3ac20ac6ce5c0b30b9 SHA1 4e1b04d3271d3b1c65e49af258ed475a893e5a3c SHA256 a82452e18879eb88c5cbbb362f5cd26566ec24d880e523b9c1a9c0954345dba5
-EBUILD raptor-2.0.2.ebuild 1706 RMD160 f6de5e62689aea3a1503f662684e4c127bd7833c SHA1 cf781e15479b9ceb6fd3567f319cdb2081e7a47f SHA256 4338bf8df13bc06b88ed4b6cec553543b1e418a155670b88afb7b8a0ac75d624
-EBUILD raptor-2.0.3.ebuild 1648 RMD160 a73782842248c214c862299fa8f2824899a70e27 SHA1 7659bcf3872085d84f1613a52c0c475c59a3579d SHA256 fcef7645273de7375e2869503602de921d9ec5db43846e74e45245c02d85ba86
-MISC ChangeLog 10986 RMD160 8be2b38f2694d80447ef1b4c1893dc2201349dca SHA1 11b3b04035bb42cba21c3bb9333fa18b76ad583a SHA256 0e5b60570fe81fe0796ac57659544bdfab2f0fc5bed4f591f3b472df84da6b1a
+EBUILD raptor-1.4.20.ebuild 1514 RMD160 40a8c0cdd746cf9011023ffd4bda3529803ec1b3 SHA1 02c298fb442be4105f713462e491b03707fcb247 SHA256 32e538e831b2ba993bbf3ec996913666381078fd764752d0390477ca7fe47bb0
+EBUILD raptor-1.4.21-r1.ebuild 1726 RMD160 44226522d8294b0a1c89d916e19cc3ea5f657b70 SHA1 cb3c3a4dc0d00a900e5f77e1ad64d658e2407188 SHA256 2acae9a118465cdabbac897c8d4fb3aa942de060842364c6c8494ef4d0e997e6
+EBUILD raptor-2.0.3.ebuild 1692 RMD160 c82423cdb16743b3a758a96423eda03329c003a2 SHA1 40a4f652f0f3aaf71799c78b232c8f935fe4e6a1 SHA256 4693917d78d65d63a78c8dc09c7137904e077ebfd650ff64930397fc768baa4f
+MISC ChangeLog 11267 RMD160 23a28224b5947ca1a7cf30a70e56fcea610c7c05 SHA1 bd3080d9081fb29262a9448b8d5ce54d1f81a000 SHA256 509360eacbba8d693a346cb2a4cab9cc5759224f8d71849d84c0754ff9e876b1
 MISC metadata.xml 238 RMD160 a0d305ec6bd1653212d168b6e61cee0c00702d01 SHA1 508ad5cf65139bb32cf6caffb035ccbbe2f387ac SHA256 e9088dff670aeaaff724dfd30b8f35090c97131a5dbb310b06b943740510bf36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4YCZMACgkQXkR9YqOcLPEXMQD/U5JuEf9B+PsriAJiUpjiA7jS
-jhhGMIPzAYmdWJ0Ios4A/iqq1E/rI1REmiYZqXAMpJKD3lj0ahmKDmuj91kmkXet
-=BnAf
+iF4EAREIAAYFAk4r3k4ACgkQmWq1bYTyC0Pm0QEAl7soFLTp9LQscbuXfZNJnRlC
+ra6UY5JXaJV/YFpRz5kA/1q5IwoEL6RrqThWkR7/Qcj7X6OccSGy84YiKe8fkApo
+=Bj3W
 -----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
new file mode 100644
index 000000000000..23ea4fe9f91d
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.3-curl-headers.patch
@@ -0,0 +1,12 @@
+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.20.ebuild b/media-libs/raptor/raptor-1.4.20.ebuild
index f736a58540d9..c8028024ccda 100644
--- a/media-libs/raptor/raptor-1.4.20.ebuild
+++ b/media-libs/raptor/raptor-1.4.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.20.ebuild,v 1.10 2010/10/24 17:01:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-1.4.20.ebuild,v 1.11 2011/07/24 08:56:50 angelos Exp $
 
 EAPI=2
 inherit eutils libtool
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.3-curl-headers.patch
 	epunt_cxx
 	elibtoolize # Required by FreeBSD .so versioning
 }
diff --git a/media-libs/raptor/raptor-1.4.21-r1.ebuild b/media-libs/raptor/raptor-1.4.21-r1.ebuild
index 882a9188d363..9064f90d8b27 100644
--- a/media-libs/raptor/raptor-1.4.21-r1.ebuild
+++ b/media-libs/raptor/raptor-1.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2011/05/03 12:20:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-1.4.21-r1.ebuild,v 1.8 2011/07/24 08:56:50 angelos Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.3-curl-headers.patch
 	epunt_cxx
 	elibtoolize
 }
diff --git a/media-libs/raptor/raptor-1.4.21.ebuild b/media-libs/raptor/raptor-1.4.21.ebuild
deleted file mode 100644
index b3febd10f860..000000000000
--- a/media-libs/raptor/raptor-1.4.21.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.4 2010/10/24 17:01:14 armin76 Exp $
-
-EAPI=3
-inherit eutils libtool
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor"
-SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~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() {
-	epunt_cxx
-	elibtoolize # Required by FreeBSD .so versioning
-}
-
-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) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTICE README
-	dohtml NEWS.html README.html RELEASE.html
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/raptor/raptor-2.0.0.ebuild b/media-libs/raptor/raptor-2.0.0.ebuild
deleted file mode 100644
index f3a5cbc7325c..000000000000
--- a/media-libs/raptor/raptor-2.0.0.ebuild
+++ /dev/null
@@ -1,69 +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.0.ebuild,v 1.2 2011/02/03 18:18:36 xarthisius Exp $
-
-EAPI=3
-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 ~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}
-	sys-devel/flex
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-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 \
-		--disable-dependency-tracking \
-		$(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() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTICE README
-	dohtml {NEWS,README,RELEASE,UPGRADING}.html
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/raptor/raptor-2.0.2.ebuild b/media-libs/raptor/raptor-2.0.2.ebuild
deleted file mode 100644
index 05fd650690f5..000000000000
--- a/media-libs/raptor/raptor-2.0.2.ebuild
+++ /dev/null
@@ -1,69 +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.2.ebuild,v 1.2 2011/05/03 12:20:14 grobian Exp $
-
-EAPI=3
-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}
-	sys-devel/flex
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-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 \
-		--disable-dependency-tracking \
-		$(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() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTICE README
-	dohtml {NEWS,README,RELEASE,UPGRADING}.html
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-libs/raptor/raptor-2.0.3.ebuild b/media-libs/raptor/raptor-2.0.3.ebuild
index c0a1209d2784..e01419b2e5cc 100644
--- a/media-libs/raptor/raptor-2.0.3.ebuild
+++ b/media-libs/raptor/raptor-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2011/07/09 07:57:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.3.ebuild,v 1.2 2011/07/24 08:56:50 angelos Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -32,6 +32,7 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-curl-headers.patch
 	epunt_cxx
 	elibtoolize
 }