From 3c2f72ba12c97ed24e349da9d5512507b99100e5 Mon Sep 17 00:00:00 2001
From: Christoph Mende <angelos@gentoo.org>
Date: Wed, 23 Jun 2010 09:53:44 +0000
Subject: [PATCH] Regenerate autotools to fix bug #305771, also stable on amd64
 wrt bug #284604 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

---
 net-misc/corkscrew/ChangeLog            |  6 ++++-
 net-misc/corkscrew/Manifest             | 10 ++++-----
 net-misc/corkscrew/corkscrew-2.0.ebuild | 29 +++++++++++++++----------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/net-misc/corkscrew/ChangeLog b/net-misc/corkscrew/ChangeLog
index 2f8625a16627..938e7b1589ca 100644
--- a/net-misc/corkscrew/ChangeLog
+++ b/net-misc/corkscrew/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/corkscrew
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/ChangeLog,v 1.8 2010/06/22 17:41:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/ChangeLog,v 1.9 2010/06/23 09:53:44 angelos Exp $
+
+  23 Jun 2010; Christoph Mende <angelos@gentoo.org> corkscrew-2.0.ebuild:
+  Regenerate autotools to fix bug #305771, also stable on amd64 wrt bug
+  #284604
 
   22 Jun 2010; Christoph Mende <angelos@gentoo.org> corkscrew-2.0.ebuild:
   QA: Respect CC and use emake
diff --git a/net-misc/corkscrew/Manifest b/net-misc/corkscrew/Manifest
index f1cc0051d9d9..7a918119ab0d 100644
--- a/net-misc/corkscrew/Manifest
+++ b/net-misc/corkscrew/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST corkscrew-2.0.tar.gz 56749 RMD160 c7b4ae4cc4df4b33f8ae9be19305004fd0ae20a0 SHA1 8bdb4c0dc71048136c721c33229b9bf795230b32 SHA256 0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be
-EBUILD corkscrew-2.0.ebuild 699 RMD160 5453fe2aef412462d52d05ba72c4631025ef285a SHA1 072eb66d4ffbbc940770929228041969086a17ef SHA256 bd6ca3b6749ff5ca0b24b99a676d24abd1c0f325bef76ebf439eca6e02dbb336
-MISC ChangeLog 1076 RMD160 5d7e73a868b943b6f67d953fe7bd8120dc15416e SHA1 c8461e7980b13aaff0b39b8282acacf1bd898853 SHA256 67bbc0763e977c84dcc06aab6fa916f2a06ed0d73b204a943e3826c5e099428d
+EBUILD corkscrew-2.0.ebuild 906 RMD160 0b7ba388f7bba64ccc68adc21f7e3c73bdeb96c7 SHA1 e54cd04e2f904b4c2da41bfbe8e31f7bf9cfd9bc SHA256 f237ba0735fd2d0dbbe5f32c627ada617e2960083e35f314713af96d3fb6220b
+MISC ChangeLog 1233 RMD160 5182479ee7282053b0cbf0d2832eb52994cd658c SHA1 56eb57433b4d3e174130e26926ac4db69024c4db SHA256 78b25f44b1095c7989699f1c37de84143b7ef4c5b6681920cffed867960b35ea
 MISC metadata.xml 396 RMD160 80eb0cca2d1d63c86cd8425ed5323ec1759997b1 SHA1 c3391bf1c51027e56c8f2f112f59f8f0486d8393 SHA256 d5ea3c6662ed224016eb43b117870711f1e2d3c93f261afc41f681a8911af2ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwg9coACgkQmWq1bYTyC0O4FgD/cy4a2HJIE9VD1FkbfDIWvOv1
-m6pXXwSNYSBagTuWxDkA/2Fq0hA29JqlihzIVBfCt2QKlvizVa2LuTcGxMvsrFtH
-=M++S
+iF4EAREIAAYFAkwh2cYACgkQmWq1bYTyC0NHfwD9EoJwHQkXKjy5xULLyG1hh74i
+9ToQGVr6X4EHNDXo1fIA/1AP0lUeLgr+9fPLf3CaLWICjqNcbnTzmSBNctAka8sp
+=ok04
 -----END PGP SIGNATURE-----
diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-misc/corkscrew/corkscrew-2.0.ebuild
index 24f2654ab58e..e17f5dcaffb7 100644
--- a/net-misc/corkscrew/corkscrew-2.0.ebuild
+++ b/net-misc/corkscrew/corkscrew-2.0.ebuild
@@ -1,24 +1,31 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.9 2010/06/22 17:41:00 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.10 2010/06/23 09:53:44 angelos Exp $
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=3
+inherit autotools
 
-DESCRIPTION="Corkscrew is a tool for tunneling SSH through HTTP proxies."
+DESCRIPTION="a tool for tunneling SSH through HTTP proxies."
 HOMEPAGE="http://www.agroman.net/corkscrew/"
+SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND=""
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 SLOT="0"
-SRC_URI="http://www.agroman.net/corkscrew/${P}.tar.gz"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
 
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
+src_prepare() {
+	# Christoph Mende <angelos@gentoo.org (23 Jun 2010)
+	# Shipped configure doesn't work with some locales (bug #305771)
+	# Shipped missing doesn't work with new configure, so we'll force
+	# regeneration
+	rm -f install-sh missing mkinstalldirs || die
+	eautoreconf
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 }
-- 
2.26.2