version bump

Package-Manager: portage-2.1.2.7

7 files changed, 31 insertions, 134 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 6201a870cd65..93c4b8662f61 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.83 2007/06/11 01:21:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.84 2007/06/25 12:19:40 dragonheart Exp $
+
+*curl-7.16.3 (25 Jun 2007)
+
+  25 Jun 2007; Daniel Black <dragonheart@gentoo.org> +curl-7.16.3.ebuild, 
+  -curl-7.16.3_pre20070418.ebuild, -curl-7.16.3_pre20070610.ebuild:
+  release thanks to upstream.
 
 *curl-7.16.3_pre20070610 (11 Jun 2007)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 3a40a2d6f6e7..0bfdf0012a60 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -25,8 +25,7 @@ SHA256 2da722f848cd4e3b7748598676e2c4d895273e9c21b129585509df155aa2f818 files/cu
 DIST curl-7.15.1.tar.bz2 1437950 RMD160 c733937754b579d45de8c26cf4dfa6c5cec82fae SHA1 2b94192557954bba396bfbb980feed17aadc6295 SHA256 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
 DIST curl-7.15.5.tar.bz2 1543007 RMD160 4494cffb382c81b7211830c7e6e40ef9ed8f4ef0 SHA1 b79ee06d1da58c12c23a1b8aeccdb2b74a692cc7 SHA256 2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0
 DIST curl-7.16.2.tar.bz2 1664414 RMD160 28edfab5659d410bf00725a0ac7228583fc171b6 SHA1 b23d35b5af7b75e53c6632cd4c9d0cb0c08cafe5 SHA256 2e833e81d43f6294e5bd0d1776d68bd147bdab31e86c7544dc1462e44db9bfa2
-DIST curl-7.16.3-20070418.tar.bz2 1710368 RMD160 323553de20da5abb66f146dde10fb7f5e0933607 SHA1 c4d7925d56525e23e7b15f8e9f2c1274f6241d56 SHA256 6e1a99e906c8560ffd9150ba8d23cee480a67f254c178846100f27a09fbcf85b
-DIST curl-7.16.3-20070610.tar.bz2 1713832 RMD160 5111cf10b095ff5195f3ec505b28613d864ae8c6 SHA1 01c725c0234ccd5b97023b70e8abcb659035ee0d SHA256 075862b2811671bafaaa13f55f24432da8a905468c9e7ac13c389702e24e3da4
+DIST curl-7.16.3.tar.bz2 1667847 RMD160 49475fd0118e4ba9bd00244852d915bc56a2a2dd SHA1 7aeda5a74da2a68df49669217859101e9d0553f6 SHA256 7dc1ff9b06686650669befd8884f3dab599de6795f24148c56d67b285211e494
 EBUILD curl-7.15.1-r1.ebuild 2259 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c SHA1 a042998854a51d5d29396fa1e1352528d2c4558a SHA256 60e895f2f1d8152febd1495ef3f62a7363d4a67525e2e373fd96c6ba779af9d7
 MD5 a8d25b53972d71f84e5e035c5b248a1c curl-7.15.1-r1.ebuild 2259
 RMD160 3974aa1c8cf2c9bd91481edec45c7f1166cf0b9c curl-7.15.1-r1.ebuild 2259
@@ -39,18 +38,14 @@ EBUILD curl-7.16.2.ebuild 2479 RMD160 5472182dee948d957137f588600acdc219299e38 S
 MD5 63c9572241b7f0d8865bd87f0ff69d96 curl-7.16.2.ebuild 2479
 RMD160 5472182dee948d957137f588600acdc219299e38 curl-7.16.2.ebuild 2479
 SHA256 38d0a2761063c7229c2744187472ef2b47abed55e041b39095aa5cac61a9c6c5 curl-7.16.2.ebuild 2479
-EBUILD curl-7.16.3_pre20070418.ebuild 2644 RMD160 6ca526f98e9c152c332eaa390676521ceb809af3 SHA1 176572b670211b9fb01c0fd05bd36f0da82d6550 SHA256 48dccb3dc89062fa157daa8e5dc3fe46905a520022965297d53eaeaec404efe6
-MD5 97bdfb7b40ab4a782e5f8e16921a15bb curl-7.16.3_pre20070418.ebuild 2644
-RMD160 6ca526f98e9c152c332eaa390676521ceb809af3 curl-7.16.3_pre20070418.ebuild 2644
-SHA256 48dccb3dc89062fa157daa8e5dc3fe46905a520022965297d53eaeaec404efe6 curl-7.16.3_pre20070418.ebuild 2644
-EBUILD curl-7.16.3_pre20070610.ebuild 3081 RMD160 5b218164fcada127d3e63f322fb20e3217bc3c4e SHA1 183e8902b2841b681f252b8a923843e2bb140eb7 SHA256 4ca3e41c00204baa23c78c8b6dac3e95c127b828f184f4fea9075624ec952048
-MD5 85cc0169262456d085263e7c91552993 curl-7.16.3_pre20070610.ebuild 3081
-RMD160 5b218164fcada127d3e63f322fb20e3217bc3c4e curl-7.16.3_pre20070610.ebuild 3081
-SHA256 4ca3e41c00204baa23c78c8b6dac3e95c127b828f184f4fea9075624ec952048 curl-7.16.3_pre20070610.ebuild 3081
-MISC ChangeLog 16134 RMD160 1241f7f9863cceb4bd77b1cac4f6cdb80602f9e9 SHA1 d73337543bcac93c99b15dcf6078e6b3d0391a95 SHA256 24e23fd69637e7657d2e1f27909b7b9122893298c8be758b0b5104a1c186d106
-MD5 7cd896c384077f89632ef38d6afd2b24 ChangeLog 16134
-RMD160 1241f7f9863cceb4bd77b1cac4f6cdb80602f9e9 ChangeLog 16134
-SHA256 24e23fd69637e7657d2e1f27909b7b9122893298c8be758b0b5104a1c186d106 ChangeLog 16134
+EBUILD curl-7.16.3.ebuild 3140 RMD160 26c7449d4994111727ad19e7531828ee473ffe84 SHA1 ca1997661db73c938d657f34360c8bf5f883da0b SHA256 13c7e42c56f6845989a2cd9028d5df06dfd9c1f9a36e194754cc253ad5e9d2b4
+MD5 2d097903f80cca8291fe445c4111ebce curl-7.16.3.ebuild 3140
+RMD160 26c7449d4994111727ad19e7531828ee473ffe84 curl-7.16.3.ebuild 3140
+SHA256 13c7e42c56f6845989a2cd9028d5df06dfd9c1f9a36e194754cc253ad5e9d2b4 curl-7.16.3.ebuild 3140
+MISC ChangeLog 16336 RMD160 716f02e1b7670a47ba137ffd685853cb69774749 SHA1 6288b594550fa26c1ef76c530c6b649e16e518f4 SHA256 5f5a6f62d383f5e8eb4e9b250cb8af18a759a51f3a62c39185f117658c5331c4
+MD5 bbbc787af99ca0b31c8f90d825c56d04 ChangeLog 16336
+RMD160 716f02e1b7670a47ba137ffd685853cb69774749 ChangeLog 16336
+SHA256 5f5a6f62d383f5e8eb4e9b250cb8af18a759a51f3a62c39185f117658c5331c4 ChangeLog 16336
 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
 MD5 2fca58a7644b7fd5e240d2054ab94fbe metadata.xml 223
 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 metadata.xml 223
@@ -64,9 +59,6 @@ SHA256 7421859a42befe5d3c3777b0e96e5fb1f3d55fc0f9616b039237eb9ecac5e1e0 files/di
 MD5 57fc5c81fa904d2fe9095d04b87f68ea files/digest-curl-7.16.2 241
 RMD160 941f9bb82eca7ba8e07971c93113c4581eea1c0d files/digest-curl-7.16.2 241
 SHA256 94b4f93c722c48109a9f596b8d2f8db7d370985905e0ea9a6f576e5779256d49 files/digest-curl-7.16.2 241
-MD5 6d7a6c6d083e03853d5e63ef1019b1ec files/digest-curl-7.16.3_pre20070418 268
-RMD160 0d7530b41a33f6ee83f36956c7d4e03c5141c47c files/digest-curl-7.16.3_pre20070418 268
-SHA256 184da0c9ce905c1c12d25d269666c0d287c226e8d6fe741b9be92ecc2153b795 files/digest-curl-7.16.3_pre20070418 268
-MD5 6872d7d5a7004dcdce4ecfc8a7611158 files/digest-curl-7.16.3_pre20070610 268
-RMD160 2a4541534778a93d4ae226de8f7a3765fc780637 files/digest-curl-7.16.3_pre20070610 268
-SHA256 454aa739be32611db76b36fc6bab2c14eb24307eb00e7e9c679fd4cc51095e8a files/digest-curl-7.16.3_pre20070610 268
+MD5 1af4fc43b0df321aa411852f8a506de1 files/digest-curl-7.16.3 241
+RMD160 cba805b4629c91e6e0542f4e2bdcc6f5de06c948 files/digest-curl-7.16.3 241
+SHA256 f31b3673f31801c926be1ed9907d55c9f952127be12d7562192958580eee3990 files/digest-curl-7.16.3 241
diff --git a/net-misc/curl/curl-7.16.3_pre20070610.ebuild b/net-misc/curl/curl-7.16.3.ebuild
index abd382f24725..b1312b720efd 100644
--- a/net-misc/curl/curl-7.16.3_pre20070610.ebuild
+++ b/net-misc/curl/curl-7.16.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.3_pre20070610.ebuild,v 1.1 2007/06/11 01:21:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.3.ebuild,v 1.1 2007/06/25 12:19:40 dragonheart Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
 inherit libtool eutils
 
-MY_P=${P/_pre/-}
+#MY_P=${P/_pre/-}
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
-SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
-#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT X11"
 SLOT="0"
@@ -23,7 +23,8 @@ RDEPEND="gnutls? ( net-libs/gnutls )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/libidn )
 	ares? ( >=net-dns/c-ares-1.4.0 )
-	kerberos? ( virtual/krb5 )"
+	kerberos? ( virtual/krb5 )
+	app-misc/ca-certificates"
 
 # net-libs/libssh2 (masked) --with-libssh2
 # fbopenssl (not in gentoo) --with-spnego
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 	)"
 # used - but can do without in self test: net-misc/stunnel
-S="${WORKDIR}"/${MY_P}
+#S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -63,7 +64,7 @@ src_compile() {
 		--enable-largefile
 		--enable-maintainer-mode
 		--disable-sspi
-		--without-ca-bundle
+		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
 		--without-krb4
 		--without-libssh2
 		--without-spnego"
@@ -91,6 +92,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "installed failed for current version"
+	rm -rf "${D}"/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/curl-7.16.3_pre20070418.ebuild b/net-misc/curl/curl-7.16.3_pre20070418.ebuild
deleted file mode 100644
index b45e6266c4ae..000000000000
--- a/net-misc/curl/curl-7.16.3_pre20070418.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.16.3_pre20070418.ebuild,v 1.1 2007/04/18 11:04:51 dragonheart Exp $
-
-# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
-
-inherit libtool eutils
-
-MY_P=${P/_pre/-}
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
-SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
-#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
-
-LICENSE="MIT X11"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 ldap ares gnutls idn kerberos test"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-	ssl? ( !gnutls? ( dev-libs/openssl ) )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/libidn )
-	ares? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )"
-
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-# used - but can do without in self test: net-misc/stunnel
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-#	epatch "${FILESDIR}"/${P}-strip-ldflags.patch
-	epatch "${FILESDIR}"/curl-7.16.2-strip-ldflags.patch
-	elibtoolize
-}
-
-src_compile() {
-
-	myconf="$(use_enable ldap)
-		$(use_with idn libidn)
-		$(use_enable kerberos gssapi)
-		$(use_enable ipv6)
-		--enable-http
-		--enable-ftp
-		--enable-gopher
-		--enable-file
-		--enable-dict
-		--enable-manual
-		--enable-telnet
-		--enable-nonblocking
-		--enable-largefile
-		--enable-maintainer-mode"
-
-	if use ipv6 && use ares; then
-		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		myconf="${myconf} --disable-ares"
-	else
-		myconf="${myconf} $(use_enable ares)"
-	fi
-
-	if use gnutls; then
-		myconf="${myconf} --without-ssl --with-gnutls=/usr"
-	elif use ssl; then
-		myconf="${myconf} --without-gnutls --with-ssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl"
-	fi
-
-	if use kerberos; then
-	   myconf="${myconf} --with-gssapi=/usr"
-	fi
-
-	econf ${myconf} || die 'configure failed'
-	emake || die "install failed for current version"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "installed failed for current version"
-
-	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
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libcurl.so.3 ]] ; then
-		ewarn "You must re-compile all packages that are linked against"
-		ewarn "curl-7.15.* by using revdep-rebuild from gentoolkit:"
-		ewarn "# revdep-rebuild --library libcurl.so.3"
-	fi
-}
diff --git a/net-misc/curl/files/digest-curl-7.16.3 b/net-misc/curl/files/digest-curl-7.16.3
new file mode 100644
index 000000000000..91f2f22d082a
--- /dev/null
+++ b/net-misc/curl/files/digest-curl-7.16.3
@@ -0,0 +1,3 @@
+MD5 ed55dfa8946ad53f245fae5db3a9d0ca curl-7.16.3.tar.bz2 1667847
+RMD160 49475fd0118e4ba9bd00244852d915bc56a2a2dd curl-7.16.3.tar.bz2 1667847
+SHA256 7dc1ff9b06686650669befd8884f3dab599de6795f24148c56d67b285211e494 curl-7.16.3.tar.bz2 1667847
diff --git a/net-misc/curl/files/digest-curl-7.16.3_pre20070418 b/net-misc/curl/files/digest-curl-7.16.3_pre20070418
deleted file mode 100644
index ce47406bde47..000000000000
--- a/net-misc/curl/files/digest-curl-7.16.3_pre20070418
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cc759ca0b631fb2f4b55cb20ab78dc56 curl-7.16.3-20070418.tar.bz2 1710368
-RMD160 323553de20da5abb66f146dde10fb7f5e0933607 curl-7.16.3-20070418.tar.bz2 1710368
-SHA256 6e1a99e906c8560ffd9150ba8d23cee480a67f254c178846100f27a09fbcf85b curl-7.16.3-20070418.tar.bz2 1710368
diff --git a/net-misc/curl/files/digest-curl-7.16.3_pre20070610 b/net-misc/curl/files/digest-curl-7.16.3_pre20070610
deleted file mode 100644
index 8cde3f7ff599..000000000000
--- a/net-misc/curl/files/digest-curl-7.16.3_pre20070610
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63b4b36bf46b20f165b0718021e088b6 curl-7.16.3-20070610.tar.bz2 1713832
-RMD160 5111cf10b095ff5195f3ec505b28613d864ae8c6 curl-7.16.3-20070610.tar.bz2 1713832
-SHA256 075862b2811671bafaaa13f55f24432da8a905468c9e7ac13c389702e24e3da4 curl-7.16.3-20070610.tar.bz2 1713832