Version bump and take over maintainership

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

4 files changed, 164 insertions, 2 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/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>