Adding parallel-make patch by xarthisius (bug 298669)

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 79 insertions, 9 deletions

diff --git a/app-crypt/keynote/ChangeLog b/app-crypt/keynote/ChangeLog
index ce89d763a7a9..58ced8e8714f 100644
--- a/app-crypt/keynote/ChangeLog
+++ b/app-crypt/keynote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/keynote
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/ChangeLog,v 1.13 2012/01/05 13:09:58 xmw Exp $
+
+*keynote-2.3-r2 (05 Jan 2012)
+
+  05 Jan 2012; Michael Weber <xmw@gentoo.org> +keynote-2.3-r2.ebuild,
+  +files/keynote-2.3-parallel-build.patch:
+  Adding parallel-make patch by xarthisius (bug 298669)
 
 *keynote-2.3-r1 (20 Sep 2010)
 
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
index a00e4da0ccbb..c0e8782e5f29 100644
--- a/app-crypt/keynote/Manifest
+++ b/app-crypt/keynote/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX keynote-2.3-make.patch 942 RMD160 3886d7ae645bf93f5f3210d58ec79204464b7d2c SHA1 7104abfcfc9ac70b08d524f9963a142f0cb2d198 SHA256 420474646e58265a061ec85ac9b4380a740b34492a6ddb06524750623acdfd3b
+AUX keynote-2.3-parallel-build.patch 477 RMD160 54b22945c971e3f9a25e8b8db017d68bdffdfd5b SHA1 eab3d639f56d8ca9e12661e8a5a730d842f3dcc5 SHA256 3e8226e9713382301a6f8cbb53c583154ecb05805907c55578fc8c56fdb76930
 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-r2.ebuild 988 RMD160 bf4d8a0db593fa9086d1ecc4fc295895a4a99e5f SHA1 8d85d0599133c84c0711b384bc7d364f83271700 SHA256 255a58c0978e34365e820168647c876b424d7de4a51228c487c93c1ab7de0657
 EBUILD keynote-2.3.ebuild 956 RMD160 5d8d5ff7132d13a5fcdec4cd9a6ba91bd63c655a SHA1 348ef1e5891d6725d244f88ceafad2d57d2f0436 SHA256 8ccc830cf9080e0b3bc702aac6a95dbedd39b19ab482faf162357e305bb49c49
-MISC ChangeLog 1332 RMD160 f114271e705dbc8c7b1c9ac23cabc2e6d6b33efd SHA1 70b4907ae689d7088627965915b556c0117f076a SHA256 6ea5379ee632c3e368b0d8802f92ceae7f656092a6df66778b5411a7c22857e3
+MISC ChangeLog 1533 RMD160 75c2274760b788a33eee5b3d5b8766d3d4667027 SHA1 7e511a234baa580d90b50963f8f301dd08400072 SHA256 322c0c491b8b051b62ab0e403b517f2e016a747562c46e3a783ce966c37b9461
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk58+gAACgkQfXuS5UK5QB0v2wQAoGKxQJ1IsTLMVp2MthrkA3LR
-HuZgWaoRuHA/yboPNXjjyamQcdSL8oHBbTpFIPGg50qyVCZsRFgPQ4UcQ49yQ9Xk
-mUZIKueHYIaELvJL1ndCga3G9sy3A/QUnadoPmIvGLmMKLObmOXhemsR/H326qcj
-Sf51kYys/QULh11t8vY=
-=LnTS
+iF4EAREIAAYFAk8FoSgACgkQknrdDGLu8JBXkAEAhp2kRV0A6hGhxcxEi1drFMkX
+9nBK3Aa4P4M/45QWtqgA/RltHHI3xe/uLK3wtbxKuOjaEnsxbVdochzbE58ZqFxd
+=H+s7
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
new file mode 100644
index 000000000000..cf4b4926f79d
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
@@ -0,0 +1,14 @@
+--- keynote-2.3.orig/Makefile.in	2010-02-04 09:51:35.757096194 +0100
++++ keynote-2.3/Makefile.in	2010-02-04 09:52:17.441137132 +0100
+@@ -86,9 +86,11 @@
+ 
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ 	$(YACC) $(YACCFLAGS) keynote.y
++k.tab.h: k.tab.c
+ 
+ z.tab.c: keynote-ver.y keynote.h header.h config.h
+ 	$(YACC) $(YACCFLAGS2) keynote-ver.y
++z.tab.h: z.tab.c
+ 
+ lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
+ 	$(LEX) $(LEXFLAGS) keynote.l
diff --git a/app-crypt/keynote/keynote-2.3-r2.ebuild b/app-crypt/keynote/keynote-2.3-r2.ebuild
new file mode 100644
index 000000000000..d22ce90a60a2
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r2.ebuild
@@ -0,0 +1,50 @@
+# 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-r2.ebuild,v 1.1 2012/01/05 13:09:58 xmw 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
+	epatch "${FILESDIR}"/$P-parallel-build.patch
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+	econf
+}
+
+src_compile() {
+	if use ssl; then
+		emake || die
+	else
+		emake 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
+}