Fix redundant python_get_PYTHON calls, thanks to Michał Górny.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 20 insertions, 12 deletions

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 <tetromino@gentoo.org>
+  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 <pacho@gentoo.org> 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/Manifest b/gnome-extra/cinnamon/Manifest
index eee75c4159c3..e171e8102ca5 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -18,14 +18,18 @@ AUX screensaver.patch 2218 SHA256 d931ca3ac5e5294a5a8afde9b861116d2b2688acaec7f3
 DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
 DIST cinnamon-1.8.8.1.tar.gz 4347516 SHA256 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb SHA512 a709781b4e6cecfe97f6fb4bad4b953f6c11ec49ebacabbfcc186e57a2e6a28abebc163d7081248d6cbac24996732a4aea7e5d54991e6c09b9701b7e64a91a0f WHIRLPOOL 49533ec7c6c40aae5e76377a67efa88f16a7ae2a6b2c3b3ab9316cb61d40fbca544f00f402e2a75b54bd90537f0813dfb5ba4d3a17a2ad3ce5d7e67e88a6c543
 DIST gnome-3.8.patch 138356 SHA256 840cebcefc183076f9e9208421354e5e9cbccec62824c788b17cb564c2d2519a SHA512 1fd95720a6398607330ff445bd55f1f898dac03dda542d7a7246f81127e55793b02a4df4cc8c759a5f6c11dd7e5a6609bf0bfc05266a87e65034eab0f94077f2 WHIRLPOOL 84899979f7a4c1c6f7cb4f3d356e45e3b49f798605e48c768c3f43a90b828b3f1e9051e9e176bc099c9051d8fb4107e7d127cef27dc4797189b7c9479edf9bd5
-EBUILD cinnamon-1.6.7-r2.ebuild 8326 SHA256 a2e729516c3d6d6b58a788bfa41c90f0d651c820c5aa4ab70ad40047511b56cb SHA512 5866bf61ff0bb79f144d7f16be4c8010320595928b549fb27e9390f58db66b4e7638ba4a9e7f8dbffa177c03e2d6bee821e8e92342f5ea93af9f257873d2558c WHIRLPOOL 99b43e6459c95c9ad041c72d31ce88ae17839f6bbee15fb04ea4e51d921a48f8bd3212e728c34e9f954056b68c3f68741388908bc120282c8301f5c2ad235fe8
-EBUILD cinnamon-1.8.8.1.ebuild 8251 SHA256 634db407825bc5ccf523bae86cd1a04a81cc5bcdacd081fa38aa695523182565 SHA512 0c363b0eab35727b7224cc908c10e6c8a7d468f56db2bb9c9aa3e33867c782150d7703f600df5f35e0c6ac3cf93fe60e04a48898554de68ed313de138784d2ce WHIRLPOOL 0078b087cbf799f78cdb7c44094328d1ff5818655e56a27aef877061d7f6aefeaa1534ef371842e8636df6fe31d84814c164961081678752985e4101c1dd9c99
-MISC ChangeLog 6810 SHA256 4b84fc10581d1b4dce86a7bd222483ecde7550893fe3c55f2856e5e713b4f7c0 SHA512 027b98b84fcf0187c94fd1f3acd4eee003c89d743ae8e9c9b04d50d7ec9fbdec067aa923c6cd35ee40bef10e9d868b1e8aae5fa1c7aba224ad9761709329e722 WHIRLPOOL 4c2dac770139fe1208aee921ae5d8a0e4326064e76b77a0ae33209245235b16721893317c56b2973f34e267dd752ddb1099cf7a93db63a139a9b550c9854d0b2
+EBUILD cinnamon-1.6.7-r2.ebuild 8317 SHA256 80fe4386eb882aece2e2fcd4f30fc6e64454ddce0e48cd986d02079f1a3dc70a SHA512 939decb69f4c66be01c0e0db7517249cdb1eb932ad307919c3aeff39e52efc3f71856b358578e27cd26cf8c6aae1ad4e5a5e9cd909f8ed6e887786f9ac910e37 WHIRLPOOL a11311da331ec72d3f0a4c58f45ec18cd9648a636ed2ee3949411c29098c5ff7b64025df6696bf81e29b83de1a501973880b70079b11383e8c9ba31c5c40729f
+EBUILD cinnamon-1.8.8.1.ebuild 8244 SHA256 ea90a73dc9c794929d68ea4be2bc7b40e30e71d3255c35b71844c7e3bdda39c1 SHA512 68b465073da3a5db2b7d96aea653a45a24954c0f73996a9949850158278fa0cf92ed3964cc9763c88326cd09a2b1bc567bdac96b9accd4cae4525c942200899a WHIRLPOOL 981f1564827166d4933a56f2d1bd3299036b3326b623d622316d5580d75fca590246b543d5961f9d33eb2fcc9756d92c49222ec09e9cedfdf09f1ebac069f644
+MISC ChangeLog 6994 SHA256 11fc39a05a8fd00a20b4d14b2532f21c7943c453270eaf445559b47523e007a1 SHA512 0b998fd44643648e548fe48a92bc6125c73d5d80a73612d167c839e58623c0a1532de10deedac7959c6c8befe67fbe9bdbe6ee7427f67b604bc8ca9c22b84b70 WHIRLPOOL ad0830396459be53cc7f924329cadfc305252e582d041bab53f711564ead8f4a55d6b10eea6a6954c6b9a6956e1eacb30026be2c7c14db7a8c0c3c7a410ffade
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIjjAUACgkQCaWpQKGI+9SKCACfa6o3qSRwbUA3v3TJp0FUy/oz
-LZIAn2cAz38cEv4dk+QckyRT4BnI7Cso
-=PLQR
+iQEcBAEBCAAGBQJSNkjFAAoJEJ0WA1zPCt1hwoAH/1uEe6WUXnad4W9jTv3vnOFh
+x8tLCqDQCCPA6iue6aCQFo3DWudp7bSO8663YcBokq/PSMwGK+TUJiI2NLtsX+Cn
+1hMBy3EmYxS+jhFvm6H9N3urq0koxuSoEfeExvBeSuyc3bReffgNq3NFfqaXMNRS
+t940O26IQzEpcKaXUsLMZZw3j15Od6y6KByaI4sTXYr+1OIhpO/qq/ufzVr2YDH4
+B0gUqbTc1ziEkfg4Ne+fOyVk+GSsSA/1ij/o9xKbuQ6P2o5Xd0xiU3gVUE130bPz
+q/+6X5wj3Ar4W+JQlH0rp+UVJ9OyfqD5+SZhTem1H3eLTuWF0LS0RcG/hnlILX0=
+=Cfn8
 -----END PGP SIGNATURE-----
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