Fix race building gdbus-codegen header and source, drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index 508a90433b3d97838faf27bf2d491debd1f1e339..a7e9538ae177cccb1a2fc021014ddcceff47bc7c 100644 (file)
--- a/app-crypt/gcr/ChangeLog
+++ b/app-crypt/gcr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gcr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.46 2014/12/15 23:00:59 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.47 2015/01/20 11:23:26 pacho Exp $
+
+  20 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gcr-3.14.0-race-building.patch, -gcr-3.10.1.ebuild, gcr-3.14.0.ebuild:
+  Fix race building gdbus-codegen header and source, drop old
 
 *gcr-3.14.0 (15 Dec 2014)
 

diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index a1b51c49c50f3cd6e30403bf4b552e1c08422fa9..f7a8ab6ea3ce9f8f5ec881d79645da6fa5f200d2 100644 (file)
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
+AUX gcr-3.14.0-race-building.patch 982 SHA256 ef1d1fc3573c1bdea69e38ae3a8a48d00c1a388cb38a06c78dc61757a850d57d SHA512 5c1d1531cfd936c9068ebb9a287c4ca28af8ee02b20564001379679dddd500492993caff44c7a347d9c9b869ef0b1a2c6f4aeb675adb634f9e2070dde4d006d5 WHIRLPOOL ef9538d676ce274729c3a761305a738dc018d1ea8ad0b6a6af0c0ddbed4277fab131f547ccd98da14305ae93df2ca05fed639bd78a7c00df4ab0400108b51013
 DIST gcr-3.12.2.tar.xz 1331884 SHA256 456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c SHA512 7c74302a4485e6909e39721b0beeeeb5920d218c4e8ab5a1878be33457f2b6d59df165bf2e6b606efc8275b8e45dffe8d28ac202cf835f7f2483237258a4d6b2 WHIRLPOOL 9655f1997ececce77f1b179f89798b5b9363ea94e0f2024772575ca05d88dd3b15432c1e0d69095b020726bc0fab1df023dfd6cc975488360f90e43fd9069a8c
 DIST gcr-3.14.0.tar.xz 1340764 SHA256 2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d SHA512 2538b2575c0d325587f8b5423ac6f9c522a69b415977398dc5c4330ce1de896c966e541eb6e536e87e81013bb2dedea4d0ae8baabdab9318db5b97e0977671b8 WHIRLPOOL 755842ad30608162bb81ed58a027a26be6d12ecb12e037b826841612c2481ea564f727e2bc4e03f13f8100257b2d2ee3dae213b56b5f04319718ff30c5eee2a9
-EBUILD gcr-3.10.1.ebuild 1907 SHA256 e2031af77b388bd8aa37f72b260a761231d16963149eeebaaeecd7c82d872fb7 SHA512 f99a36fb3330e1a0adaed37091f9c499d0d158cb2258fbfe2269fd0a82d503e61256bce126ddd7db64316d20ec60246a27d543d5effb0ee16d35e87243c981aa WHIRLPOOL 6ab46d68017f0589f75b10077c8c9449810ab2ac6f4ff73ccc84cae977a3fe7f24c2c99907018d537ef30e963dd457ab5ca866e3d70e243fdc4b24b6356905b0
 EBUILD gcr-3.12.2.ebuild 2044 SHA256 6e75e041167163595dd7ef852c10e04260f7563572d47fb4a4723e80442a85fe SHA512 a4af50a6d674dd2de05c5e98ca3991e388bb219b9a66a70a63145db64f13a1c29118d5b594f82f74993a640b99420dea1b035005af1c4a7774596ceee33dc12e WHIRLPOOL 24871fb99e03c481b07e25dfa5172da19a77f1d48a049173b663854423cd6a3ed78382fbcc3d4bebaf8ba2cb698e68a1beb52106b244d1bfe5bb98a10698fbc4
-EBUILD gcr-3.14.0.ebuild 2048 SHA256 325d316e76232c69c111d9eb6fbd262003c993d9c0076ddb14c93cce0580c072 SHA512 290e816930ea74d38696aeb710c934ccdb652c3f8fba3aea810f49fee7443c7fae263c01d3c116ef1890b4186a7351f0f401140612a574af310672af85d4aa6c WHIRLPOOL 3f7d9ea804be57ad99cfc4892c9d3fa2d3e7ec194bd770ccecae54adf876b1e7c9883dc316e30239be03fba03ef5545318087837c7c2bcd1645c7fddbe2c1cc8
-MISC ChangeLog 5868 SHA256 b85b7703748c4cd172e8195a67692764c1cee1d1f510e825e344bf5e00fad299 SHA512 34f4953a213c0e36e1e378adf5e92b72539d7dc8788b744e5cc84777057be72277759df83e93e79d0921a05bced50665660210254e7649ddbcd9131e0c778745 WHIRLPOOL 08d8d65cca1cdce5a6b051af6be30a6c9a6aef221000557bec11cd75f20bc5d04ce26afa936b212a370bf9b26823c3c8ba8342b49d592fc9e379b60eb46ef86b
+EBUILD gcr-3.14.0.ebuild 2167 SHA256 1ffb1252771f92c7b1a81b221cd92fe5c3aa8a992c46e8ef95dc5102dd44c77d SHA512 58ef473afcf3eaa85e89b26510a63be34581b9cee451fd24bb93042093abeae2c66527bbf02926deaaa21a4966a363ca9cf086b42c1519e05103ce1556271b0b WHIRLPOOL 083bf199936b4537b37d04dee181415a7f561b5d0e98b3891bdfb2a3e24d3c19364287aaf7e09bef38bf4cf2b10e185043d30fece39b1392350c5a0c88c92279
+MISC ChangeLog 6059 SHA256 2c70a34fe206fe5a60bc93d3ff189956533956ac7a58d70c7d7c28acd3444ea1 SHA512 5d3e73988de306572e3b91f3cc2f956b0cc063e06fd61c6a440d6e3cf62466663ea0a8886d247f7081456b12006fe6ddd8a83d5ff144dfdeb202c66cea1a0237 WHIRLPOOL 05852b15260429fb7260aeedd809806e7f87b1acc0283bde3ac0cb77acc105e7dddf42e7686c1b2be45bc20d799b421ef1ae36124b46b2a85819c772055b68df
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSPaCsACgkQ1fmVwcYIWAa5jwCg2XylGy+dgrWZXJD25LdmAUaH
-ucEAoJ0ZxtOqKYn95z0yH4nCgiqQTumC
-=+AIg
+iEYEAREIAAYFAlS+Oq8ACgkQCaWpQKGI+9QMHgCfWlsyH1q5MWjQ5f+9KWCpAyGq
+GK4An0fjc3T4PmaOQnkXwYYPABa4ar7p
+=krIn
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/gcr/files/gcr-3.14.0-race-building.patch b/app-crypt/gcr/files/gcr-3.14.0-race-building.patch
new file mode 100644 (file)
index 0000000..b387f34
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.14.0-race-building.patch
@@ -0,0 +1,29 @@
+From 58de2d787a31175b26687b9a228da0fb1cea5809 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Mon, 29 Sep 2014 20:28:00 +0000
+Subject: gcr: Fix race building gdbus-codegen header and source
+
+https://bugzilla.gnome.org/show_bug.cgi?id=737622
+
+diff --git a/gcr/Makefile.am b/gcr/Makefile.am
+index 0834c67..59f32b7 100644
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
+@@ -161,12 +161,12 @@ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS)
+       $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+               gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \
+       mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c
+-
+-gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
+       $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \
+               gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \
+       mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h
+ 
++gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
++
+ pkgconfig_DATA += \
+       gcr-base-$(GCR_MAJOR).pc
+ 
+-- 
+cgit v0.10.1
+

diff --git a/app-crypt/gcr/gcr-3.10.1.ebuild b/app-crypt/gcr/gcr-3.10.1.ebuild
deleted file mode 100644 (file)
index a9c3c2b..0000000
--- a/app-crypt/gcr/gcr-3.10.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.10.1.ebuild,v 1.11 2014/04/21 10:28:28 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://developer.gnome.org/gcr/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-       >=app-crypt/gnupg-2
-       >=app-crypt/p11-kit-0.19
-       >=dev-libs/glib-2.32:2
-       >=dev-libs/libgcrypt-1.2.2:0=
-       >=dev-libs/libtasn1-1:=
-       >=sys-apps/dbus-1
-       gtk? ( >=x11-libs/gtk+-3:3 )
-       introspection? ( >=dev-libs/gobject-introspection-1.34 )
-"
-RDEPEND="${COMMON_DEPEND}
-       !<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-       dev-libs/gobject-introspection-common
-       dev-util/gdbus-codegen
-       >=dev-util/gtk-doc-am-1.9
-       >=dev-util/intltool-0.35
-       sys-devel/gettext
-       virtual/pkgconfig
-       vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#      dev-libs/gobject-introspection-common
-
-src_prepare() {
-       # Disable stupid flag changes
-       sed -e 's/CFLAGS="$CFLAGS -g"//' \
-               -e 's/CFLAGS="$CFLAGS -O0"//' \
-               -i configure.ac configure || die
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-src_configure() {
-       DOCS="AUTHORS ChangeLog HACKING NEWS README"
-       gnome2_src_configure \
-               $(use_with gtk) \
-               $(use_enable introspection) \
-               $(use_enable vala) \
-               $(usex debug --enable-debug=yes --enable-debug=default) \
-               --disable-update-icon-cache \
-               --disable-update-mime
-}
-
-src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS
-       Xemake check
-}

diff --git a/app-crypt/gcr/gcr-3.14.0.ebuild b/app-crypt/gcr/gcr-3.14.0.ebuild
index d29207876f22bf6045ba7036222b6022fb8acbb7..545e996b6493f3256619325c606b1c33e24b2966 100644 (file)
--- a/app-crypt/gcr/gcr-3.14.0.ebuild
+++ b/app-crypt/gcr/gcr-3.14.0.ebuild
@@ -1,14 +1,13 @@
-# 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/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.1 2014/12/15 23:00:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.14.0.ebuild,v 1.2 2015/01/20 11:23:26 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1 vala virtualx
+inherit autotools eutils gnome2 python-any-r1 vala virtualx
 
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
 HOMEPAGE="https://developer.gnome.org/gcr/"
@@ -52,11 +51,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+       # Fix race building gdbus-codegen header and source (from '3.14')
+       epatch "${FILESDIR}"/${P}-race-building.patch
+
        # Disable stupid flag changes
        sed -e 's/CFLAGS="$CFLAGS -g"//' \
                -e 's/CFLAGS="$CFLAGS -O0"//' \
                -i configure.ac configure || die
 
+       eautoreconf
        use vala && vala_src_prepare
        gnome2_src_prepare
 }