Added cuba-3.0.ebuild; removed cuba-2.1.ebuild

3 files changed, 162 insertions, 4 deletions

diff --git a/sci-libs/cuba/Manifest b/sci-libs/cuba/Manifest
index 4301a24..f74c031 100644
--- a/sci-libs/cuba/Manifest
+++ b/sci-libs/cuba/Manifest
@@ -1,4 +1,7 @@
+AUX 3.0-shared.patch 5071 RMD160 934ecfe7d12bb4556b57f6198baa39d859b9c851 SHA1 246c1089965bf5e78d8a9c8b250ac81cfcf2d9ab SHA256 946ed0a9f7a6fcf5f27d553d8e3800ac299aae8338cd59cb2baa5195ad0048cc
 AUX shared.patch 4438 RMD160 69ae644305896797a91fffcbd4dcb30629be99bd SHA1 8c3a766c1352a7de18ce1f567b167590eabbec9b SHA256 4c7644563350c7db5d72a8e6164e74755e7cb451f25d06910849e6ef17b23a35
 DIST Cuba-2.1.tar.gz 308756 RMD160 0b7872bdea7815fb096e18cb25ef42628ac15930 SHA1 214bb49a0a0fb364789bc9bf83012bc128e59960 SHA256 8af26e8d0400be8d8811e2bf7d6a7605b9d8d2fc370a3f5f6c7e788d964d7853
+DIST Cuba-3.0.tar.gz 352577 RMD160 c10c84050cb5047d4a46ce00670b7f3e56556ab5 SHA1 cca1e28d77296e9b9c76c4a73cc7e9ec52df1054 SHA256 530bf3676fe273ee6ab28234a7af2a1b52f69a02d887540b17c396ddd2d69226
 EBUILD cuba-2.1-r1.ebuild 1053 RMD160 df64f9a7557b89a2d0ebb0041142f6a8d4435f35 SHA1 55bd17b22d7c814fb3f2f5b07d0c8de6d533d7b0 SHA256 12e72665c042ee7a774cf3a5daa5987326ac181e67287e924fd942487aa6ae5f
-EBUILD cuba-2.1.ebuild 1063 RMD160 9cdac675ebb1e7f880098579b545672494f0bea9 SHA1 5a5461d20bec78b66f77c768229db5505aa5b1b2 SHA256 792c91044c4c9d9fe34c819b40fa81c2b44cba64055d84757df23a784632aba4
+EBUILD cuba-3.0.ebuild 1059 RMD160 87bc164040cf36dfeac416b469c192fc0af85b22 SHA1 4ce541146d7d2527905ac1130db93885d798b93b SHA256 2f8d9335a2a7f29e79a2e7c8122914f755a904b6b360c0ba5e9d8c4b4239ca94
+MISC Cuba-3.0.tar.gz 352577 RMD160 c10c84050cb5047d4a46ce00670b7f3e56556ab5 SHA1 cca1e28d77296e9b9c76c4a73cc7e9ec52df1054 SHA256 530bf3676fe273ee6ab28234a7af2a1b52f69a02d887540b17c396ddd2d69226
diff --git a/sci-libs/cuba/cuba-2.1.ebuild b/sci-libs/cuba/cuba-3.0.ebuild
index a2fc013..8f3b6c3 100644
--- a/sci-libs/cuba/cuba-2.1.ebuild
+++ b/sci-libs/cuba/cuba-3.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils distutils
+inherit eutils
 
-EAPI="2"
+EAPI="3"
 
 DESCRIPTION="A library for multidimensional numerical integration"
 HOMEPAGE="http://www.feynarts.de/cuba/"
@@ -19,7 +19,7 @@ SLOT="0"
 
 src_prepare() {
 	if use shared-libs; then
-		epatch "${FILESDIR}/shared.patch"
+		epatch "${FILESDIR}/${PV}-shared.patch"
 	elif use !static-libs; then
 		eerror "Must USE shared-libs or static-libs"
 		die
diff --git a/sci-libs/cuba/files/3.0-shared.patch b/sci-libs/cuba/files/3.0-shared.patch
new file mode 100644
index 0000000..3941b58
--- /dev/null
+++ b/sci-libs/cuba/files/3.0-shared.patch
@@ -0,0 +1,155 @@
+diff -dubr Cuba-3.0.orig/makefile.in Cuba-3.0/makefile.in
+--- Cuba-3.0.orig/makefile.in	2011-11-04 00:22:53.000000000 +0400
++++ Cuba-3.0/makefile.in	2011-11-04 00:30:37.000000000 +0400
+@@ -1,5 +1,5 @@
+ CC = @CC@
+-CFLAGS = @CFLAGS@ @DEFS@ -I$(common) -I. -I$(srcdir)
++CFLAGS = @CFLAGS@ @DEFS@ -I$(common) -I. -I$(srcdir) -fPIC
+ MCFLAGS = @MCFLAGS@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -9,6 +9,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ RANLIB = @RANLIB@
+ EXE = @EXEEXT@
++VERSION = @PACKAGE_VERSION@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -31,13 +32,14 @@
+ 
+ HEADERS = cuba.h
+ LIB = libcuba.a
++SHLIB = libcuba.so.$(VERSION).0
+ MATH = Vegas$(EXE) Suave$(EXE) Divonne$(EXE) Cuhre$(EXE)
+ TOOLS = partview$(EXE)
+ 
+ 
+ all: lib demos $(MATH_DEFAULT) $(TOOLS_DEFAULT)
+ 
+-lib: $(LIB)
++lib: $(LIB) $(SHLIB)
+ 
+ demos: demo-c$(EXE) $(DEMO_FORTRAN_DEFAULT)
+ 
+@@ -92,26 +94,21 @@
+ $(LIB)(Vegas.o): $(VEGAS_C) $(VEGAS_DEPS) $(COMMON_CDEPS) 
+ 	$(CC) $(CFLAGS) -I$(vegas) -DNOUNDERSCORE -c -o Vegas.o $(VEGAS_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Vegas.o
+-	$(RM) Vegas.o
+ 
+ $(LIB)(llVegas.o): $(VEGAS_C) $(VEGAS_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(vegas) -DLONGLONGINT -DNOUNDERSCORE -c -o llVegas.o $(VEGAS_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llVegas.o
+-	$(RM) llVegas.o
+ 
+ $(LIB)(Vegas_.o): $(VEGAS_C) $(VEGAS_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(vegas) -c -o Vegas_.o $(VEGAS_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Vegas_.o
+-	$(RM) Vegas_.o
+ 
+ $(LIB)(llVegas_.o): $(VEGAS_C) $(VEGAS_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(vegas) -DLONGLONGINT -c -o llVegas_.o $(VEGAS_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llVegas_.o
+-	$(RM) llVegas_.o
+ 
+ Vegas$(EXE): $(VEGAS_TM) $(VEGAS_DEPS) $(COMMON_TMDEPS)
+ 	$(MCC) $(MCFLAGS) $(CFLAGS) -I$(vegas) -o Vegas$(EXE) $(VEGAS_TM)
+-	strip Vegas$(EXE)
+ 
+ 
+ SUAVE_C = $(suave)/Suave.c
+@@ -125,26 +122,21 @@
+ $(LIB)(Suave.o): $(SUAVE_C) $(SUAVE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(suave) -DNOUNDERSCORE -c -o Suave.o $(SUAVE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Suave.o
+-	$(RM) Suave.o
+ 
+ $(LIB)(llSuave.o): $(SUAVE_C) $(SUAVE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(suave) -DLONGLONGINT -DNOUNDERSCORE -c -o llSuave.o $(SUAVE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llSuave.o
+-	$(RM) llSuave.o
+ 
+ $(LIB)(Suave_.o): $(SUAVE_C) $(SUAVE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(suave) -c -o Suave_.o $(SUAVE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Suave_.o
+-	$(RM) Suave_.o
+ 
+ $(LIB)(llSuave_.o): $(SUAVE_C) $(SUAVE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(suave) -DLONGLONGINT -c -o llSuave_.o $(SUAVE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llSuave_.o
+-	$(RM) llSuave_.o
+ 
+ Suave$(EXE): $(SUAVE_TM) $(SUAVE_DEPS) $(COMMON_TMDEPS)
+ 	$(MCC) $(MCFLAGS) $(CFLAGS) -I$(suave) -o Suave$(EXE) $(SUAVE_TM)
+-	strip Suave$(EXE)
+ 
+ 
+ DIVONNE_C = $(divonne)/Divonne.c
+@@ -159,26 +151,21 @@
+ $(LIB)(Divonne.o): $(DIVONNE_C) $(DIVONNE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(divonne) -DNOUNDERSCORE -c -o Divonne.o $(DIVONNE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Divonne.o
+-	$(RM) Divonne.o
+ 
+ $(LIB)(llDivonne.o): $(DIVONNE_C) $(DIVONNE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(divonne) -DLONGLONGINT -DNOUNDERSCORE -c -o llDivonne.o $(DIVONNE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llDivonne.o
+-	$(RM) llDivonne.o
+ 
+ $(LIB)(Divonne_.o): $(DIVONNE_C) $(DIVONNE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(divonne) -c -o Divonne_.o $(DIVONNE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Divonne_.o
+-	$(RM) Divonne_.o
+ 
+ $(LIB)(llDivonne_.o): $(DIVONNE_C) $(DIVONNE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(divonne) -DLONGLONGINT -c -o llDivonne_.o $(DIVONNE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llDivonne_.o
+-	$(RM) llDivonne_.o
+ 
+ Divonne$(EXE): $(DIVONNE_TM) $(DIVONNE_DEPS) $(COMMON_TMDEPS)
+ 	$(MCC) $(MCFLAGS) $(CFLAGS) -I$(divonne) -o Divonne$(EXE) $(DIVONNE_TM)
+-	strip Divonne$(EXE)
+ 
+ 
+ CUHRE_C = $(cuhre)/Cuhre.c
+@@ -191,26 +178,21 @@
+ $(LIB)(Cuhre.o): $(CUHRE_C) $(CUHRE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(cuhre) -DNOUNDERSCORE -c -o Cuhre.o $(CUHRE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Cuhre.o
+-	$(RM) Cuhre.o
+ 
+ $(LIB)(llCuhre.o): $(CUHRE_C) $(CUHRE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(cuhre) -DLONGLONGINT -DNOUNDERSCORE -c -o llCuhre.o $(CUHRE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llCuhre.o
+-	$(RM) llCuhre.o
+ 
+ $(LIB)(Cuhre_.o): $(CUHRE_C) $(CUHRE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(cuhre) -c -o Cuhre_.o $(CUHRE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) Cuhre_.o
+-	$(RM) Cuhre_.o
+ 
+ $(LIB)(llCuhre_.o): $(CUHRE_C) $(CUHRE_DEPS) $(COMMON_CDEPS)
+ 	$(CC) $(CFLAGS) -I$(cuhre) -DLONGLONGINT -c -o llCuhre_.o $(CUHRE_C)
+ 	$(AR) $(ARFLAGS) $(LIB) llCuhre_.o
+-	$(RM) llCuhre_.o
+ 
+ Cuhre$(EXE): $(CUHRE_TM) $(CUHRE_DEPS) $(COMMON_TMDEPS)
+ 	$(MCC) $(MCFLAGS) $(CFLAGS) -I$(cuhre) -o Cuhre$(EXE) $(CUHRE_TM)
+-	strip Cuhre$(EXE)
+ 
+ 
+ $(LIB): $(LIB)(Vegas.o)     $(LIB)(Vegas_.o)     \
+@@ -223,6 +205,11 @@
+ 	$(LIB)(llCuhre.o)   $(LIB)(llCuhre_.o)
+ 	-$(RANLIB) $(LIB)
+ 
++$(SHLIB): $(LIB)
++	$(CC) -shared -Wl,-soname,libcuba.so.$(VERSION) -o $@ *.o
++	ln -sf $(SHLIB) libcuba.so.$(VERSION)
++	ln -sf $(SHLIB) libcuba.so
++
+ 
+ DEMO_F = $(demo)/demo-fortran.F
+ DEMO_C = $(demo)/demo-c.c
+Только в Cuba-3.0.orig: .makefile.in.swp