| 1 |
darkside 10/07/01 20:46:53 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.21.0.ebuild |
| 4 |
Log: |
| 5 |
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 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.162 net-misc/curl/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.162&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.162&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.161&r2=1.162 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 18 |
retrieving revision 1.161 |
| 19 |
retrieving revision 1.162 |
| 20 |
diff -u -r1.161 -r1.162 |
| 21 |
--- ChangeLog 1 Jul 2010 20:14:54 -0000 1.161 |
| 22 |
+++ ChangeLog 1 Jul 2010 20:46:53 -0000 1.162 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for net-misc/curl |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.161 2010/07/01 20:14:54 spatz Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.162 2010/07/01 20:46:53 darkside Exp $ |
| 28 |
+ |
| 29 |
+ 01 Jul 2010; Jeremy Olexa <darkside@g.o> |
| 30 |
+ +files/curl-7.18.2-prefix.patch, curl-7.21.0.ebuild: |
| 31 |
+ Add modifications for Gentoo Prefix as tested in the Gentoo Prefix |
| 32 |
+ overlay. Add keywords, add EPREFIX/ED, add patch for prefix offset instead |
| 33 |
+ of hardcoded paths. Approved by spatz |
| 34 |
|
| 35 |
*curl-7.21.0 (01 Jul 2010) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 net-misc/curl/curl-7.21.0.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: curl-7.21.0.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- curl-7.21.0.ebuild 1 Jul 2010 20:14:54 -0000 1.1 |
| 53 |
+++ curl-7.21.0.ebuild 1 Jul 2010 20:46:53 -0000 1.2 |
| 54 |
@@ -1,12 +1,12 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.1 2010/07/01 20:14:54 spatz Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.0.ebuild,v 1.2 2010/07/01 20:46:53 darkside Exp $ |
| 59 |
|
| 60 |
# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! |
| 61 |
|
| 62 |
-EAPI=2 |
| 63 |
+EAPI=3 |
| 64 |
|
| 65 |
-inherit multilib eutils |
| 66 |
+inherit multilib eutils libtool prefix |
| 67 |
|
| 68 |
#MY_P=${P/_pre/-} |
| 69 |
DESCRIPTION="A Client that groks URLs" |
| 70 |
@@ -17,7 +17,7 @@ |
| 71 |
|
| 72 |
LICENSE="MIT" |
| 73 |
SLOT="0" |
| 74 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
| 75 |
+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" |
| 76 |
IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test threads" |
| 77 |
|
| 78 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 79 |
@@ -56,14 +56,19 @@ |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \ |
| 83 |
- "${FILESDIR}"/${PN}-7.19.7-test241.patch |
| 84 |
+ "${FILESDIR}"/${PN}-7.19.7-test241.patch \ |
| 85 |
+ "${FILESDIR}"/${PN}-7.18.2-prefix.patch |
| 86 |
+ |
| 87 |
+ eprefixify curl-config.in |
| 88 |
+ # for FreeMiNT |
| 89 |
+ elibtoolize |
| 90 |
} |
| 91 |
|
| 92 |
src_configure() { |
| 93 |
myconf="$(use_enable ldap) |
| 94 |
$(use_enable ldap ldaps) |
| 95 |
$(use_with idn libidn) |
| 96 |
- $(use_with kerberos gssapi /usr) |
| 97 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) |
| 98 |
$(use_with libssh2) |
| 99 |
$(use_enable ipv6) |
| 100 |
$(use_enable ares) |
| 101 |
@@ -89,13 +94,13 @@ |
| 102 |
if use ssl ; then |
| 103 |
if use gnutls; then |
| 104 |
myconf="${myconf} --without-ssl --with-gnutls --without-nss" |
| 105 |
- myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" |
| 106 |
+ myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 107 |
elif use nss; then |
| 108 |
myconf="${myconf} --without-ssl --without-gnutls --with-nss" |
| 109 |
- myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" |
| 110 |
+ myconf="${myconf} --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" |
| 111 |
else |
| 112 |
myconf="${myconf} --without-gnutls --without-nss --with-ssl" |
| 113 |
- myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs" |
| 114 |
+ myconf="${myconf} --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs" |
| 115 |
fi |
| 116 |
else |
| 117 |
myconf="${myconf} --without-gnutls --without-nss --without-ssl" |
| 118 |
@@ -106,7 +111,7 @@ |
| 119 |
|
| 120 |
src_install() { |
| 121 |
emake DESTDIR="${D}" install || die "installed failed for current version" |
| 122 |
- rm -rf "${D}"/etc/ |
| 123 |
+ rm -rf "${ED}"/etc/ |
| 124 |
|
| 125 |
# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 |
| 126 |
insinto /usr/share/aclocal |
Archives