Small python fix

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 35 insertions, 7 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 5703eb5ee8e0..dfdd85980649 100644
--- a/sci-libs/cbflib/ChangeLog
+++ b/sci-libs/cbflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cbflib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.11 2010/07/05 11:36:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.12 2010/07/05 12:45:05 jlec Exp $
+
+*cbflib-0.9.0-r2 (05 Jul 2010)
+
+  05 Jul 2010; Justin Lecher <jlec@gentoo.org> +files/0.9.0-python.patch,
+  -cbflib-0.9.0-r1.ebuild, +cbflib-0.9.0-r2.ebuild:
+  Small python fix
 
 *cbflib-0.9.0-r1 (05 Jul 2010)
 
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
index 33e7d4d17686..39af980941c7 100644
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX 0.8.1-Makefile.patch 1382 RMD160 79a344ee3654403ade4ddbc1a3bd1133f47e4e79 SHA1 7311cdafc01881555403cafb62e09a4f467f3e22 SHA256 92b3108840d2ccf7392ac24db52bb86fed7a9561cb3db9ccbf29e6c4e9e76cc5
 AUX 0.9.0-Makefile.patch 3091 RMD160 d976bb6fab07ffb5fa982b84f0c2d02c940c69ca SHA1 0b14f223cf4af87856acdb053918d5a0484987e3 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4
+AUX 0.9.0-python.patch 326 RMD160 5c5bc8b6a8d4a4b7e9ec137683778ded86800838 SHA1 ac68d1fe8620389a5f9ff570a31447221ef32224 SHA256 12465e33bcbc10da6bfef03b6be8d5dac97a80b08b62d18d35abf6ebe010afc2
 DIST CBFlib-0.8.1.tar.gz 3532726 RMD160 e2b82cabaeb7da07ca547822f7b3ac8871f6f467 SHA1 2b17b7f79c0e32e0a5a22aa43c93c170296e6d02 SHA256 197660197d0f861da26764d67fcf92fd75cfa3ad1da30df02fb33e6d67c6b5e3
 DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 RMD160 a90052a584f982df456a9426d07f2fd506c55ef4 SHA1 b05ab50f6a9f921444f3bb27cbbc72797be4f41f SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba
 EBUILD cbflib-0.8.1-r7.ebuild 1677 RMD160 caad43d73d2cf612a149d5fdc971cf65dd425f3b SHA1 82bf6ee604a087f90132612dbc294461645398df SHA256 3408beb2ca2d6e4e9b62a787118faba842ab2b0235cff16540bc0e6fa266cd98
-EBUILD cbflib-0.9.0-r1.ebuild 2030 RMD160 b5f0009db8b9e0b4185fc9e22eab1dd900715717 SHA1 6cfc221f6b7b8b81eed889b8ef247e08c5855a4e SHA256 7cc7699a18b00ffb25c3eeb1a0d4360daf71900a1808ca617279749b29666770
-MISC ChangeLog 2021 RMD160 226276e1afc702f921770b33e83f7bd3b413e5f4 SHA1 7de2c5fbedea33c1915d3fa8579d8f10bebaaa25 SHA256 6bc786892d01cc29137046be22dd434e7b3b6210969be077485d44bb05640fbc
+EBUILD cbflib-0.9.0-r2.ebuild 2235 RMD160 4dedb5c91d68f46822ee67c90c92e294edd72fb2 SHA1 44bd90bdc9ba572671b7a2edea6e0706db6f249b SHA256 1dfdd6f19ce9e819cd181dfc8f7eb9d1698fa78d337f0db110ed5881f22379c6
+MISC ChangeLog 2199 RMD160 0d9495b63cf8977cfb8e8a00400a7ddf6a5770ac SHA1 647efc8ef81080b95514d87bfe95a0410e47facb SHA256 f33e7717a7ec10d4f9ffddd2f4efd433edd96369ef3ad195b18f7702329eb238
 MISC metadata.xml 872 RMD160 65a3873ad810c058abebf748ebdbc29a0da05e2d SHA1 df579c7f63aff50d1e3877013bf62e6ae9a2a438 SHA256 60351f0290d2947caddf8470468b8891dd63dd00545af8099859bde40eda1f49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwxw9kACgkQgAnW8HDreRZoWACgzTR/dlJ/QfbHlVobIVes8lkn
-uYYAni2xPR5oQW163Hm04P1EMipEzT4f
-=o/Pm
+iEYEARECAAYFAkwx09gACgkQgAnW8HDreRbg0gCgmvrmx1uF6umiNrNqJG0Yju+9
+xeQAn00f+QP5B5U5PXjIZUkbWcjjnDJy
+=JiMy
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild
index f4c0d24d8d47..03bc8d816595 100644
--- a/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild,v 1.1 2010/07/05 11:36:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r2.ebuild,v 1.1 2010/07/05 12:45:05 jlec Exp $
 
 EAPI="3"
 
@@ -10,6 +10,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils eutils flag-o-matic toolchain-funcs
 
+PYTHON_MODNAME="pycbf.py"
 MY_P1="CBFlib-${PV}"
 MY_P2="CBFlib_${PV}"
 
@@ -35,6 +36,8 @@ S="${WORKDIR}/${MY_P1}"
 src_prepare(){
 	rm -rf Py* drel* dRel* ply*
 	epatch "${FILESDIR}"/${PV}-Makefile.patch
+	edos2unix pycbf/setup.py
+	epatch "${FILESDIR}"/${PV}-python.patch
 	cp Makefile_LINUX_gcc42 Makefile
 
 	append-fflags -fno-range-check
@@ -83,3 +86,11 @@ src_install() {
 		distutils_src_install
 	fi
 }
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sci-libs/cbflib/files/0.9.0-python.patch b/sci-libs/cbflib/files/0.9.0-python.patch
new file mode 100644
index 000000000000..972c252bd861
--- /dev/null
+++ b/sci-libs/cbflib/files/0.9.0-python.patch
@@ -0,0 +1,10 @@
+diff --git a/pycbf/setup.py b/pycbf/setup.py
+index 0763f06..f55a42f 100644
+--- a/pycbf/setup.py
++++ b/pycbf/setup.py
+@@ -14,4 +14,4 @@ e = Extension('_pycbf',
+          include_dirs = ["../include"] )
+             
+ # Build it
+-setup(name="_pycbf",ext_modules=[e],)
++setup(name="_pycbf",ext_modules=[e],py_modules=["pycbf"],)