Fix static building #123686 by Alexander Skwar and revert most changes.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 50 insertions, 13 deletions

diff --git a/net-misc/proxytunnel/ChangeLog b/net-misc/proxytunnel/ChangeLog
index ccadbb6560d4..a31abfa0d591 100644
--- a/net-misc/proxytunnel/ChangeLog
+++ b/net-misc/proxytunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/proxytunnel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.11 2006/02/22 16:37:52 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/ChangeLog,v 1.12 2006/02/22 23:25:37 vapier Exp $
+
+  22 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  files/proxytunnel-1.6.0-build.patch, proxytunnel-1.6.0-r1.ebuild:
+  Fix static building #123686 by Alexander Skwar and revert most changes.
 
   22 Feb 2006; Stefan Briesenick <sbriesen@gentoo.org>
   proxytunnel-1.6.0-r1.ebuild:
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index 31febc614623..e8f1a8fe5c53 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,6 +1,9 @@
-MD5 90f8995cb2794d07941ec69651349867 ChangeLog 1712
-RMD160 6df90ac9c60f0b2187c644ebe332fd1c83c8f168 ChangeLog 1712
-SHA256 5a2ab7cf5f6ed8192596f526b4fa254f81e2a31c64e0257b12336e9fd11240e6 ChangeLog 1712
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c9d7e663ccedd0c649168e0784d8343 ChangeLog 1903
+RMD160 8aa6d6a6596e1b93ec968abf74517336430e0a85 ChangeLog 1903
+SHA256 c9f72d133936797b42bd6552eb170db7b889beabfa8d639b015654729bb09ffa ChangeLog 1903
 MD5 4abbce06d14cb7cd98c338f999b43323 files/1.2.0-makefile.patch 710
 RMD160 c8e51cf8770f05a3beedafe8b93ad1fd1b0c0f8d files/1.2.0-makefile.patch 710
 SHA256 34e845a48fc88a7052b60b7fc14d84d3b140cd8704bf4a4ff81e5005a171bfcf files/1.2.0-makefile.patch 710
@@ -28,9 +31,9 @@ SHA256 8af001186a5c9900f92cd9dc81890f950109d54ab0652b93d1c92bdb3fa99e21 files/pr
 MD5 a9963d5270246707b3ede285225e3ed1 files/proxytunnel-1.5.0-build.patch 682
 RMD160 ba0f256e71badbdb2e70f4f8d5c70945f3f6d24c files/proxytunnel-1.5.0-build.patch 682
 SHA256 b6b6e5040c7efefb972310e978250527e42f787f657d78ee2205c2d1e072c652 files/proxytunnel-1.5.0-build.patch 682
-MD5 4c29be571e9441632edb11e8d3c8c20b files/proxytunnel-1.6.0-build.patch 271
-RMD160 04651e40f4c661352a03677c8f60958fa0fb77b5 files/proxytunnel-1.6.0-build.patch 271
-SHA256 1f4812d2e1c9abbd446d17f043386b29b485d753f19b56783e20ac5b34164849 files/proxytunnel-1.6.0-build.patch 271
+MD5 626e985e3e821d9c324834ccaf7fd274 files/proxytunnel-1.6.0-build.patch 710
+RMD160 013ed0e6a318dbc145661dc077456dd4a6422771 files/proxytunnel-1.6.0-build.patch 710
+SHA256 979bc747888ef81e8248a63253108d349fc9efc87553feeb1ebb5396f33d1207 files/proxytunnel-1.6.0-build.patch 710
 MD5 210340eb860a1c9a5cf63401b5fce5ce proxytunnel-1.2.0.ebuild 795
 RMD160 5f249f9a53ba0a9f570d7df05fbe675239b6ae61 proxytunnel-1.2.0.ebuild 795
 SHA256 f6384f93e89c2ae52863d98a5ef3ebc9ca3767f8a073eb17d00e87d46d605ea1 proxytunnel-1.2.0.ebuild 795
@@ -40,9 +43,16 @@ SHA256 f413c39d596a98147069abb35e3d216e29072711f84a665047a786c3c40f169b proxytun
 MD5 1345973723eeff7150ab023638c10e7d proxytunnel-1.5.0.ebuild 843
 RMD160 8993755d0135f4aad2afac187190df904482d434 proxytunnel-1.5.0.ebuild 843
 SHA256 dc28f495972e7a60db35bf1984ccf2e389ab67ccb6c36f71712cab52ffca0b43 proxytunnel-1.5.0.ebuild 843
-MD5 065f35f2b368a458e3c7e6c10097d3db proxytunnel-1.6.0-r1.ebuild 791
-RMD160 c72cbaf4e5ffede87354a6a96d83c2a83812743f proxytunnel-1.6.0-r1.ebuild 791
-SHA256 0297e66b1343de33939caf913ed8b319be71888bb42d8d9e2aff1a37f2e86d38 proxytunnel-1.6.0-r1.ebuild 791
+MD5 77a85bf7e0cf4b3c1e50edfa30555f20 proxytunnel-1.6.0-r1.ebuild 871
+RMD160 4e854208807c9254e0a0353a01e4286316361e8a proxytunnel-1.6.0-r1.ebuild 871
+SHA256 392a042ba068bebef68a75742e88596ab257e3e2a6db1935542ee5db1245219c proxytunnel-1.6.0-r1.ebuild 871
 MD5 1b9d82bcea990b7ded94c734d62a82ab proxytunnel-1.6.0.ebuild 787
 RMD160 ec394bd111835561b30bd48c284eb4e479e86e0b proxytunnel-1.6.0.ebuild 787
 SHA256 480badebb7354717a20dc38ffee2eb7ecacee9739415d597493b986021de04ff proxytunnel-1.6.0.ebuild 787
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD/PMW2+ySkm8kpY0RAppLAJ9tENEEXx6VK3kWC4We7UG+3C1CWQCdEIUh
+RH9hVk6mAu0p3QfNqzWyA4Y=
+=w3xq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch b/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch
index bc58a080e5a8..28be4b73c069 100644
--- a/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch
+++ b/net-misc/proxytunnel/files/proxytunnel-1.6.0-build.patch
@@ -1,5 +1,23 @@
 --- Makefile
 +++ Makefile
+@@ -6,7 +6,7 @@
+ CFLAGS ?= -Wall -O2 -g
+ CFLAGS += -DHAVE_GETOPT_LONG -DUSE_SSL
+ CFLAGS += -DSETPROCTITLE -DSPT_TYPE=1
+-LDFLAGS += -lssl -lcrypto
++LDFLAGS += -lssl $(shell pkg-config libcrypto --libs)
+ 
+ PREFIX =/usr/local
+ BINDIR = $(PREFIX)/bin
+@@ -27,7 +27,7 @@
+ 	ntlm.o
+ 
+ proxytunnel: $(OBJ)
+-	$(CC) -o $(PROGNAME) $(CFLAGS) $(LDFLAGS) $(OBJ)
++	$(CC) -o $(PROGNAME) $(CFLAGS) $(OBJ) $(LDFLAGS)
+ 
+ clean:		
+ 	@rm -f $(PROGNAME) $(OBJ)
 @@ -34,4 +34,4 @@
  
  install:
diff --git a/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild
index b200f86ed77e..8e41eb0c0522 100644
--- a/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild,v 1.2 2006/02/22 16:37:52 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxytunnel/proxytunnel-1.6.0-r1.ebuild,v 1.3 2006/02/22 23:25:37 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,13 +15,18 @@ IUSE="static"
 
 DEPEND="dev-libs/openssl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
 src_compile() {
 	use static && append-ldflags -static
 	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	dobin proxytunnel
-	doman debian/proxytunnel.1
+	make install PREFIX=/usr DESTDIR="${D}" || die
 	dodoc CHANGES CREDITS KNOWN_ISSUES README
 }