From 5ee90270f57ff47d0a3667acbd0ffa15b2c7cb92 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sun, 15 Sep 2013 23:54:48 +0000 Subject: Fix redundant python_get_PYTHON calls, thanks to Michał Górny. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- gnome-extra/cinnamon/ChangeLog | 6 +++++- gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild | 4 ++-- gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'gnome-extra/cinnamon') diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index b946d36cf110..db2a32b9af51 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/cinnamon # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.26 2013/09/01 18:48:35 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.27 2013/09/15 23:54:48 tetromino Exp $ + + 15 Sep 2013; Alexandre Rostovtsev + cinnamon-1.6.7-r2.ebuild, cinnamon-1.8.8.1.ebuild: + Fix redundant python_get_PYTHON calls, thanks to Michał Górny. 01 Sep 2013; Pacho Ramos cinnamon-1.8.8.1.ebuild: Drop notes about intel[gallium] as it works fine for me and haven't seen any diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild index c84a4458db27..dc265096d24f 100644 --- a/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild +++ b/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild,v 1.1 2013/06/10 16:16:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild,v 1.2 2013/09/15 23:54:48 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -190,7 +190,7 @@ src_install() { gnome2_src_install python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor} # Fix broken shebangs - sed -e "s%#!.*python%#!$(python_get_PYTHON)%" \ + sed -e "s%#!.*python%#!${PYTHON}%" \ -i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \ -i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die diff --git a/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild b/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild index d5435aaed4bd..8e85adde1f6c 100644 --- a/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild +++ b/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild,v 1.2 2013/09/01 18:48:35 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild,v 1.3 2013/09/15 23:54:48 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -197,7 +197,7 @@ src_install() { gnome2_src_install python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor} # Fix broken shebangs - sed -e "s%#!.*python%#!$(python_get_PYTHON)%" \ + sed -e "s%#!.*python%#!${PYTHON}%" \ -i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \ -i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die -- cgit v1.2.3-65-gdbad