Convert python shebangs to python2. Describe the python useflag. Bug #442802

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

5 files changed, 29 insertions, 22 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index f9c244ae24e1..fdf3f29d0962 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.257 2012/11/30 20:08:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.258 2012/11/30 20:18:03 hwoarang Exp $
+
+  30 Nov 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
+  openbox-3.5.0_p20121006.ebuild, openbox-9999.ebuild:
+  Convert python shebangs to python2. Describe the python useflag. Bug #442802
 
   30 Nov 2012; Markos Chandras <hwoarang@gentoo.org> ChangeLog:
   Add --disable-silent-rules for bug #445108
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 2d54ab57d454..3f93bedb0ae3 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -15,24 +15,24 @@ DIST surreal-gentoo.tar.gz 13410 SHA256 f478c58b2b6cd7a2a2ebe53fa261adb2d1fddf18
 EBUILD openbox-3.5.0-r1.ebuild 1876 SHA256 cffd9d0d31c1895d94149ee0d1c6a8fe2e76cc0e4337eb8c0720a43266af2206 SHA512 8de93cb42cc2138ad72d49776d3e9072a96ec645c52c1a12519834c4c7a40c1ce73af35035ff5f1b7e530e704c04fcfd455643327282c748e601eafade7a554a WHIRLPOOL 4b860ba4cade8bd02a0a249565b88b8b30d0558ace342080ec4d39d9723e926c53dfb71806f8868f8ffa68a6b8e4998a9d2f7280b94f2a8208009d801b5a8c76
 EBUILD openbox-3.5.0_p20111019-r2.ebuild 2392 SHA256 41d081b4ad124c233240a3559ef1c3a9c7d7b2b94f1a89ec6a749f85514053fc SHA512 2cdaa807f173d524b5e5907aeda72ad337ffb2dee8a5dc20779915ca34163eed33a87bf11ab822c01bc57d03f888a35b0c8107e4a558761593f2ac2edd77f7cc WHIRLPOOL ca579ec836dee7561aac7415726609ebe0f3e835983778b7dbd75f6c4f332a7f830767594385b825d52a210827c58ad5ceb4fd9fc6e8b13dac4f9cf03e97432e
 EBUILD openbox-3.5.0_p20111019.ebuild 1899 SHA256 a29124c6585b62d608185e37c507ad9bd92aefb996a8caf83d527139bc5c332f SHA512 6e271180d3dd994da6da853b242d3b9095ab05b7928890446f0cdd47705d78453825081253a75fcb5cb26cf01269532ba827badc1d71de93e9877bafc5db44e5 WHIRLPOOL e40f9ded5efc1c63160a79f4b27d9ca303cac86c0ec18921bcb47dd276258ded24d6ca9bfb4c9c484385510c7f4ef7f88fe6a2f464d79fe46d15d46f0b4325ae
-EBUILD openbox-3.5.0_p20121006.ebuild 2357 SHA256 d9fe811bec7c2fd2ad717b60c8dba9980af50baf4f4759ddceea4a50e92802ca SHA512 2ebbfa55aacbb281f2a7ac11609048a1d09e21984cf4760d1bb4524c1ddfa43aaa18f841d7de0af621946e51c7ad0d6a620903331dee08d6193c34e47ec84367 WHIRLPOOL 5475595be54c6483c55474051c43ea124f413fe368d1d277edd8c2b2db99d900da8f9693cda72e69b919670bc8b29ac482fff8a4f9d5d86fa0da8132b31664e2
-EBUILD openbox-9999.ebuild 2385 SHA256 e67d8dadab1892c1791a084d3465f5665b2bc0b498f0e0959dea133f988ef0bd SHA512 0987812719952af84b25e93c3a61e6af64a25dd029241857ee00869486a7fcf44bb055a0e9c26d7e136601c93ccf58fec6e2cb4b4689533d0eab95fcac294e8e WHIRLPOOL 1f8bf5dd4ccaf095c62172b7fc72a1b7ab5e65524b7fdbd7b5d01ed00fe035beb5eeea7753d213b0855a1f90ddc36bb034145795246bf8da6fdb0a8e65ad243c
-MISC ChangeLog 39829 SHA256 cbd1184af52ad3306e6571d8e9a83550d74a71b05685480bcdd709a7d0919b46 SHA512 73348c83e40315bee4d72633abcd96bfae6cefadc2d9c61fe0eedcb0454a49a497707c542da37139fc7b96c0a32fcc2c7953cfb4edca90dd12504337c9468750 WHIRLPOOL 20c337b99db1be10111e0d0c0881ad0ee807c334f25144e7178f2d8f5f76014a00bf738f7de202336749064bfffb3eb3d2fa6beae51325f2e743a79f8451efe5
-MISC metadata.xml 700 SHA256 42ce3ab980f8cf6077d16381a147008ddaede31d04cac6847359ac38c69a88c6 SHA512 5051524c6f8067718d456417df39edc6265c3007866bbe524b450c6343aca5029c9a1a1eef22996d383aec6d9c668f034e59b198bf2d5b70960c246cf188ddcc WHIRLPOOL 8206ff8ff85d048e6922e3f23c8d855593f0a16d76ab8070e9b95dece672bb97b834bbf32dd1cc5f042e20f2655d21316e104e5269a774001a94c5613d8b1f78
+EBUILD openbox-3.5.0_p20121006.ebuild 2410 SHA256 f3fabb46e0cda990c87fbbf310300d0ae5b619a19db9e90be93b6c98dbbf132f SHA512 3a353c545cea2a980ea2dbe53d1fcdf0af2a9fabe32d146c9867ba4554f73e8025de45e0e363a959eb5d9606013f3c3ba52add6b912f88c3e6fcc2a17166e1b6 WHIRLPOOL 7881f9c6aad90d7675730ac29ff6c635445115f35a52e9d90c53b3585acac54fcf9845115c362d6a65212137b0323bc3439a411a34f9170effcd2aaa94130bc8
+EBUILD openbox-9999.ebuild 2439 SHA256 f744ee05d4429dd4bbc6a037ed1f5c8c2cd763376133b44baa1b94345490173c SHA512 a1f78e7fed15e226177ba333374630678c5e340883453af766a7c9f42d80ad54880ae7af01f2d84358cb5863a99e93a5e83cc56356848a7aaea5bf845fb34257 WHIRLPOOL ca914756d51bc70044949d9496db2de347097a0ca3e80751aa286880d6b60beea5cd40525423e85e6f8c0a1e83c2680538491a7b4e5daf1150cd9489aa3b06e1
+MISC ChangeLog 40031 SHA256 d77a3b262c764625eb837ae2102e96073161a935a55a540997c6a3c19a7c11c6 SHA512 751c55ae46098c9ca9cb536f1ba15ca555831e353aaf74a4578937c9c1e0375a6cb38a0254b152af550115ac101fdceeeb84f885881f022fe0b6b3f894396edc WHIRLPOOL 2a69d9d91963fbb3d787dc2ba6866c9dedeb1e30367c1ed903ed3664fc1c1bcab5f9c705a3af264f971c5a985b9304e763de90323605152e1fc89260947810fd
+MISC metadata.xml 776 SHA256 d02e05a5db0427f6575fd19364c8dcf112bd8b404662f557f1046ec95535a1a3 SHA512 8af195dfdff20741f78feb28f70714d7f65293ab2b8e1ef31adc43ef0712e227045926228460c35dc0263039c6660984b103c304b1cb9ea58ad65f8fc72df26e WHIRLPOOL 6f038167fa6a1dca44ccb2b7d21a6701e66366475cc0fd2bbe6471079abc7bb1e12f61e2b4138a5b3c3c246d7664c505c049f49a59aa6c28ba04f3ad321a4ec9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQuRJJAAoJEPqDWhW0r/LCRjYP/0g0DYeDlKmlU7oCREMdYlzY
-nYHpo9toN1kbWlTly8nKg41MX/Ga5ckF4gv9vYZKZWF9P2TRVkAOGpvzu8DtsXhQ
-qbovfhM7NVDEDke54y1KmlCaMqXvtInb26JQs7/ayHdmVLDa4UiSnitxewxGpzNB
-CgHt+wzr30wscan1tnTIbsfz0b82sEEkzfV5K/aIPfxKV6ZXm6r9+tFb0NfU6bCr
-Ik8e8eF9fUgZwIQM9z81e0F39duG5SU6PRu2X2DO3Gs0k6IsVyie1zpEE27qRMVT
-P/BKCohdc/sqSt7O0HhO1TiebSspsi8T8V34IkfaBgs91NGw6TQeTXoME7JVkxYd
-AobuAl6IAGdD6rtxXCl8lfUvDlU9SZ6Ztvqelzc8m2ePh+6/C+NU3Ciu1AlmBrZD
-2XFGlDVv64KrF090+UIPfOpe99+9479LVTi9cV1Bg0TRGVtWpDDIe/omtN5XJRqJ
-wG12djyaSSaMH7q6wMe97TayS/6ihU0SObs1eyjbEO25DIn/r/Sxf4YIAG1NXv1G
-ecOdlvBKkt1jA0QbnlPt0y6yhirBoKq7fNCLi0MBEjG1uJ7rIXzSwaL0zAGWpfNF
-rv5YOvGl7cY3KIPJ55JPGhU7fczV7hFMfDM3Y9jkpGGfp21SmYcct+6MFerS8tbi
-dnjODM4IXo2Ae/Q6Y4J0
-=q2g6
+iQIcBAEBCAAGBQJQuRR8AAoJEPqDWhW0r/LCOz8P/jF3OA4c5dP93B8q8VJca1SP
++AVhyLBlo2qR8dVUoQvpETb0Soiaq5+g9ZXHrAv5LiaeuWLKIXX5oV1iC3Jnjgpm
+scRNsdtB2oMuSANjUHy9MRubhd4sYXdJPWVqgnrGYwx8hQ+tyspVA1i1OYSw6ncu
+JVrbttpjzTZAnayRn1jOZrzPBk/HTJBIW5ov0qVtJavjy++vmEtXSR+TejHXy5Y4
+VQbiwGSHTZddwwa27Qray9uJV9V+tAajuSO7L8QkBCeJ8xJhD6/L4VVP9jECMd2K
+wSKad6fgQsYpjzU5DqdJMrVimGFNWLCpHBPP9TY8ou4EQmIfXcdCdrIr1CgUMINN
+5M5NqXT5zAyLdQoeEGfSU91IVyvHXKDHqndYsMT7V3ueKrlvrf0rp2oi7ccIBI63
+8xJkVejQtjkTP9+uHsFmcrmxTlcVlbdbXdxAl4QvYdtCiQjWHJdgMZd9XzHIY/7d
+An6sXw4kiihAGJI9HrRdik8V7kIJMVFok+phwAQ7VRWMMyduzlWi45ghNd6YS4he
+KvZ2IqyCKIeAxs4aNjV+GwPCNU2U/QunVZ3x5xCUhVjN6di1gbj/kssz3PCaxMXn
+uzPlDRaBGxiPfMbwmtk/iqFEDc2UhhwI9JPPKWyCJeM11eQzWOcY04f9yvWe5qc7
+Img/TDRrg4yMU+2IamAa
+=6qKI
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 31df581c06e3..0c1b87464354 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -9,6 +9,7 @@
   </maintainer>
   <use>
  	 <flag name="session">Enables support for session managers</flag>
+	 <flag name="python">Install the python xdg files for xdg autostart</flag>
   </use>
   <upstream>
     <maintainer status='active'>
diff --git a/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild b/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild
index f4d26d7071d6..e24f5590016e 100644
--- a/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild
+++ b/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild,v 1.3 2012/11/30 20:06:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_p20121006.ebuild,v 1.4 2012/11/30 20:18:03 hwoarang Exp $
 
 EAPI="4"
-inherit multilib autotools eutils
+inherit multilib autotools python eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"
 
 src_prepare() {
+	use python && python_convert_shebangs -r 2 .
 	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
 	epatch "${FILESDIR}"/${P/_p*/}-fix-desktop-files.patch
 	epatch "${FILESDIR}"/${P}-javaswing.patch
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 68e585b75457..62a834bdd74b 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.20 2012/08/29 10:52:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.21 2012/11/30 20:18:03 hwoarang Exp $
 
 EAPI="2"
-inherit multilib autotools eutils git-2
+inherit multilib autotools eutils python git-2
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xineramaproto"
 
 src_prepare() {
+	use python && python_convert_shebangs -r 2 . 
 	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
 	# Lets try to replace docbook-to-man with docbook2man.pl since
 	# Gentoo does not provide (why?) a docbook-to-man package