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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 52 insertions, 14 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/Manifest b/app-crypt/mdcrack/Manifest
index 0f96b9800657..b41becf0873e 100644
--- a/app-crypt/mdcrack/Manifest
+++ b/app-crypt/mdcrack/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mdcrack-1.2-asneeded.patch 1372 RMD160 db6a45cd79b812ac75095b6f2f99c1306cd3e09a SHA1 1ee1dc824f3f45b2dc0466d1006758cc28464a50 SHA256 0644ac0be6b990ab378655aece4f7e31f41260688d72783b86fa4016ca20373c
 AUX mdcrack-1.2-gcc4.diff 798 RMD160 bf13ed93fb69678deb7c2a73501e90da579d72db SHA1 3ffc95d6f1952c60f0128eb1b2e67dd8eb9dba11 SHA256 b803e56979a23c501794dd1ab02c10bc1cecc4ab7531cb5bd2f75a4691260877
 DIST mdcrack-1.2.tar.gz 60261 RMD160 6d149decf7f97658838527be70fdcd263a18c5b1 SHA1 18f1f2cc3425858463b24fe08074b6dc2f612d17 SHA256 b68dec25170f177c70264c5a2863a70c28011f669db56a8825ae4ca28b1f5825
-EBUILD mdcrack-1.2.ebuild 885 RMD160 9d1b31425f51453091f08eefb2801eac5e6fc3b1 SHA1 c95db298e97a831e2854f0fd286ff962f6803fbc SHA256 b1e4e6b9a5d9acf2e2e4c298e7f20d1d1cdf46757e802c28bb43ae8cb1f4f3a3
-MISC ChangeLog 714 RMD160 6696c3e205bc83d8457aef159ef6609a40e0dd54 SHA1 896115220dc55aa6ffd90bad703b13eb5a64a075 SHA256 fce401873082f4a514d3ab9a85bb75b6f86bca6c194e909af154085f88fa30ac
+EBUILD mdcrack-1.2.ebuild 960 RMD160 68cef9001aea688ae0bf2cd61f3e0c86d1c440e4 SHA1 f4ed62c298c8fb4d1f939d1a294ba6cec5f07c46 SHA256 8fa2e60fd86a9589835db90ad90492f2b534f64b2f9b2be1052752d18065ae68
+MISC ChangeLog 935 RMD160 086b5f6466dcd15503bf4d295e61e7f3a7ac6bd7 SHA1 4f3bc09f791ba4e739a8373d96790808354a1862 SHA256 297228c0c44abb4913fc0d8366a3749e02cdebb78de8dc47c42e1db4633e4a30
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmRqCwACgkQKhnDs22gwa8PFACePmSgL0PntYmeLYAI0EpnDQJr
+zPsAoKxjCHStYXSLK40qsMpJCGmwL+zJ
+=OJpr
+-----END PGP SIGNATURE-----
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
 }