Pass --disable-menu-editor to configure options because it's not yet supported by new menu system.

Package-Manager: portage-2.1.2.2

4 files changed, 110 insertions, 5 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 19f3b153bbaa..582f53d3bd24 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # 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.95 2007/03/25 16:23:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.96 2007/03/26 13:47:33 drac Exp $
+
+*xfdesktop-4.5_pre20070325-r1 (26 Mar 2007)
+
+  26 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +xfdesktop-4.5_pre20070325-r1.ebuild:
+  Pass --disable-menu-editor to configure options because it's not yet
+  supported by new menu system.
 
   25 Mar 2007; Samuli Suominen <drac@gentoo.org>
   xfdesktop-4.5_pre20070325.ebuild:
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index db0db60c2b71..2f71d1ca5a98 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -9,14 +9,18 @@ EBUILD xfdesktop-4.4.0-r3.ebuild 2243 RMD160 59c41fb5b3832d61f5ccad47a74075167d2
 MD5 02e77ef509eb98201900bdc69fe1a0a7 xfdesktop-4.4.0-r3.ebuild 2243
 RMD160 59c41fb5b3832d61f5ccad47a74075167d2e48c9 xfdesktop-4.4.0-r3.ebuild 2243
 SHA256 adc9bb2e6e4fd38ed29a85b997f44daa7bd00506bef3685d3b75d94924526fdc xfdesktop-4.4.0-r3.ebuild 2243
+EBUILD xfdesktop-4.5_pre20070325-r1.ebuild 2458 RMD160 648441d6cc66f431f6afd2c05c8d59cc529ca192 SHA1 abf529da207c3fa9e1188e4b4e6f4961d5ae57f1 SHA256 658bc19b64ffca89c8348b67e5a20fbe8bc19700da816d8ee8c101468f4047e1
+MD5 eee551b078bf76baf41a3cadc90408d4 xfdesktop-4.5_pre20070325-r1.ebuild 2458
+RMD160 648441d6cc66f431f6afd2c05c8d59cc529ca192 xfdesktop-4.5_pre20070325-r1.ebuild 2458
+SHA256 658bc19b64ffca89c8348b67e5a20fbe8bc19700da816d8ee8c101468f4047e1 xfdesktop-4.5_pre20070325-r1.ebuild 2458
 EBUILD xfdesktop-4.5_pre20070325.ebuild 2317 RMD160 b1574434ce80e4a20f3f5547335f7a6852ef66d1 SHA1 aa5caf6b8e7284c7d0229c4b71ac3fdd74790a5f SHA256 8d845fc611b1823d1514afc27b81dbe075c5d680084fae8cbae24e562f1e5c09
 MD5 c90fee382495549ef307b13dd93364f1 xfdesktop-4.5_pre20070325.ebuild 2317
 RMD160 b1574434ce80e4a20f3f5547335f7a6852ef66d1 xfdesktop-4.5_pre20070325.ebuild 2317
 SHA256 8d845fc611b1823d1514afc27b81dbe075c5d680084fae8cbae24e562f1e5c09 xfdesktop-4.5_pre20070325.ebuild 2317
-MISC ChangeLog 11810 RMD160 eb28e01af11005a681c54e4a953cbb2c13c1bad7 SHA1 d7afd4bd927260bb13282c8bf30d0635cd2f9fe1 SHA256 ebbbe8cb4b01161129e0e6009703ea31b4feead4e2c3a9113a476763a06a707f
-MD5 d5253c5c71cc379dfc9c0d7e2ab07ecd ChangeLog 11810
-RMD160 eb28e01af11005a681c54e4a953cbb2c13c1bad7 ChangeLog 11810
-SHA256 ebbbe8cb4b01161129e0e6009703ea31b4feead4e2c3a9113a476763a06a707f ChangeLog 11810
+MISC ChangeLog 12048 RMD160 fc278a6cc68836987e2a68b09fa11eecaccee27c SHA1 99cdec7b2ad9ea4482578421064db3cd23fdff86 SHA256 55714513e767076911390d638ae15bd5bde3a790359c15c282cf9de01e1997a5
+MD5 b7ff554a91336b5c9256d408529c3fd5 ChangeLog 12048
+RMD160 fc278a6cc68836987e2a68b09fa11eecaccee27c ChangeLog 12048
+SHA256 55714513e767076911390d638ae15bd5bde3a790359c15c282cf9de01e1997a5 ChangeLog 12048
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -30,3 +34,6 @@ SHA256 4d72ecec4468ad413db51f9e36be65a2430535ef756ce08e6b54eb4a54b72391 files/di
 MD5 821add2d018fccd3a52935e62e7430d4 files/digest-xfdesktop-4.5_pre20070325 283
 RMD160 c88ac91bc7dafdea317a09551a3bf24cd892e383 files/digest-xfdesktop-4.5_pre20070325 283
 SHA256 2ed3c25f70d9184f4d0178d42b7ba8e647422e86756b72365fb0bec0f8feec0b files/digest-xfdesktop-4.5_pre20070325 283
+MD5 821add2d018fccd3a52935e62e7430d4 files/digest-xfdesktop-4.5_pre20070325-r1 283
+RMD160 c88ac91bc7dafdea317a09551a3bf24cd892e383 files/digest-xfdesktop-4.5_pre20070325-r1 283
+SHA256 2ed3c25f70d9184f4d0178d42b7ba8e647422e86756b72365fb0bec0f8feec0b files/digest-xfdesktop-4.5_pre20070325-r1 283
diff --git a/xfce-base/xfdesktop/files/digest-xfdesktop-4.5_pre20070325-r1 b/xfce-base/xfdesktop/files/digest-xfdesktop-4.5_pre20070325-r1
new file mode 100644
index 000000000000..4bfd7020fbb6
--- /dev/null
+++ b/xfce-base/xfdesktop/files/digest-xfdesktop-4.5_pre20070325-r1
@@ -0,0 +1,3 @@
+MD5 b47bbc7c73ff2ee68b65064f691efb6e xfdesktop-4.5_pre20070325.tar.bz2 5737890
+RMD160 02f4274d7fe279135571614e2174e599357ce1d0 xfdesktop-4.5_pre20070325.tar.bz2 5737890
+SHA256 552214bf9586ec6ca61345ab7fb0bfec86fcea3ca8b569dbaad1f5e451a7a31f xfdesktop-4.5_pre20070325.tar.bz2 5737890
diff --git a/xfce-base/xfdesktop/xfdesktop-4.5_pre20070325-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.5_pre20070325-r1.ebuild
new file mode 100644
index 000000000000..31ab3ef49c64
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.5_pre20070325-r1.ebuild
@@ -0,0 +1,88 @@
+# 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.5_pre20070325-r1.ebuild,v 1.1 2007/03/26 13:47:33 drac Exp $
+
+inherit xfce44
+
+xfce44
+
+DESCRIPTION="Desktop manager"
+HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
+SRC_URI="http://dev.gentoo.org/~drac/distfiles/${P}.tar.bz2"
+
+KEYWORDS="~x86"
+IUSE="dbus debug doc minimal"
+
+LANG="ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR ro ru sk sv uk vi zh_CN zh_TW"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	gnome-base/librsvg
+	>=xfce-base/libxfce4menu-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=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 <sys-apps/dbus-1 )
+		>=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
+	!minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
+		>=xfce-extra/exo-0.3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+for X in ${LANG}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc) --enable-maintainer-mode
+--disable-menu-editor"
+DOCS="AUTHORS ChangeLog HACKING NEWS TODO README"
+XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+	/etc/xdg/xfce4/desktop/menu.xml"
+
+pkg_setup() {
+	if use dbus; then
+		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"
+	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
+			local localized_config="${D}/${config}.${lang}"
+			if [[ -f ${localized_config} ]]; then
+				use "linguas_${lang}" || rm ${localized_config}
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	xfce44_pkg_postinst
+
+	if ! use dbus; then
+		elog
+		elog "You need USE=\"dbus\" to enable desktop icons."
+		elog
+	fi
+
+	elog
+	elog "Be noted that menu-editor has been disable because it's not"
+	elog "supported in new menu system."
+	elog
+}