Dep fixes, various other fixes

Package-Manager: portage-2.1.2-r4

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 9d8e02dbbad7369d59f18ace1051a60f6e213c8d..d1f49417475ff0c1342d54803d4ae223836bcdd2 100644 (file)
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.13 2007/01/23 16:57:24 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.14 2007/01/28 14:37:31 welp Exp $
+
+  28 Jan 2007; Peter Weller <welp@gentoo.org> thunar-0.8.0.ebuild:
+  Dep fixes, various other fixes
 
   23 Jan 2007; Peter Weller <welp@gentoo.org> thunar-0.8.0.ebuild:
   Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.

diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index a03c8debebfd296708eb3073d5ad9b366647a3ed..96b5058ff49e3559aa508e7653d95cd76630560d 100644 (file)
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -4,14 +4,14 @@ EBUILD thunar-0.5.0_rc2-r3.ebuild 2354 RMD160 6f1d15ed3ebbb6554407420bb403d02180
 MD5 462557fc6bac6f0937d5f47ff29a6534 thunar-0.5.0_rc2-r3.ebuild 2354
 RMD160 6f1d15ed3ebbb6554407420bb403d02180a89c7e thunar-0.5.0_rc2-r3.ebuild 2354
 SHA256 6203c72919f4cbad4a03fded22378c8ff4f039ec3f1815b13168f564d6a83da6 thunar-0.5.0_rc2-r3.ebuild 2354
-EBUILD thunar-0.8.0.ebuild 2504 RMD160 66777517161a28bf1b287beb4e253c6b22dd53a5 SHA1 4e1d378c5e7820c05d601e94d56f217f86285a0b SHA256 7be1dc8cbb1a20f5422aff1a53c62a659e2b0db86a08674b34f8d5c539681bdf
-MD5 fb3a2cc02b3e5198df8719c1edc3e2de thunar-0.8.0.ebuild 2504
-RMD160 66777517161a28bf1b287beb4e253c6b22dd53a5 thunar-0.8.0.ebuild 2504
-SHA256 7be1dc8cbb1a20f5422aff1a53c62a659e2b0db86a08674b34f8d5c539681bdf thunar-0.8.0.ebuild 2504
-MISC ChangeLog 2654 RMD160 0d472158fd435c95256a2061e336cbd836290559 SHA1 84a0c3323fe6cc83209211789ecd4f907c222165 SHA256 f0e24e36a9c47b3dab3063fdb2bf878dd0ddb4f65cbc6fcb191d51af6a04f16f
-MD5 323c3c0cc7c0ac463f41044871acef8e ChangeLog 2654
-RMD160 0d472158fd435c95256a2061e336cbd836290559 ChangeLog 2654
-SHA256 f0e24e36a9c47b3dab3063fdb2bf878dd0ddb4f65cbc6fcb191d51af6a04f16f ChangeLog 2654
+EBUILD thunar-0.8.0.ebuild 1690 RMD160 f8f29b9ed9b0aca00db6f5153791ac427f531610 SHA1 26be75fea8fd806361a6fcae09ecf8d32a437e91 SHA256 d2ed26e5982c4f1d5503e64b9dbb7d1fe598a4f13ae90456e5ebac0ed9ac32fe
+MD5 c6cba839774d0a162ef0098ad4879019 thunar-0.8.0.ebuild 1690
+RMD160 f8f29b9ed9b0aca00db6f5153791ac427f531610 thunar-0.8.0.ebuild 1690
+SHA256 d2ed26e5982c4f1d5503e64b9dbb7d1fe598a4f13ae90456e5ebac0ed9ac32fe thunar-0.8.0.ebuild 1690
+MISC ChangeLog 2755 RMD160 8b439f85372c61a4dcaafc38ba0758f127c5b173 SHA1 57bba766712b84e799e2e498be12966096e5f115 SHA256 d269173b0a971c46ff1a50aca97af99cac9eba650050be7e2f978e41869ce07b
+MD5 3728e6ebfe8d69c4245bcfbd38e35ac6 ChangeLog 2755
+RMD160 8b439f85372c61a4dcaafc38ba0758f127c5b173 ChangeLog 2755
+SHA256 d269173b0a971c46ff1a50aca97af99cac9eba650050be7e2f978e41869ce07b ChangeLog 2755
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

diff --git a/xfce-base/thunar/thunar-0.8.0.ebuild b/xfce-base/thunar/thunar-0.8.0.ebuild
index 422cd00b0dcb73afc4a474f592456580808e87d9..4e2c040e89e9982992a2b455e35a3606bf3cb9db 100644 (file)
--- a/xfce-base/thunar/thunar-0.8.0.ebuild
+++ b/xfce-base/thunar/thunar-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0.ebuild,v 1.2 2007/01/23 16:57:24 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0.ebuild,v 1.3 2007/01/28 14:37:31 welp Exp $
 
 inherit xfce44
 
@@ -8,76 +8,49 @@ MY_P="${P/t/T}"
 S="${WORKDIR}/${MY_P}"
 
 xfce44
-xfce44_extra_package # technically, it's core, but in terms of what the eclass
-                                        # does, it's more akin to 'extra' -nichoj
 
-DESCRIPTION="Xfce4 file manager"
+DESCRIPTION="File manager"
 HOMEPAGE="http://thunar.xfce.org"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc dbus debug exif gnome hal plugins pcre startup-notification"
 
-IUSE="doc dbus debug exif hal pcre startup-notification thumbnail trash-panel-plugin"
-
-# 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
+RDEPEND=">=dev-lang/perl-5.6
+       x11-libs/libSM
+       >=x11-libs/gtk+-2.6
+       >=dev-libs/glib-2.6
        >=xfce-extra/exo-0.3.2
-       >=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 ) )
-       )
+       dbus? ( dev-libs/dbus-glib )
+       hal? ( sys-apps/hal )
        >=media-libs/freetype-2.0
-       thumbnail? ( >=gnome-base/gconf-2.4 )
+       gnome? ( gnome-base/gconf )
        exif? ( >=media-libs/libexif-0.6 )
        >=media-libs/jpeg-6b
-       startup-notification? ( >=x11-libs/startup-notification-0.4 )
-       pcre? ( >=dev-libs/libpcre-6.0 )
-       trash-panel-plugin? ( dbus? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) )"
-
+       startup-notification? ( x11-libs/startup-notification )
+       pcre? ( >=dev-libs/libpcre-6 )
+       plugins? ( dbus? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) )
+       gnome-base/librsvg"
 DEPEND="${RDEPEND}
+       dev-util/pkgconfig
        dev-util/intltool
-       x11-proto/xproto"
-
-# 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 doc gtk-doc) \
-       $(use_enable doc xsltproc) \
-       $(use_enable exif) \
-       $(use_enable pcre) \
-       $(use_enable startup-notification) \
-       $(use_enable thumbnail gnome-thumbnailers) \
-       "
+       doc? ( dev-util/gtk-doc )"
 
-if use hal; then
-       XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=hal"
-else
-       XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none"
-fi
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \
+       $(use_enable dbus) $(use_with hal volume-manager hal) $(use_enable pcre)"
 
-use trash-panel-plugin && use dbus || XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin"
+use plugins && use dbus || XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin"
 
 pkg_setup() {
-       if use trash-panel-plugin && ! use dbus ; then
-               ewarn "trash-panel-plugin requires ${PN} with dbus support"
-               ewarn "Enable dbus use flag and re-emerge this ebuild if you want this feature."
-               epause 3
+       if use plugins && ! use dbus ; then
+       ewarn "Plugins requires ${PN} with dbus support. Enable dbus use flag"
+       ewarn "and re-emerge this ebuild if you want this feature."
+       epause 3
        fi
 }
+
+DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS"
+
+xfce44_extra_package