Don't install obj files #326933; add python support

(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 77 insertions, 18 deletions

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 4e15ea4d226c..5703eb5ee8e0 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.10 2010/07/03 08:18:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/ChangeLog,v 1.11 2010/07/05 11:36:51 jlec Exp $
+
+*cbflib-0.9.0-r1 (05 Jul 2010)
+
+  05 Jul 2010; Justin Lecher <jlec@gentoo.org> files/0.9.0-Makefile.patch,
+  -cbflib-0.9.0.ebuild, +cbflib-0.9.0-r1.ebuild:
+  Don't install obj files #326933; add python support
 
   03 Jul 2010; Justin Lecher <jlec@gentoo.org> cbflib-0.9.0.ebuild:
   Remove spaming during emerge
diff --git a/sci-libs/cbflib/cbflib-0.9.0.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild
index 8ad038af92fa..f4c0d24d8d47 100644
--- a/sci-libs/cbflib/cbflib-0.9.0.ebuild
+++ b/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild
@@ -1,10 +1,14 @@
 # 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.ebuild,v 1.3 2010/07/03 08:18:45 jlec Exp $
+# $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 $
 
 EAPI="3"
 
-inherit eutils flag-o-matic toolchain-funcs
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils flag-o-matic toolchain-funcs
 
 MY_P1="CBFlib-${PV}"
 MY_P2="CBFlib_${PV}"
@@ -21,7 +25,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P1}_14Feb10.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="doc python"
 
 #RDEPEND=""
 #DEPEND="test? ( sys-process/time )"
@@ -29,7 +33,7 @@ IUSE=""
 S="${WORKDIR}/${MY_P1}"
 
 src_prepare(){
-	rm -rf Py*
+	rm -rf Py* drel* dRel* ply*
 	epatch "${FILESDIR}"/${PV}-Makefile.patch
 	cp Makefile_LINUX_gcc42 Makefile
 
@@ -51,6 +55,11 @@ src_prepare(){
 
 src_compile() {
 	emake -j1 shared || die
+
+	if use python; then
+		cd pycbf
+		distutils_src_compile
+	fi
 }
 
 # test app is borked in this version
@@ -61,7 +70,16 @@ src_compile() {
 
 src_install() {
 	insinto /usr/include/${PN}
-	doins include/* || die
+	doins include/*.h || die
+
+	dolib.so solib/lib* || die
 
-	dolib.so solib/* || die
+	dodoc README || die
+	if use doc; then
+		dohtml -r README.html html_graphics doc || die
+	fi
+	if use python; then
+		cd pycbf
+		distutils_src_install
+	fi
 }
diff --git a/sci-libs/cbflib/files/0.9.0-Makefile.patch b/sci-libs/cbflib/files/0.9.0-Makefile.patch
index 27ecdff88fc1..914152c9e9e0 100644
--- a/sci-libs/cbflib/files/0.9.0-Makefile.patch
+++ b/sci-libs/cbflib/files/0.9.0-Makefile.patch
@@ -1,8 +1,20 @@
 diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
-index 52c5286..5d922a7 100644
+index 52c5286..5c894a0 100644
 --- a/Makefile_LINUX_gcc42
 +++ b/Makefile_LINUX_gcc42
-@@ -282,7 +282,7 @@ SHAR	= /usr/bin/shar
+@@ -250,7 +250,10 @@
+ 
+ 
+ # Version string
+-VERSION = 0.9.0
++MAJOR = 0
++MINOR = 9
++MICRO = 0
++VERSION = ${MAJOR}.${MINOR}.${MICRO}
+ 
+ 
+ #
+@@ -282,7 +285,7 @@ SHAR	= /usr/bin/shar
  #
  # Program to use to create archives
  #
@@ -11,7 +23,7 @@ index 52c5286..5d922a7 100644
  
  #
  # Program to use to add an index to an archive
-@@ -292,13 +292,13 @@ RANLIB  = /usr/bin/ranlib
+@@ -292,13 +295,13 @@ RANLIB  = /usr/bin/ranlib
  #
  # Program to use to decompress a data file
  #
@@ -27,7 +39,7 @@ index 52c5286..5d922a7 100644
  
  #
  # Program to use to generate a signature
-@@ -486,9 +486,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
+@@ -486,9 +489,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90     \
  		    $(SRC)/fcb_read_image.f90    \
  		    $(SRC)/fcb_read_line.f90     \
  		    $(SRC)/fcb_read_xds_i2.f90   \
@@ -40,30 +52,53 @@ index 52c5286..5d922a7 100644
  		    
  		   
  #
-@@ -849,7 +849,7 @@ endif
- $(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+@@ -663,7 +666,7 @@ all::	$(BIN)/test_xds_binary   \
+ 		$(BIN)/test_fcb_read_image
+ endif
+ 
+-shared:	$(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
++shared:	$(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
+ 
+ javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
+ 
+@@ -846,10 +849,11 @@ ifneq ($(RANLIB),)
+ 	$(RANLIB) $@
+ endif
+ 
+-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
  	mv *.o $(SOLIB)
 -	$(CC) -o $@ $(SOLIB)/*.o $(SOLDFLAGS) $(EXTRALIBS)
 +	$(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS)
++	ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
  
  #
  # IMG library
-@@ -864,7 +864,7 @@ endif
+@@ -862,9 +866,10 @@ ifneq ($(RANLIB),)
+ endif
+ 	rm img.o
  	
- $(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  	$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
 -	$(CC) -o $@ img.o $(SOLDFLAGS)
 +	$(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o
++	ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
  	rm img.o
  
  #
-@@ -891,7 +891,7 @@ endif
- $(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+@@ -888,10 +893,11 @@ else
+ 	echo "Define F90C to build $(LIB)/libfcb.a"
+ endif
+ 
+-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
++$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
  ifneq ($(F90C),)
  	$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
 -	$(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
-+	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o 
++	$(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o
++	ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
  	rm *.o
  else
  	echo "Define F90C to build $(SOLIB)/libfcb.so"