Respect LDFLAGS (bug #336820). Do not hard-wire AR. Set RDEPEND.

Package-Manager: portage-2.2_rc85/cvs/Linux i686

4 files changed, 97 insertions, 13 deletions

diff --git a/app-crypt/keynote/ChangeLog b/app-crypt/keynote/ChangeLog
index 375ed5f5c63b..ce89d763a7a9 100644
--- a/app-crypt/keynote/ChangeLog
+++ b/app-crypt/keynote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/keynote
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/ChangeLog,v 1.11 2009/12/28 11:59:51 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/ChangeLog,v 1.12 2010/09/20 22:36:24 jer Exp $
+
+*keynote-2.3-r1 (20 Sep 2010)
+
+  20 Sep 2010; Jeroen Roovers <jer@gentoo.org> +keynote-2.3-r1.ebuild,
+  +files/keynote-2.3-make.patch:
+  Respect LDFLAGS (bug #336820). Do not hard-wire AR. Set RDEPEND.
 
   28 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> keynote-2.3.ebuild:
   Use -j1 for build (bug #298669).
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
index 10d17b15c25f..74badd5831c0 100644
--- a/app-crypt/keynote/Manifest
+++ b/app-crypt/keynote/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX keynote-2.3-make.patch 942 RMD160 3886d7ae645bf93f5f3210d58ec79204464b7d2c SHA1 7104abfcfc9ac70b08d524f9963a142f0cb2d198 SHA256 420474646e58265a061ec85ac9b4380a740b34492a6ddb06524750623acdfd3b
 DIST keynote-2.3.tar.gz 141930 RMD160 89a2b1b379b1eb7cf4c77158fe47cbfddb3d37f5 SHA1 1b51066ffc66d04660cc206254c41531a17e8b04 SHA256 62f7a9d57ceb6bcdd47b604b637a7ac8ed337cef0ab02f1fa28b7e61c9b15821
+EBUILD keynote-2.3-r1.ebuild 964 RMD160 95f7f829a1be5666eff6763137b001d6504f4287 SHA1 7519bfa4851c2e93e044e8c9a19fb3b40e5a77be SHA256 53342f33f94469c533fd0820761b21c4dc83c8a69d93d58046c25c5e5b9db977
 EBUILD keynote-2.3.ebuild 956 RMD160 5d8d5ff7132d13a5fcdec4cd9a6ba91bd63c655a SHA1 348ef1e5891d6725d244f88ceafad2d57d2f0436 SHA256 8ccc830cf9080e0b3bc702aac6a95dbedd39b19ab482faf162357e305bb49c49
-MISC ChangeLog 1135 RMD160 1a34f734d4151897d394e2ae7fae8b98fc5bd423 SHA1 c5100dd88119f7df5d52b696e6d3f620a0f58a95 SHA256 00fcbcfc110a194c0fb1249d1a5ef827f65e248af6e3ed40df6d7d2ceeb14404
+MISC ChangeLog 1332 RMD160 f114271e705dbc8c7b1c9ac23cabc2e6d6b33efd SHA1 70b4907ae689d7088627965915b556c0117f076a SHA256 6ea5379ee632c3e368b0d8802f92ceae7f656092a6df66778b5411a7c22857e3
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAks4ncIACgkQAiZjviIA2XhVOACgxavNWFnzIXeqqYhV6t6ClVws
-fF8AoKpxIYaOVz/E1vSZfMzigeOv0Jwm
-=sHj4
------END PGP SIGNATURE-----
diff --git a/app-crypt/keynote/files/keynote-2.3-make.patch b/app-crypt/keynote/files/keynote-2.3-make.patch
new file mode 100644
index 000000000000..3b9d8a128841
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-make.patch
@@ -0,0 +1,36 @@
+--- a/Makefile.in	2000-09-27 01:16:27.000000000 +0200
++++ b/Makefile.in	2010-09-21 00:30:37.000000000 +0200
+@@ -35,6 +35,7 @@
+ SED = @SED@
+ ECHO = @ECHO@
+ TR = @TR@
++AR = @AR@
+ 
+ TARFLAGS = -cvzf ${DISTFILE}
+ YACCFLAGS2 = -d -p kv -b z
+@@ -45,6 +46,7 @@
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
++LDFLAGS = @LDFLAGS@
+ 
+ SSLCONF = testsuite/openssl.cnf
+ SSLCERT = testsuite/test.cert.pem
+@@ -83,7 +85,7 @@
+ 	$(RANLIB) $(TARGET)
+ 
+ $(TARGET2): $(TARGET) $(OBJS2)
+-	$(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
+@@ -131,7 +133,7 @@
+ 	-keyout $(SSLKEY)
+ 
+ test-sample: all $(OBJS3)
+-	$(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
+ 
+ test-sig: all $(SSLCERT) $(SSLKEY)
+ 	$(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r1.ebuild b/app-crypt/keynote/keynote-2.3-r1.ebuild
new file mode 100644
index 000000000000..d7ffe8789880
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/keynote-2.3-r1.ebuild,v 1.1 2010/09/20 22:36:24 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The KeyNote Trust-Management System"
+HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
+SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+cp -av Makefile.in{,.orig}
+	epatch "${FILESDIR}"/${P}-make.patch
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	econf
+}
+
+src_compile() {
+	# bug #298669
+	if use ssl; then
+		emake -j1 || die
+	else
+		emake -j1 nocrypto || die
+	fi
+}
+
+src_install() {
+	dobin keynote || die
+
+	dolib.a libkeynote.a
+
+	insinto /usr/include
+	doins keynote.h
+
+	doman man/keynote.[1345]
+	dodoc README HOWTO.add.crypto TODO
+}