Remove mention of stfl.pyc from Makefiles and stop automatic generation of stfl.pyc by doing 'python -c stfl' in the buildsystem. Also fix a parallel build bug produced (partly) by the stfl.pyc stuff. Thanks to Christian Weiske for the report in bug #262006 and Ihar Hrachyshka for the initial patch.

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

4 files changed, 62 insertions, 20 deletions

diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog
index 6bae3551f6c2..0182d56b4659 100644
--- a/dev-libs/stfl/ChangeLog
+++ b/dev-libs/stfl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/stfl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.21 2009/03/07 19:23:13 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.22 2009/05/23 10:54:17 gentoofan23 Exp $
+
+  23 May 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  files/stfl-0.19-multilib.patch, stfl-0.19.ebuild:
+  Remove mention of stfl.pyc from Makefiles and stop automatic generation of
+  stfl.pyc by doing 'python -c stfl' in the buildsystem. Also fix a parallel
+  build bug produced (partly) by the stfl.pyc stuff. Thanks to Christian
+  Weiske for the report in bug #262006 and Ihar Hrachyshka for the initial
+  patch.
 
   07 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> stfl-0.17.ebuild,
   stfl-0.18.ebuild, stfl-0.19.ebuild:
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 4c685f2904b7..aac2f22c7552 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -1,10 +1,10 @@
 AUX stfl-0.18-multilib.patch 1768 RMD160 aee79ca9107e64a4abd0d31ccdc05a3566f1be82 SHA1 cba05ec3cb6a6755f82a64b67ea831d701b0a90c SHA256 346f187e4922e6652a1a0d9d2699948ccaf3ca4412fe05f8a5ae3cb94985f520
-AUX stfl-0.19-multilib.patch 2511 RMD160 b697ace49266e983aed097edb4d16b3e19ed42ba SHA1 05e82da8fc49337bf793e9e62159140cd6f5611b SHA256 cea3265dfec6be959c7bffe2605b7d62f52385f9f98eb7ba2d4f7ed4ce9a22ca
+AUX stfl-0.19-multilib.patch 3388 RMD160 7b067311d1c6c35705d04cdd86eb1d69643ebd57 SHA1 18d7b42880ee46250b5febbb734b6e787f67fbc1 SHA256 aaf38835f1263804f0d8732615733bc18185b9489a1d8c8d5daf121c9111547e
 DIST stfl-0.17.tar.gz 38950 RMD160 dc0fe9e1c1600667251069f9396fa044841d2d85 SHA1 315591618c7125daf3263b510e0e48aa82d73711 SHA256 d34fa8297bf15f13c206ef6eb3669cf3718fbcf0cd5abb47f704511c5f30ea7a
 DIST stfl-0.18.tar.gz 39188 RMD160 d3fc37aa7542c7e89d0957f8e25572f94e789b8d SHA1 d8ce5c7290ff438fcabac0fe4de2d54ae4ad5d49 SHA256 2295378d21596eb4aa5c775bfd0385db82825a18f093a9c0ba2a32c03f423832
 DIST stfl-0.19.tar.gz 40182 RMD160 e0b3b1a1405baf8b530e3d6a47a00f7167a0fa40 SHA1 f3183b3699687b25a602549284ac96122bc56482 SHA256 658aa189ce2751b0d15a1f2ea8f08fe8bf787dbc1049d606cb14885f73c2e33d
 EBUILD stfl-0.17.ebuild 1634 RMD160 0165b5b08e54aa5a7c210208b74b54183c9fa525 SHA1 ce6566797686581d5b9106eeb0fc57bc21b8cff1 SHA256 e99898ad61650b849a2951083b74d4a5533fe2f31b2a7b7dcfa00483db05090d
 EBUILD stfl-0.18.ebuild 1722 RMD160 b62ddfbe2ac590d277976781f00c16f1f094d70f SHA1 b349274199a02595148ac04d7e5043ec8e0c4741 SHA256 eda581b012a93b5881af2423a2ef36efee6f06dfe5dfd04989e000b7f5bdc9ae
-EBUILD stfl-0.19.ebuild 1787 RMD160 0c1f9020ee05d6c5eeb45ed9b863714dc1e945e0 SHA1 e66a610192ac0e182d25b4264323380dc6d18e86 SHA256 09855676e093fee87c5b7cfc56c794ff8a0a1fa272374825c25914a5d66cd528
-MISC ChangeLog 3233 RMD160 2947e73a6725c7b4c2fa444eb41fcc66126c1ef0 SHA1 6ce7940ad8691ee51ea64976bc32aeedb800adb2 SHA256 6d56e729e4f36c73fd49dfbabd7b0016c373189319d8d30238ccf094cef0085c
+EBUILD stfl-0.19.ebuild 1924 RMD160 26c2185fdbf16084283a907eda75d0993b46258d SHA1 edb82aee338a872bf8a5b0f877f1322f56e6933f SHA256 e97c5ad72746eb0b33597f3aec3dbcfadc255c71e8f8fa90355cd33cd5bd786b
+MISC ChangeLog 3653 RMD160 342b6e9ec6d19093549477163b7c47746874a0ca SHA1 4f263043778293c25e56ccbdd925ff0e448dc783 SHA256 b2721e662a6095e450db2504ddee22a041c6cb3dfde54ada75ad2b9eda4e85cc
 MISC metadata.xml 928 RMD160 a6ef85ffe95d97346102bb9c3760bef25c371ff4 SHA1 7240e5528021d47d9170e67cae1aae338a843fc2 SHA256 63b5cc21c004f06d90d0734c666d31ca3540c604fdaead8fa5260f6bdbe08d33
diff --git a/dev-libs/stfl/files/stfl-0.19-multilib.patch b/dev-libs/stfl/files/stfl-0.19-multilib.patch
index a32b09f0f566..d1c01e7c2e3d 100644
--- a/dev-libs/stfl/files/stfl-0.19-multilib.patch
+++ b/dev-libs/stfl/files/stfl-0.19-multilib.patch
@@ -1,7 +1,17 @@
-diff -aur stfl-0.19-orig/Makefile stfl-0.19/Makefile
---- stfl-0.19-orig/Makefile	2007-09-19 19:24:14.000000000 -0400
-+++ stfl-0.19/Makefile	2008-09-02 20:05:10.000000000 -0400
-@@ -50,9 +50,9 @@
+diff --git stfl-0.19/Makefile stfl-0.19-ta/Makefile
+index f098187..80dd338 100644
+--- stfl-0.19/Makefile
++++ stfl-0.19-ta/Makefile
+@@ -39,7 +39,7 @@ clean:
+ 	rm -f widgets/*.o spl/mod_stfl.so spl/example.db
+ 	cd perl5 && perl Makefile.PL && make clean && rm -f Makefile.old
+ 	rm -f perl5/stfl_wrap.c perl5/stfl.pm perl5/build_ok
+-	rm -f python/stfl.py python/stfl.pyc python/_stfl.so 
++	rm -f python/stfl.py python/_stfl.so 
+ 	rm -f python/stfl_wrap.c python/stfl_wrap.o
+ 	rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
+ 	rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
+@@ -50,9 +50,9 @@ Makefile.deps: *.c widgets/*.c *.h
  	mv -f Makefile.deps_new Makefile.deps
  
  install: all
@@ -13,26 +23,41 @@ diff -aur stfl-0.19-orig/Makefile stfl-0.19/Makefile
  	install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
  
  ifeq ($(FOUND_SPL),1)
-diff -aur stfl-0.19-orig/python/Makefile.snippet stfl-0.19/python/Makefile.snippet
---- stfl-0.19-orig/python/Makefile.snippet	2007-09-03 12:13:04.000000000 -0400
-+++ stfl-0.19/python/Makefile.snippet	2008-09-02 20:00:40.000000000 -0400
-@@ -32,8 +32,8 @@
- 	cd python && python -c 'import stfl'
+diff --git stfl-0.19/python/Makefile.snippet stfl-0.19-ta/python/Makefile.snippet
+index 65e7a3d..a8d830c 100644
+--- stfl-0.19/python/Makefile.snippet
++++ stfl-0.19-ta/python/Makefile.snippet
+@@ -21,19 +21,17 @@
  
- install_python: python/_stfl.so python/stfl.py python/stfl.pyc
+ PYTHON_VERSION = $(shell python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d'.')
+ 
+-all: python/_stfl.so python/stfl.py python/stfl.pyc
++all: python/_stfl.so python/stfl.py
+ 
+ install: install_python
+ 
+-python/_stfl.so python/stfl.py python/stfl.pyc: libstfl.a stfl.h python/stfl.i swig/*.i
++python/_stfl.so python/stfl.py: libstfl.a stfl.h python/stfl.i swig/*.i
+ 	cd python && swig -python stfl.i
+ 	gcc -shared -pthread -fPIC python/stfl_wrap.c -I/usr/include/python$(PYTHON_VERSION) \
+ 		-I. libstfl.a -lncursesw -o python/_stfl.so
+-	cd python && python -c 'import stfl'
+ 
+-install_python: python/_stfl.so python/stfl.py python/stfl.pyc
 -	mkdir -p $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
 -	cp python/_stfl.so $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
 -	cp python/stfl.pyc $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
 -	cp python/stfl.py $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
++install_python: python/_stfl.so python/stfl.py
 +	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
 +	cp python/_stfl.so $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
-+	cp python/stfl.pyc $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/
 +	cp python/stfl.py $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/
  
-diff -aur stfl-0.19-orig/ruby/Makefile.snippet stfl-0.19/ruby/Makefile.snippet
---- stfl-0.19-orig/ruby/Makefile.snippet	2007-09-03 12:13:04.000000000 -0400
-+++ stfl-0.19/ruby/Makefile.snippet	2008-09-02 20:02:40.000000000 -0400
-@@ -25,9 +25,9 @@
+diff --git stfl-0.19/ruby/Makefile.snippet stfl-0.19-ta/ruby/Makefile.snippet
+index 74dfa9b..f0ced6f 100644
+--- stfl-0.19/ruby/Makefile.snippet
++++ stfl-0.19-ta/ruby/Makefile.snippet
+@@ -25,9 +25,9 @@ install: install_ruby
  
  ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i
  	cd ruby && swig -ruby stfl.i && ruby extconf.rb
diff --git a/dev-libs/stfl/stfl-0.19.ebuild b/dev-libs/stfl/stfl-0.19.ebuild
index cafad55a0bfc..e90bb52e3f32 100644
--- a/dev-libs/stfl/stfl-0.19.ebuild
+++ b/dev-libs/stfl/stfl-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.19.ebuild,v 1.4 2009/03/07 19:23:13 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.19.ebuild,v 1.5 2009/05/23 10:54:17 gentoofan23 Exp $
 
 EAPI="2"
 inherit eutils multilib perl-module python toolchain-funcs
@@ -54,6 +54,7 @@ src_compile() {
 }
 
 src_install() {
+	python_version
 	emake prefix="/usr" DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "make install failed"
 
 	dodoc README
@@ -78,3 +79,11 @@ src_install() {
 	## Remove some empty directories
 	rm -fr "${D}/usr/$(get_libdir)/perl5/5.8.8/" || die "Perl directory cleanup failed"
 }
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/stfl.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}