Add stable release of gnome-main-menu, mask live ebuild as it requires NetworkManager 0.7

svn path=/; revision=82

4 files changed, 85 insertions, 3 deletions

diff --git a/gnome-extra/gnome-main-menu/Manifest b/gnome-extra/gnome-main-menu/Manifest
index 9cb7ada..43549d6 100644
--- a/gnome-extra/gnome-main-menu/Manifest
+++ b/gnome-extra/gnome-main-menu/Manifest
@@ -3,4 +3,6 @@ AUX 03-tracker-search.patch 714 RMD160 daa5b0e6d26930edc0c53394e99286dd761b4021
 AUX 04-disable-search.patch 595 RMD160 6d50cf4442e34119909e47a11157d985a098681d SHA1 2e51810689bee5b69b13276c3bec3810418b7b4c SHA256 b901cdd617380c3024b7f8c8aaedfd3e84115ede27ff33ec67c427f9a692eced
 AUX gnome-main-menu-gentooifications.patch 641 RMD160 beaa96f51ddd91d02ef3b8b6b44aa50c7eb16551 SHA1 001b7ed095222a655fc3766d188ffc8fac8e4afa SHA256 e39c1af38cf70393bead0e2e69df0bb70fa4259059a01ade0c6fa91716b48df1
 AUX gnome-main-menu-libssui.patch 1558 RMD160 11d9c5e14f3934bbae8819823569b29351ef425d SHA1 3f4fa94baf1f08f91ddd3021b8a51e6457a0788d SHA256 3d5728ad444c398b0354ad73d811c5f5e837af552a5db0a7d623ada35231bcba
-EBUILD gnome-main-menu-9999.ebuild 2071 RMD160 968f73bb753e4a11469d010f9fa30dc39558ef85 SHA1 7cb69874399239eca323b0c8cb6e20e392de9bbc SHA256 0ded57b888540d1d6220d14ea355a3dcd03120995475f3cb2c0136b0064b0215
+DIST gnome-main-menu-0.9.9.tar.bz2 577138 RMD160 e0a8571dc175321536f5d9a62e5b2f6911527605 SHA1 f97c79da9ead64411f3c975efdc8716208c07d39 SHA256 403062abf3288cb00c5e3105c6b4ebe867301016c0f06111bd4d954c9fce7fe7
+EBUILD gnome-main-menu-0.9.9.ebuild 1982 RMD160 5e691041d997a531a56cfb1668230645ba42597e SHA1 6ed0f49f4a94129bfba04bd8db6cad81a7b7562b SHA256 6d0355a243b684c5c3b1b7ec2a05afe43dd9ded0c40ae637e725ad758486e5cd
+EBUILD gnome-main-menu-9999.ebuild 2164 RMD160 45322867d9992f11a62a181a1ac0113542d57dbd SHA1 41a9be758e13c1448efc0b27adf79572df92ccca SHA256 6dab6c41ae7e6d9512f8e3be622d65913ab4a6cfbda61ca5d7c9a12401194816
diff --git a/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild b/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild
new file mode 100644
index 0000000..a05c6fb
--- /dev/null
+++ b/gnome-extra/gnome-main-menu/gnome-main-menu-0.9.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2000-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The new Desktop Menu from SUSE"
+HOMEPAGE="http://www.novell.com/products/desktop/preview.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="beagle doc libssui nautilus tracker"
+
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2
+	>=gnome-base/gnome-panel-2
+	>=gnome-base/librsvg-2
+	>=gnome-base/eel-2
+	>=gnome-base/gnome-menus-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgtop-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	dev-libs/dbus-glib
+	=net-misc/networkmanager-0.6
+	sys-apps/hal
+	x11-libs/cairo
+	x11-libs/pango
+	libssui? ( >=gnome-extra/libssui-0.5.6 )
+	nautilus? ( >=gnome-base/nautilus-2.6
+		>=gnome-base/gnome-vfs-2 )
+	tracker? ( app-misc/tracker )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		dev-util/gtk-doc
+	)"
+
+src_unpack() {
+	gnome2_src_unpack
+	cd ${S}
+
+	gnome2_omf_fix
+
+	epatch "${FILESDIR}"/gnome-main-menu-gentooifications.patch
+	use libssui && epatch "${FILESDIR}"/gnome-main-menu-libssui.patch
+	use doc || epatch "${FILESDIR}"/03-configure.in-remove-gtk-doc.patch
+	if use tracker && ! use beagle ; then
+		epatch ${FILESDIR}/03-tracker-search.patch
+	elif ! use tracker && ! use beagle ; then
+		epatch ${FILESDIR}/04-disable-search.patch
+	fi
+
+	G2CONF="`use_enable nautilus nautilus-extension`"
+	intltoolize --force || die "intloolize failed"
+	eautoreconf || die "eautoreconf failed"
+}
+
+pkg_postinst() {
+
+	elog
+	elog " If you want to have recent applications-support working, you should "
+	elog " also use the patched gnome-panel and gnome-desktop packages from this "
+	elog " overlay "
+	elog
+	if use tracker && use beagle ; then
+		ewarn " You have both beagle and tracker set in your USE flags. "
+		ewarn " Beagle will be used by default. If you would like to use "
+		ewarn " tracker, emerge this package with the beagle USE flag unset. "
+	fi
+}
diff --git a/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild b/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild
index 6cab6eb..16c1f50 100644
--- a/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild
+++ b/gnome-extra/gnome-main-menu/gnome-main-menu-9999.ebuild
@@ -21,21 +21,24 @@ IUSE="beagle doc libssui nautilus tracker"
 
 RDEPEND=">=dev-libs/glib-2.8.0
 	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
 	>=gnome-base/gnome-desktop-2
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/librsvg-2
+	>=gnome-base/eel-2
 	>=gnome-base/gnome-menus-2
 	>=gnome-base/gconf-2
 	>=gnome-base/libgtop-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
 	dev-libs/dbus-glib
-	net-misc/networkmanager
+	>=net-misc/networkmanager-0.7
 	sys-apps/hal
 	x11-libs/cairo
 	x11-libs/pango
 	libssui? ( >=gnome-extra/libssui-0.5.6 )
+	nautilus? ( >=gnome-base/nautilus-2.6
+		>=gnome-base/gnome-vfs-2 )
 	tracker? ( app-misc/tracker )"
 
 DEPEND="${RDEPEND}
diff --git a/profiles/package.mask b/profiles/package.mask
index 1ba96ca..19a2424 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,6 +9,9 @@
 # Live ebuild for tasque
 =app-misc/tasque-9999
 
+# Live ebuild for gnome-main-menu
+=gnome-extra/gnome-main-menu-9999
+
 # Mask development releases of gnome-panel and gnome-desktop
 >=gnome-base/gnome-desktop-2.23.5
 >=gnome-base/gnome-panel-2.23.5