summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2008-12-22 12:41:35 +0000
committerChristian Faulhammer <fauli@gentoo.org>2008-12-22 12:41:35 +0000
commit8008248f81bcfeb7625edae61d1686f6378c3e62 (patch)
treeb440207abb6c10f2b032c368ece783f7964bfe63 /app-misc/gramps
parentDisable stripping -- this is a binary-only package. (diff)
downloadhistorical-8008248f81bcfeb7625edae61d1686f6378c3e62.tar.gz
historical-8008248f81bcfeb7625edae61d1686f6378c3e62.tar.bz2
historical-8008248f81bcfeb7625edae61d1686f6378c3e62.zip
fix a race condition for parallel install. Patch provided by flameeyes in bug 249165
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'app-misc/gramps')
-rw-r--r--app-misc/gramps/ChangeLog8
-rw-r--r--app-misc/gramps/Manifest15
-rw-r--r--app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch15
-rw-r--r--app-misc/gramps/gramps-3.0.3.ebuild3
4 files changed, 37 insertions, 4 deletions
diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 2725e2392f27..23c14b6697e2 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-misc/gramps
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.83 2008/12/13 22:47:13 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.84 2008/12/22 12:41:35 fauli Exp $
+
+ 22 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
+ +files/gramps-3.0.3_fix-installation-race-condition.patch,
+ gramps-3.0.3.ebuild:
+ fix a race condition for parallel install. Patch provided by flameeyes in
+ bug 249165
13 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> gramps-3.0.3.ebuild:
Stable on sparc, bug #249165
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 644e102a9159..2acae72b448e 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gramps-3.0.1-no_scrollkeeper.patch 2220 RMD160 94fea473a8cd34e51d6d80882569845f9d483970 SHA1 96b32599dc10488aff9520f8bdb9c1f2f29c6be1 SHA256 4c0e81c2b28d6865d2fb598c242a475c6220e01582dddbd18352252f02df6035
+AUX gramps-3.0.3_fix-installation-race-condition.patch 358 RMD160 b792536b814a66b808e1932c188f683848da5401 SHA1 476f672669d7fa06c3957c0a8bd35ced5ad26ec3 SHA256 53bd2058c6e1b5d72e781b1c09bdcaca66888d4f9daf4221ccfbe404ce06e85e
DIST gramps-3.0.1.tar.gz 5932971 RMD160 a76e88bc51e50ae52440cde0779e5b04657a8524 SHA1 371ffba136fe596a3a1a853cd63fd8cd68d0d02b SHA256 5492e8766ef17286ca23ac60bc6c262a07c0669646d1b7c103bf28f4f2032605
DIST gramps-3.0.3.tar.gz 6056907 RMD160 0fc33fdbb8017174d0bce007b3662fe0c67cd782 SHA1 15e344033bf6015c6714f5c5b13a8e3e96096b80 SHA256 e880a6fb86b13170c28c4203d04b9821617014e51dbc0ef8ad422192b994f046
EBUILD gramps-3.0.1-r1.ebuild 1610 RMD160 3d346d68f5502d2dfa9d4528091a1e81eec16175 SHA1 a571a7de933cb33bf726fe0cd5e8df642fcfa3d4 SHA256 e4263362d527a1d7c2c82a7c3114031587bd64f651eb7004ae785338f5034fc4
-EBUILD gramps-3.0.3.ebuild 1671 RMD160 8b6b82cb0a9cf423448d2e97d2f2b6dab869ecd4 SHA1 3a1b158dd8b32fdba6528e1668477d8e207daab7 SHA256 12cafe66b17ba3f84648a4b39dab56bb5b9787a336bb8339da4d03a9329f22cd
-MISC ChangeLog 11560 RMD160 f409222ae8b29c78df91a460938f1fc69fbabb99 SHA1 bc6a099e24b34d528f792f0c41be0335f07c6f0b SHA256 e332d3f29598b3733a35f6f2d36988e85822f69c1be308a972964b89e337dab7
+EBUILD gramps-3.0.3.ebuild 1733 RMD160 69f1458f315a7f843bd652667d947bd69986596f SHA1 53f66d40135258c9c63a45cabffd2ee8267ccf20 SHA256 26096ce3d9354da043d483afcbf7eb62133d2d603de6aadf4174249c9dfa87a9
+MISC ChangeLog 11786 RMD160 b9b0e69cf675e84af5f05ce604322d964eb07ce9 SHA1 c5ffb3965576c734ba23cf8b4095fe8a73a03d6e SHA256 7b5f603e3abe29d82e086473e5de453e80a97335464a1f4af848c1eb5b3faa04
MISC metadata.xml 1107 RMD160 fa9e24e467103fb07bfacddbdafa7209c0428774 SHA1 60e89b5c5bbbfddecca19f80a3d06ad4b277a211 SHA256 475ba5393a3802b3201f89c0cad5a1ffcc7259b4f1f5357a0cf9fe71049a070c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklPixMACgkQNQqtfCuFneM5uQCbBZH6bLSz3uxtpD0k4JBs6JYi
+56MAn0UsrUHaDnV5it8uoTTXimF5nNjC
+=7JWb
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch b/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch
new file mode 100644
index 000000000000..ed5e5cb487f2
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch
@@ -0,0 +1,15 @@
+--- src/docgen/Makefile.am.orig 2008-12-22 13:24:05.000000000 +0100
++++ src/docgen/Makefile.am 2008-12-22 13:24:39.000000000 +0100
+@@ -23,11 +23,9 @@
+ TextBufDoc.py \
+ GtkPrint.py
+
+-docgen_DATA = \
++dist_docgen_DATA = \
+ gtkprintpreview.glade
+
+-dist_docgen_DATA = $(docgen_DATA)
+-
+ # Clean up all the byte-compiled files
+ MOSTLYCLEANFILES = *pyc *pyo
+
diff --git a/app-misc/gramps/gramps-3.0.3.ebuild b/app-misc/gramps/gramps-3.0.3.ebuild
index 4c663d827a19..8aa759f5d922 100644
--- a/app-misc/gramps/gramps-3.0.3.ebuild
+++ b/app-misc/gramps/gramps-3.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.3.ebuild,v 1.6 2008/12/13 22:47:13 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.3.ebuild,v 1.7 2008/12/22 12:41:35 fauli Exp $
NEED_PYTHON="2.5"
WANT_AUTOCONF="latest"
@@ -43,6 +43,7 @@ pkg_setup() {
src_unpack() {
gnome2_src_unpack
+ epatch "${FILESDIR}"/${P}_fix-installation-race-condition.patch
eautoreconf
# This is for bug 215944, so .pyo/.pyc files don't get into the
# file system