Respect CFLAGS wrt bug #442146. Respect AR, migrate to EAPI 5.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 117 insertions, 3 deletions

diff --git a/app-crypt/keynote/ChangeLog b/app-crypt/keynote/ChangeLog
index 9dd0d876b7ad..b474daabe5cf 100644
--- a/app-crypt/keynote/ChangeLog
+++ b/app-crypt/keynote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/keynote
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/ChangeLog,v 1.18 2012/06/07 21:17:19 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/ChangeLog,v 1.19 2012/11/07 13:17:51 kensington Exp $
+
+*keynote-2.3-r3 (07 Nov 2012)
+
+  07 Nov 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/keynote-2.3-qa.patch, +keynote-2.3-r3.ebuild:
+  Respect CFLAGS wrt bug #442146. Respect AR, migrate to EAPI 5.
 
   07 Jun 2012; Johannes Huber <johu@gentoo.org> -keynote-2.3.ebuild:
   Remove old.
@@ -58,4 +64,3 @@
   23 Dec 2003; <plasmaroo@gentoo.org> keynote-2.3.ebuild:
   Initial commit. This ebuild was kindly contributed by Sebastien 
   Estienne, bug #27279.
-
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
index 919bd5eabfd2..87561a4c1af4 100644
--- a/app-crypt/keynote/Manifest
+++ b/app-crypt/keynote/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX keynote-2.3-make.patch 942 SHA256 420474646e58265a061ec85ac9b4380a740b34492a6ddb06524750623acdfd3b SHA512 70a2b2d803e71bde29826260503eee137233fa315f7065b87ac5640fee10a1f46a9669c0407927705b5f6538e3a1f92151399fac4ca1c1714193d4bd80b0fa99 WHIRLPOOL 09f23060d70dfb358cceab72afa6494632ca62c679b6f7e54597e436f5fbc3bab5cbe4a9e246a3896c8d7814395c7399ad0c57277696af8759695d199f9465ad
 AUX keynote-2.3-parallel-build.patch 477 SHA256 3e8226e9713382301a6f8cbb53c583154ecb05805907c55578fc8c56fdb76930 SHA512 1c1934150dd9137d410755e2c6a85f17f3b84e60f24abac070ae240c6b6581b3123f35b927edc2bf17296a0d797409cd1865d7d72b58f15488b66ad26c6bf996 WHIRLPOOL 60301609d78990d67f97fb7263cd1d8a0ad10365cec37f4dd87098be0bf2164d090594c34bea9b29fee169c4dc21192950cfcf63dc4d6e5410599379756e49c6
+AUX keynote-2.3-qa.patch 1112 SHA256 11a207689b7052413825b233e1a74f56211ba819238d991494bbb461a3f11b05 SHA512 ec681de7b3f4372a07c0b8a693e4d83d12cdd28fcd605044a2afd8dc9645eb09815efa1d1c74232deb96bb88c394a05ba803e61be912c3a4369f07d62e0eb4a2 WHIRLPOOL dde2c4ee4c77b8bded4b3ede85bbf3aada71dd6e046afb394c6cf7c7687ee60db63ef75d1889374806ccb4db81a401601b9dc6514de39ffe6ea1efea7a8b7656
 DIST keynote-2.3.tar.gz 141930 SHA256 62f7a9d57ceb6bcdd47b604b637a7ac8ed337cef0ab02f1fa28b7e61c9b15821 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe WHIRLPOOL 42cc4830d06f59fe0bb26a52ddd5c40c2192d1d44e7ece99a5013c4fb31cc7f4e284d46c21c9ec4f448e20642b0b00735435801854f217c800cedca9f43ecbf4
 EBUILD keynote-2.3-r2.ebuild 988 SHA256 86a4249f22af4e5f9ceaf29c86f4d42b27228e22f1d85851ce6d05b9cf284efd SHA512 7d605cb89681bf1cb1387667e609ea3d096c1278eb3e4f0acf31f518a02eef78a566e1d8d02d1bb092957cacea5d3d902b787f960beb921328247b060c699723 WHIRLPOOL 6d94871de8e4b32f770db248a021aff56671bdede387b8e0a9e4a967be4daee2d18266ed18016b03d87a719d44f082224105d94e5c228ed1de7f6eee610ce758
-MISC ChangeLog 2045 SHA256 83a059de85abeabf835d4541ead7ea98f400e35a2b628db1190025a6fd2808d3 SHA512 582289368374838debc1f15d6f4298404e7512a3fa91e976a76dd2eb27a3abbb941328564ca420d36d3699247cdee30b2649082fe3bebe5a26cc815b269b5e89 WHIRLPOOL 0150f459d3c2232d0f5d557e685adb570a30292c214b6d65cd203b9e0b73acb253a1574c7d60fbd51fe96357289596ac7c22119dbf93ae279d8390ee2c10ca09
+EBUILD keynote-2.3-r3.ebuild 948 SHA256 ecf073d663576d17d3e346bc4fe3023788b1dbb914f9571c008d7ce536f53b1f SHA512 d658038479d39c8e631c8a4f469a1b9fb28506523df72573e3bd326cc1e2f17382f363bc11e0751f3018f84a68ec0d32a1895997a0db1369c929caa3efa09903 WHIRLPOOL ee8858b80999c916a92642cb24070db7603d4ac7d4c90638d81647bd182ea77cb5ced4bf2e0e17ba37ffae7b71e8f5f1105151ccb8b5523beb7dae94fddf23b4
+MISC ChangeLog 2258 SHA256 e28ffec70dbb691f3117e590ef67a688b9c95e91363a18020e20078095ff9193 SHA512 a689b57cc4c1b046c32cbb0b39bd9596859e2e6b052052ac4031b3ee19b42f69886b466c61afe0b2302e50a758f78a598bfaada671cabb75db0a1b33b8a0478f WHIRLPOOL c9aa127afaab1432a2c856cfd348fd1178b0b06811caea54fbb09e0526691031431b5e2b904d7380ce7744ae465fd447d5b6939434482daa553756b7ca36ee20
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQml8iAAoJEMbwO6tnXQ0s0d8IAI+cfTVK+RMM0DlvT5fxR5Lk
+2e0JcOEaDNAwUxijiToMfBAhe1q6tzZgr0W94FzjE3EieuTfmD1TlwmiJGIImS2K
+UQ2gNp2n37v544ypPTChkYdNf2de13QAz+bL8jIgBhVNK8cV+5WP98gizdKzyHYg
+PxZnkaYo91XYwhMDlVB8Flzs2fgjceRRTDlvI2kAaV6hqgDTDob+Og8qTzN+/sPl
+WVT/vpS4fp3X6L4/pNaCCdVXjm5BD5M0sjnv+/dWCTuDci/mtZ2kFu+P/hB1JAks
+bpH1/3H2ZhurYSVNYpBYTDbCPdh3n6VheX0fJaAR63lCBAlW+fiHgdKTUSAhN6M=
+=wSvd
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
new file mode 100644
index 000000000000..f6b1ff28cdb8
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-qa.patch
@@ -0,0 +1,44 @@
+Respect CFLAGS, LDFLAGS, and AR.
+
+The better way to fix AR would be to patch configure.in,
+but it is sufficiently old to fail with current autotools.
+--- Makefile.in
++++ Makefile.in
+@@ -27,7 +27,6 @@
+ YACC = @YACC@
+ SSLEAY = @SSLEAY@
+ RM = @RM@
+-AR = @AR@
+ NROFF = @NROFF@
+ TAR = @TAR@
+ TRUE = @TRUE@
+@@ -41,10 +40,10 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
++LDFLAGS = @LDFLAGS@
+ 
+ SSLCONF = testsuite/openssl.cnf
+ SSLCERT = testsuite/test.cert.pem
+@@ -83,7 +82,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 +130,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-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
new file mode 100644
index 000000000000..c5b69b28ad4a
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/keynote-2.3-r3.ebuild,v 1.1 2012/11/07 13:17:51 kensington Exp $
+
+EAPI=5
+
+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"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+pkg_setup() {
+	tc-export AR CC RANLIB
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
+src_compile() {
+	if use ssl; then
+		emake
+	else
+		emake nocrypto
+	fi
+}
+
+src_install() {
+	dobin keynote
+
+	dolib.a libkeynote.a
+
+	insinto /usr/include
+	doins keynote.h
+
+	doman man/keynote.[1345]
+	dodoc README HOWTO.add.crypto TODO
+}