Sanitize USE flag handling using EAPI=1.

Package-Manager: portage-2.1.4_rc7

3 files changed, 21 insertions, 25 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 6e597c6935b1..33095869bf90 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.111 2007/12/02 17:14:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.112 2007/12/05 18:29:29 drac Exp $
+
+  05 Dec 2007; Samuli Suominen <drac@gentoo.org> xfdesktop-4.4.2.ebuild:
+  Sanitize USE flag handling using EAPI=1.
 
   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.
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 35eaac9ebaf7..ae9cbb11416e 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 2170 RMD160 174a80828528fd0b270fb53fb4e279fd6c5bd24f SHA1 f0dcf2074fece6d4d8473a5a3d27e80241817440 SHA256 2355de0236365c24c6438c7700f7d06c7b0262fadde1774de64f65b6597af1a9
-MD5 46880de530c1ccd9e6af952eceed77f2 xfdesktop-4.4.2.ebuild 2170
-RMD160 174a80828528fd0b270fb53fb4e279fd6c5bd24f xfdesktop-4.4.2.ebuild 2170
-SHA256 2355de0236365c24c6438c7700f7d06c7b0262fadde1774de64f65b6597af1a9 xfdesktop-4.4.2.ebuild 2170
-MISC ChangeLog 13963 RMD160 9ac0d976fa7b861231c329dc53433795fd3e7207 SHA1 4f23f69412f5e635c438f6b0a808507d0bb96880 SHA256 7cf46b96bbef363ce94676059aaf68fe0b673e2935142e1e4e343bee9b9c93f7
-MD5 c0657d2698f921d251385d31ecb0832f ChangeLog 13963
-RMD160 9ac0d976fa7b861231c329dc53433795fd3e7207 ChangeLog 13963
-SHA256 7cf46b96bbef363ce94676059aaf68fe0b673e2935142e1e4e343bee9b9c93f7 ChangeLog 13963
+EBUILD xfdesktop-4.4.2.ebuild 1927 RMD160 37194f67e6b2d0569d271428ca7106328177a53f SHA1 888962838bded86c803b19fea602381a6bae6455 SHA256 a76ab307cbe74f94596777c0b16d45ff8bd028173817353b9f0c1884fef4818e
+MD5 5cf2d0b96288a470f0996920bfc19829 xfdesktop-4.4.2.ebuild 1927
+RMD160 37194f67e6b2d0569d271428ca7106328177a53f xfdesktop-4.4.2.ebuild 1927
+SHA256 a76ab307cbe74f94596777c0b16d45ff8bd028173817353b9f0c1884fef4818e xfdesktop-4.4.2.ebuild 1927
+MISC ChangeLog 14080 RMD160 a3bb969979acd55883df2483c2cf616ce17e6e68 SHA1 f0ef2601404bc7ca59f54f3c570f4b83a3566d67 SHA256 95857bf61c54b28f4c551d9bf35c003b97259cabfcd11f80bd6bf3392d8a0903
+MD5 756b6de55b2fb6a3ab6eb414f5cb8ff9 ChangeLog 14080
+RMD160 a3bb969979acd55883df2483c2cf616ce17e6e68 ChangeLog 14080
+SHA256 95857bf61c54b28f4c551d9bf35c003b97259cabfcd11f80bd6bf3392d8a0903 ChangeLog 14080
 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 2819f5df7ebd..4f20c32fb721 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.2.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/xfdesktop/xfdesktop-4.4.2.ebuild,v 1.3 2007/12/02 20:52:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2.ebuild,v 1.4 2007/12/05 18:29:29 drac Exp $
 
 EAPI=1
 
@@ -13,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 +menu-plugin"
+IUSE="debug doc +file-icons +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"
 
@@ -26,9 +26,9 @@ RDEPEND="x11-libs/libX11
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
 	>=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} )
-	menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
-	>=xfce-extra/exo-0.3.2"
+	file-icons? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION}
+		>=xfce-extra/exo-0.3.2 dev-libs/dbus-glib )
+	menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
@@ -43,20 +43,18 @@ XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
 	/etc/xdg/xfce4/desktop/menu.xml"
 
 pkg_setup() {
-	XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin) --enable-exo"
+	XFCE_CONFIG+=" $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin)"
 
-	if use dbus; then
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons"
+	if use file-icons; then
+		XFCE_CONFIG+=" --enable-thunarx --enable-file-icons --enable-exo"
 	else
-		XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons"
-		ewarn "Disabling desktop icons because USE dbus is not selected."
+		XFCE_CONFIG+=" --disable-thunarx --disable-file-icons --disable-exo"
 	fi
 }
 
 src_install() {
 	xfce44_src_install
 
-	# clean out the config files that don't affect us
 	local config lang
 	for config in ${XFCE_LOCALIZED_CONFIGS}; do
 		for lang in ${LANG}; do
@@ -67,8 +65,3 @@ src_install() {
 		done
 	done
 }
-
-pkg_postinst() {
-	xfce44_pkg_postinst
-	use dbus || elog "Desktop icons disabled because USE dbus was not selected."
-}