Version bump for Gnome 3.10

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

3 files changed, 11 insertions, 93 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index 997bbf7d4e31..e32f15ba3cd2 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.121 2013/12/08 19:49:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.122 2013/12/24 17:43:13 pacho Exp $
+
+*alacarte-3.10.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +alacarte-3.10.0.ebuild,
+  -alacarte-0.13.4.ebuild, -alacarte-3.6.1-r1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> alacarte-3.7.90.ebuild:
   x86 stable, bug #478252
diff --git a/x11-misc/alacarte/alacarte-0.13.4.ebuild b/x11-misc/alacarte/alacarte-0.13.4.ebuild
deleted file mode 100644
index cedfba9b0792..000000000000
--- a/x11-misc/alacarte/alacarte-0.13.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.4.ebuild,v 1.2 2012/12/19 10:10:21 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit gnome2 python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-python/pygobject:3
-	>=gnome-base/gnome-menus-3.2.0.1:3[introspection]
-"
-# gnome-panel needed for gnome-desktop-item-edit
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-panel
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	configure() {
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -a)"
-		gnome2_src_configure
-	}
-	python_execute_function -s 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
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild b/x11-misc/alacarte/alacarte-3.10.0.ebuild
index e9b7e8f73211..71ba18c65232 100644
--- a/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild
+++ b/x11-misc/alacarte/alacarte-3.10.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild,v 1.1 2012/12/19 10:10:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-3.10.0.ebuild,v 1.1 2013/12/24 17:43:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+# FIXME: support python3 but installs in a weird location
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
-SUPPORT_PYTHON_ABIS="1"
 
 inherit gnome2 python-r1
 
 DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -23,9 +23,7 @@ COMMON_DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=gnome-base/gnome-menus-3.5.3:3[introspection]
 "
-# gnome-panel needed for gnome-desktop-item-edit
 RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-panel
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 "
@@ -37,7 +35,6 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	gnome2_src_prepare
-
 	python_copy_sources
 }
 
@@ -63,9 +60,3 @@ src_install() {
 		}
 	python_foreach_impl run_in_build_dir installing
 }
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}