QA: Fixed compilation with --as-needed (bug 246867), respect CC (bug 243544), respect LDFLAGS, let dobin die

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 39 insertions, 12 deletions

diff --git a/app-crypt/mdcrack/ChangeLog b/app-crypt/mdcrack/ChangeLog
index 5051bc40ff27..bbe6da1c59de 100644
--- a/app-crypt/mdcrack/ChangeLog
+++ b/app-crypt/mdcrack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mdcrack
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mdcrack/ChangeLog,v 1.4 2007/02/08 21:19:49 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mdcrack/ChangeLog,v 1.5 2009/02/10 16:15:32 angelos Exp $
+
+  10 Feb 2009; Christoph Mende <angelos@gentoo.org>
+  +files/mdcrack-1.2-asneeded.patch, mdcrack-1.2.ebuild:
+  QA: Fixed compilation with --as-needed (bug 246867), respect CC (bug
+  243544), respect LDFLAGS, let dobin die
 
   08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch b/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
new file mode 100644
index 000000000000..3b5abe5967b1
--- /dev/null
+++ b/app-crypt/mdcrack/files/mdcrack-1.2-asneeded.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2009-02-10 17:06:52.786706429 +0100
++++ Makefile	2009-02-10 17:07:15.947791244 +0100
+@@ -56,7 +56,7 @@
+ NCURSES=-DNCURSES 
+ 
+ #LDFLAGS=
+-LDFLAGS=-lncurses
++LIBS=-lncurses
+ 
+ # Debugging 
+ DEBUG=
+@@ -94,7 +94,7 @@
+ 
+ 
+ bin/mdcrack: src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mdcrack.o src/stats.o src/mesgs.o src/hash.o src/charset.o
+-	$(CC) $(LDFLAGS) -o bin/mdcrack src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mesgs.o src/mdcrack.o src/stats.o  src/hash.o src/charset.o
++	$(CC) $(LDFLAGS) -o bin/mdcrack src/coding.o src/NTLM1/core3.o src/NTLM1/core3b.o src/NTLM1/unicode.o src/MD4/core1b.o src/MD4/core2b.o src/MD4/core3b.o src/MD4/core1.o src/MD4/core2.o src/MD4/core3.o src/MD5/core1b.o src/MD5/core2b.o src/MD5/core3b.o src/MD5/core1.o src/MD5/core2.o src/MD5/core3.o src/title.o src/mesgs.o src/mdcrack.o src/stats.o  src/hash.o src/charset.o $(LIBS)
+ 
+ big:
+ 	@echo
diff --git a/app-crypt/mdcrack/mdcrack-1.2.ebuild b/app-crypt/mdcrack/mdcrack-1.2.ebuild
index 430dc02e24a0..d7dda2302fc4 100644
--- a/app-crypt/mdcrack/mdcrack-1.2.ebuild
+++ b/app-crypt/mdcrack/mdcrack-1.2.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mdcrack/mdcrack-1.2.ebuild,v 1.3 2005/09/10 22:47:30 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mdcrack/mdcrack-1.2.ebuild,v 1.4 2009/02/10 16:15:32 angelos Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A MD4/MD5/NTML hashes bruteforcer."
 HOMEPAGE="http://mdcrack.df.ru/"
 SRC_URI="http://mdcrack.df.ru/download/${P}.tar.gz"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="ncurses"
-DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc4.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.diff \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
 	use ncurses || \
 		sed -i -e 's/^NCURSES/#NCURSES/g' \
-			-e 's/^LDFLAGS/#LDFLAGS/g' Makefile
-	sed -i "s,^\(CFLAGS =\).*,\1 ${CFLAGS},g" Makefile
+			-e 's/^LIBS/#LIBS/g' Makefile
+	sed -i -e "/^CFLAGS/d" Makefile
 
 	#endian
-	emake little || die "emake failed"
+	emake CC="$(tc-getCC)" little || die "emake failed"
 }
 
 src_test() {
-	make fulltest ||die 'self test failed'
+	make CC="$(tc-getCC)" fulltest || die "self test failed"
 }
 
 src_install() {
-	dobin bin/mdcrack
+	dobin bin/mdcrack || die "dobin failed"
 	dodoc BENCHMARKS CREDITS FAQ README TODO VERSIONS WWW
 }