8 files changed, 54 insertions, 62 deletions
diff --git a/app-crypt/md5deep/ChangeLog b/app-crypt/md5deep/ChangeLog
index d60bc2a4817c..02f74db1c02b 100644
--- a/app-crypt/md5deep/ChangeLog
+++ b/app-crypt/md5deep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/md5deep
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/ChangeLog,v 1.22 2007/02/21 20:25:14 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/ChangeLog,v 1.23 2007/08/24 09:12:55 nyhm Exp $
+
+*md5deep-1.13 (24 Aug 2007)
+
+  24 Aug 2007; Tristan Heaven <nyhm@gentoo.org>
+  -files/md5deep-0.16-gentoo.diff, -md5deep-1.5.ebuild,
+  -md5deep-1.5-r1.ebuild, +md5deep-1.13.ebuild:
+  Version bump, bug #189988
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-crypt/md5deep/files/digest-md5deep-1.13 b/app-crypt/md5deep/files/digest-md5deep-1.13
new file mode 100644
index 000000000000..33d5abb3b9a0
--- /dev/null
+++ b/app-crypt/md5deep/files/digest-md5deep-1.13
@@ -0,0 +1,3 @@
+MD5 e0fc5cffa676a9f8d42da78c781736ba md5deep-1.13.tar.gz 91758
+RMD160 13a65fe2c6bd2bee47d90def51177d06b2794d91 md5deep-1.13.tar.gz 91758
+SHA256 38a267a5a35444ae584a53afe5db9a643668cc60d94d7f3dcee34778b24127c2 md5deep-1.13.tar.gz 91758
diff --git a/app-crypt/md5deep/files/digest-md5deep-1.5 b/app-crypt/md5deep/files/digest-md5deep-1.5
deleted file mode 100644
index d2fa7bcfc9bf..000000000000
--- a/app-crypt/md5deep/files/digest-md5deep-1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14b94d3a38bd4ea6bcd7a6331fae6030 md5deep-1.5.tar.gz 33002
-RMD160 abdc1ec0a730820a7b1e13d8a99c260bbd6b6ddf md5deep-1.5.tar.gz 33002
-SHA256 a7018078b1a72220c1d9e16ea18fb055732aafbcbcb78487d8ba12cbb1c24c26 md5deep-1.5.tar.gz 33002
diff --git a/app-crypt/md5deep/files/digest-md5deep-1.5-r1 b/app-crypt/md5deep/files/digest-md5deep-1.5-r1
deleted file mode 100644
index d2fa7bcfc9bf..000000000000
--- a/app-crypt/md5deep/files/digest-md5deep-1.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14b94d3a38bd4ea6bcd7a6331fae6030 md5deep-1.5.tar.gz 33002
-RMD160 abdc1ec0a730820a7b1e13d8a99c260bbd6b6ddf md5deep-1.5.tar.gz 33002
-SHA256 a7018078b1a72220c1d9e16ea18fb055732aafbcbcb78487d8ba12cbb1c24c26 md5deep-1.5.tar.gz 33002
diff --git a/app-crypt/md5deep/files/md5deep-0.16-gentoo.diff b/app-crypt/md5deep/files/md5deep-0.16-gentoo.diff
deleted file mode 100644
index f03b6f8cabc4..000000000000
--- a/app-crypt/md5deep/files/md5deep-0.16-gentoo.diff
+++ /dev/null
@@ -1,4 +0,0 @@
-350c350
-<   char i;
----
->   int i;
diff --git a/app-crypt/md5deep/md5deep-1.13.ebuild b/app-crypt/md5deep/md5deep-1.13.ebuild
new file mode 100644
index 000000000000..43f33ad65fa6
--- /dev/null
+++ b/app-crypt/md5deep/md5deep-1.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-1.13.ebuild,v 1.1 2007/08/24 09:12:55 nyhm Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Expanded md5sum program with recursive and comparison options"
+HOMEPAGE="http://md5deep.sourceforge.net/"
+SRC_URI="mirror://sourceforge/md5deep/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^CC /s:gcc:$(tc-getCC):" \
+		-e "/^CFLAGS /s:-O3:${CFLAGS}:" \
+		-e "/^LINK_OPT /s:$: ${LDFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	case ${CHOST} in
+		*-darwin*) BUILDTARGET="mac" ;;
+		*-linux*)  BUILDTARGET="linux" ;;
+		# Let it fallback to general "unix" when not using linux exactly
+		*)         BUILDTARGET="unix" ;;
+	esac
+	emake "${BUILDTARGET}" || die "emake failed"
+}
+
+src_install() {
+	emake install \
+		BIN="${D}/usr/bin" \
+		MAN="${D}/usr/share/man/man1" \
+		|| die "emake install failed"
+	dodoc CHANGES README
+}
diff --git a/app-crypt/md5deep/md5deep-1.5-r1.ebuild b/app-crypt/md5deep/md5deep-1.5-r1.ebuild
deleted file mode 100644
index fcbe1c85f787..000000000000
--- a/app-crypt/md5deep/md5deep-1.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-1.5-r1.ebuild,v 1.4 2005/08/10 16:36:43 kito Exp $
-
-DESCRIPTION="Expanded md5sum program that has recursive and comparison options. Also includes SHA hash generation."
-HOMEPAGE="http://md5deep.sourceforge.net"
-SRC_URI="mirror://sourceforge/md5deep/${P}.tar.gz"
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~ppc-macos"
-IUSE=""
-DEPEND=""
-
-src_compile () {
-	sed -i -e "s:-Wall -O2:\$(CFLAGS):g" Makefile
-	BUILDTARGET="linux"
-	use userland_Darwin && BUILDTARGET="mac"
-	make CFLAGS="${CFLAGS}" ${BUILDTARGET} || die
-}
-
-src_install() {
-	dobin md5deep sha1deep sha256deep
-	dodoc README CHANGES
-	doman md5deep.1 sha1deep.1 sha256deep.1
-}
diff --git a/app-crypt/md5deep/md5deep-1.5.ebuild b/app-crypt/md5deep/md5deep-1.5.ebuild
deleted file mode 100644
index 9209987982d6..000000000000
--- a/app-crypt/md5deep/md5deep-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-1.5.ebuild,v 1.5 2005/03/27 11:21:43 hansmi Exp $
-
-DESCRIPTION="Expanded md5sum program that has recursive and comparison options. Also includes SHA hash generation."
-HOMEPAGE="http://md5deep.sourceforge.net"
-SRC_URI="mirror://sourceforge/md5deep/${P}.tar.gz"
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-DEPEND=""
-
-src_unpack () {
-	unpack ${A} ; cd ${S}
-}
-
-src_compile () {
-	make CFLAGS="${CFLAGS}" linux || die
-}
-
-src_install() {
-	dobin md5deep sha1deep
-	dodoc README CHANGES
-	doman md5deep.1 sha1deep.1
-}