diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-15 22:53:38 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-15 22:53:38 +0000 |
| commit | 354dde377e894b425c373af603a042992cedc3f1 (patch) | |
| tree | bd4e5e5d84d21c79b84135ce36f6c62515a724df /app-crypt/nasty | |
| parent | Mask dillo useflag on claws-mail as current dillo version is unkeyworded on (diff) | |
| download | gentoo-2-354dde377e894b425c373af603a042992cedc3f1.tar.gz gentoo-2-354dde377e894b425c373af603a042992cedc3f1.tar.bz2 gentoo-2-354dde377e894b425c373af603a042992cedc3f1.zip | |
Fix building with app-crypt/gpgme-1.2.0 (bug #277886). Respect CC, LDFLAGS.
(Portage version: 13827-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/nasty')
| -rw-r--r-- | app-crypt/nasty/ChangeLog | 9 | ||||
| -rw-r--r-- | app-crypt/nasty/files/nasty-0.6-flags.patch | 22 | ||||
| -rw-r--r-- | app-crypt/nasty/nasty-0.6-r1.ebuild | 18 |
3 files changed, 38 insertions, 11 deletions
diff --git a/app-crypt/nasty/ChangeLog b/app-crypt/nasty/ChangeLog index 99b18f129edd..45a147798965 100644 --- a/app-crypt/nasty/ChangeLog +++ b/app-crypt/nasty/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/nasty -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/nasty/ChangeLog,v 1.5 2008/10/05 13:12:45 flameeyes Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/nasty/ChangeLog,v 1.6 2009/07/15 22:53:38 arfrever Exp $ + + 15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + nasty-0.6-r1.ebuild, +files/nasty-0.6-flags.patch: + Fix building with app-crypt/gpgme-1.2.0 (bug #277886). Respect CC, + LDFLAGS. 05 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> nasty-0.6-r1.ebuild: Fix up ebuild: fix typo in DEPEND (which broke dependencies) and die on diff --git a/app-crypt/nasty/files/nasty-0.6-flags.patch b/app-crypt/nasty/files/nasty-0.6-flags.patch new file mode 100644 index 000000000000..271bbaab4984 --- /dev/null +++ b/app-crypt/nasty/files/nasty-0.6-flags.patch @@ -0,0 +1,22 @@ +--- Makefile ++++ Makefile +@@ -1,15 +1,16 @@ + VERSION=0.6 + + DEBUG=-g # -pg +-CFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) +-LDFLAGS=-lgpgme $(DEBUG) ++CPPFLAGS+=-DVERSION=\"${VERSION}\" -D_FILE_OFFSET_BITS=64 ++CFLAGS+=-Wall $(DEBUG) `gpgme-config --cflags` ++LIBS=`gpgme-config --libs` + + OBJS=nasty.o + + all: nasty + + nasty: $(OBJS) +- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o nasty ++ $(CC) $(LDFLAGS) $(OBJS) -o nasty $(LIBS) + + install: nasty + cp nasty /usr/bin diff --git a/app-crypt/nasty/nasty-0.6-r1.ebuild b/app-crypt/nasty/nasty-0.6-r1.ebuild index 4a1176d34b43..ba779b223fb3 100644 --- a/app-crypt/nasty/nasty-0.6-r1.ebuild +++ b/app-crypt/nasty/nasty-0.6-r1.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2008 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/nasty/nasty-0.6-r1.ebuild,v 1.4 2008/10/05 13:12:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/nasty/nasty-0.6-r1.ebuild,v 1.5 2009/07/15 22:53:38 arfrever Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs DESCRIPTION="Proof-of-concept GPG passphrase recovery tool." HOMEPAGE="http://www.vanheusden.com/nasty/" @@ -12,16 +16,12 @@ IUSE="" RDEPEND="app-crypt/gpgme" DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - sed -i.orig \ - -e 's,^LDFLAGS=-lgpgme,LDFLAGS=`gpgme-config --libs`,g' \ - -e '/^CFLAGS/s,$(DEBUG),`gpgme-config --cflags` $(DEBUG),g' \ - "${S}"/Makefile || die "sed failed" +src_prepare() { + epatch "${FILESDIR}/${P}-flags.patch" } src_compile() { - emake DEBUG='' || die "emake failed" + emake CC="$(tc-getCC)" DEBUG= || die "emake failed" } src_install() { |