summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-01-06 19:45:27 +0000
committerBrian Evans <grknight@gentoo.org>2015-01-06 19:45:27 +0000
commit0bd62ceea770809ef64bc94dc5dce0cfe58b632e (patch)
treee061f7b6d54d505b582bc5ff2455c4afa4637fe9
parentFix more format security warnings. (diff)
downloadhistorical-0bd62ceea770809ef64bc94dc5dce0cfe58b632e.tar.gz
historical-0bd62ceea770809ef64bc94dc5dce0cfe58b632e.tar.bz2
historical-0bd62ceea770809ef64bc94dc5dce0cfe58b632e.zip
Fix parallel make for bug 425340
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x67C78E1D
-rw-r--r--dev-db/mysql-super-smack/ChangeLog9
-rw-r--r--dev-db/mysql-super-smack/Manifest20
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch3
-rw-r--r--dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild4
-rw-r--r--dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild4
5 files changed, 25 insertions, 15 deletions
diff --git a/dev-db/mysql-super-smack/ChangeLog b/dev-db/mysql-super-smack/ChangeLog
index 07dbe7c04a65..a023ef488039 100644
--- a/dev-db/mysql-super-smack/ChangeLog
+++ b/dev-db/mysql-super-smack/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-db/mysql-super-smack
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.23 2014/12/28 15:05:44 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.24 2015/01/06 19:45:14 grknight Exp $
+
+ 06 Jan 2015; Brian Evans <grknight@gentoo.org>
+ files/mysql-super-smack-1.3-automake-1.13.patch,
+ mysql-super-smack-1.3-r2.ebuild, mysql-super-smack-1.3-r3.ebuild:
+ Fix parallel make for bug 425340
28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
mysql-super-smack-1.3-r2.ebuild, mysql-super-smack-1.3-r3.ebuild:
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index d55ba060d752..ed501d3072e8 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -2,19 +2,23 @@
Hash: SHA256
AUX mysql-super-smack-1.2.destdir.patch 420 SHA256 584454ce2cf04dddb37a05785a2544e79e7fb141e7619298444969ecdd47b3b7 SHA512 9319fb29af0e91bedc969a0c5f02bcac386274aa179af7ef3130b18ac9bfa36a0a422a76e50abb777323cac242283c1b680051689a6269ab7e567b5ae53a216b WHIRLPOOL 479cbd6ec4a0a9c69f70ac120cfaf5e479455aea84fc1fce8b97ac795c6e1e65642bffff7a789acd1e0e173a367cdef1d2d00b3ea37e94a6e8cc8c68020113c9
-AUX mysql-super-smack-1.3-automake-1.13.patch 7643 SHA256 887abcaeaa734244ba85b53c71ebf660626750a84fba532e7967ac8863433f1b SHA512 ba413d6ac59e5f77001fb043ec3d8bf09698e5cd5ecca93b252796e8f51610da63599a334504d78d9e8631d47f5929d4f362fa6bb17e30a5ca836a454776ca54 WHIRLPOOL afc6d2d6468d5ca9f2e90d6af08598e808be01f5859cf003f2dccab3fd05b6a978a36254e5429abd24ee41c8669fa45cd353ae592d51e12e061340a52c97bada
+AUX mysql-super-smack-1.3-automake-1.13.patch 7680 SHA256 72c1513f4327c1aac4dc70f99a0afd8b6bb1118928fc06318a1558a26c4fca64 SHA512 b74994f03b136c7642423ee5eb1346134ed127a9ca0996df83ed777f49f9dff3efe93889bc3a375868afec38be20303ffbede98dcfd3b6ec5921f0e417b5a000 WHIRLPOOL ec76e83d4e6c886defa05b7e0111878ec3e084fba29ba745e5debcb248ae7f8c5716c5098ed73bbfe58f20fedbabb74b00ff0a069c27c3899432ce67549bc4a7
AUX mysql-super-smack-1.3-gen-data.patch 2265 SHA256 d52d4c69f7b2c16b37ea412b5bedd54b668e908a70779cd5af1292daf28f1b11 SHA512 6a08a3ccc158e7c8e0500a8d3231d0b1fc0d0f4a41e2a5bf40426e480c6fc373b0fa7ff5c08b5d40afe559a34b97fd00412c43fe9212047f2c4d063b98ac2154 WHIRLPOOL bb6e93c91c1222eb554d1b62bdcd822be4c819baedc10d4203d2b38514431aa601dfdbcdfe338c3d2c0dd5c35be4a93aa09a7e0dc6f41258d19ae09d5ba8a8ec
AUX mysql-super-smack-1.3.amd64.patch 702 SHA256 c88a75a35851433689bfa2f2922bd389344643a3ad6bcafa1ce3f4a80e4ef564 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9 WHIRLPOOL d1dde988b58830573af51ea3c1e8183a195b37a399dec336e5f3cc01f473620acd27a28cc0ff5e1ea18a500ba7fdfc1b0aceae0cb3ee35ad2381f96936e02125
AUX mysql-super-smack-1.3.gcc4.3.patch 237 SHA256 aabdc73cdf00b547a7cb512cee1f30ba460bb4be98f022cf9401aec29232876b SHA512 2682770012d8e429b8fe93bb77e274e1d9570cf4ff2301511f4a3b8e0ab56dc5fb5c2b3f46ee94a6aad79a84c740c0f352399f304d58eba1efe3ed6c870269a1 WHIRLPOOL 45d2ab3bc8d934acd57a3a6a88c020dd9d767d0ccbd5bffd4b312cbb7819f1f905c590a527e34214bd0f5d6febbda4684b9edea414400da4205f4529b975d885
DIST super-smack-1.3.tar.gz 155375 SHA256 969d40e772faa8580f8e8f2dfa2a381fbadbd79fc0c94304347d594dba2a9bd9 SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920 WHIRLPOOL df63a45d1b860d888b1d2abcd6d82c17f1551554416d249f4ad86a11e82e5ca7de61bb855e94472fe447b08ce37c6de86f3e2c64cc7dc7de52913bf3e43d66c1
-EBUILD mysql-super-smack-1.3-r2.ebuild 1595 SHA256 0b3de063fdcb9c9c6cfe72187556a601c6be4ba94efe1033159dbf78082ba839 SHA512 43c554e7f1935570d718193ebe04dc5ef1e8783df659c2f9e1b2265e176fb04286c2f4d99bf0d8ada4614204d309ce31139e9275117825e89884df005d4f7d32 WHIRLPOOL f80dc8156f400c3942b687073df0c315446780f4c7ed3393a0cd21aa35fa624dceda5a856a3e34ec63534fe90b1b88035621a29c82e4689118adb4597cb8860b
-EBUILD mysql-super-smack-1.3-r3.ebuild 1643 SHA256 d5d95e008c3469b5fedcc82b58d13188a56aa84704a011f26602353a706f8336 SHA512 b5b7fe0efdb59edf975d752b90d3e46774a154a7f2aaf33656a2841e00c53f1e0e6ceb74868a5e4c9d125cd7576230897cdfa956782771593aa2f25ba37159d0 WHIRLPOOL 48c250a2ecc60bf36146b6ae28419ac31046b28c2b7c5337bdd18d6013c9aede7d1a3e82534a3d77c16fa3ac68234c18d752709cf7cf66924cb3dda2664ad436
-MISC ChangeLog 3991 SHA256 48700e7a6f067db6e3c6e26647cf19520f8c53e58c1fc7e8609ef0eb6f5ad2b4 SHA512 0105f622cb6517153be9e3790d6dd39317d997df40d5f7f3dd74982b1d08d50b45956874de5b505511825f4df8e9757e5cbcc1265671e351e22b7087dbbcd28e WHIRLPOOL 6feef0cb8a39ae26a0a5ea4de99bff81be9f9b915505ae4d62c5b3a3e94e33086a8d0e56cae9335ae0a46708803fa42ace17d15ee0386a26596deb4040e29e6b
+EBUILD mysql-super-smack-1.3-r2.ebuild 1594 SHA256 a36d5dc2c00d40d8b5123a0a414b4c387d556fca97b8eedc99fb2ded942a879f SHA512 5056979a4596c103e801bc60cd4e5a1182a5b99d634156010ca0575c949a181f7e96f0cb9b3a2b899d5e1dd8188dbee0191ec57bf29e8bad059eb998c8eef75f WHIRLPOOL 87585742a4440a9645c3615a0e76bb491e5e897c591a5ee9087059db09d9ecb074aa6700514c56b5b23349135ad5e157cbe7e96ca480c7f484fd854b7f29c331
+EBUILD mysql-super-smack-1.3-r3.ebuild 1641 SHA256 8f35d12447082e5bab7210955ade960db4f873ac74d3453199f387ba33ffd534 SHA512 08cdbcbec46efb2678cd496be49764f6f8bca3ea7d63d200f632ecadf779c102c76be1388f55879bd4d6d4f157f2b29a9bacf92475ea7909e1e0116002b25c49 WHIRLPOOL 6e7ba14f8f29dee627fa96123c5096fff2bc75d783c89ebb2909877248a2129df7ea44ec7e5bf46d133173ad1e257c8ec386f2d8486fbbb52e1a5c7850afbac0
+MISC ChangeLog 4193 SHA256 1de9128e0dd779f066be2f3b2fc8a2f197ea20cd89253f908e10d632f45a76d3 SHA512 08651f3f2973b4e3f3df9a6f39bb1866dcc8fb42aacb23a943cee1f15a1599b79439797e1f18d7a35a1097e131fa82fa52c3dfd3b7fb82da4cd4cfc76b98920e WHIRLPOOL 3bd6fc248af633429a9d81d0bf9690fc15c5a9aef7d2587500fcecffec96f96cf378ff5e3d47bccdec58d681e51162a9d8ce92099aa5b307ea01334019d579c9
MISC metadata.xml 225 SHA256 9072914e1f255004795621cc128734730b730ffaabda8ca955d781a0e0398b13 SHA512 30fee6629574f5ad334d1e843027ccfeadba29a40626605ae52099bc01b007382e50b15c1643075c1963cc3f776b3e346674044e5766a24428dcf770729a8345 WHIRLPOOL 0ba7bed6b1e43fb6b5470bd5e0378ce0e13ac2366eea5d75199a925c65943a33dfdf515b5fe15a5cb0dfe12197e537fd08d97e90f20107a7dd0e0c9921712d06
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iF4EAREIAAYFAlSgHEkACgkQVxOqA9G7/aDOigD/duajS36IGZqiYqboBqFOJocm
-piNgRdmtWESpM+AKvU0A/jBouPPhpKSo24BdQuRkHRwkvYTMYnreY74EjDz5qkPj
-=h1K0
+iQEcBAEBCAAGBQJUrDtTAAoJEE4V4vFnx44dAUIH/jkJbroVbulPbjJTUxMAIT53
+PohjRPmq992ClyYVErHQR2mSkhHrilQkhx7Bn0c85UHF0ozTWcNF4e826V7idhh7
+kSQX5guEg+/Yw1a2SFLw6eNmKP9pV4OIPPTn5Om2XvxukWCU9eYLMhZRO9puOXUE
+ZwBUd3ezmbsA8c9AkAQJHaM6KlSSERVq0Q+TRWwQmcTLpRK6hHRHsCxqU03wJC3H
+TfMPl6+OxC/+Y0zZoatdBzf+FkyuPnTBWsTNtrxbjNdA4q0YmeYKOOKXeTtL7q87
+D5HU/TJ7pmisV7dUsGzy4p1tnA6e5K/sEzW0joSpD/2iPLf23tMyXDFJjC5FUH0=
+=MrY6
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch
index ae88192a01e6..6cf69580b887 100644
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch
+++ b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch
@@ -231,12 +231,13 @@ diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4
diff -aurwN a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am 2014-06-20 14:37:35.266956252 -0400
+++ b/src/Makefile.am 2014-06-20 15:12:40.278227315 -0400
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,8 @@
# Process this file with automake to create Makefile.in
-INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
+AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
++BUILT_SOURCES = super-smack-yacc.hh
noinst_PROGRAMS=test-dictionary test-client test_tcp_client
bin_PROGRAMS=super-smack super-smack-gen-data
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
index b0a2e82aa1d2..07010aee7bde 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.9 2014/12/28 15:05:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.10 2015/01/06 19:45:14 grknight Exp $
EAPI=2
WANT_AUTOMAKE="1.4"
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
index 5bcc4333c3d2..0df6cc01526e 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild,v 1.4 2014/12/28 15:05:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild,v 1.5 2015/01/06 19:45:14 grknight Exp $
EAPI=5
WANT_AUTOMAKE="1.13"