diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-06-16 18:18:39 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-06-16 18:18:39 +0000 |
| commit | 1d4c8911da78850ea6ab92a5e9bb7f58cd8f29bc (patch) | |
| tree | d60d370683cbf945375105e1549deca3ea5c6d91 /net-libs/libsoup-gnome | |
| parent | Adding 9.0 virtual (diff) | |
| download | gentoo-2-1d4c8911da78850ea6ab92a5e9bb7f58cd8f29bc.tar.gz gentoo-2-1d4c8911da78850ea6ab92a5e9bb7f58cd8f29bc.tar.bz2 gentoo-2-1d4c8911da78850ea6ab92a5e9bb7f58cd8f29bc.zip | |
Fix bug #324267 and rename system-lib patch
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libsoup-gnome')
| -rw-r--r-- | net-libs/libsoup-gnome/ChangeLog | 10 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch (renamed from net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch) | 0 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog index 2ee480aa7cd9..c13f5fdd05d4 100644 --- a/net-libs/libsoup-gnome/ChangeLog +++ b/net-libs/libsoup-gnome/ChangeLog @@ -1,6 +1,14 @@ # 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.25 2010/06/13 18:50:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.26 2010/06/16 18:18:39 pacho Exp $ + + 16 Jun 2010; Pacho Ramos <pacho@gentoo.org> libsoup-gnome-2.30.1.ebuild, + +files/libsoup-gnome-2.30.1-system-lib.patch, + -files/libsoup-gnome-system-lib.patch: + Depend on gnome-base/libgnome-keyring when needed instead of recent + gnome-base/gnome-keyring versions per bug #324267 (by Jan-Matthias Braun) + and choose a proper name for system-lib patch as reminded by Leio some + days ago on IRC. 13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +files/libsoup-gnome-system-lib.patch: diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.30.1-system-lib.patch index 964b71048d26..964b71048d26 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch +++ b/net-libs/libsoup-gnome/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 26b4b93e2f9a..edbd06e2fe10 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.2 2010/06/13 18:50:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.3 2010/06/16 18:18:39 pacho Exp $ EAPI="2" @@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~ IUSE="debug doc" RDEPEND="~net-libs/libsoup-${PV} - gnome-base/gnome-keyring + || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) net-libs/libproxy >=gnome-base/gconf-2 dev-db/sqlite:3" @@ -47,6 +47,6 @@ src_prepare() { sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed" # Use lib present on the system - epatch "${FILESDIR}"/${PN}-system-lib.patch + epatch "${FILESDIR}"/${PN}-2.30.1-system-lib.patch eautoreconf } |