cleanups

7 files changed, 22 insertions, 105 deletions

diff --git a/dev-libs/libmcrypt/ChangeLog b/dev-libs/libmcrypt/ChangeLog
index 77dc5f5f0bb3..5f54e4de5648 100644
--- a/dev-libs/libmcrypt/ChangeLog
+++ b/dev-libs/libmcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libmcrypt
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.8 2002/06/30 20:30:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.9 2002/07/01 18:09:01 azarah Exp $
+
+*libmcrypt-2.5.1-r4 (1 Jul 2002)
+
+  1 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Ok, officially bug #3940 is fixed with -r3, but r4 is just the
+  final with cleanups, etc.  Thanks Jon.
 
 *libmcrypt-2.5.1-r3 (30 Jun 2002)
 
@@ -38,7 +45,7 @@
 
   5 May 2002: Martin Schlemmer <azarah@gentoo.org> libmcrypt-2.4.19-r1.ebuild :
 
-  Resolve bug #2276.  Add $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.8 2002/06/30 20:30:07 azarah Exp $.
+  Resolve bug #2276.  Add $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.9 2002/07/01 18:09:01 azarah Exp $.
 
 *libmcrypt-2.4.19 (1 Feb 2002)
 
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r2 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r2
deleted file mode 100644
index 4ed9f2f21337..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b260193a725cd77c10f8e12c4a505eac libmcrypt-2.5.1.tar.gz 503588
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r3 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r3
deleted file mode 100644
index 4ed9f2f21337..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b260193a725cd77c10f8e12c4a505eac libmcrypt-2.5.1.tar.gz 503588
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r1 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r4
index 4ed9f2f21337..4ed9f2f21337 100644
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r1
+++ b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r4
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.1-r1.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.1-r1.ebuild
deleted file mode 100644
index 4679ccb8686c..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.1-r1.ebuild,v 1.2 2002/06/24 12:28:04 stroke Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libmcrypt is a library that provides uniform interface to access several encryption algorithms."
-SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/${P}.tar.gz"
-HOMEPAGE="http://mcrypt.hellug.gr/"
-
-DEPEND="virtual/glibc
-	>=sys-devel/automake-1.6.1"
-RDEPEND="virtual/glibc"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_compile() {
-
-	# Do not compile with -mcpu=k6/5 because of a k6/5 varible
-	# in modules/algorithms/gosh.c
-	CFLAGS="${CFLAGS/mcpu=k/march=k}"
-
-	# Doesn't work with --host bug #3517
-        # econf --host=${CHOST} \ 
-	export WANT_AUTOMAKE_1_6=1
-	autoreconf --force --install --symlink || die
-	econf --disable-posix-threads || die
-		
-	# PHP manual states to disable posix threads, no further explanation given, but i'll
-	# stick with it :) (Source: http://www.php.net/manual/en/ref.mcrypt.php)
-
-	emake || die
-}
-
-src_install () {
-	
-	dodir /usr/{bin,include,lib}
-	
-	einstall || die
-
-	dodoc AUTHORS COPYING INSTALL KNOW-BUGS NEWS README THANKS TODO doc/README.* doc/example.c
-}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild
deleted file mode 100644
index 9fb5177870aa..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild,v 1.1 2002/06/24 14:09:40 seemant Exp $
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="libmcrypt is a library that provides uniform interface to access several encryption algorithms."
-SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/${P}.tar.gz"
-HOMEPAGE="http://mcrypt.hellug.gr/"
-
-DEPEND="virtual/glibc
-	>=sys-devel/automake-1.6.1"
-RDEPEND="virtual/glibc"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_compile() {
-
-	# Do not compile with -mcpu=k6/5 because of a k6/5 varible
-	# in modules/algorithms/gosh.c
-	CFLAGS="${CFLAGS/mcpu=k/march=k}"
-
-	# Doesn't work with --host bug #3517
-	elibtoolize
-	econf --disable-posix-threads || die
-		
-	# PHP manual states to disable posix threads, no further explanation 
-	# given, but i'll stick with it :)
-	# (Source: http://www.php.net/manual/en/ref.mcrypt.php)
-
-	emake || die
-}
-
-src_install () {
-	
-	dodir /usr/{bin,include,lib}
-	
-	einstall || die
-
-	dodoc AUTHORS COPYING INSTALL KNOW-BUGS NEWS README THANKS TODO
-	dodoc doc/README.* doc/example.c
-}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.1-r3.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.1-r4.ebuild
index c4c9233ddb1b..251e3ccd5745 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.1-r3.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.1-r3.ebuild,v 1.5 2002/07/01 16:54:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.1-r4.ebuild,v 1.1 2002/07/01 18:09:02 azarah Exp $
 
 inherit libtool
 
@@ -29,22 +29,18 @@ src_unpack() {
 
 	# Try to fix some wierd build problems. See bug #3940.
 	echo ">>> Reconfiguring package..."
-	for x in $(find ${S} -name configure)
-	do
-		cd ${x%/*}
-		export WANT_AUTOMAKE_1_6=1
-		export WANT_AUTOCONF_2_5=1
-		autoreconf --force --install --symlink &>${T}/autoreconf.log || ( \
-			echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log
-			eerror "Reonfigure failed, please attatch the contents of:"
-			eerror
-			eerror "  ${T}/autoreconf.log"
-			eerror
-			eerror "in your bugreport."
-			# we need an error here, else the ebuild do not die
-			exit 1
-		) || die "running autoreconf failed"
-	done
+	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOCONF_2_5=1
+	autoreconf --force --install --symlink &>${T}/autoreconf.log || ( \
+		echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log
+		eerror "Reonfigure failed, please attatch the contents of:"
+		eerror
+		eerror "  ${T}/autoreconf.log"
+		eerror
+		eerror "in your bugreport."
+		# we need an error here, else the ebuild do not die
+		exit 1
+	) || die "running autoreconf failed"
 }
 
 src_compile() {