summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gardiner <obz@gentoo.org>2005-01-21 10:12:14 +0000
committerMike Gardiner <obz@gentoo.org>2005-01-21 10:12:14 +0000
commit75bddf472445f0445ecd731a9a755164a8d3d513 (patch)
tree0fe6784828d261265602540a5c5ecee34aee6f29 /gnome-base
parentMarked stable on x86 (diff)
downloadhistorical-75bddf472445f0445ecd731a9a755164a8d3d513.tar.gz
historical-75bddf472445f0445ecd731a9a755164a8d3d513.tar.bz2
historical-75bddf472445f0445ecd731a9a755164a8d3d513.zip
Fix for bw compat with cups patch
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/nautilus/Manifest2
-rw-r--r--gnome-base/nautilus/nautilus-2.8.2-r1.ebuild10
2 files changed, 9 insertions, 3 deletions
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 025e75531a2c..13bfd737a5fa 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,7 +1,7 @@
MD5 403b0fb7191c89ba4101948e0c11f150 nautilus-2.8.2.ebuild 2678
MD5 e68e229bdcaa2b24d9542da53d7ee66a nautilus-1.0.6-r9.ebuild 3394
MD5 1f21f286a67d2d669f180312d22f76fc nautilus-2.6.3.ebuild 2732
-MD5 f19acf52ff56b654bd9007268da4954d nautilus-2.8.2-r1.ebuild 2844
+MD5 4a4588570e67e6d2b971aad277a931f8 nautilus-2.8.2-r1.ebuild 2928
MD5 e03f75e77593aec5d89be7e162c6d889 ChangeLog 16255
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 df950888f88f804470320cb6b6c32aa5 nautilus-2.8.0.ebuild 2683
diff --git a/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
index 01848c9598f7..42153689e25f 100644
--- a/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild,v 1.8 2005/01/21 01:24:55 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.8.2-r1.ebuild,v 1.9 2005/01/21 10:12:14 obz Exp $
inherit gnome2 eutils
@@ -70,7 +70,13 @@ src_unpack() {
use gstreamer && epatch ${FILESDIR}/${PN}-2.6-icon_view_gst_audio_preview.patch
# add libgnomeprint support
# With extra 2.8 fun - fixes #65604
- use cups && has_version >=net-print/libgnomecups-0.1.13 && epatch ${FILESDIR}/${PN}-2.8-x-printers.patch
+ if use cups; then
+ if has_version ">=net-print/gnome-cups-manager-0.28"; then
+ epatch ${FILESDIR}/${PN}-2.8-x-printers.patch
+ else
+ epatch ${FILESDIR}/${PN}-2-x-printers.patch
+ fi
+ fi
# patch to support libexif versions 0.5 and 0.6
epatch ${FILESDIR}/${PN}-2-libexif.patch