diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-05-31 19:05:55 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-05-31 19:05:55 +0000 |
| commit | 1563ec955ceda150f7c3c4fab0824fb16cbeb12d (patch) | |
| tree | db70904ff8b8b817df1776d9280ac0da37b9718e /gnome-base/gvfs | |
| parent | EAPI 3 was merged into master, remove USE=eapi3-draft (diff) | |
| download | historical-1563ec955ceda150f7c3c4fab0824fb16cbeb12d.tar.gz historical-1563ec955ceda150f7c3c4fab0824fb16cbeb12d.tar.bz2 historical-1563ec955ceda150f7c3c4fab0824fb16cbeb12d.zip | |
Fix tests with USE='archive', bug #270105.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'gnome-base/gvfs')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/gvfs/Manifest | 14 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.2.3.ebuild | 12 |
3 files changed, 25 insertions, 6 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 360c19bb41c0..bc060ed3cfb5 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gvfs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.72 2009/05/30 14:04:31 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.73 2009/05/31 19:05:55 eva Exp $ + + 31 May 2009; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.2.3.ebuild: + Fix tests with USE='archive', bug #270105. 30 May 2009; Brent Baude <ranger@gentoo.org> gvfs-1.2.2.ebuild: Marking gvfs-1.2.2 ~ppc64 for bug 269287 diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index e80edb97e48d..b7fc036a17a2 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX gvfs-1.0.3-bluez4-debug.patch 813 RMD160 17173a9a2a1dff295b7ab97ce9eb3910eebd781d SHA1 71790ed4385978188baa78fdb9b496de3ab64057 SHA256 0aec6ed9395f3ebf598613ddc80fab86ff14db1a8f2256fc1355ea864ac4943b AUX gvfs-1.0.3-bluez4.patch 15992 RMD160 ce019597f52e3f58bea23e098ffab70ac1f1ed83 SHA1 3734c27032184c956013c46b3915e05d84dd5009 SHA256 e9eb881f06b1b404e0c362c6e66975cdef2e5956b103720364a8fd6db7c9a4ce AUX gvfs-1.0.3-gmountspec-SIGSEGV.patch 467 RMD160 17131acfdbe080d283cf4290b338554192c71ea1 SHA1 f4e898d755463f55280ae712935bafb19891c30f SHA256 c93f11cc77de7e8b5e40c61cd7e2edaad7adb30c816087d67370ce49f518be10 @@ -12,6 +15,13 @@ DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 EBUILD gvfs-1.0.3-r13.ebuild 2834 RMD160 68c40088637cfd7265b5f6b595e36727eb940784 SHA1 f6800a30eeafe35a17e144394bdca62931a1e867 SHA256 509faaea743316c87af8413a60a051730d1254af498882fd06642d04f416795d EBUILD gvfs-1.0.3-r2.ebuild 2549 RMD160 f2cdecd0ecef907b0ea6edf7541724c8cee41822 SHA1 40169e794fee6710a0900d297bb8125f92568ade SHA256 0d3d94d668fa3d9750fc486d017f08f89281906d9fa54bf0fba282dc1ae5fc4e EBUILD gvfs-1.2.2.ebuild 2069 RMD160 34f9e625b8235fa0a4a4f0c88352717f1e22ddbd SHA1 8d0b120169b2994b02bf95716414a63fbbc559c3 SHA256 34a95e31f473b7d7ac015c04e960cdac0dc55b379393e9ff8dca078d7651fe63 -EBUILD gvfs-1.2.3.ebuild 2072 RMD160 1bfc695fd8bfdac72bde4b6aeb3c74cedbd26bae SHA1 555870f2334912b3142e86044209757b744c647f SHA256 ed44cb86b001dde4231c3839f04a64a232ccb037b9659b1de642ce7b4d768ac8 -MISC ChangeLog 10467 RMD160 50cd617486e88fbad5e26e2428925864e3f2c413 SHA1 955a89fcf1f159567ff8df5ed55919829b453b68 SHA256 650ce1940d0c260cbb3c1964817c94cb4bc9fe4b86ebc41fdf69788cc02265a2 +EBUILD gvfs-1.2.3.ebuild 2201 RMD160 eba2a11ecefe0099dec995500819433e9f53f722 SHA1 a6bb62f958d38e4eab47c286428680c0985b83bd SHA256 59ab6fae2b228c7fed17c33a000ac5a1bf33259ece056bcc11728dda568466e5 +MISC ChangeLog 10583 RMD160 07711669d4480c8f84a98c073f62d59751c583a4 SHA1 386aca111aefcd7e573aa051ab4ffc5dff0ce1dd SHA256 352cebf54ecfaa7a36e0732e4e4722efff6d8678a8ce768443e24a8a222189a5 MISC metadata.xml 864 RMD160 71f72e397643a884a5df4613040bd7a711ffc8f4 SHA1 2b83f7169d29d389e6aba00812b2dfb25d7f1a77 SHA256 7122d3aa2f01e10a870560059bf8b3a2bec93730d3451e73f9d7e145acce3783 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkoi1RgACgkQ1fmVwcYIWAbblwCfXMDnY5ZwmMepICAj6JJwUIZ9 +G2EAmgMsFzXdKT1WlYR2cz22cJHm2CWZ +=rznd +-----END PGP SIGNATURE----- diff --git a/gnome-base/gvfs/gvfs-1.2.3.ebuild b/gnome-base/gvfs/gvfs-1.2.3.ebuild index fbb8eb3852f0..543739755561 100644 --- a/gnome-base/gvfs/gvfs-1.2.3.ebuild +++ b/gnome-base/gvfs/gvfs-1.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.3.ebuild,v 1.3 2009/05/20 17:32:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.3.ebuild,v 1.4 2009/05/31 19:05:55 eva Exp $ EAPI="2" @@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="archive avahi bluetooth cdda doc fuse gnome gnome-keyring gphoto2 hal samba" RDEPEND=">=dev-libs/glib-2.19 @@ -62,7 +62,13 @@ src_prepare() { # Conditional patching purely to avoid eautoreconf use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch" - use archive && epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch" + + if use archive; then + epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch" + echo "mount-archive.desktop.in" >> po/POTFILES.in + echo "mount-archive.desktop.in.in" >> po/POTFILES.in + fi + use gphoto2 || use archive && eautoreconf } |