diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2006-11-23 13:11:29 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2006-11-23 13:11:29 +0000 |
| commit | d74f04332ea5711681dd90a7175f9e905b395c66 (patch) | |
| tree | d0606546ecfb11e80a46147f307421c3a55885c6 /app-crypt/bcrypt | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d74f04332ea5711681dd90a7175f9e905b395c66.tar.gz gentoo-2-d74f04332ea5711681dd90a7175f9e905b395c66.tar.bz2 gentoo-2-d74f04332ea5711681dd90a7175f9e905b395c66.zip | |
Added support for custom LDFLAGS and CC.
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'app-crypt/bcrypt')
| -rw-r--r-- | app-crypt/bcrypt/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/bcrypt/bcrypt-1.1.ebuild | 18 | ||||
| -rw-r--r-- | app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch | 19 | ||||
| -rw-r--r-- | app-crypt/bcrypt/files/digest-bcrypt-1.1 | 2 |
4 files changed, 41 insertions, 6 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/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 |