9 files changed, 22 insertions, 118 deletions
diff --git a/dev-libs/libmcrypt/ChangeLog b/dev-libs/libmcrypt/ChangeLog
index 248ec7d12b46..7bcb2b162e6b 100644
--- a/dev-libs/libmcrypt/ChangeLog
+++ b/dev-libs/libmcrypt/ChangeLog
@@ -1,13 +1,15 @@
 # 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.6 2002/06/24 12:28:04 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.7 2002/06/24 14:09:40 seemant Exp $
 
-*libmcrypt-2.5.1-r1 (21 Jun 2002)
+*libmcrypt-2.5.1-r2 (24 Jun 2002)
+
+  24 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  libmcrypt-2.5.1-r2.ebuild files/digest-libmcrypt-2.5.1-r2.ebuild :
 
-  24 Jun 2002: Gabriele Giorgetti <stroke@gentoo.org> ChangeLog:
+  elibtoolize
 
-  lintool fixes applied (SLOT, LICENSE). automake dependece was added.
-  Closes bug #4068
+*libmcrypt-2.5.1-r1 (21 Jun 2002)
 
   21 Jun 2002: Gabriele Giorgetti <stroke@gentoo.org> libmcrypt-2.5.1-r1.ebuild
 
@@ -30,7 +32,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.6 2002/06/24 12:28:04 stroke Exp $.
+  Resolve bug #2276.  Add $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.7 2002/06/24 14:09:40 seemant Exp $.
 
 *libmcrypt-2.4.19 (1 Feb 2002)
 
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19
deleted file mode 100644
index 6984bed96eff..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de7123b98801f755d6cd1bb53079aa28 libmcrypt-2.4.19.tar.gz 472468
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19-r1 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19-r1
deleted file mode 100644
index 6984bed96eff..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.4.19-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de7123b98801f755d6cd1bb53079aa28 libmcrypt-2.4.19.tar.gz 472468
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.0 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.0
deleted file mode 100644
index 514ec462bc55..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d67938f9992f7ebd9906b128e2efd88 libmcrypt-2.5.0.tar.gz 498937
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r2
index 4ed9f2f21337..4ed9f2f21337 100644
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1
+++ b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.1-r2
diff --git a/dev-libs/libmcrypt/libmcrypt-2.4.19-r1.ebuild b/dev-libs/libmcrypt/libmcrypt-2.4.19-r1.ebuild
deleted file mode 100644
index b85111fb3f4a..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.4.19-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Christian Rubbert <crubb@xrc.de>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.4.19-r1.ebuild,v 1.1 2002/05/05 09:26:38 azarah 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"
-
-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}"
-
-	econf --host=${CHOST} \
-		--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.4.19.ebuild b/dev-libs/libmcrypt/libmcrypt-2.4.19.ebuild
deleted file mode 100644
index 1c5c3abe3860..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.4.19.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Christian Rubbert <crubb@xrc.de>
-
-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"
-
-src_compile() {
-
-	econf --host=${CHOST} \
-		--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.0.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.0.ebuild
deleted file mode 100644
index 4284a6af1dd2..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.5.0.ebuild
+++ /dev/null
@@ -1,37 +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.0.ebuild,v 1.2 2002/06/13 22:57:52 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"
-
-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}"
-
-	# Not Working with this one;
-        # econf --host=${CHOST} \ 
-
-        # Just removed --host then:
-	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.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild
index 44e9fc852dae..9fb5177870aa 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.1.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.1-r2.ebuild
@@ -1,13 +1,19 @@
 # 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.ebuild,v 1.1 2002/06/17 15:19:59 stroke Exp $
+# $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"
+DEPEND="virtual/glibc
+	>=sys-devel/automake-1.6.1"
+RDEPEND="virtual/glibc"
+SLOT="0"
+LICENSE="GPL-2"
 
 src_compile() {
 
@@ -16,12 +22,12 @@ src_compile() {
 	CFLAGS="${CFLAGS/mcpu=k/march=k}"
 
 	# Doesn't work with --host bug #3517
-        # econf --host=${CHOST} \ 
-
+	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)
+	# 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
 }
@@ -32,5 +38,6 @@ src_install () {
 	
 	einstall || die
 
-	dodoc AUTHORS COPYING INSTALL KNOW-BUGS NEWS README THANKS TODO doc/README.* doc/example.c
+	dodoc AUTHORS COPYING INSTALL KNOW-BUGS NEWS README THANKS TODO
+	dodoc doc/README.* doc/example.c
 }