python fixes from bug #313533 and ported to all versions, required to build if python 3 is eselected

Package-Manager: portage-2.1.11.25/cvs/Linux x86_64

5 files changed, 123 insertions, 31 deletions

diff --git a/media-libs/libkate/ChangeLog b/media-libs/libkate/ChangeLog
index bc8ff185e92c..95d6e424cf0b 100644
--- a/media-libs/libkate/ChangeLog
+++ b/media-libs/libkate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libkate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/ChangeLog,v 1.55 2012/05/29 14:47:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/ChangeLog,v 1.56 2012/10/10 03:11:40 zerochaos Exp $
+
+  10 Oct 2012; Rick Farina <zerochaos@gentoo.org> libkate-0.3.7.ebuild,
+  libkate-0.3.8.ebuild, libkate-0.4.1.ebuild:
+  python fixes from bug #313533 and ported to all versions, required to build if
+  python 3 is eselected
 
   29 May 2012; Alexis Ballier <aballier@gentoo.org> libkate-0.4.1.ebuild:
   keyword ~amd64-fbsd
@@ -230,4 +235,3 @@
   25 Aug 2008; Alexis Ballier <aballier@gentoo.org> +metadata.xml,
   +libkate-0.1.7.ebuild:
   initial import, ebuild by me
-
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 2cc8fff7469d..8a87d5aa5280 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX libkate-0.3.7-libpng14.patch 1083 RMD160 7c44551df5ff7dfaff645cc54b722eea879498ea SHA1 8306759bf08334a6d3116d4f85d71efc739e0d88 SHA256 66ef41f59aeabae04cc36dc865c00120419879281cd9e42aae5fad775b711537
-DIST libkate-0.3.7.tar.gz 728239 RMD160 c3a09bb5804364522ea52db355edadf9b25c5975 SHA1 08ab5837d12b09ff36c213be17cfb0597dd8d9b0 SHA256 b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51
-DIST libkate-0.3.8.tar.gz 745633 RMD160 32b563a68900af804c7a562fd4f758f98ffa2bd8 SHA1 c096cd1f7c98fbb8f8da161d3cf61ebd44982320 SHA256 56e8990f44a8494d61437e825279f4c7c49d093d2b258cd64a8a86f18229a601
-DIST libkate-0.4.1.tar.gz 906896 RMD160 e92e11bde9cd14312c304a89d79c3ba9e4384762 SHA1 87fd8baaddb7120fb4d20b0a0437e44ea8b6c9d8 SHA256 c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68
-EBUILD libkate-0.3.7.ebuild 1166 RMD160 07bbcb90d2fdf8d04fa6b090e84786c66864e145 SHA1 6978f972257bdce51b9e72f69b8f3fb9961d6b3e SHA256 f98462262c567936613800f274cffe79599d6bf1be4116b0b6050341c2dc93c5
-EBUILD libkate-0.3.8.ebuild 1100 RMD160 9641ded0da6a120e7322831ab908e571676ea8e7 SHA1 6c3e5162656cfb7c03248092cf12f5ad385339be SHA256 f96614f46d7ab220814b3b0a5b25dea0e5ce32559ed3efffeaf1bed44d2662ae
-EBUILD libkate-0.4.1.ebuild 1114 RMD160 5a74c22b9d4acc65a843cd29241bb9ae5a536a44 SHA1 8e1069da8a093f5f3d943ca7be5d210d50736b22 SHA256 e714560cfcc8ec5f40455b84ff8d48f150597db1c3583bf67f1a2d63f897ca65
-MISC ChangeLog 6932 RMD160 b8a755148ff1b1a25f93fc9af25c3f0d6614f982 SHA1 9cefd9d332c71f63ebe6ee5eb7c3b81cfd6cba15 SHA256 264afea59eed0e5ad44ffecf8c77ecae5988dd6fb30077c624f84654febaefe4
-MISC metadata.xml 966 RMD160 d803007c89a4d7e20374eb4214f381b2422ef6ca SHA1 cb59e27bb672aad35aaf7ab8b612715ad1a56182 SHA256 9c32b6601b3ea659ed3a64f571ec7505c9f57cf71b5a2a864781b623b7361267
+AUX libkate-0.3.7-libpng14.patch 1083 SHA256 66ef41f59aeabae04cc36dc865c00120419879281cd9e42aae5fad775b711537 SHA512 bd84fb15199aef54e61e4967365403fab6bcd8afef6b0a09e50436b4889e399994bf36f64b97c476cd9a93ab0d39e2076ab5c6b7d6e01811f7d629b5400bec5e WHIRLPOOL 862bce18926efd57833f485381017d001a290957a738b83f178884fac711e5d7a1c51d21c78be686037760350183b06a7815a4a8faf5baac1f127d212233607e
+DIST libkate-0.3.7.tar.gz 728239 SHA256 b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51 SHA512 4a9f123c271ac8e4df12ea0205160418fb9312a428894f18c8219c1f6569de1bd6ef233972ae3d2ee8ed25bb75a3c8868834ed945b308b0dbf469433c384f16b WHIRLPOOL 1aeaadb42509687159ddf70cbc5b699f92cfb535ba6304718960595afe539ee3946026fd6cb31bac922d7fc9172def8f23058e5225982d27d8da9ab09f15d66e
+DIST libkate-0.3.8.tar.gz 745633 SHA256 56e8990f44a8494d61437e825279f4c7c49d093d2b258cd64a8a86f18229a601 SHA512 d5bfcfa66423f4859490c7c03f4b40dcc4f092801cc16d586648da8af1e50d3f78e0f2568bb05d335ac33a061a49faa7b930633c84cb5626998855dd6f34f7d8 WHIRLPOOL f632853f4043ca50978329dac5f3fb0b7c9bf7eab4abad99a0113cec5aab2917311358868a0cc159863839545cc9cdb727ece45c3de0dab6de6c238b04b81889
+DIST libkate-0.4.1.tar.gz 906896 SHA256 c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68 SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b WHIRLPOOL 8693527ea8680eded864aae49df840e2071eee434391f828b07224b4af279df0fbc6744af6be8a435aad5cdfb3124df10170bcead7b20a6d63ee3dacb1f28d1c
+EBUILD libkate-0.3.7.ebuild 1469 SHA256 24fe1135508bce47cec522a0e1f4599b1705bc66fe30570043b873cb01d0b8a5 SHA512 ebd4496068b07a17e954189bfdb3f3eded6561fa21255c323d31b644347ff40ed685004d30df0700c2f9292e65898bc7334fbba8d17a390b9db8b769e5dd79bd WHIRLPOOL 8456fab2720aa52f03f0f45ab59cb38dd8f9407788a87510b7dc8a26668add488f469dcd62290691c20dfc48390bac9b6fc947dc23b5b217bd86a79594a0df2e
+EBUILD libkate-0.3.8.ebuild 1453 SHA256 08f101e6ad02f2ca92be966e903f69bdc0fed0be48d67828018cf1cd61bd44a7 SHA512 69dbae3e7bdee882f187d38b4a9fde741a18c9374cb9ab1b5a2be3823e5d6a01d78764989fed5931a3fcb8aa1bf4a6d69be8fc6878abd1f292561cf40d8a5400 WHIRLPOOL d1cf9ecf47b4f3403c9e090645b698428a1ab0c064325dc9a2bf192d5ef5c1a4a49b6b24755086ee0d6c1574c54544eccc93d74d15ce49f86fe45ac6e976f616
+EBUILD libkate-0.4.1.ebuild 1465 SHA256 117a988ae6163a77f53c50de74e852233e7ba8f906482385055b70f671ace2a2 SHA512 e07427b987c251fa724acb07128dc19a5352d821df11de72fe0cb1d60516e153e5ee6c1c6fd6b3c109762bc0fbc96cee2fc97167025ca66b2a8a25ac96425a9e WHIRLPOOL 6532774536efec5e60b93f931c07ad8a805edae7fca200e1a5cf3cf58029b8f26ec818f40e4c0b419c3733f851dbf787169362fdbb9c26b7b51f1cea66e1fdb0
+MISC ChangeLog 7156 SHA256 5862c829151ec350641d0b2a64cc70242ea3602c66401fa958501ef56c5c5e1d SHA512 777ed37ae71f35800831cbc5250f21c7594adc32f21da16d714dc72d402a03df92513b47443e89c04b9b24e58f624de417cfaee784304d171cdf62da05c6588f WHIRLPOOL f7bc8411f2fa131e4bb3c582eac74a47ef9b03dfd6197e1d5985870dd23a4668bb609ca2d1f117e1528f9f4e0de56153c2ad9e7944a7d022604aa2dad24dc8f3
+MISC metadata.xml 966 SHA256 9c32b6601b3ea659ed3a64f571ec7505c9f57cf71b5a2a864781b623b7361267 SHA512 591228342b7f856e3f3338e8da32bde2a58b65883baa0b5ccc4867eb78501af4b24f4cea062316138289a65748ebe80ba9ef9f415e051e75c9fcf947fbdca437 WHIRLPOOL 2df61ee1283d0c5b755502bad9b4323b81129f4c8f6da68e362518132cab96411b5fe41aa3ca0a1916f1dc5a0e3fdca9d8574d1ea80927caa71230d7d02534b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/E4ZoACgkQvFcC4BYPU0p6zACbBnDvFLrYbuqdEVShsgzw4G/7
-GSAAnA86kL4u70NQXJt2ifQRAW6dhQeV
-=ij68
+iQIcBAEBCgAGBQJQdOexAAoJEKXdFCfdEflKZukP/2Xg4NLYjjtGKYhdS01TI8XF
+9gVvVHLilfZf600OtLuYJuxlcgARIn17Q70IQcNO+UmvybIGRwIR8xBi2js+XgLe
+nHaqurC7jKBrnjjJnNxRK8yEGcmCN8h38XPGDSqDgUuJwkNIhMBbCzoa7oZ+y0jY
+gwXv4gywizB/FiNXTKQLpNMbJPz1mAU5rtp0dMf8xwprXjHG2m5QERtb8PAUB/yh
+YO6/hPFe7kucITHBCOFnedB9yhTkRaDrL3sgZJFcFSxKOrJL/7VZ9d0hhaBW7TwG
+U9MEv2VQz5FTDBDbhK57cyKEe6TvDDMhaK+9ELRr5IaZmPsqNtbf0KZmgvhDYR+R
+KWxHmuc+43LJPtLqUvgJCp4axycFbewwOrBOBa6KYgo4ch5hVx5zkeZY+iaQ5YcG
+NdL4X6IMC7vKSVGdv1tjuOgg65fDocRZhACY1JbU5HtSYbNISq5lS2Vy7d2cXzQ8
+0WMQlfumJ0j4rvj2MvNiUzhaQXDshWoT7SZYeSdaaQCwgIEG3uGFtRXUbCZ7kYzT
+2Hph+Er0btLK6qSTcyo3vmt38pAzZuyGmatOkdkaCRvSiyXLWsPaB20ZH3R+Jrnp
+D64qc/xgxrfMXGaCkcoHc9Ig5A34P8g+f4MofLpvzeJx2jlm0f0M0oQOz7tkOz+V
+htubL6MU3jQ7nsFy3PNA
+=ceQV
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libkate/libkate-0.3.7.ebuild b/media-libs/libkate/libkate-0.3.7.ebuild
index f98807a2acea..cbd643149228 100644
--- a/media-libs/libkate/libkate-0.3.7.ebuild
+++ b/media-libs/libkate/libkate-0.3.7.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.7.ebuild,v 1.16 2012/05/05 08:02:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.7.ebuild,v 1.17 2012/10/10 03:11:40 zerochaos Exp $
 
-inherit eutils
+EAPI="4"
+PYTHON_DEPEND="wxwidgets? 2"
+
+inherit eutils python
 
 DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
 HOMEPAGE="http://code.google.com/p/libkate/"
@@ -16,7 +19,6 @@ IUSE="doc wxwidgets"
 COMMON_DEPEND="media-libs/libogg
 	media-libs/libpng"
 DEPEND="${COMMON_DEPEND}
-	wxwidgets? ( dev-lang/python )
 	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison
@@ -24,19 +26,39 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	wxwidgets? ( =dev-python/wxpython-2.8* media-libs/liboggz )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	if use wxwidgets; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	python_clean_py-compile_files
 	epatch "${FILESDIR}"/${P}-libpng14.patch
 }
 
-src_compile() {
+src_configure() {
 	use wxwidgets || sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure
 	econf $(use_enable doc) --docdir=/usr/share/doc/${PF}
-	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README
+	if use wxwidgets; then
+		python_convert_shebangs -r 2 "${D}"
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets; then
+		python_mod_optimize kdj
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets; then
+		python_mod_cleanup kdj
+	fi
 }
diff --git a/media-libs/libkate/libkate-0.3.8.ebuild b/media-libs/libkate/libkate-0.3.8.ebuild
index 02cf9251dece..2b259f4a71e0 100644
--- a/media-libs/libkate/libkate-0.3.8.ebuild
+++ b/media-libs/libkate/libkate-0.3.8.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.8.ebuild,v 1.2 2012/05/05 08:02:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.8.ebuild,v 1.3 2012/10/10 03:11:40 zerochaos Exp $
+
+EAPI="4"
+PYTHON_DEPEND="wxwidgets? 2"
+inherit python
 
 DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
 HOMEPAGE="http://code.google.com/p/libkate/"
@@ -14,7 +18,6 @@ IUSE="debug doc wxwidgets"
 COMMON_DEPEND="media-libs/libogg
 	media-libs/libpng"
 DEPEND="${COMMON_DEPEND}
-	wxwidgets? ( dev-lang/python )
 	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison
@@ -22,13 +25,38 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	wxwidgets? ( =dev-python/wxpython-2.8* media-libs/liboggz )"
 
-src_compile() {
+pkg_setup() {
+	if use wxwidgets; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	python_clean_py-compile_files
+}
+
+src_configure() {
 	use wxwidgets || sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure
 	econf $(use_enable debug) $(use_enable doc) --docdir=/usr/share/doc/${PF}
-	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README
+	if use wxwidgets; then
+		python_convert_shebangs -r 2 "${D}"
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets; then
+		python_mod_optimize kdj
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets; then
+		python_mod_cleanup kdj
+	fi
 }
diff --git a/media-libs/libkate/libkate-0.4.1.ebuild b/media-libs/libkate/libkate-0.4.1.ebuild
index 11c2817d33b3..935dd8efc836 100644
--- a/media-libs/libkate/libkate-0.4.1.ebuild
+++ b/media-libs/libkate/libkate-0.4.1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.4.1.ebuild,v 1.3 2012/05/29 14:47:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.4.1.ebuild,v 1.4 2012/10/10 03:11:40 zerochaos Exp $
+
+EAPI="4"
+PYTHON_DEPEND="wxwidgets? 2"
+inherit python
 
 DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
 HOMEPAGE="http://code.google.com/p/libkate/"
@@ -14,7 +18,6 @@ IUSE="debug doc wxwidgets"
 COMMON_DEPEND="media-libs/libogg
 	media-libs/libpng"
 DEPEND="${COMMON_DEPEND}
-	wxwidgets? ( dev-lang/python )
 	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison
@@ -22,13 +25,38 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	wxwidgets? ( =dev-python/wxpython-2.8* media-libs/liboggz )"
 
-src_compile() {
+pkg_setup() {
+	if use wxwidgets; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	python_clean_py-compile_files
+}
+
+src_configure() {
 	use wxwidgets || sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure
 	econf $(use_enable debug) $(use_enable doc) --docdir=/usr/share/doc/${PF}
-	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README
+	if use wxwidgets; then
+		python_convert_shebangs -r 2 "${D}"
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets; then
+		python_mod_optimize kdj
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets; then
+		python_mod_cleanup kdj
+	fi
 }