Added support for custom LDFLAGS and CC.

Package-Manager: portage-2.1.2_rc1-r4

5 files changed, 67 insertions, 18 deletions

diff --git a/app-crypt/bcrypt/ChangeLog b/app-crypt/bcrypt/ChangeLog
index 56019379eaa9..307b3d7b7b2c 100644
--- a/app-crypt/bcrypt/ChangeLog
+++ b/app-crypt/bcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/bcrypt
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcrypt/ChangeLog,v 1.6 2005/09/20 19:42:04 grobian Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcrypt/ChangeLog,v 1.7 2006/11/23 13:11:29 drizzt Exp $
+
+  23 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/bcrypt-1.1-Makefile.patch, bcrypt-1.1.ebuild:
+  Added support for custom LDFLAGS and CC.
 
   20 Sep 2005; Fabian Groffen <grobian@gentoo.org> bcrypt-1.1.ebuild:
   Marking ~ppc-macos (bug #106599)
diff --git a/app-crypt/bcrypt/Manifest b/app-crypt/bcrypt/Manifest
index 5dc4b1f79608..6c7a1c40ffa2 100644
--- a/app-crypt/bcrypt/Manifest
+++ b/app-crypt/bcrypt/Manifest
@@ -1,16 +1,30 @@
-DIST bcrypt-1.1.tar.gz 36781
-EBUILD bcrypt-1.1.ebuild 685 RMD160 3c81b3aba2fef480361e66ee1ca93c1cf775b225 SHA1 ce34323e30639751d904f6d2b715b24e6639ca45 SHA256 dc59c7dcb8ad84379ebfd665c4e60e82e26c9121b838902ca260b581e5dd884e
-MD5 1252e7ff867f43124b5754d236e47433 bcrypt-1.1.ebuild 685
-RMD160 3c81b3aba2fef480361e66ee1ca93c1cf775b225 bcrypt-1.1.ebuild 685
-SHA256 dc59c7dcb8ad84379ebfd665c4e60e82e26c9121b838902ca260b581e5dd884e bcrypt-1.1.ebuild 685
-MISC ChangeLog 1000 RMD160 52e2e9387849c72a24eecc96a3928c4bdf66eea1 SHA1 5e27a85a43e0398049f60b26371da4342b9dbb5b SHA256 7785d710505c49522c3f3b11d52534aeef9236a4bdc2d297d9469436480f1381
-MD5 8c5734513ac3c5722fdec3c1ff2e5c95 ChangeLog 1000
-RMD160 52e2e9387849c72a24eecc96a3928c4bdf66eea1 ChangeLog 1000
-SHA256 7785d710505c49522c3f3b11d52534aeef9236a4bdc2d297d9469436480f1381 ChangeLog 1000
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bcrypt-1.1-Makefile.patch 570 RMD160 85beeb5a269c77f512d4e754066f5884daab65ce SHA1 d1cc782789426be03bbc52922a8b9955c99343fa SHA256 6958aeff3b7cb86c6129039866ceb5b4ba69250862b5a5f644fa1108cd3e5033
+MD5 8ee710355efd49486917bbd3c5630614 files/bcrypt-1.1-Makefile.patch 570
+RMD160 85beeb5a269c77f512d4e754066f5884daab65ce files/bcrypt-1.1-Makefile.patch 570
+SHA256 6958aeff3b7cb86c6129039866ceb5b4ba69250862b5a5f644fa1108cd3e5033 files/bcrypt-1.1-Makefile.patch 570
+DIST bcrypt-1.1.tar.gz 36781 RMD160 c043a25169b09e7b07c2e00db0d4ca2c3b3d13be SHA1 fd4c7c83fdc560f143bb0e0a8c9fb7aa57e69698 SHA256 b9c1a7c0996a305465135b90123b0c63adbb5fa7c47a24b3f347deb2696d417d
+EBUILD bcrypt-1.1.ebuild 768 RMD160 fdd79ad7405f357efd5b4980af954bf51a5bace8 SHA1 3eefe389c579e0497dfa283ff44713a7bf9ea69e SHA256 bb5e8fd582f85bad711a2f6a2f652bc6dbb1b7d544c6704f446271402ffbefa2
+MD5 18afad0db24c0c8e30091897f5e86135 bcrypt-1.1.ebuild 768
+RMD160 fdd79ad7405f357efd5b4980af954bf51a5bace8 bcrypt-1.1.ebuild 768
+SHA256 bb5e8fd582f85bad711a2f6a2f652bc6dbb1b7d544c6704f446271402ffbefa2 bcrypt-1.1.ebuild 768
+MISC ChangeLog 1150 RMD160 cd779c33e51b1e73d8b0ec0260516d4847f6b7ea SHA1 a92e5e9ec7570c7f92d8f1d811ec462eb91e94df SHA256 c1d600d63038d304cde220242450ff4e16896d4e1cfbcf1970a4b61c75689cbc
+MD5 75714c390a01382118c3a5ab27499b20 ChangeLog 1150
+RMD160 cd779c33e51b1e73d8b0ec0260516d4847f6b7ea ChangeLog 1150
+SHA256 c1d600d63038d304cde220242450ff4e16896d4e1cfbcf1970a4b61c75689cbc ChangeLog 1150
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
-MD5 99d04f9cdab690b8f1c86be81f974c24 files/digest-bcrypt-1.1 61
-RMD160 7649204427e0b4a9584e357850bd2c7c81f95cab files/digest-bcrypt-1.1 61
-SHA256 0650dacfe28824025b0f8d72a036bb7a3777b4f36e454eae2f3719423369e14d files/digest-bcrypt-1.1 61
+MD5 70a14eacd598b02c543562dee83d2ad0 files/digest-bcrypt-1.1 229
+RMD160 510a7db3dded45572db5946149da63f52a8687d8 files/digest-bcrypt-1.1 229
+SHA256 564b2a64948bd69c7882b3c9ce6a6983e3584574c51638018441e12ed3658fbc files/digest-bcrypt-1.1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFZZ4KGDyatLGpTbYRApjCAJ40+1XzXXWYrESLMaXWoc5L++gLLQCZAfOs
+e0OEdny0QpTQ1VcfmFO0KhU=
+=/BjW
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/bcrypt/bcrypt-1.1.ebuild b/app-crypt/bcrypt/bcrypt-1.1.ebuild
index 6c5efa07f429..31b957425bff 100644
--- a/app-crypt/bcrypt/bcrypt-1.1.ebuild
+++ b/app-crypt/bcrypt/bcrypt-1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcrypt/bcrypt-1.1.ebuild,v 1.9 2005/09/20 19:42:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bcrypt/bcrypt-1.1.ebuild,v 1.10 2006/11/23 13:11:29 drizzt Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A file encryption utility using Paul Kocher's implementation of the blowfish algorithm"
 HOMEPAGE="http://bcrypt.sourceforge.net/"
@@ -10,10 +12,18 @@ LICENSE="BSD"
 KEYWORDS="alpha amd64 ppc ~ppc-macos sparc x86"
 IUSE=""
 DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
 
 src_compile() {
-	sed -i -e "s:CFLAGS = -O2 -Wall:CFLAGS = -Wall ${CFLAGS}:" Makefile
-	make || die
+	tc-export CC
+	emake || die
 }
 
 src_install() {
diff --git a/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch b/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
new file mode 100644
index 000000000000..1b210392427e
--- /dev/null
+++ b/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
@@ -0,0 +1,19 @@
+--- Makefile.old	2006-11-23 13:58:19.000000000 +0100
++++ Makefile	2006-11-23 13:59:52.000000000 +0100
+@@ -1,13 +1,12 @@
+ DEFAULTS = Makefile includes.h blowfish.h functions.h config.h
+-CC = gcc
+-CFLAGS = -O2 -Wall 
++CFLAGS += -Wall
+ COMPILE = ${CC} ${CFLAGS}
+ OBJS = main.o blowfish.o rwfile.o keys.o wrapbf.o endian.o wrapzl.o
+-LDFLAGS = -L/usr/local/lib -lz 
++LIBS = -lz 
+ PREFIX = /usr/local
+ 
+ bcrypt:	${OBJS} Makefile
+-	${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}
++	${COMPILE} ${LDFLAGS} -o bcrypt ${OBJS} ${LIBS}
+ 
+ install:	bcrypt Makefile
+ 	mkdir -p ${PREFIX}/bin;\
diff --git a/app-crypt/bcrypt/files/digest-bcrypt-1.1 b/app-crypt/bcrypt/files/digest-bcrypt-1.1
index 4ad9dd7d4ab3..30a0731af22c 100644
--- a/app-crypt/bcrypt/files/digest-bcrypt-1.1
+++ b/app-crypt/bcrypt/files/digest-bcrypt-1.1
@@ -1 +1,3 @@
 MD5 8ce2873836ccd433329c8df0e37e298c bcrypt-1.1.tar.gz 36781
+RMD160 c043a25169b09e7b07c2e00db0d4ca2c3b3d13be bcrypt-1.1.tar.gz 36781
+SHA256 b9c1a7c0996a305465135b90123b0c63adbb5fa7c47a24b3f347deb2696d417d bcrypt-1.1.tar.gz 36781