Consolidated xslt USE into doc. Dropped freetype and jpeg flags and made them require...

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 402732ab4d4dd5669fb3ff39cd7b1134ff53413d..ac26b89a4b9076dcd86f54edb2e4acc1ec62beac 100644 (file)
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.8 2006/12/11 04:00:52 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.9 2006/12/19 01:35:15 nichoj Exp $
+
+*thunar-0.5.0_rc2-r2 (19 Dec 2006)
+
+  19 Dec 2006; Joshua Nichols <nichoj@gentoo.org>
+  +thunar-0.5.0_rc2-r2.ebuild:
+  Consolidated xslt USE into doc. Dropped freetype and jpeg flags and made
+  them required dependencies, as you can't explicitly enable/disable them.
+  See bug #157920.
 
 *thunar-0.5.0_rc2-r1 (11 Dec 2006)
 

diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 9096031deef765f81aec3e349131b7d99a8effcd..05aa426d8f587ad75ac0895532883682218264ed 100644 (file)
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -3,14 +3,18 @@ EBUILD thunar-0.5.0_rc2-r1.ebuild 2237 RMD160 ad0f3b3a54b29ef9bf9b6e133d2d3cbb53
 MD5 308179f3fef23f3b635801bfdfd71d0c thunar-0.5.0_rc2-r1.ebuild 2237
 RMD160 ad0f3b3a54b29ef9bf9b6e133d2d3cbb534562db thunar-0.5.0_rc2-r1.ebuild 2237
 SHA256 1c405a8a7215007edca2712aec6c4c4c7eeb9cce8cc3160a02e2fa88ab163435 thunar-0.5.0_rc2-r1.ebuild 2237
+EBUILD thunar-0.5.0_rc2-r2.ebuild 2235 RMD160 d0e40de437354211bffc2d1dd40bbb18bab3c9d1 SHA1 517474403b10af0e8d37146e893cfa178e648588 SHA256 5d25e1791947ac7ee74de176d583e2f43d353e0fbe76ded6f8846129578f609d
+MD5 5c5c08eb9d3938f6b5bdd603b92f4ff2 thunar-0.5.0_rc2-r2.ebuild 2235
+RMD160 d0e40de437354211bffc2d1dd40bbb18bab3c9d1 thunar-0.5.0_rc2-r2.ebuild 2235
+SHA256 5d25e1791947ac7ee74de176d583e2f43d353e0fbe76ded6f8846129578f609d thunar-0.5.0_rc2-r2.ebuild 2235
 EBUILD thunar-0.5.0_rc2.ebuild 1677 RMD160 54018373d1619b1a6e4caace9a2ab74f772dbd18 SHA1 b9927f4a1b7c5c1b5cb4bd36394394537d196a04 SHA256 e0a6e30abcaef3f379b8184b4b186b4aee9b87953f9234ec4b35bee1cd215577
 MD5 8e22764483d88f3f939ae499a1831c29 thunar-0.5.0_rc2.ebuild 1677
 RMD160 54018373d1619b1a6e4caace9a2ab74f772dbd18 thunar-0.5.0_rc2.ebuild 1677
 SHA256 e0a6e30abcaef3f379b8184b4b186b4aee9b87953f9234ec4b35bee1cd215577 thunar-0.5.0_rc2.ebuild 1677
-MISC ChangeLog 1466 RMD160 daec327ab76f0d2579af85f14f7cae7ff4bdcb8b SHA1 587146ad187d1d8b23dc2c6c4faa9f8b11358b27 SHA256 370b16eabb9df212743375f105a4c80f939401bcb47376ad7a69736f620a5467
-MD5 5a31561354857a0d49ea545e42dfb9ec ChangeLog 1466
-RMD160 daec327ab76f0d2579af85f14f7cae7ff4bdcb8b ChangeLog 1466
-SHA256 370b16eabb9df212743375f105a4c80f939401bcb47376ad7a69736f620a5467 ChangeLog 1466
+MISC ChangeLog 1753 RMD160 da4efb7833651923ffb6f7eaf6a5e5fc906a0bc9 SHA1 d0c340f9f38ce5a54e316e7dc4c818f1979fea45 SHA256 38f6d1aba892a2774e728d538ead29cf556321d2e5f66684ef85508fe2edbbd1
+MD5 caed2c92416f8e0110ce3542425ebd70 ChangeLog 1753
+RMD160 da4efb7833651923ffb6f7eaf6a5e5fc906a0bc9 ChangeLog 1753
+SHA256 38f6d1aba892a2774e728d538ead29cf556321d2e5f66684ef85508fe2edbbd1 ChangeLog 1753
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -21,3 +25,6 @@ SHA256 90911898c6a9cc6d7453e926f2ae58c17eedc6d05ab72ce218aa723a0454a401 files/di
 MD5 f8ca5101fa84398091021e2a7c534e83 files/digest-thunar-0.5.0_rc2-r1 253
 RMD160 9e362725e0d06beba567b94132f2b73be9f4de73 files/digest-thunar-0.5.0_rc2-r1 253
 SHA256 90911898c6a9cc6d7453e926f2ae58c17eedc6d05ab72ce218aa723a0454a401 files/digest-thunar-0.5.0_rc2-r1 253
+MD5 f8ca5101fa84398091021e2a7c534e83 files/digest-thunar-0.5.0_rc2-r2 253
+RMD160 9e362725e0d06beba567b94132f2b73be9f4de73 files/digest-thunar-0.5.0_rc2-r2 253
+SHA256 90911898c6a9cc6d7453e926f2ae58c17eedc6d05ab72ce218aa723a0454a401 files/digest-thunar-0.5.0_rc2-r2 253

diff --git a/xfce-base/thunar/files/digest-thunar-0.5.0_rc2-r2 b/xfce-base/thunar/files/digest-thunar-0.5.0_rc2-r2
new file mode 100644 (file)
index 0000000..5235171
--- /dev/null
+++ b/xfce-base/thunar/files/digest-thunar-0.5.0_rc2-r2
@@ -0,0 +1,3 @@
+MD5 c97f6a011eb72b8653ad799290c71d52 Thunar-0.5.0rc2.tar.bz2 1832838
+RMD160 243d353cc64912cc30df1d44f2470baed9713284 Thunar-0.5.0rc2.tar.bz2 1832838
+SHA256 019b937e1cdbc3d554eea4230e10351355316dc4a3ffb65eaf0a927351e780cd Thunar-0.5.0rc2.tar.bz2 1832838

diff --git a/xfce-base/thunar/thunar-0.5.0_rc2-r2.ebuild b/xfce-base/thunar/thunar-0.5.0_rc2-r2.ebuild
new file mode 100644 (file)
index 0000000..18c56f4
--- /dev/null
+++ b/xfce-base/thunar/thunar-0.5.0_rc2-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.5.0_rc2-r2.ebuild,v 1.1 2006/12/19 01:35:15 nichoj Exp $
+
+inherit xfce44 versionator
+
+
+MY_PN="Thunar"
+MY_PV="$(replace_version_separator 3 '')"
+MY_P="${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+xfce44_beta
+xfce44_extra_package # technically, it's core, but in terms of what the eclass
+                                        # does, it's more akin to 'extra' -nichoj
+
+DESCRIPTION="Xfce 4 file manager"
+HOMEPAGE="http://thunar.xfce.org"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc dbus exif hal pcre startup-notification thumbnail"
+
+# The order of RDEPEND is based on the list in README, by:
+#      required packages
+#      required packages not listed in README
+#      optional packages
+#   optional packages not listed
+RDEPEND="
+       >=dev-lang/perl-5.6
+       >=x11-libs/gtk+-2.6.4
+       >=dev-libs/glib-2.6.4
+       >=xfce-extra/exo-0.3.1.12_rc2
+       >=dev-util/intltool-0.30
+       >=media-libs/libpng-1.2.0
+       >=x11-misc/shared-mime-info-0.15
+       >=dev-util/desktop-file-utils-0.10
+       >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+       virtual/fam
+       doc? ( >=dev-util/gtk-doc-1 dev-libs/libxslt )
+       dbus? ( ||      ( >=dev-libs/dbus-glib-0.71
+                               ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+       )
+       hal? ( >=sys-apps/hal-0.5
+               ||      ( >=dev-libs/dbus-glib-0.71
+                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+       )
+       >=media-libs/freetype-2.0
+       thumbnail? ( >=gnome-base/gconf-2.4 )
+       exif? ( >=media-libs/libexif-0.6 )
+       >=media-libs/jpeg-6b
+       startup-notification? ( >=x11-libs/startup-notification-0.4 )
+       pcre? ( >=dev-libs/libpcre-6.0 )
+       "
+
+DEPEND="${RDEPEND}
+       || ( x11-proto/xproto virtual/x11 )"
+
+# TODO report upstream:
+#      --enable/disable for jpeg
+#      --enable/disable for freetype
+# when those are fixed, we make IUSE="jpeg freetype"
+XFCE_CONFIG="
+       $(use_enable dbus) \
+       $(use_enable debug) \
+       $(use_enable doc gtk-doc) \
+       $(use_enable doc xsltproc) \
+       $(use_enable exif) \
+       $(use_enable pcre) \
+       $(use_enable startup-notification) \
+       $(use_enable thumbnail gnome-thumbnailers) \
+       "
+
+if use hal; then
+       XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=hal"
+else
+       XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none"
+fi