[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-menus/, gnome-base/gnome-menus/files/

[Alexandre Restovtsev]

commit:     f7d956110cb24da280c6bdfe3656247e26b67581
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:52:12 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:52:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f7d95611

gnome-base/gnome-menus: moved to gx86

---
 gnome-base/gnome-menus/files/10-xdg-menu-gnome     |    6 -
 .../gnome-menus-3.0.0-ignore_kde_standalone.patch  |   22 ----
 .../files/gnome-menus-3.0.2-library-only.patch     |   26 -----
 .../gnome-menus/gnome-menus-3.0.1-r50.ebuild       |   84 ---------------
 gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild  |  110 --------------------
 5 files changed, 0 insertions(+), 248 deletions(-)

diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome
deleted file mode 100644
index b12a712..0000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ]
-then
-	export XDG_MENU_PREFIX=gnome-
-fi

diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
deleted file mode 100644
index 5f5f8b2..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
-         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+        <Not><Category>X-KDE-settings-components</Category></Not>
-+        <Not><Category>X-KDE-settings-desktop</Category></Not>
-+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+        <Not><Category>X-KDE-settings-network</Category></Not>
-+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+        <Not><Category>X-KDE-settings-hardware</Category></Not>
-+        <Not><Category>X-KDE-settings-power</Category></Not>
-+        <Not><Category>X-KDE-settings-security</Category></Not>
-+        <Not><Category>X-KDE-settings-sound</Category></Not>
-+        <Not><Category>X-KDE-settings-system</Category></Not>
-+        <Not><Category>X-KDE-information</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->

diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
deleted file mode 100644
index b55ed7e..0000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@×××××.com>
-Date: Thu, 18 Aug 2011 20:05:56 -0400
-Subject: [PATCH 2/2] Do not install anything other than the library
-
----
- Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 565ab87..65c059a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
--SUBDIRS = libmenu desktop-directories layout util po
-+SUBDIRS = libmenu util po
- 
- if HAVE_PYTHON
--SUBDIRS += python simple-editor
-+SUBDIRS += python
- endif
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--- 
-1.7.6
-

diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild
deleted file mode 100644
index f644bda..0000000
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r50.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild,v 1.4 2011/01/30 18:40:38 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="python? 2:2.4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug python +introspection"
-
-RDEPEND=">=dev-libs/glib-2.18
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40"
-# The actual menus are provided by slot 3
-PDEPEND="gnome-base/gnome-menus:3"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-}
-
-src_prepare() {
-	# Only build the library (everything else is coming from slot 3)
-	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
-	eautoreconf
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}

diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
deleted file mode 100644
index c2209e0..0000000
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild,v 1.4 2011/01/30 18:40:38 armin76 Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="2:2.4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-# +python for gmenu-simple-editor
-IUSE="debug +introspection +python test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	python? (
-		>=dev-libs/gobject-introspection-0.9.5
-		dev-python/pygobject:3
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection] )"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r50:0"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	test? ( dev-libs/gjs )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	if use python || use introspection; then
-		use introspection || ewarn "Enabling introspection due to USE=python"
-		G2CONF="${G2CONF} --enable-introspection"
-	else
-		G2CONF="${G2CONF} --disable-introspection"
-	fi
-
-	G2CONF="${G2CONF} --disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	# Prefix menu, bug #256614
-	mv "${ED}"/etc/xdg/menus/applications.menu \
-		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize GMenuSimpleEditor
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
-}