summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2014-10-30 07:46:41 +0000
committerAlfredo Tupone <tupone@gentoo.org>2014-10-30 07:46:41 +0000
commit430a993791e5ecba12c64d840b7b6ee261fa2c23 (patch)
treeee55112144d4b324ebb644b99554c2c7111fd961 /app-misc
parentmask cg useflag as on ia64/hppa (diff)
downloadhistorical-430a993791e5ecba12c64d840b7b6ee261fa2c23.tar.gz
historical-430a993791e5ecba12c64d840b7b6ee261fa2c23.tar.bz2
historical-430a993791e5ecba12c64d840b7b6ee261fa2c23.zip
Fix parallel install. Bug #527382
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/geneweb/ChangeLog6
-rw-r--r--app-misc/geneweb/Manifest12
-rw-r--r--app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch11
-rw-r--r--app-misc/geneweb/geneweb-6.07.ebuild4
4 files changed, 24 insertions, 9 deletions
diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 352f2b4dd710..4427137d794e 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/geneweb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.33 2014/08/10 18:04:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.34 2014/10/30 07:46:34 tupone Exp $
+
+ 30 Oct 2014; Alfredo Tupone <tupone@gentoo.org> geneweb-6.07.ebuild,
+ files/geneweb-6.07-parallellbuild.patch:
+ Fix parallel install. Bug #527382 by flameeyes@gentoo.org
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> geneweb-6.07.ebuild:
QA: drop trailing '.' from DESCRIPTION
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 348a109e7ade..7cdb4d359be0 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -2,18 +2,18 @@
Hash: SHA256
AUX geneweb-6.07-gentoo.patch 781 SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545 SHA512 21408c7a4eba583242d751da6c688c2f175bb81fabac92644c936acd9bde5a9322e21f21306af7f53c261432f941e149219c045f21afab4401da98d7a004d69e WHIRLPOOL e74d266be237d10ca4a90ff01a9bb34f387e653a91a68ad4dc3a9d353839c969eee3e5438823c4649da2d317aa02d2d333e150d6ff98dd353eeeb1a7139d51ba
-AUX geneweb-6.07-parallellbuild.patch 2469 SHA256 eb4aa30f66d10be850dd623e17fb173ff912daf8d09cd3f2b2281a69885f38e8 SHA512 7d2d9426d3d75e48fcd3f95a31e1b84de03da3190f2d1bb8fa9f26ca8e34de7244616f6ef8b37f11a358b2768c3a77e656cb76437cd5b4fc9e40eccaf6e5b77e WHIRLPOOL 7b21225f33f113e283be918432225247b65cc921000988edd4bfa4c3ba1d1e9b2aae03a64bfdf84e271f2886dd31b4e18fcf52e7539ef20b9a6c2dd2350e464a
+AUX geneweb-6.07-parallellbuild.patch 2823 SHA256 79b61f7d0208eb242fb2d90c8fd7bcb3c8209b47b5ca978cef5b603dfff69b5d SHA512 0eced445bff368ebe4f5b8a09653cdc4444c3ae956aeade9b64728136d9334b1cee18e891273308b64ecf819c9ef0937be82b15ee0a9c739ba2c19967f5e2934 WHIRLPOOL 5fb4bc7f0d8f59436f4c88cfc881715b3f2f748fe962601dbc9d5b9f6e0a2551203a4e1338dcc200a7bf5aede69c9e68f032f15a7594585ca06624d80f62471b
AUX geneweb.confd 67 SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1 SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3 WHIRLPOOL 03be4026c4f23ebc6a73d3690318cd27616e23f31893645edae8cd257fd11b38b63feb52d2f91445ab1bef1b1ba20e609d837157c9d0102b771458d1ea1085b7
AUX geneweb.initd 539 SHA256 d1f301e1fa8c12e974a43dde6fe35ae3c3dec7169c5f6d9f5776ee217e3b9213 SHA512 6d60b911338af71cf89b776f85d47ad1df8d07bb034a85b10081440becc8fabee9df11e87590474e5aaa2f3e16858b27b57ece93abb2aeac68c4bfa84f845759 WHIRLPOOL 185ca55744b65ffb05c9bb54af14d6a7563b246fba57fc1d025e6bc453bb9bee908fecd122ae222febb7b6ad6774f65e053ae5be22913acb413604fd45415294
DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 SHA256 cc5b7d30333e8c7b187b83106189b5e63a7d423c2e500b77b5d087cd8cd239fa SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 WHIRLPOOL 75e30b8ef19803dcc6f391fc798c2bb4d4e4fa685d0d5d060dcb1a9ad676a45f5016fef2e6306019876d0d30d662ee3f67f361267a2829b2ce679836c573104c
DIST gw-6.07-src.tgz 1855016 SHA256 c1ecc337f8bce4d8509ca49081d098b5a44ddb6407208496e55e9a38d6bfb1f6 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d WHIRLPOOL 70305616cafcb9476814e3fe8355571611fef4eabe022afd2f3b92c3a9c9c6bc2be69a37532e4b04cc16e9ce8979abda1b103f4606a8784bf64caa0c1b9ff5e5
-EBUILD geneweb-6.07.ebuild 2203 SHA256 556a1726b571b872bf9c64f78261cd6a37aa34702cf6e1424c92b3362562ef7e SHA512 bdd3a44fcfe90af3b32ec256f17b1fde899c5c53b603a85c8aa06aec36d501100c4d34713ff4551beb49c1bc0b99850aaf539303fffd57bf17d39797aab47f9c WHIRLPOOL 1333e108323e73510ef17836f14e98c86fa3e400d26f7ecde0c9d963ee841259043360f42d5b6a4ec63647737edc794bc8950bc307c2d1454ee997e333d7884c
-MISC ChangeLog 5566 SHA256 a8d22695fb3793180afa2b4ba747c72903e1a3ca5434d7477ab429d08e6fc217 SHA512 ed2a07c02a2d2ebcdcf54f6dde5e2e1bfd46eee3bc25ba3f2c5e15af00de77fca6173cfc4012b3a4235b57c8d0481a3a20c3079a3c27c2b156872aa045dcc70d WHIRLPOOL 065533d18f463dd7b49c33f0f8434e511803454bfa08ee2cf350a38bc789d01d703d960a77d660ad2fe2c18446d864d44deedcf0b5d4b02855709cd0f1d30235
+EBUILD geneweb-6.07.ebuild 2204 SHA256 e8649a53c3dab2d2981ae2fbc4847d4e652acbffb5ca14851a709114a684f892 SHA512 774cb5fe39a3ffd00abd78f116b1a75f9040ac014ea8e4bd889134aa8ebf5b6cf72c644a8f1fc1ef065c0a000c97ec03ae9f14e518719ec1786b7bf8cfcc0737 WHIRLPOOL 169d159cc624fd6d6b2800d57c9093442f38aad6f51c9b4826e5e5703c08a2df71a1759a66a0fb4eaa6e62e334ad14359d5c4cb37e1f9722d5c76c11db8985f7
+MISC ChangeLog 5741 SHA256 cf2718ba12ba71ff6c4862701777ca5cc9aba3ab184c3a6bfe6abb81aa007387 SHA512 51cefbba16d9f642f0005a6535b48a559aa8b3b8f94f6be3c60efd5056a3d07592630aad6faeea718c7847ea3e1b519367d736aa84614320666c0874fa8c159f WHIRLPOOL 8a4f2c758fc6787e8dce029f5610e82168571c4d59cc5616ff5267fd9eb6a09c6aaff17b3cbafd12c772ab4ecf5781decb16c0f1cef9a5662c6fca2a1fdc0a27
MISC metadata.xml 663 SHA256 3fbb6788d796221795bb8ed0cfbe45d19d0dc6eec5bdc2a3c22b5420bbb4a6b3 SHA512 9ceb72e3306f5bf8cd56d2e67d741c5cf929dad48263d07e935f1d19300d72bfe5207eabcc032c8d83aefe9c90fff9776394419daf862dad7ad0412853272e84 WHIRLPOOL 38f10127a943cf62e39307c7692284146f58fd620c535449c6aedcf21fc50e98df9b3f0c1c15fdc567ed7596794821ef5f70f5aacff69be645f8c1cfd31e1caa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlPntCsACgkQcaHudmEf86pBWACcD9L+1hiPtHnvb2F4uJ4rbf8e
-omUAnic0LuW59kgWN86o0vfc7GQedg8Z
-=g5s/
+iEYEAREIAAYFAlRR7N8ACgkQIY77eQFFFC3C8QCgnWI/xVXX3C03dI94jlPNEyY0
+Qt8AoNrB7pDfXC9ganAscMwQizvedMOt
+=ntzP
-----END PGP SIGNATURE-----
diff --git a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
index fb0c33b964bb..cb1a5b0125e9 100644
--- a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
+++ b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
@@ -55,3 +55,14 @@
ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
+--- Makefile.old 2014-10-30 08:36:50.308668062 +0100
++++ Makefile 2014-10-30 08:37:13.204451602 +0100
+@@ -65,7 +65,7 @@
+
+ distrib: new_distrib wrappers
+
+-wrappers:
++wrappers: new_distrib
+ if test "$(CAMLP5F)" = "-DWIN95"; then \
+ echo -ne 'setlocal enableextensions\r\n' > $(DESTDIR)/gwd.bat; \
+ echo -ne 'md bases\r\n' >> $(DESTDIR)/gwd.bat; \
diff --git a/app-misc/geneweb/geneweb-6.07.ebuild b/app-misc/geneweb/geneweb-6.07.ebuild
index 829bcdca4bca..6726a97980ba 100644
--- a/app-misc/geneweb/geneweb-6.07.ebuild
+++ b/app-misc/geneweb/geneweb-6.07.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-6.07.ebuild,v 1.7 2014/08/10 18:04:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-6.07.ebuild,v 1.8 2014/10/30 07:46:34 tupone Exp $
EAPI=4
inherit eutils user
@@ -46,7 +46,7 @@ src_compile() {
src_install() {
dodoc ICHANGES
- make distrib
+ emake distrib
# Install doc
cd distribution
dodoc CHANGES.txt