Adapt to gcalctool.desktop provided by gnome-calculator (#474960 by Paolo Stivanin), drop old.

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 72 insertions, 116 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index fb5ad6c1780d..bc76e6536bff 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.194 2013/06/02 00:12:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.195 2013/06/27 18:18:29 pacho Exp $
+
+*gnome-menus-3.8.0-r1 (27 Jun 2013)
+
+  27 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-menus-3.8.0-gnome-calculator.patch, +gnome-menus-3.8.0-r1.ebuild,
+  -gnome-menus-2.30.5.ebuild, -gnome-menus-3.8.0.ebuild:
+  Adapt to gcalctool.desktop provided by gnome-calculator (#474960 by Paolo
+  Stivanin), drop old.
 
   02 Jun 2013; Jonathan Callen <abcd@gentoo.org> gnome-menus-3.6.2.ebuild:
   Force non-empty PYTHON_TARGETS for USE=python
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
new file mode 100644
index 000000000000..83a4a83d60bc
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
@@ -0,0 +1,41 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Thu, 28 Mar 2013 21:54:34 +0000
+Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+         <Not><Filename>file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+-        <Not><Filename>gnome-calculator.desktop</Filename></Not>
+         <Not><Filename>gcalctool.desktop</Filename></Not>
+         <Not><Filename>gucharmap.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+     <Directory>X-GNOME-Utilities.directory</Directory>
+     <Include>
+       <Filename>file-roller.desktop</Filename>
+-      <Filename>gnome-calculator.desktop</Filename>
++      <Filename>gcalctool.desktop</Filename>
+       <Filename>gnome-font-viewer.desktop</Filename>
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+         <Not><Filename>gnome-eog.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+-        <Not><Filename>gcalctool.desktop</Filename></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
deleted file mode 100644
index 23cf72d424dd..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 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.13 2012/12/19 09:55:31 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-PYTHON_DEPEND="python? 2:2.5"
-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="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug +introspection python"
-
-RDEPEND=">=dev-libs/glib-2.18
-	python? ( dev-python/pygtk )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-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() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-
-	# disable pyc compiling
-	echo '#!/bin/sh' > 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"
-
-	use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize GMenuSimpleEditor
-	fi
-
-	ewarn "Due to bug #256614, you might lose icons in applications menus."
-	ewarn "If you use a login manager, please re-select your session."
-	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
-	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.8.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.8.0-r1.ebuild
index a5b2339c1ade..5e6585b92a94 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.8.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.8.0-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.8.0.ebuild,v 1.1 2013/03/28 17:08:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.8.0-r1.ebuild,v 1.1 2013/06/27 18:18:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
 
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
+DESCRIPTION="Library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
@@ -16,32 +16,39 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-fr
 
 IUSE="debug +introspection test"
 
-COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
 # Older versions of slot 0 install the menu editor and the desktop directories
+
 RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0"
+	!<gnome-base/gnome-menus-3.0.1-r1:0
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( dev-libs/gjs )"
+	test? ( dev-libs/gjs )
+"
 
 src_prepare() {
-	gnome2_src_prepare
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 	# Don't show KDE standalone settings desktop files in GNOME others menu
 	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
+
+	# Adapt for gnome-calculator -> gcalctool desktop file rename (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-gnome-calculator.patch"
+
+	gnome2_src_prepare
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 	# Do NOT compile with --disable-debug/--enable-debug=no
 	# It disables api usage checks
-	G2CONF="${G2CONF}
-		$(usex debug --enable-debug=yes --enable-debug=minimum)
-		$(use_enable introspection)
-		--disable-static"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable introspection) \
+		--disable-static
 }