From 893537d321c7efa83e30b8dfc6cfaa9ecaed7902 Mon Sep 17 00:00:00 2001
From: Dane Smith <smitdane@gmail.com>
Date: Fri, 15 Oct 2010 18:12:15 -0400
Subject: New patch. Should address issues

---
 app-crypt/signing-party/Manifest                       |  6 +++---
 .../signing-party/files/signing-party-makefile.diff    | 18 ++++++++++++++++++
 app-crypt/signing-party/signing-party-1.1.3-r4.ebuild  |  8 +++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 app-crypt/signing-party/files/signing-party-makefile.diff

diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index e0bbd42..a24f032 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,7 +1,7 @@
+AUX signing-party-makefile.diff 445 RMD160 3e65bdae518f57b4d02e516d6b02b3ce958a9864 SHA1 19136417a1756671bed4098c3e3ec5c141d6f1b0 SHA256 739a9e1e5274ff1d14a3125e385029a63f23fdef6178bd27b09ae3ca392ec0cf
 DIST signing-party_1.1.3.orig.tar.gz 223459 RMD160 cfbc658854e0e9f562bd31221eaa0e1a25bcb742 SHA1 072c306e8c63e205aff07b6c4165140a7d59cdba SHA256 b3d774de41b97861f1acd33502be44e5f3dcec05d990a4095518dc65106237c4
 EBUILD signing-party-1.1.3-r3.ebuild 2566 RMD160 ac744aefb4038b908527457a5d00b1327c2eed03 SHA1 5221797597855ea65ee9a0454dca71df785b2956 SHA256 5a92a603b143aff33d32c2773175ac28c104fcb921c4c7f1cb86babcb73d089e
-EBUILD signing-party-1.1.3-r4.ebuild 2712 RMD160 c5f133a7caddef89704ce131bb358419d399199a SHA1 3c8d450c80fd475eee8e90bb42563a69ae17c025 SHA256 b89f1485acf839b035e542dda3b51027bcbdad0ea224b2b6c723d6bff63e6d4f
+EBUILD signing-party-1.1.3-r4.ebuild 2871 RMD160 527f2960c895fad3fb909f7423cd67d48f0e9f65 SHA1 240fe2c710e1798f1cc19aa717eda95330d5464a SHA256 a73866684d0cfb85a4d0755420da65ee9ffe82bd9685f9c0c6210ce96e631df4
 EBUILD signing-party-1.1.3.ebuild 1605 RMD160 51c5f420b29c17d0b45b38035c878e4a2c19521a SHA1 c459b9448e78ad410dd0655eca97e0e4d1cce138 SHA256 814319a7b4fc8cbb3753c586e651e17f8569d263dcd21c9e5be1fdb2431d211f
-MISC ChangeLog 4062 RMD160 4afe53193ff9d72ca271898a46b6c3b745f39e23 SHA1 78344379707334b4a7fa0db3a120bc7853d42a2a SHA256 39d389001f75c0645480c00a90802cf85240f804a15e1d350007991bfb385c92
 MISC metadata.xml 248 RMD160 d300a6a39cab5cfc836dd8154166ea93795e7682 SHA1 651e99b4c63f219da583fdc286e904f57bfa7741 SHA256 cab631a70b543455c36e9f6125586ae2421fb453f6b20a158fcdd7317b57f2aa
-MISC signing-party-1.1.3-r3.ebuild~ 2566 RMD160 ac744aefb4038b908527457a5d00b1327c2eed03 SHA1 5221797597855ea65ee9a0454dca71df785b2956 SHA256 5a92a603b143aff33d32c2773175ac28c104fcb921c4c7f1cb86babcb73d089e
+MISC signing-party-1.1.3-r4.ebuild~ 2890 RMD160 f5e612e7c4ad043162ac511801f214f982d6df8e SHA1 46413d3dba32861111300baf57f721bf97fb4e2c SHA256 b0776bcd6fd1a2b0912648e8d26f37f81d622ee52ce44fe8d06bf88d9842fafd
diff --git a/app-crypt/signing-party/files/signing-party-makefile.diff b/app-crypt/signing-party/files/signing-party-makefile.diff
new file mode 100644
index 0000000..46993b3
--- /dev/null
+++ b/app-crypt/signing-party/files/signing-party-makefile.diff
@@ -0,0 +1,18 @@
+--- Makefile	2010-02-11 13:26:29.000000000 -0500
++++ Makefile.new	2010-10-15 18:10:27.000000000 -0400
+@@ -1,5 +1,4 @@
+ CC=${DIET} gcc -s -Wall -O2 -fomit-frame-pointer
+-STRIP=strip -R .note -R .comment
+ RM=rm -f
+ TARGET=../bin/gpgwrap
+ 
+@@ -8,8 +7,7 @@
+ all: ${TARGET}
+ 
+ ${TARGET}: gpgwrap.c
+-	${CC} -o ${TARGET} gpgwrap.c
+-	${STRIP} ${TARGET} 2>/dev/null || true
++	${CC} -o ${TARGET} ${CFLAGS} ${LDFLAGS} gpgwrap.c
+ 
+ clean:
+ 	${RM} ${TARGET}
diff --git a/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild b/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild
index 74fdb78..773c107 100644
--- a/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild
+++ b/app-crypt/signing-party/signing-party-1.1.3-r4.ebuild
@@ -35,8 +35,14 @@ src_prepare() {
 	rm -fr keylookup
 	# media-gfx/springgraph
 	rm -fr springgraph
+	
+	epatch "${FILESDIR}"/${PN}-makefile.diff
 
-	sed -i -e "s:/usr/share/doc/signing-party/caff/caffrc.sample:/usr/share/doc/${P}/caff/caffrc.sample.gz:g" caff/caff
+	sed -i -e \
+	"s:/usr/share/doc/signing-party/caff/caffrc.sample:/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
+	caff/caff || die "Sed failed"
+	sed -i -e "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile \
+	|| die "Sed failed"
 }
 
 src_compile() {
-- 
cgit v1.2.3-18-g5258