projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46c9184)
Don't install obj files #326933; add python support
authorJustin Lecher <jlec@gentoo.org>
Mon, 5 Jul 2010 11:36:51 +0000 (11:36 +0000)
committerJustin Lecher <jlec@gentoo.org>
Mon, 5 Jul 2010 11:36:51 +0000 (11:36 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

sci-libs/cbflib/ChangeLog patch | blob | history
sci-libs/cbflib/Manifest patch | blob | history
sci-libs/cbflib/cbflib-0.9.0-r1.ebuild [moved from sci-libs/cbflib/cbflib-0.9.0.ebuild with 72% similarity] patch | blob | history
sci-libs/cbflib/files/0.9.0-Makefile.patch patch | blob | history

diff --git a/sci-libs/cbflib/ChangeLog b/sci-libs/cbflib/ChangeLog
index 4e15ea4d226c9594226adbcce4d3906aff52339d..5703eb5ee8e0adbdbf28b93f3d21ac192b14dcec 100644 (file)
--- 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/Manifest b/sci-libs/cbflib/Manifest
index 91799dbd913a4061077402acaad81911c5a26254..33e7d4d1768658bafd86fa4939f2b5ffaad4abcb 100644 (file)
--- a/sci-libs/cbflib/Manifest
+++ b/sci-libs/cbflib/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 AUX 0.8.1-Makefile.patch 1382 RMD160 79a344ee3654403ade4ddbc1a3bd1133f47e4e79 SHA1 7311cdafc01881555403cafb62e09a4f467f3e22 SHA256 92b3108840d2ccf7392ac24db52bb86fed7a9561cb3db9ccbf29e6c4e9e76cc5
-AUX 0.9.0-Makefile.patch 2102 RMD160 25ac33c49465db16db1931ea097d5c52bf08bea4 SHA1 de30e174f80c03f720d86acd6c732dc3d72962aa SHA256 53dded9277ebd53279dd1a3670f7bc8de06fbb0723b3700525fc5784dd4d2657
+AUX 0.9.0-Makefile.patch 3091 RMD160 d976bb6fab07ffb5fa982b84f0c2d02c940c69ca SHA1 0b14f223cf4af87856acdb053918d5a0484987e3 SHA256 361cd3c6a906f6bfe2761196e459aec2735e4bb539586b5589b1a8d2d35a02b4
 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.ebuild 1693 RMD160 57b06ec818a9c0ca2617dccf58947716d2e10c26 SHA1 91f9e4d367627a475db94525c3f1c40087906263 SHA256 0754c50d0ca39c2d347efd5321d47fcbaa4406dd3aa29754bf3a2e05c5b25a4f
-MISC ChangeLog 1810 RMD160 e1178acdfb04358048eac06c7ae7081de30241b1 SHA1 40602a04a704ecfcbbbb1d786655d866b3512caa SHA256 aef720bfc181080e359d0d8a66e80a4e87142ce335ec5d76ac582c59f90e77aa
+EBUILD cbflib-0.9.0-r1.ebuild 2030 RMD160 b5f0009db8b9e0b4185fc9e22eab1dd900715717 SHA1 6cfc221f6b7b8b81eed889b8ef247e08c5855a4e SHA256 7cc7699a18b00ffb25c3eeb1a0d4360daf71900a1808ca617279749b29666770
+MISC ChangeLog 2021 RMD160 226276e1afc702f921770b33e83f7bd3b413e5f4 SHA1 7de2c5fbedea33c1915d3fa8579d8f10bebaaa25 SHA256 6bc786892d01cc29137046be22dd434e7b3b6210969be077485d44bb05640fbc
 MISC metadata.xml 872 RMD160 65a3873ad810c058abebf748ebdbc29a0da05e2d SHA1 df579c7f63aff50d1e3877013bf62e6ae9a2a438 SHA256 60351f0290d2947caddf8470468b8891dd63dd00545af8099859bde40eda1f49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwu8msACgkQgAnW8HDreRbfTgCgjgIt1PRLfb2Xn7zW3R5xsQ2M
-jsEAoKGGCN1AlH4leCgtah7gIiYdhsEj
-=p4TB
+iEYEARECAAYFAkwxw9kACgkQgAnW8HDreRZoWACgzTR/dlJ/QfbHlVobIVes8lkn
+uYYAni2xPR5oQW163Hm04P1EMipEzT4f
+=o/Pm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cbflib/cbflib-0.9.0.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r1.ebuild
similarity index 72%
rename from sci-libs/cbflib/cbflib-0.9.0.ebuild
rename to sci-libs/cbflib/cbflib-0.9.0-r1.ebuild
index 8ad038af92fa0a718975929f42c40e271c4771f7..f4c0d24d8d47073a830bbdea13054f0d81e43210 100644 (file)
--- 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 27ecdff88fc1708f625b7e3f80bb81a661b763df..914152c9e9e0fff0ef08a38f4af9e18e4b02e482 100644 (file)
--- 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"
Unnamed repository; edit this file 'description' to name the repository.