diff options
| author |   Arun Raghavan <ford_prefect@gentoo.org> | 2010-06-20 14:19:54 +0000 |
|---|---|---|
| committer | Arun Raghavan <ford_prefect@gentoo.org> | 2010-06-20 14:19:54 +0000 |
| commit | 9036ab4223c26902463833fa980d5b0d94bbaadd (patch) | |
| tree | 6eb5418d07328ec66d101cb797cff69a8cb6ea72 /net-libs | |
| parent | stable x86, bug 299388 (diff) | |
| download | gentoo-2-9036ab4223c26902463833fa980d5b0d94bbaadd.tar.gz gentoo-2-9036ab4223c26902463833fa980d5b0d94bbaadd.tar.bz2 gentoo-2-9036ab4223c26902463833fa980d5b0d94bbaadd.zip | |
Apply g-i patches unconditionally os the system lib patch always applies.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libsoup-gnome/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog index f0ca43b74a0b..8e9e9b4c555b 100644 --- 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/libsoup-gnome-2.30.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild index fccd32e043ec..8a65ff18ba90 100644 --- 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 |