Version bump and take over maintainership

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

5 files changed, 173 insertions, 8 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 318ec4c7eaf1..e47119cb1292 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.184 2011/07/20 14:52:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.185 2011/07/20 16:14:50 angelos Exp $
+
+*curl-7.21.7 (20 Jul 2011)
+
+  20 Jul 2011; Christoph Mende <angelos@gentoo.org>
+  +files/curl-respect-cflags-2.patch, +curl-7.21.7.ebuild, metadata.xml:
+  Version bump and take over maintainership
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 3ae31cf25666..3e69c5801f36 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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-strip-ldflags.patch 419 RMD160 9373e95129812c9da74e1dafed33adcfeea84d3d SHA1 11f5466959fe0b93e2e2e47121a44093ac79c0b2 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6
+AUX curl-respect-cflags-2.patch 1174 RMD160 8d613e222baae7dee7207931025f5389c529eec1 SHA1 0bcdaf3c5081e7b3196fae9dbd123ed5e09b8439 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe
 AUX curl-respect-cflags.patch 8180 RMD160 027b43d8fe11b5635af8473a4236cd483f6dadee SHA1 72d4829a2eac9b7f33343140ae0104fa3c796496 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665
 DIST curl-7.21.4.tar.bz2 2256354 RMD160 c18710206d30a0f1078b2156df25ded30443f7cf SHA1 9cc59be07932b63e1f7d714c56ffaaa92af55373 SHA256 d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
 DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17 SHA1 049a3aff13d283f6e4ea1f9aa3aa6abc067fd42e SHA256 d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955
+DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a
 EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6
 EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d
-MISC ChangeLog 30861 RMD160 0b08cf29a4f15cc83f6f0b98f4a67533afab5874 SHA1 64effe19cdb47b5ea31b23bd77602c8ff3eb1b69 SHA256 4ef1854a90448b088416fbdad11de31941c494105ba5e99cf0ea68f339af9b55
-MISC metadata.xml 638 RMD160 d985fb306a587e448df3400762d3dd2fd0e08ca2 SHA1 30e95a1220ca29d99183ed62f833e22eaf12e138 SHA256 a71e0c400e1b799d2985f3375f8a7df87e29e7dc6144a12ae839bd8c68d9f0b7
+EBUILD curl-7.21.7.ebuild 3491 RMD160 1052560a8bb2da902a912126f8ea22b66c3094dd SHA1 94476f4a9a710a785ed47531f91e68eb3620c925 SHA256 d606494222e00a2a8aeddf8e6169fb89bec1b06754940dbe552137d38c9094f2
+MISC ChangeLog 31061 RMD160 a4823e5f9fc53eb86269236c11d694f3cac847a4 SHA1 5de0ed4edafdd0ec83ebc0d492431aaad9beee0a SHA256 0064951154435983410cc8c8a3b630f5865ce14551e2ee5c5242e4fcc7864748
+MISC metadata.xml 661 RMD160 01583b468ecdaef206cc2ed15da0a481e2f3b9c8 SHA1 2a3b2ebdc360ba87a1926b18f1ff3be5257565db SHA256 17dc3be94df3140e158ce615047e02a8604286c74bf33f62fe1aabd33c4a1890
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4m67QACgkQCaWpQKGI+9SZQgCeNpCCCVJaJ3DpI8gim/JwQ70T
-CH8An1erJR/7CpnKi2aT95NVdZv8g31S
-=VuMz
+iF4EAREIAAYFAk4m/vkACgkQmWq1bYTyC0PP7AD/RrYZ7g/6ErQbxTV2kBZz1Fn5
+k7vQG8BQ2zIkWdLGPeIA/AqqQS4tFo78vBQKmyaDbAVQ3WrprRsnkSb7VPqon5LQ
+=sKhX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.21.7.ebuild b/net-misc/curl/curl-7.21.7.ebuild
new file mode 100644
index 000000000000..9191618b100d
--- /dev/null
+++ b/net-misc/curl/curl-7.21.7.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.1 2011/07/20 16:14:51 angelos Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+EAPI=4
+
+inherit autotools multilib eutils libtool prefix
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+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 ~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 static-libs test threads"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates )
+		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+		!gnutls? ( !nss? ( dev-libs/openssl ) )
+	)
+	idn? ( net-dns/libidn )
+	ares? ( >=net-dns/c-ares-1.4.0 )
+	kerberos? ( virtual/krb5 )
+	libssh2? ( >=net-libs/libssh2-0.16 )"
+
+# rtmpdump ( media-video/rtmpdump )  / --with-librtmp
+# fbopenssl (not in gentoo) --with-spnego
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+# used - but can do without in self test: net-misc/stunnel
+
+# ares must be disabled for threads and both can be disabled
+# one can use wether gnutls or nss if ssl is enabled
+REQUIRED_USE="threads? ( !ares )
+	gnutls? ( ssl )
+	nss? ( ssl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.20.0-strip-ldflags.patch \
+		"${FILESDIR}"/${PN}-7.19.7-test241.patch \
+		"${FILESDIR}"/${PN}-7.18.2-prefix.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-2.patch
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		$(use_with idn libidn)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		$(use_with libssh2)
+		$(use_enable static-libs static)
+		$(use_enable ipv6)
+		$(use_enable threads threaded-resolver)
+		$(use_enable ares)
+		--enable-http
+		--enable-ftp
+		--enable-gopher
+		--enable-file
+		--enable-dict
+		--enable-manual
+		--enable-telnet
+		--enable-smtp
+		--enable-pop3
+		--enable-imap
+		--enable-rtsp
+		--enable-nonblocking
+		--enable-largefile
+		--enable-maintainer-mode
+		--disable-sspi
+		--without-krb4
+		--without-librtmp
+		--without-spnego"
+
+	if use ssl ; then
+		if use gnutls; then
+			myconf+=" --without-ssl --with-gnutls --without-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		elif use nss; then
+			myconf+=" --without-ssl --without-gnutls --with-nss"
+			myconf+=" --with-ca-bundle=${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		else
+			myconf+=" --without-gnutls --without-nss --with-ssl"
+			myconf+=" --without-ca-bundle --with-ca-path=${EPREFIX}/etc/ssl/certs"
+		fi
+	else
+		myconf+=" --without-gnutls --without-nss --without-ssl"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	rm -rf "${ED}"/etc/
+
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+	insinto /usr/share/aclocal
+	doins docs/libcurl/libcurl.m4
+
+	dodoc CHANGES README
+	dodoc docs/FEATURES docs/INTERNALS
+	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}
diff --git a/net-misc/curl/files/curl-respect-cflags-2.patch b/net-misc/curl/files/curl-respect-cflags-2.patch
new file mode 100644
index 000000000000..a67ed4799d07
--- /dev/null
+++ b/net-misc/curl/files/curl-respect-cflags-2.patch
@@ -0,0 +1,36 @@
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index adafaa6..b7517c1 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -199,19 +199,19 @@ AC_DEFUN([CURL_CHECK_COMPILER_IBM_C], [
+   if test "$curl_cv_have_def___IBMC__" = "yes"; then
+     AC_MSG_RESULT([yes])
+     compiler_id="IBM_C"
+-    flags_dbg_all="-g -g0 -g1 -g2 -g3"
+-    flags_dbg_yes="-g"
++    flags_dbg_all=""
++    flags_dbg_yes=""
+     flags_dbg_off=""
+-    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
+-    flags_opt_all="$flags_opt_all -qnooptimize"
+-    flags_opt_all="$flags_opt_all -qoptimize=0"
+-    flags_opt_all="$flags_opt_all -qoptimize=1"
+-    flags_opt_all="$flags_opt_all -qoptimize=2"
+-    flags_opt_all="$flags_opt_all -qoptimize=3"
+-    flags_opt_all="$flags_opt_all -qoptimize=4"
+-    flags_opt_all="$flags_opt_all -qoptimize=5"
+-    flags_opt_yes="-O2"
+-    flags_opt_off="-qnooptimize"
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_all=""
++    flags_opt_yes=""
++    flags_opt_off=""
+     flags_prefer_cppflags="yes"
+   else
+     AC_MSG_RESULT([no])
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 117a781856d7..a861e7ee890c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
   <herd>no-herd</herd>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</name>
   </maintainer>
   <use>
     <flag name="ares">Enabled c-ares dns support</flag>