Convert USE="trash-plugin" to XFCE_PLUGINS="trash" expand.

5 files changed, 21 insertions, 27 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 7a58844ef661..4121f7a23ffd 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.98 2010/08/11 20:46:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.99 2010/08/23 22:34:39 ssuominen Exp $
+
+  23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> thunar-1.0.1.ebuild,
+  thunar-1.0.2.ebuild, thunar-1.1.1.ebuild:
+  Convert USE="trash-plugin" to XFCE_PLUGINS="trash" expand.
 
   11 Aug 2010; Joseph Jezak <josejx@gentoo.org> thunar-1.0.2.ebuild:
   Marked ppc stable for bug #323729.
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index afe5e44de5c0..06b346612f41 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX thunar-1.0.1-libpng14.patch 414 RMD160 e9c44d88bf3d995379c89d40283271cae2392684 SHA1 1e24009ec9162bf7ca22827e944d7745cb339a89 SHA256 907c5cfc2e56bffece40e04a580a1557c160162d700d1c0ca817c22e6a6b2ac4
 DIST Thunar-1.0.1.tar.bz2 8802672 RMD160 203690b9eb05ca8e5248bb026f98b8e3e6881f2c SHA1 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 SHA256 7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
 DIST Thunar-1.0.2.tar.bz2 9320379 RMD160 c5b98203353cef7312b736053e5a7678d0644272 SHA1 f7ae00c32402e4bc502aba15477b78e2c558c7c3 SHA256 75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03
 DIST Thunar-1.1.1.tar.bz2 4142974 RMD160 45617e0a0bf6dee5a676bce344ec99aba43f19c7 SHA1 b2c32960818bf0d853f4d8f36c21fc44d82cc987 SHA256 dea28ce5e78a5db5b69634191ae5fe979f4e081827e41f25712bbaad3cd25e59
-EBUILD thunar-1.0.1.ebuild 2161 RMD160 a0723ae4174834a381253d70ec14bea55753aa72 SHA1 be904a5630ef6ce2a4733d966a70602ded943f90 SHA256 bd881bcb24c9d0aec404fcfb428a938dddc3cf8d661e373dc0764d8fde80373b
-EBUILD thunar-1.0.2.ebuild 2160 RMD160 ee30c20203c23139607ce362fd0ec8e499234f94 SHA1 88c8a0c219c5468b224b6d337d29f7b587a2c2fd SHA256 34658cfd00e6ba53540e515905e9f72675283af1f337c910e3cc3911633aa761
-EBUILD thunar-1.1.1.ebuild 2078 RMD160 8a4b657acdc1766b2afe4f8e96c30b5259ffd3bc SHA1 72d74020493c507d7705a1b99be2443d496f1fa9 SHA256 bacb9285a1c5d12a0e8aaaca89216bcc62e20f2989b5405645824bed0e4af9ae
+EBUILD thunar-1.0.1.ebuild 2176 RMD160 02c45b1d88bcacf3f3bd7fb585c70fbe47aa2bd5 SHA1 3cd002ca0b19381de1ca56fe8c7bb3536734ca14 SHA256 43eb11841814e783f6643f398c3f699a3b8efc48863dcf4275cfcb1e76c15bc9
+EBUILD thunar-1.0.2.ebuild 2177 RMD160 463c0bdd9c71d86719f04be2548849ac6282714c SHA1 0693a681d033fc51399f0ec39908d2c18fabc8c7 SHA256 fd0f9d36ead2c87a3fbdfba89f61f4c908ad6a71d84c1ebd4990942ce6c372e4
+EBUILD thunar-1.1.1.ebuild 2095 RMD160 667cdc103482a07eaba3c31ffbe039261ca020c5 SHA1 0e6af6320c907fc1c2bd4036ab5ab5b44bb557c7 SHA256 844abaabc738e62a76f82f405acaad38f984abb096ead53c7106e74ce90d4406
 MISC ChangeLog 13058 RMD160 a3a5a6c14fa5d914db2b43868b4a23f2762b544a SHA1 33b83d81b68e80081c940ca029113357fce2cfc6 SHA256 d3b31f6820b5edff501dc563a7b5ed0b9d3a81a9df9eec9486050cc3776af45c
 MISC metadata.xml 331 RMD160 ef2182615ff067df5acce557db89c65ac3f0aa87 SHA1 6ad7bce8ef0ef5c83f9609d791efab995d42c0d0 SHA256 be76c3c5d770eff06d38667b1db42d1fc6a1efaa1aa72c2cae918e1c0f453435
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxjC+gACgkQcsIHjyDViGQ7MwCgvI9yKRqZcxLEG/Wq+++ytQjI
-qggAn20ahbvYJsJx6qrYjRYEKHXtIJfP
-=UWCd
------END PGP SIGNATURE-----
diff --git a/xfce-base/thunar/thunar-1.0.1.ebuild b/xfce-base/thunar/thunar-1.0.1.ebuild
index 1e290b34581b..b9bf2e7a88b8 100644
--- a/xfce-base/thunar/thunar-1.0.1.ebuild
+++ b/xfce-base/thunar/thunar-1.0.1.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/thunar/thunar-1.0.1.ebuild,v 1.17 2010/03/09 10:41:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.1.ebuild,v 1.18 2010/08/23 22:34:39 ssuominen Exp $
 
 EAPI=2
 MY_P=${P/t/T}
@@ -12,14 +12,14 @@ HOMEPAGE="http://thunar.xfce.org"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug doc exif gnome hal pcre startup-notification +trash-plugin"
+IUSE="dbus debug doc exif gnome hal pcre startup-notification xfce_plugins_trash"
 
 RDEPEND=">=dev-lang/perl-5.6
 	>=dev-libs/glib-2.6:2
 	>=dev-util/desktop-file-utils-0.14
 	>=media-libs/freetype-2
 	>=media-libs/jpeg-6b:0
-	>=media-libs/libpng-1.2.0
+	>=media-libs/libpng-1.4
 	virtual/fam
 	>=x11-libs/gtk+-2.6:2
 	x11-libs/libSM
@@ -34,7 +34,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	gnome? ( gnome-base/gconf )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	trash-plugin? ( dev-libs/dbus-glib
+	xfce_plugins_trash? ( dev-libs/dbus-glib
 		>=xfce-base/xfce4-panel-4.6 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -59,7 +59,7 @@ pkg_setup() {
 		XFCONF="${XFCONF} --with-volume-manager=none"
 	fi
 
-	if use trash-plugin; then
+	if use xfce_plugins_trash; then
 		XFCONF="${XFCONF} --enable-dbus"
 	else
 		XFCONF="${XFCONF} --disable-tpa-plugin"
diff --git a/xfce-base/thunar/thunar-1.0.2.ebuild b/xfce-base/thunar/thunar-1.0.2.ebuild
index 7339a1944521..231267e9f90d 100644
--- a/xfce-base/thunar/thunar-1.0.2.ebuild
+++ b/xfce-base/thunar/thunar-1.0.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/thunar/thunar-1.0.2.ebuild,v 1.8 2010/08/11 20:46:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.2.ebuild,v 1.9 2010/08/23 22:34:39 ssuominen Exp $
 
 EAPI=2
 MY_P=${P/t/T}
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/1.0/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug doc exif gnome hal pcre startup-notification +trash-plugin"
+IUSE="dbus debug doc exif gnome hal pcre startup-notification xfce_plugins_trash"
 
 RDEPEND=">=dev-lang/perl-5.6
 	>=dev-libs/glib-2.6:2
@@ -35,7 +35,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	gnome? ( gnome-base/gconf )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	trash-plugin? ( dev-libs/dbus-glib
+	xfce_plugins_trash? ( dev-libs/dbus-glib
 		>=xfce-base/xfce4-panel-4.6 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -59,7 +59,7 @@ pkg_setup() {
 		XFCONF="${XFCONF} --with-volume-manager=none"
 	fi
 
-	if use trash-plugin; then
+	if use xfce_plugins_trash; then
 		XFCONF="${XFCONF} --enable-dbus"
 	else
 		XFCONF="${XFCONF} --disable-tpa-plugin"
diff --git a/xfce-base/thunar/thunar-1.1.1.ebuild b/xfce-base/thunar/thunar-1.1.1.ebuild
index 5f8c21c69621..dafad6062981 100644
--- a/xfce-base/thunar/thunar-1.1.1.ebuild
+++ b/xfce-base/thunar/thunar-1.1.1.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/thunar/thunar-1.1.1.ebuild,v 1.5 2010/08/08 13:24:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.1.1.ebuild,v 1.6 2010/08/23 22:34:39 ssuominen Exp $
 
 EAPI=3
 inherit virtualx xfconf
@@ -14,7 +14,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/1.1/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug exif libnotify pcre startup-notification test +trash-plugin udev"
+IUSE="dbus debug exif libnotify pcre startup-notification test xfce_plugins_trash udev"
 
 COMMON_DEPEND=">=xfce-base/exo-0.5.3
 	>=dev-libs/glib-2.18:2
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=xfce-base/exo-0.5.3
 	libnotify? ( x11-libs/libnotify )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	trash-plugin? ( dev-libs/dbus-glib
+	xfce_plugins_trash? ( dev-libs/dbus-glib
 		>=xfce-base/xfce4-panel-4.3.90 )
 	udev? ( >=sys-fs/udev-145[extras] )"
 RDEPEND="${COMMON_DEPEND}
@@ -52,7 +52,7 @@ pkg_setup() {
 		$(use_enable pcre)
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 
-	if use trash-plugin; then
+	if use xfce_plugins_trash; then
 		XFCONF="${XFCONF} --enable-dbus"
 	else
 		XFCONF="${XFCONF} --disable-tpa-plugin"