Convert USE="menu-plugin" to XFCE_PLUGINS="menu".

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 19 insertions, 16 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 89ae13d34107..7c9bd0079d2d 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.168 2010/08/23 21:55:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.169 2010/08/23 22:28:52 ssuominen Exp $
+
+  23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfdesktop-4.6.1-r1.ebuild, xfdesktop-4.6.2.ebuild:
+  Convert USE="menu-plugin" to XFCE_PLUGINS="menu".
 
   23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
   xfdesktop-4.6.2.ebuild:
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 9092d1b858ad..dcd0fe552cb2 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -5,7 +5,7 @@ AUX xfdesktop-4.6.2-automagic.patch 4766 RMD160 776129b86b3e90ed5f3d13b472b470c0
 DIST gentoo-minimal-1280x1024.jpg 103489 RMD160 9d736c236c29c39836910337c6b9b62e0d217c08 SHA1 0ef26494879e6e4f4e66f9111ebfc1080423217b SHA256 6134b6eea65e6c8e996cfaab07d30050d66207a518d589bc9115f8342255c57b
 DIST xfdesktop-4.6.1.tar.bz2 3671378 RMD160 86785f706a65e443c5521179b68309b9aca0cb32 SHA1 c2c1b54acaae924077caa3cdffe449e3bb34b2bd SHA256 22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
 DIST xfdesktop-4.6.2.tar.bz2 4480477 RMD160 744c6442c612f41f5567713c3e9265ee95dd2898 SHA1 cefcd1c1386d34386d4e900cbf88b7c24ef3bafb SHA256 cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb
-EBUILD xfdesktop-4.6.1-r1.ebuild 2515 RMD160 292f0cdd080797b796fb0f4dfe3769838d675372 SHA1 7cffea4bf795cef5757053bee531efdb1e97366c SHA256 6fe9c7ebcfd641fbeb7694d93e8a379254c9e4b45269d4b7a373c08f8ebf13c2
-EBUILD xfdesktop-4.6.2.ebuild 2735 RMD160 32d8a12ae26bb9b56023be0c8e1f0e40f271fece SHA1 e8aa2b78ff618f555c807e9c61884c0a1f936d13 SHA256 ef4501cd181ddd16e26497eb47f100e531bdf5067ab3e14eb8d738d8ebba7ab7
-MISC ChangeLog 21294 RMD160 880d33ec1a6e420f6e4cf75c5fb01a99335bc1c1 SHA1 2dfcd0cd18cfe71ac619cf8bc7e339ab6a9570d0 SHA256 4dc00c9d465647b0ff97b5626edeaa709d77fbba4b3277877ecdd3d4fcc06c9b
-MISC metadata.xml 346 RMD160 db69f950346db7139bccc19fe72eeeb6a8a8b7e4 SHA1 25f215bb4fe8e3fdfd2fb3bc43cf4f616f769929 SHA256 d4389fc99aa5e80fe49c933c2878047dc8ec82203eb1066bcaf391f56f71aafe
+EBUILD xfdesktop-4.6.1-r1.ebuild 2532 RMD160 6936b2cc50faacd650ebfcb42e53024eb0cd77a7 SHA1 ae33ff7205529d4866528d3aa62e77cbe16625cd SHA256 8a6b422f44c15fcf27d00e3e998ef3bf6bb21b90d74fd4e5b235ecc19746572c
+EBUILD xfdesktop-4.6.2.ebuild 2752 RMD160 e2e6fcfde960d19710287e110c2f62bd88a4399e SHA1 6eb5b76022ad72cd6f8658995da2e69f4bbd5943 SHA256 2e2eb7502c5e999732fff34ad19b6778c9b9d30133e6a25d81f07095cef47571
+MISC ChangeLog 21454 RMD160 b4b1057da86158349d614af1a1275affa86f22db SHA1 735f6fc986a7c18e88c530eeac542b23d014d6b8 SHA256 d0e1221443e77b3f4064ddd05261c90a597da6e769433244888d266248b65c61
+MISC metadata.xml 276 RMD160 13b24c1b04cf3019681e2b6a455c4fd196ac7ac2 SHA1 b58ca6fb049d21778094471208bc75b4f9fbe704 SHA256 02ac0bb7333dd11cef3a53b2d3c3cc744406509d104d37bd8bd31641646d8ae4
diff --git a/xfce-base/xfdesktop/metadata.xml b/xfce-base/xfdesktop/metadata.xml
index 057f04db9e8d..d6cf275a9553 100644
--- a/xfce-base/xfdesktop/metadata.xml
+++ b/xfce-base/xfdesktop/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>xfce</herd>
   <use>
-    <flag name='thunar'>Build support for application launchers using <pkg>xfce-base/thunar</pkg></flag>
-    <flag name='menu-plugin'>Build Menu plug-in for panel</flag>
+    <flag name='thunar'>Build support for desktop icons (for example, launchers and folders)</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
index 43693caba637..a840d0728dc8 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.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/xfdesktop/xfdesktop-4.6.1-r1.ebuild,v 1.12 2010/03/21 19:34:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild,v 1.13 2010/08/23 22:28:52 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -14,7 +14,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2
 LICENSE="GPL-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="+branding debug doc +menu-plugin thunar"
+IUSE="+branding debug doc xfce_plugins_menu thunar"
 
 LINGUAS="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
 
@@ -36,7 +36,7 @@ RDEPEND="gnome-base/libglade
 	thunar? ( >=xfce-base/thunar-1
 		>=xfce-base/exo-0.3.100
 		dev-libs/dbus-glib )
-	menu-plugin? ( =xfce-base/xfce4-panel-4.6* )"
+	xfce_plugins_menu? ( =xfce-base/xfce4-panel-4.6* )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
@@ -51,9 +51,9 @@ pkg_setup() {
 		$(use_enable thunar file-icons)
 		$(use_enable thunar thunarx)
 		$(use_enable thunar exo)
-		$(use_enable menu-plugin panel-plugin)
+		$(use_enable xfce_plugins_menu panel-plugin)
 		$(use_enable doc xsltproc)
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
 	DOCS="AUTHORS ChangeLog NEWS TODO README"
 	PATCHES=( "${FILESDIR}/${P}-automagic.patch"
 		"${FILESDIR}/${P}-assert.patch" )
diff --git a/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild
index 8aa59cbb612c..eb3aea41caae 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.6.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/xfdesktop/xfdesktop-4.6.2.ebuild,v 1.8 2010/08/23 21:55:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.2.ebuild,v 1.9 2010/08/23 22:28:52 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -14,7 +14,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2
 LICENSE="GPL-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="+branding debug +menu-plugin thunar"
+IUSE="+branding debug xfce_plugins_menu thunar"
 
 LINGUAS="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
 
@@ -36,7 +36,7 @@ RDEPEND="gnome-base/libglade
 	thunar? (
 		|| ( ( =xfce-base/exo-0.3* <xfce-base/thunar-1.1.0 ) xfce-extra/thunar-vfs )
 		dev-libs/dbus-glib )
-	menu-plugin? ( >=xfce-base/xfce4-panel-4.6 )"
+	xfce_plugins_menu? ( >=xfce-base/xfce4-panel-4.6 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
@@ -61,7 +61,7 @@ pkg_setup() {
 		$(use_enable thunar file-icons)
 		$(use_enable thunar thunarx)
 		$(use_enable thunar exo)
-		$(use_enable menu-plugin panel-plugin)
+		$(use_enable xfce_plugins_menu panel-plugin)
 		$(xfconf_use_debug)
 		${mycfg}"