Rename USE minimal to USE menu-plugin and enable it by default using EAPI=1.

Package-Manager: portage-2.1.4_rc4

3 files changed, 21 insertions, 21 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 76211c5891e2..6e597c6935b1 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.110 2007/11/18 07:04:49 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.111 2007/12/02 17:14:07 drac Exp $
+
+  02 Dec 2007; Samuli Suominen <drac@gentoo.org> xfdesktop-4.4.2.ebuild:
+  Rename USE minimal to USE menu-plugin and enable it by default using EAPI=1.
 
 *xfdesktop-4.4.2 (18 Nov 2007)
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 300dc5c76596..a2c1cf138e7c 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -8,14 +8,14 @@ EBUILD xfdesktop-4.4.1-r1.ebuild 2339 RMD160 fcf4e27a94b90096c9dff487b9382028f6d
 MD5 2e47f24923bec388e5a6a26873aa2585 xfdesktop-4.4.1-r1.ebuild 2339
 RMD160 fcf4e27a94b90096c9dff487b9382028f6d363c5 xfdesktop-4.4.1-r1.ebuild 2339
 SHA256 f844565d7e01da8918c9c34cce7eb75673aa24c35eb007c2d4b5436ce7d930e4 xfdesktop-4.4.1-r1.ebuild 2339
-EBUILD xfdesktop-4.4.2.ebuild 2235 RMD160 98d0b51c1c668b8109814f0aeadfb25a7401d5f9 SHA1 2c366ad55ab03e089aa85c6e5b58b16e12475de2 SHA256 4cde759440839fe711b2657c093e4584391785396835afe9f839fcb53aa7082c
-MD5 06644b7bfb3a43f7c27322909281c257 xfdesktop-4.4.2.ebuild 2235
-RMD160 98d0b51c1c668b8109814f0aeadfb25a7401d5f9 xfdesktop-4.4.2.ebuild 2235
-SHA256 4cde759440839fe711b2657c093e4584391785396835afe9f839fcb53aa7082c xfdesktop-4.4.2.ebuild 2235
-MISC ChangeLog 13810 RMD160 3cb0552306238cee5bdb24b69f6028517e1141b2 SHA1 af8fb8cdecfab789c6ad329b0552bac1118201ce SHA256 9b721791a886035ccd2a64c597c5976732850cbd4f469460897659b967d689aa
-MD5 f92adc6a8054583e20311c4390807b05 ChangeLog 13810
-RMD160 3cb0552306238cee5bdb24b69f6028517e1141b2 ChangeLog 13810
-SHA256 9b721791a886035ccd2a64c597c5976732850cbd4f469460897659b967d689aa ChangeLog 13810
+EBUILD xfdesktop-4.4.2.ebuild 2167 RMD160 95573eea76c445d514d04f986a6d862e157c4828 SHA1 d9437741ab7fd904b5dabf345f0394790cc33e05 SHA256 05bf8feea7d7e82f5727c817aa708f5516f82c159687a042d08edd8c5993af4f
+MD5 31d22134a8c2f391d2316391823d662e xfdesktop-4.4.2.ebuild 2167
+RMD160 95573eea76c445d514d04f986a6d862e157c4828 xfdesktop-4.4.2.ebuild 2167
+SHA256 05bf8feea7d7e82f5727c817aa708f5516f82c159687a042d08edd8c5993af4f xfdesktop-4.4.2.ebuild 2167
+MISC ChangeLog 13963 RMD160 9ac0d976fa7b861231c329dc53433795fd3e7207 SHA1 4f23f69412f5e635c438f6b0a808507d0bb96880 SHA256 7cf46b96bbef363ce94676059aaf68fe0b673e2935142e1e4e343bee9b9c93f7
+MD5 c0657d2698f921d251385d31ecb0832f ChangeLog 13963
+RMD160 9ac0d976fa7b861231c329dc53433795fd3e7207 ChangeLog 13963
+SHA256 7cf46b96bbef363ce94676059aaf68fe0b673e2935142e1e4e343bee9b9c93f7 ChangeLog 13963
 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/xfdesktop/xfdesktop-4.4.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild
index 300cc1ea2ded..0aa924770b8d 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild,v 1.1 2007/11/18 07:04:49 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild,v 1.2 2007/12/02 17:14:07 drac Exp $
+
+EAPI=1
 
 inherit eutils xfce44
 
@@ -11,7 +13,7 @@ xfce44_core_package
 DESCRIPTION="Desktop manager"
 HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus debug doc minimal"
+IUSE="dbus debug doc +menu-plugin"
 
 LANG="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"
 
@@ -25,8 +27,8 @@ RDEPEND="x11-libs/libX11
 	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
 	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
 	dbus? ( dev-libs/dbus-glib >=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
-	!minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
-		>=xfce-extra/exo-0.3.2 )"
+	menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
+	>=xfce-extra/exo-0.3.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
@@ -35,7 +37,7 @@ for X in ${LANG}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc)"
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin) --enable-exo"
 DOCS="AUTHORS ChangeLog NEWS TODO README"
 XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
 	/etc/xdg/xfce4/desktop/menu.xml"
@@ -45,12 +47,7 @@ pkg_setup() {
 		XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons"
 	else
 		XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons"
-	fi
-
-	if use minimal; then
-		XFCE_CONFIG="${XFCE_CONFIG} --disable-desktop-icons --disable-exo --disable-panel-plugin"
-	else
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-desktop-icons --enable-exo --enable-panel-plugin"
+		ewarn "Disabling desktop icons because USE dbus is not selected."
 	fi
 }
 
@@ -71,5 +68,5 @@ src_install() {
 
 pkg_postinst() {
 	xfce44_pkg_postinst
-	use dbus || elog "You need USE=\"dbus\" to enable desktop icons."
+	use dbus || elog "Desktop icons disabled because USE dbus was not selected."
 }