summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-15 22:27:11 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-07-15 22:27:11 +0000
commit73c4fe632e2cec2c0e2adbef7a6bf28beafbe9d9 (patch)
tree9e1b7b8b368ce61712ac1f0d7c3fff6db3144388 /app-crypt/gpgstats
parentRemoving vulnerable versions wrt bug 276432 now that 2.1.1 is stable on all a... (diff)
downloadgentoo-2-73c4fe632e2cec2c0e2adbef7a6bf28beafbe9d9.tar.gz
gentoo-2-73c4fe632e2cec2c0e2adbef7a6bf28beafbe9d9.tar.bz2
gentoo-2-73c4fe632e2cec2c0e2adbef7a6bf28beafbe9d9.zip
Fix building with app-crypt/gpgme-1.2.0 (bug #277701).
(Portage version: 13827-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/gpgstats')
-rw-r--r--app-crypt/gpgstats/ChangeLog8
-rw-r--r--app-crypt/gpgstats/files/gpgstats-0.5-flags.patch25
-rw-r--r--app-crypt/gpgstats/gpgstats-0.5-r1.ebuild14
3 files changed, 42 insertions, 5 deletions
diff --git a/app-crypt/gpgstats/ChangeLog b/app-crypt/gpgstats/ChangeLog
index bf3e002106be..815f6f12e62a 100644
--- a/app-crypt/gpgstats/ChangeLog
+++ b/app-crypt/gpgstats/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/gpgstats
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgstats/ChangeLog,v 1.6 2008/10/05 13:00:12 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgstats/ChangeLog,v 1.7 2009/07/15 22:27:07 arfrever Exp $
+
+ 15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ gpgstats-0.5-r1.ebuild, +files/gpgstats-0.5-flags.patch:
+ Fix building with app-crypt/gpgme-1.2.0 (bug #277701).
05 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> gpgstats-0.5-r1.ebuild:
Fix up ebuild: fix typo in DEPEND (which broke dependencies) and die on
diff --git a/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
new file mode 100644
index 000000000000..018d97390c65
--- /dev/null
+++ b/app-crypt/gpgstats/files/gpgstats-0.5-flags.patch
@@ -0,0 +1,25 @@
+--- Makefile
++++ Makefile
+@@ -1,16 +1,18 @@
+ VERSION=0.5
+
+ DEBUG=-g # -fprofile-arcs -ftest-coverage # -pg -g
+-CXXFLAGS+=-Wall -O2 -DVERSION=\"${VERSION}\" $(DEBUG) `gpgme-config --cflags`
+-CFLAGS+=${CXXFLAGS}
+-LDFLAGS=-lstdc++ `gpgme-config --libs` $(DEBUG)
++CPPFLAGS+=-DVERSION=\"${VERSION}\" -D_FILE_OFFSET_BITS=64
++FLAGS+=-Wall $(DEBUG) `gpgme-config --cflags`
++CFLAGS+=${FLAGS}
++CXXFLAGS+=${FLAGS}
++LIBS=`gpgme-config --libs`
+
+ OBJS=error.o utils.o array.o iarray.o s.o
+
+ all: gpgstats
+
+ gpgstats: $(OBJS)
+- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o gpgstats
++ $(CXX) $(LDFLAGS) -Wall -W $(OBJS) -o gpgstats $(LIBS)
+
+ install: gpgstats
+ cp gpgstats /usr/bin
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
index 4534d5170196..3925fb00de83 100644
--- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
+++ b/app-crypt/gpgstats/gpgstats-0.5-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/gpgstats/gpgstats-0.5-r1.ebuild,v 1.3 2008/10/05 13:00:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild,v 1.4 2009/07/15 22:27:07 arfrever Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
HOMEPAGE="http://www.vanheusden.com/gpgstats/"
@@ -12,8 +16,12 @@ IUSE=""
RDEPEND="app-crypt/gpgme"
DEPEND="${RDEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-flags.patch"
+}
+
src_compile() {
- emake DEBUG='' || die "emake failed"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG= || die "emake failed"
}
src_install() {