From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 29 Oct 2005 09:31:40 +0000 (+0000)
Subject: Cleanup autotools #91677.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f567ae73ab6fb9edf1f1ba3e0691219fa60b9c7a;p=gentoo.git

Cleanup autotools #91677.
Package-Manager: portage-2.0.53_rc6
---

diff --git a/net-misc/proxychains/ChangeLog b/net-misc/proxychains/ChangeLog
index aaf8c9a04a18..e3aa81c39af4 100644
--- a/net-misc/proxychains/ChangeLog
+++ b/net-misc/proxychains/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/proxychains
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.6 2005/04/19 22:12:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.7 2005/10/29 09:31:40 vapier Exp $
+
+  29 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/proxychains-2.1-autotools.patch, proxychains-2.1-r2.ebuild:
+  Cleanup autotools #91677.
 
 *proxychains-2.1-r2 (19 Apr 2005)
 
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 0d752eca57a9..2b118bf6bdc5 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,5 +1,16 @@
-MD5 4e73a03cb8d1fdf233dd7cac68912ae9 ChangeLog 1014
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 9a6466422caf413973d53237ffde15c7 proxychains-2.1-r2.ebuild 1065
-MD5 31f74f67a6811847c3b733a8ee3595c3 files/proxychains-2.1-libc-connect.patch 294
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4ef70dcf883dcbb7992ef179282f1ca5 ChangeLog 1162
 MD5 4cebebd00e1b468ed723ce38470e87e8 files/digest-proxychains-2.1-r2 67
+MD5 1c061d1b2cf15c31098b00f930145f11 files/proxychains-2.1-autotools.patch 2198
+MD5 31f74f67a6811847c3b733a8ee3595c3 files/proxychains-2.1-libc-connect.patch 294
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 7ebce22a77ec6ee78d053fc5532410e9 proxychains-2.1-r2.ebuild 1271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDY0GRgIKl8Uu19MoRAl8nAJ9iJKf7/C8186NcjQnaHz/2ObWJIQCfWJwZ
+RZmUDIb1BCw28+OcgvsglDE=
+=dGal
+-----END PGP SIGNATURE-----
diff --git a/net-misc/proxychains/files/proxychains-2.1-autotools.patch b/net-misc/proxychains/files/proxychains-2.1-autotools.patch
new file mode 100644
index 000000000000..816ac66567dc
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-2.1-autotools.patch
@@ -0,0 +1,84 @@
+Update autotools and remove cruft that kdevelop added for no reason
+
+--- configure.in
++++ configure.in
+@@ -1,30 +1,24 @@
+ dnl without this order in this file, autoconf will not work!
+ dnl the argument is a source file out of your sources. But
+ dnl acinclude.m4 makes the job for all programs ;-)
+-AC_INIT(acinclude.m4)
++AC_INIT(proxychains,2.1)
+ 
+ dnl enable the following if you want to use autoconf/automake
+ dnl framework from a certain directory (like kde-common)
+ dnl AC_CONFIG_AUX_DIR(admin)
+ 
+ AC_CANONICAL_SYSTEM
+-AC_ARG_PROGRAM
+ 
+-AM_INIT_AUTOMAKE(proxychains,2.1)
++AM_INIT_AUTOMAKE
+ 
+ AC_PREFIX_DEFAULT(/usr)
+-if test "x$prefix" = "xNONE"; then
+-  prefix=$ac_default_prefix
+-  ac_configure_args="$ac_configure_args --prefix $prefix"
+-fi
+ 
+ dnl without this order in this file, automake will be confused!
+ dnl 
+ AM_CONFIG_HEADER(config.h)
+ 
+-dnl checks for programs.
+-dnl first check for c compiler
+-AC_CHECK_C_COMPILER
++AC_PROG_CC
++AC_PROG_LIBTOOL
+ 
+ dnl create only shared libtool-libraries
+ AC_ENABLE_SHARED(yes)
+@@ -33,44 +27,6 @@
+ dnl libtool-libraries
+ AC_ENABLE_STATIC(no)
+ 
+-dnl create a working libtool-script
+-if test -z "$LIBTOOL"; then
+-  AC_LANG_SAVE
+-  AC_LANG_C
+-  AC_LIBTOOL_DLOPEN
+-  AM_PROG_LIBTOOL
+-  dnl LIBTOOL="$LIBTOOL --silent"
+-  dnl AC_SUBST(LIBTOOL)
+-  AC_LANG_RESTORE
+-  LIBTOOL_SHELL='/bin/sh ./libtool'
+-else
+-  LIBTOOL_SHELL=$LIBTOOL
+-fi
+-
+-dnl check for presence of dynamic-loading-library functions
+-KDE_CHECK_LIBDL
+-
+-dnl activate the following for some additional tests
+-dnl   (compat, crypt, socket, nsl, ...)
+-dnl KDE_MISC_TESTS
+-
+-dnl add --with-extra-includes and --with-extra-libs switch to ./configure
+-dnl 
+-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+-all_libraries="$all_libraries $USER_LDFLAGS"
+-all_includes="$all_includes $USER_INCLUDES"
+-AC_SUBST(all_includes)
+-AC_SUBST(all_libraries)
+-
+-AC_SUBST(AUTODIRS)
+-
+-dnl in this space add everything you want to check for
+-dnl examples are specific headers, libraries, etc.
+-
+-
+-
+-dnl perform program name transformation
+-AC_ARG_PROGRAM
+ 
+ dnl add here all your Makefiles. These will be created by configure
+ AC_OUTPUT(Makefile proxychains/Makefile proxychains/docs/Makefile proxychains/docs/en/Makefile )
diff --git a/net-misc/proxychains/proxychains-2.1-r2.ebuild b/net-misc/proxychains/proxychains-2.1-r2.ebuild
index fff7979549c5..415201014fc5 100644
--- a/net-misc/proxychains/proxychains-2.1-r2.ebuild
+++ b/net-misc/proxychains/proxychains-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-2.1-r2.ebuild,v 1.1 2005/04/19 22:12:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-2.1-r2.ebuild,v 1.2 2005/10/29 09:31:40 vapier Exp $
 
 # This doesn't seem to be 64bit clean ... on amd64 for example,
 # trying to do `proxychains telnet 192.168.0.77` will attempt to 
@@ -24,9 +24,13 @@ DEPEND=""
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
-	sed -i 's:/etc/:$(DESTDIR)/etc/:' proxychains/Makefile.in || die
+	sed -i 's:/etc/:$(DESTDIR)/etc/:' proxychains/Makefile.am || die
 	epatch "${FILESDIR}"/${P}-libc-connect.patch
-	touch *
+
+	# bundled timestamps/autotools are all busted so rebuild
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	rm acconfig.h *.m4
+	aclocal && autoheader && libtoolize -c -f && autoconf && automake || die "autotools failed"
 }
 
 src_install() {