summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-05 21:57:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-05 21:57:15 +0000
commite80d77dedc8edeef7a377af591edaa5192ea8e94 (patch)
tree93e6a9ac575ea2376695b7d500ef91ad6caffb10 /xfce-base/tumbler
parentUse new libxfce4ui library (instead of old libxfcegui4). (diff)
downloadgentoo-2-e80d77dedc8edeef7a377af591edaa5192ea8e94.tar.gz
gentoo-2-e80d77dedc8edeef7a377af591edaa5192ea8e94.tar.bz2
gentoo-2-e80d77dedc8edeef7a377af591edaa5192ea8e94.zip
Block xfce-extra/thunar-thumbnailers for upgrade path.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/tumbler')
-rw-r--r--xfce-base/tumbler/ChangeLog5
-rw-r--r--xfce-base/tumbler/tumbler-0.1.2.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/xfce-base/tumbler/ChangeLog b/xfce-base/tumbler/ChangeLog
index 079e9f858580..a3165c075a7d 100644
--- a/xfce-base/tumbler/ChangeLog
+++ b/xfce-base/tumbler/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for xfce-base/tumbler
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/tumbler/ChangeLog,v 1.5 2010/07/23 21:05:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/tumbler/ChangeLog,v 1.6 2010/08/05 21:57:15 ssuominen Exp $
+
+ 05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> tumbler-0.1.2.ebuild:
+ Block xfce-extra/thunar-thumbnailers for upgrade path.
23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> tumbler-0.1.2.ebuild:
Use virtual/jpeg.
diff --git a/xfce-base/tumbler/tumbler-0.1.2.ebuild b/xfce-base/tumbler/tumbler-0.1.2.ebuild
index b16ead403dec..a67243e8bbab 100644
--- a/xfce-base/tumbler/tumbler-0.1.2.ebuild
+++ b/xfce-base/tumbler/tumbler-0.1.2.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/xfce-base/tumbler/tumbler-0.1.2.ebuild,v 1.4 2010/07/23 21:05:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/tumbler/tumbler-0.1.2.ebuild,v 1.5 2010/08/05 21:57:15 ssuominen Exp $
EAPI=2
inherit xfconf
@@ -22,7 +22,8 @@ RDEPEND=">=dev-libs/glib-2.16
media-libs/freetype:2
ffmpeg? ( >=media-video/ffmpegthumbnailer-2 )
jpeg? ( virtual/jpeg )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )"
+ pdf? ( >=app-text/poppler-0.12.4[cairo] )
+ !xfce-extra/thunar-thumbnailers"
DEPEND="${RDEPEND}
dev-util/pkgconfig
dev-util/intltool"