Add modifications for Gentoo Prefix as tested in the Gentoo Prefix overlay. Add keywords, add EPREFIX/ED, add patch for prefix offset instead of hardcoded paths. Approved by spatz

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 45 insertions, 27 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index a2f4aadeb0d1..b9aa555db255 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.161 2010/07/01 20:14:54 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.162 2010/07/01 20:46:53 darkside Exp $
+
+  01 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
+  +files/curl-7.18.2-prefix.patch, curl-7.21.0.ebuild:
+  Add modifications for Gentoo Prefix as tested in the Gentoo Prefix
+  overlay. Add keywords, add EPREFIX/ED, add patch for prefix offset instead
+  of hardcoded paths. Approved by spatz
 
 *curl-7.21.0 (01 Jul 2010)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d13e040d9101..817e5be75d5f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
+AUX curl-7.18.2-prefix.patch 662 RMD160 a5cf90f3b93acd610adf116d00383ec8f792105e SHA1 5424f70aaf0ed9843bb84bc5e3e9e3654aca66a9 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
 AUX curl-7.20.0-libcurlm4.patch 490 RMD160 d4b821bf728286011ce11d7ccc9704522afae98a SHA1 2c592feba55b77965a8cf7e5491f7d0d1db9305e SHA256 b302bcce3d5fccf017eb80dc56e5e129164614c8b24b4c2415aaf63149362f55
 AUX curl-7.20.0-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
@@ -12,17 +10,6 @@ DIST curl-7.21.0.tar.bz2 2130889 RMD160 121eb3645c1286d583462244c1d7e7356129c440
 EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46
 EBUILD curl-7.20.0-r2.ebuild 3273 RMD160 4ddc154d74aec6e2742a4095fb908b2943512f07 SHA1 311c2c49c9bb0395303803b4f8ab0845a882fb44 SHA256 df38cd61d36ca1e72ac9b4b81bebf003d49092d082e171938d6f143ce90993c2
 EBUILD curl-7.20.1.ebuild 3199 RMD160 89e6290e6eaad376ce0e1676f99956186a82c8c8 SHA1 580a07d1c9f7b3a19ce8ce25bfa42031758a217f SHA256 48ed254257d49c3820aca25f9d07765fc882e97d650d28e6d3ae3ca21819b6c3
-EBUILD curl-7.21.0.ebuild 3453 RMD160 099c7c9d2f9c7d703c421cfbfb008b91d98ab385 SHA1 f04833000b9628c4af34eb6f92a0ef6bee083548 SHA256 c846a3de708f40b70e6cee719ab3792b9c929db28e6e2d20c5a11a2bdae6e5ca
-MISC ChangeLog 27339 RMD160 0728db7e0923eab9e7ebf2f06cfa922d02eb54c0 SHA1 b5104b6c275ed851c66f8ec5b63874714c4af2c9 SHA256 4e07cfdb0394a257836f841bc81174ea19fc9524fbe5c27fe312a670dc1f95f1
+EBUILD curl-7.21.0.ebuild 3811 RMD160 c740ad2d42d4cd60364cf36ff1b687340eb834aa SHA1 7535fe3693b1dcc10f1983baf10922571d042b2b SHA256 51802142ef323576fd0d510cb442daa727acec9d9845c8f5a3d159519842dec7
+MISC ChangeLog 27634 RMD160 f2c4d970ecc50002e981fb748267c2400acc87fb SHA1 61e4e5d56f9ebe1ee05077f16e33839210d57226 SHA256 59a268f1e5ee7d01c4ec73b1dd324634b070588a67c093081b79459b75c3166f
 MISC metadata.xml 697 RMD160 75f1a38985395bbb89971476c5fc004e8f247959 SHA1 d3f52a273d008cfaee85396ff1e01694a2ba3f19 SHA256 f78ea4a02ffb68ecdaa3947f1c0b3a8aaefa36cebb0aa12e9cee1413868463cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMLPdHAAoJEAWF714uGAc6p5AH/0K6uO/o5LcCMvKP8C/Yp8TD
-lnG8qwkQwxjQpXOLKH8UdUP/LSWxyaVE+MsIFpVHIXFthAShtAZqyhvDuM/l/40g
-udJKxDvzUOTKtg1/SnljAx1mlWIYVuC+6x/nOTRB8fYRhnOrBn3o6Vkblk1OqbFQ
-4XYKiL2G7IxtNjkESAvVrm76E7urL4utX2g4A2f4tg0vQIghTzP2FeS+ofY+2mol
-Pr0Y1lrJrCRYquDHcsiOdcULAW/MT1k1qq3Zz6i4Wh0+XDHImsrxsnQdWmQIZiIx
-8IVi77zCaThrysVyjuWgnUhYftQhCFiyHr5sve4YAS4MqzsYdFSey3IfvOjkFT4=
-=qHWO
------END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.0.ebuild b/net-misc/curl/curl-7.21.0.ebuild
index 2bc94f8e99cc..f7baa69ebe1c 100644
--- a/net-misc/curl/curl-7.21.0.ebuild
+++ b/net-misc/curl/curl-7.21.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.1 2010/07/01 20:14:54 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.2 2010/07/01 20:46:53 darkside Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
-EAPI=2
+EAPI=3
 
-inherit multilib eutils
+inherit multilib eutils libtool prefix
 
 #MY_P=${P/_pre/-}
 DESCRIPTION="A Client that groks URLs"
@@ -17,7 +17,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads"
 
 RDEPEND="ldap? ( net-nds/openldap )
@@ -56,14 +56,19 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.19.7-test241.patch
+		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
+		"${FILESDIR}"/${PN}-7.18.2-prefix.patch
+
+	eprefixify curl-config.in
+	# for FreeMiNT
+	elibtoolize
 }
 
 src_configure() {
 	myconf="$(use_enable ldap)
 		$(use_enable ldap ldaps)
 		$(use_with idn libidn)
-		$(use_with kerberos gssapi /usr)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
 		$(use_with libssh2)
 		$(use_enable ipv6)
 		$(use_enable ares)
@@ -89,13 +94,13 @@ src_configure() {
 	if use ssl ; then
 		if use gnutls; then
 			myconf="${myconf} --without-ssl --with-gnutls --without-nss"
-			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+			myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
 		elif use nss; then
 			myconf="${myconf} --without-ssl --without-gnutls --with-nss"
-			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+			myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
 		else
 			myconf="${myconf} --without-gnutls --without-nss --with-ssl"
-			myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+			myconf="${myconf} --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
 		fi
 	else
 		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
@@ -106,7 +111,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "installed failed for current version"
-	rm -rf "${D}"/etc/
+	rm -rf "${ED}"/etc/
 
 	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
 	insinto /usr/share/aclocal
diff --git a/net-misc/curl/files/curl-7.18.2-prefix.patch b/net-misc/curl/files/curl-7.18.2-prefix.patch
new file mode 100644
index 000000000000..9f7761f4edc8
--- /dev/null
+++ b/net-misc/curl/files/curl-7.18.2-prefix.patch
@@ -0,0 +1,20 @@
+--- curl-config.in.orig	2008-10-10 13:43:19.000000000 +0200
++++ curl-config.in	2008-10-10 13:43:56.000000000 +0200
+@@ -181,7 +181,7 @@
+ 	;;
+ 
+     --cflags)
+-       	if test "X@includedir@" = "X/usr/include"; then
++       	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+           echo ""
+         else
+           echo "-I@includedir@"
+@@ -189,7 +189,7 @@
+        	;;
+ 
+     --libs)
+-	if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
++	if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+ 	   CURLLIBDIR="-L@libdir@ "
+ 	else
+ 	   CURLLIBDIR=""