Cleanup

Package-Manager: portage-2.1.4_rc9

6 files changed, 16 insertions, 78 deletions

diff --git a/dev-libs/libmcrypt/ChangeLog b/dev-libs/libmcrypt/ChangeLog
index 17454866df2c..c9401c9f7027 100644
--- a/dev-libs/libmcrypt/ChangeLog
+++ b/dev-libs/libmcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libmcrypt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.43 2007/11/19 01:59:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/ChangeLog,v 1.44 2007/12/11 13:38:58 alonbl Exp $
+
+  11 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/libmcrypt-2.5.7-m4.patch, -libmcrypt-2.5.7.ebuild,
+  libmcrypt-2.5.8.ebuild:
+  Cleanup
 
   19 Nov 2007; Joshua Kinard <kumba@gentoo.org> libmcrypt-2.5.8.ebuild:
   Stable on mips, per #198664.
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index a6a2d58a5c38..d975da0c7ec8 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,38 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libmcrypt-2.5.7-m4.patch 274 RMD160 826f08fe8555a352ca5c1eb428eb39ab89af2c8f SHA1 dd1b150604af7b58f80a7249f403878afb8221c8 SHA256 cab47c8209fc351076a12708dc003d8fa3c43794d839d4d9cddf8da7221767a1
-MD5 4addd4c629433b66b873addcdf8f6cbb files/libmcrypt-2.5.7-m4.patch 274
-RMD160 826f08fe8555a352ca5c1eb428eb39ab89af2c8f files/libmcrypt-2.5.7-m4.patch 274
-SHA256 cab47c8209fc351076a12708dc003d8fa3c43794d839d4d9cddf8da7221767a1 files/libmcrypt-2.5.7-m4.patch 274
-DIST libmcrypt-2.5.7.tar.gz 523321 RMD160 27b58eb3e35d4fb2eda44f69990b1e59238182ed SHA1 c1de667c4fa1bf8b0941e36a8c0e5ef5910a41ca SHA256 186f091a3b5f6bba4301480d6a07d9ea830a813b03d79fec3cde383ac96bd3a1
 DIST libmcrypt-2.5.8.tar.gz 1335178 RMD160 1b174c4c3633c67ef5526c151ba2935b676a8ccd SHA1 9a426532e9087dd7737aabccff8b91abf9151a7a SHA256 e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e
-EBUILD libmcrypt-2.5.7.ebuild 894 RMD160 585fdb5c122635b26245beb810026d8d2fdaef04 SHA1 53c932fbb77e1713615982c5618bd49191c70199 SHA256 f0b94ae96f828d4366ae927cba3e9474cc958efe1dad1d6f723e340445244dbe
-MD5 e2bc2866933d7462c9ea93b244ed29ec libmcrypt-2.5.7.ebuild 894
-RMD160 585fdb5c122635b26245beb810026d8d2fdaef04 libmcrypt-2.5.7.ebuild 894
-SHA256 f0b94ae96f828d4366ae927cba3e9474cc958efe1dad1d6f723e340445244dbe libmcrypt-2.5.7.ebuild 894
-EBUILD libmcrypt-2.5.8.ebuild 930 RMD160 de5edc6021fca42dca4c6d7ec67a21bef7f8f8b1 SHA1 314efd95a3f85d1098a54a05606d50fe38b9336a SHA256 0c4ef230a597a806f885d322014be28b5e059f9afce4aef183939c9606c0c4e5
-MD5 12c2dcc055f8db51421db3046cd5ade6 libmcrypt-2.5.8.ebuild 930
-RMD160 de5edc6021fca42dca4c6d7ec67a21bef7f8f8b1 libmcrypt-2.5.8.ebuild 930
-SHA256 0c4ef230a597a806f885d322014be28b5e059f9afce4aef183939c9606c0c4e5 libmcrypt-2.5.8.ebuild 930
-MISC ChangeLog 5239 RMD160 0af16160348128457e23c75b6c255fde0deae330 SHA1 9dc1d0be6ce4fbeec90c567d2e6349dbcfd6e4cd SHA256 2e4e63b83727365637909b473b8c2efe1d4aa936c39714ee2355de4acef7d962
-MD5 342340b58220040cf46ecfa95c7568d0 ChangeLog 5239
-RMD160 0af16160348128457e23c75b6c255fde0deae330 ChangeLog 5239
-SHA256 2e4e63b83727365637909b473b8c2efe1d4aa936c39714ee2355de4acef7d962 ChangeLog 5239
+EBUILD libmcrypt-2.5.8.ebuild 841 RMD160 ec11c4191060b518d4a833fc3093205176df6a9b SHA1 cfaafce59b10f61ebdd3118669772806d829aadc SHA256 0ff06ef9ad9ab0442397cd50b72b64a3deabd9a2814bd3d1c792085ee444adf6
+MD5 9d003eccd5284e70da153d80665e4631 libmcrypt-2.5.8.ebuild 841
+RMD160 ec11c4191060b518d4a833fc3093205176df6a9b libmcrypt-2.5.8.ebuild 841
+SHA256 0ff06ef9ad9ab0442397cd50b72b64a3deabd9a2814bd3d1c792085ee444adf6 libmcrypt-2.5.8.ebuild 841
+MISC ChangeLog 5385 RMD160 094ddefe9cf3d96f40df9633a94a8f0abfc0e16b SHA1 014a8ac79c408de8a34312ffaf82f6684cb1ce08 SHA256 2eced54608c1bd53bd4290a26e4188d93a873e41830e253007fdfd4836f6f62b
+MD5 43065887dc3355d17ccd41a92eac1acd ChangeLog 5385
+RMD160 094ddefe9cf3d96f40df9633a94a8f0abfc0e16b ChangeLog 5385
+SHA256 2eced54608c1bd53bd4290a26e4188d93a873e41830e253007fdfd4836f6f62b ChangeLog 5385
 MISC metadata.xml 278 RMD160 a7f296a5304f80db941e44613607bcc3b6c8fc0a SHA1 e92b5ba90ebad3046c7459e88a5be4a5c8563c2d SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6
 MD5 845f62e464e324ce7cb4bf977183f98f metadata.xml 278
 RMD160 a7f296a5304f80db941e44613607bcc3b6c8fc0a metadata.xml 278
 SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6 metadata.xml 278
-MD5 105479718094f6dc633d25d7d316bbb1 files/digest-libmcrypt-2.5.7 247
-RMD160 c4e45ffe0a4329e668deea23706ca7ac6db1d060 files/digest-libmcrypt-2.5.7 247
-SHA256 c5046cb2e9b688ddc3be5fdb1512133f2370379c0810420342772b8f0052fa32 files/digest-libmcrypt-2.5.7 247
 MD5 d6cecb76b9661d014dd5221ca03b3df2 files/digest-libmcrypt-2.5.8 250
 RMD160 5188f20dc3e6a464ed7f56f85cf6dd46c4cd457d files/digest-libmcrypt-2.5.8 250
 SHA256 c4dc6065a5dac79a6625395537147d8c6386e94517a03f426df796aa53c030e6 files/digest-libmcrypt-2.5.8 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHXmFGp/wUKkr7RBoRAqjPAKCIikv4lcZ+EoqREzJUNCWKJjbxKACgnRtK
-4oPoIs2wM2HHFl0x4ryX5Ic=
-=27ys
------END PGP SIGNATURE-----
diff --git a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.7 b/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.7
deleted file mode 100644
index d9af8751bd3a..000000000000
--- a/dev-libs/libmcrypt/files/digest-libmcrypt-2.5.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b1be163143f8e8ed0474beeb642b3bad libmcrypt-2.5.7.tar.gz 523321
-RMD160 27b58eb3e35d4fb2eda44f69990b1e59238182ed libmcrypt-2.5.7.tar.gz 523321
-SHA256 186f091a3b5f6bba4301480d6a07d9ea830a813b03d79fec3cde383ac96bd3a1 libmcrypt-2.5.7.tar.gz 523321
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.7-m4.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.7-m4.patch
deleted file mode 100644
index e7acf39548c3..000000000000
--- a/dev-libs/libmcrypt/files/libmcrypt-2.5.7-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warnings:
-/usr/share/aclocal/libmcrypt.m4:17: warning: underquoted definition of AM_PATH_LIBMCRYPT
---- libmcrypt-2.5.7/lib/libmcrypt.m4
-+++ libmcrypt-2.5.7/lib/libmcrypt.m4
-@@ -16,3 +16,3 @@
- dnl
--AC_DEFUN(AM_PATH_LIBMCRYPT,
-+AC_DEFUN([AM_PATH_LIBMCRYPT],
- [dnl
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.7.ebuild
deleted file mode 100644
index ba06d9f3f253..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.5.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.7.ebuild,v 1.25 2007/07/02 14:56:24 peper Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="libmcrypt is a library that provides uniform interface to access several encryption algorithms."
-HOMEPAGE="http://mcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	elibtoolize
-}
-
-src_install() {
-	dodir /usr/{bin,include,lib}
-	make install DESTDIR="${D}" || die "install failure"
-
-	dodoc AUTHORS KNOWN-BUGS INSTALL NEWS README THANKS TODO ChangeLog
-	dodoc doc/README.* doc/example.c
-	prepalldocs
-}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild
index 0fe4fed8be86..d415b7b42153 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild,v 1.11 2007/12/11 10:07:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.8.ebuild,v 1.12 2007/12/11 13:38:58 alonbl Exp $
 
 inherit eutils libtool
 
@@ -17,13 +17,12 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	##EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.5.7-m4.patch
 	cd "${S}"
+	# freebsd?
 	elibtoolize
 }
 
 src_install() {
-	dodir /usr/{bin,include,lib}
 	make install DESTDIR="${D}" || die "install failure"
 
 	dodoc AUTHORS KNOWN-BUGS INSTALL NEWS README THANKS TODO ChangeLog