Apply g-i patches unconditionally os the system lib patch always applies.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index f0ca43b74a0bea5aa30a346867c5bd4f59dd8456..8e9e9b4c555b4cd75e6443a032ef3d520bcd15c0 100644 (file)
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.27 2010/06/20 14:07:24 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.28 2010/06/20 14:19:54 ford_prefect Exp $
+
+  20 Jun 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  libsoup-gnome-2.30.1.ebuild:
+  Apply g-i patches unconditionally os the system lib patch always applies.
 
   20 Jun 2010; Arun Raghavan <ford_prefect@gentoo.org>
   libsoup-gnome-2.30.1.ebuild, files/libsoup-gnome-2.30.1-system-lib.patch,

diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index ceb683c7e326abea0a1bdf5c11da8042cc1a40ca..3633e5ce83e5d66fa84350a2aec55cfa246f6879 100644 (file)
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -7,6 +7,6 @@ DIST libsoup-2.30.1-build-gir-patches.tar.bz2 8678 RMD160 2043a4847d1d5830e1f2f2
 DIST libsoup-2.30.1.tar.bz2 644401 RMD160 7de3ae172b3eff0a2d0aa26b0fa8e537b3431f4b SHA1 661d14ff2dde5a9ff04c3751711bfec11dfd0738 SHA256 6395c6e0bbcf4e822f1c5f3dd6f844116c571ed13cdf611d5c8f1dd4fe5777ed
 EBUILD libsoup-gnome-2.26.3-r1.ebuild 1296 RMD160 2394891f170242ec3d470f144c160d0f22cca1bf SHA1 7299d61e1c9eb548b4ab4075b110d21026313e0a SHA256 8b33cbb507a1ee8a9c73f1e0f88a800948103b7c76a8b5cc002b5756ae0f78a8
 EBUILD libsoup-gnome-2.28.2.ebuild 1316 RMD160 a5b4d6ba0e495006b016034328dc170cee8483fa SHA1 83250dd1df2e997c4fd6ddfe08891c8e38db1bed SHA256 6a13e0d4ebe2a372d36d3fd2473575308ce088bfd38d69092141f90efa8d753a
-EBUILD libsoup-gnome-2.30.1.ebuild 1656 RMD160 83a6ff3032fb415f1fbc3cfce470c8001fb98337 SHA1 d588eb73d3a20260e950880cfd502833360de3b3 SHA256 8620f02379bb040fc7213b17058920dbe7ed22040a01543b9b95dc79c4e3079a
-MISC ChangeLog 4521 RMD160 ac8b5c07fc04a5b73dc8e0219d1888c354227cd4 SHA1 bf59b5a1f51940255a0b95fcadbbac3f5590cdcd SHA256 c171e90584d9044bc09dbed4c4c11bad6b5473937bec7a24144b0003a4f0dbaf
+EBUILD libsoup-gnome-2.30.1.ebuild 1673 RMD160 d5a1d6d2476f0afb5f111ec251bb5978d13003d7 SHA1 4a936559edfd8c45003df1d0c30df7b8ce89579e SHA256 7814931729ec930a003f5508dfc55b472331c750cc8fa795d1db015550d4b585
+MISC ChangeLog 4684 RMD160 866468f3ab2fe72d2569dc6b20303cb261aff851 SHA1 52fc4daff00f950ff3cccfdd5eea70f41e57672d SHA256 a2e1cced7c5e8b916726bc3e46a32b400529bf7cfd03b69d58cf41ab1f53225e
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
index fccd32e043ec43d37979a22daf2516c8961c7dcd..8a65ff18ba90ec76d40c1b68e95997c93f1936e0 100644 (file)
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.4 2010/06/20 14:07:24 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.5 2010/06/20 14:19:54 ford_prefect Exp $
 
 EAPI="2"
 
@@ -49,10 +49,9 @@ src_prepare() {
        # No patch to prevent having to eautoreconf
        sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
 
-       if use introspection; then
-               epatch "${WORKDIR}/${MY_P}-build-gir-1.patch"
-               epatch "${WORKDIR}/${MY_P}-build-gir-2.patch"
-       fi
+       # Unconditionally apply so the next patch applies
+       epatch "${WORKDIR}/${MY_P}-build-gir-1.patch"
+       epatch "${WORKDIR}/${MY_P}-build-gir-2.patch"
 
        # Use lib present on the system
        epatch "${FILESDIR}"/${PN}-2.30.1-system-lib.patch