diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2012-06-26 23:49:24 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-06-26 23:49:24 +0000 |
commit | 8e226976eafe260d74c932f4dd8cc8045983ce4a (patch) | |
tree | 953b5ba24c0f92d36d91dc6e7522a7b1cb181fcb /sci-libs/libsvm | |
parent | keyword amd64-linux and x86-linux (diff) | |
download | historical-8e226976eafe260d74c932f4dd8cc8045983ce4a.tar.gz historical-8e226976eafe260d74c932f4dd8cc8045983ce4a.tar.bz2 historical-8e226976eafe260d74c932f4dd8cc8045983ce4a.zip |
keyword amd64-linux and x86-linux, clean old
Package-Manager: portage-2.2.01.20430-prefix/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/libsvm')
-rw-r--r-- | sci-libs/libsvm/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/libsvm/Manifest | 22 | ||||
-rw-r--r-- | sci-libs/libsvm/files/2.91-makefile.patch | 30 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.0-makefile.patch | 32 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.1-openmp.patch | 36 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.11-makefile.patch | 32 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.12-makefile.patch | 19 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.12-makefile2.patch | 45 | ||||
-rw-r--r-- | sci-libs/libsvm/libsvm-3.11.ebuild | 87 | ||||
-rw-r--r-- | sci-libs/libsvm/libsvm-3.12.ebuild | 6 |
10 files changed, 30 insertions, 287 deletions
diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog index 466db595dc2f..db39dc74142b 100644 --- a/sci-libs/libsvm/ChangeLog +++ b/sci-libs/libsvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/libsvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.27 2012/06/19 18:20:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.28 2012/06/26 23:49:24 bicatali Exp $ + + 26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -files/2.91-makefile.patch, + -files/3.0-makefile.patch, -files/3.1-openmp.patch, + -files/3.11-makefile.patch, -files/3.12-makefile2.patch, -libsvm-3.11.ebuild, + files/3.12-makefile.patch, libsvm-3.12.ebuild: + keyword amd64-linux and x86-linux, clean old 19 Jun 2012; Justin Lecher <jlec@gentoo.org> +files/3.12-makefile2.patch, libsvm-3.12.ebuild: diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest index af6e08aa4c95..6d379945a2b5 100644 --- a/sci-libs/libsvm/Manifest +++ b/sci-libs/libsvm/Manifest @@ -1,29 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX 2.90-fpic.patch 713 RMD160 d2be5724cbde2aa5c7254c5be37d62cf48de0efb SHA1 231825014841bdf58b19e9f69864210b6d96416b SHA256 7b40aba4cf560488c464ede3374c455bb194b2ef6f15e7c447e823c81964fffc AUX 2.90-ldflags.patch 662 RMD160 ed4b98dc092dad67b32dbf513341dd6dbdc2f27d SHA1 55e97a9ef2bec6ba5bb7bff84892c98d6861d639 SHA256 0fb14dfeb3dc508210d2353bc9a1ab5081c7af11223f297b01c651d7a98c450b AUX 2.90-python3.patch 408 RMD160 fa1a5cf9b03fe8a0c6a2aaeb3a5de4ffd81888fa SHA1 fcfbf9b8b5525cd4f408e4e3c88f7189eb4f20e2 SHA256 6c319490e6856fe5636de80a2fb89da3765511d9a1854d459a2376e7b36833c4 -AUX 2.91-makefile.patch 1098 RMD160 a54fb2e62c07878071a028b373b524cbb963c173 SHA1 3055121e66bf3e53273d1ff522ffc9d07c2e8720 SHA256 f62358a34f7210aa73efe5eac6a7564951a393e820c499fabbb43e9faf7d125a -AUX 3.0-makefile.patch 1213 RMD160 52c7a34819d6ef6899a5011e5d7e6d3825d821bb SHA1 1daa33709ad74d22842bc6fd0fa75ba682e016d1 SHA256 004b6f0168888716e0822fa2791530c176f3d2cb9b86d45ff583261b4c2b663e -AUX 3.1-openmp.patch 1082 RMD160 e2c4ae0be7c255a9f4a5189d74cf5301add91c90 SHA1 418d203a87cb0c794368c8d45acc2a794a4d54b6 SHA256 090054f532bf12e2ab85ea86142eb6a9dd846ea382e31f554fb93f032756f38c -AUX 3.11-makefile.patch 1258 RMD160 118094113097207ec850502821528da64bd4aaed SHA1 e78fd98710aedff220d381c0d7f84ee5e14bacab SHA256 0f57ae5547a4278a4f28626745528a8ed19b54fe33a3d47fdc2c82d702bda311 AUX 3.11-openmp.patch 939 RMD160 1e8cca6b9ecfad28daa48a6ba1073b21d4ed78cd SHA1 2ec5bd5a86a44e0be9e3aa7b1b3d4c54ce06d0de SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298ddb7a612bc2f3854f0 -AUX 3.12-makefile.patch 1346 RMD160 a8d099c2e22ef7f6b260e91258c3d412c109527c SHA1 4198b87370a2e8bf385298e26c24d8356d5ec5a1 SHA256 a4579793c7a258cfac56a236fc5d457614bd6361010564ab2beee4822c14de3c -AUX 3.12-makefile2.patch 1616 RMD160 a1613ebae1b1111fd8cae589d754fca67884560b SHA1 731c0caf2f8b23d631754ab446b7d17430a765b5 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42 +AUX 3.12-makefile.patch 1616 RMD160 a1613ebae1b1111fd8cae589d754fca67884560b SHA1 731c0caf2f8b23d631754ab446b7d17430a765b5 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42 DIST libsvm-2.9.tar.gz 563829 RMD160 ff6207d399f59eea3329fd629fcdf4c399583a2b SHA1 506725e3328b7fd78b00b99b93e5fb4c90506528 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757 -DIST libsvm-3.11.tar.gz 611835 RMD160 75ad8a4380da20f0c72928bdb1b21025227f53aa SHA1 044638cb2335fa020da115dca54c0c685d15dc08 SHA256 8ff59bf7b487b339cac7ed94593f6ba5136c01c985f9a0601c145ce472a621d5 DIST libsvm-3.12.tar.gz 645287 RMD160 1058df24d9ecca928144425099c69ee268d61330 SHA1 6ee77eb3d89af07fe48058dba0dcc24c85020b85 SHA256 9dcd7a301665d2cbd8c109bba0e8cc2d47b5cc2a9c46aeb359f2dab67be69f74 EBUILD libsvm-2.90-r1.ebuild 2358 RMD160 df8c1f2d6f169df0cfd49175b8427675cd13bb2d SHA1 0077921f5e0a931b7447067b4d38ab0d125ae92f SHA256 0d0481f369bc12e3d91ada2ae9cf44dc6d53895a0b5d42c9767c8d39d97754e3 -EBUILD libsvm-3.11.ebuild 2048 RMD160 cf6e25de7e7579a70e073fd8a8b6bd9ea1feb3ff SHA1 b06e7f385827b62ab947c0355edf2fc9c32e9bac SHA256 a795a79c7b8c26befa655f3b34b266149a7930c4d87041112783a049c851570d -EBUILD libsvm-3.12.ebuild 2081 RMD160 edf0521969620c7b83dc07fdf4ee43c1574ff353 SHA1 674854e13226405b9dd03de75a3106781d5bd594 SHA256 13c23d4856cdc815ef027f2ba656634422d05387d79fdf49bbf9cc0a85d44c7a -MISC ChangeLog 4398 RMD160 46ffcd0ad9a8d8285ba1cc5f3d4658c07f83f72d SHA1 41f94bed06406e64d9d1f34580c3460da18ad78f SHA256 7009191ae3c53074606a3eb4b14b6caff7e7852a5fa2e5f1dee1e70437c0c4aa +EBUILD libsvm-3.12.ebuild 2108 RMD160 e0b0510ae8afa44463cacefbeb9b759cf1d5c1f9 SHA1 192d7c5d66d7a76f9dfa0f80305fbfdbf062ec8b SHA256 096d4495946734e64ef599775de75fe99b75bada2dadcf08d46d96bd762f2976 +MISC ChangeLog 4714 RMD160 1c05b15e5a4de9204f3f66d3ce4f41a7d554b94d SHA1 4b29f72196d0564eac7243c333e8cc0bdd85406d SHA256 dcc2cf21197f3f6bb17ee16aaba1f3efc284e428a5879dfda50c478f73612fce MISC metadata.xml 612 RMD160 aa8a12cb83ea820ab64c431ccabc8093f6da0e19 SHA1 1359ee9f43a7a2c65b6c5e861609a113b9c11a73 SHA256 9b5cf6cdd90cf907fbb016ccdd6a0794e304b53551a4b8a411f61a06111acca0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk/gwvEACgkQgAnW8HDreRZUUACfVYI5Ur4mEH8t1KSfLSaFLPPL -TFIAoJhMyKBVvKm1rv+gBgAdZXaBVn1U -=+cJY +iEYEARECAAYFAk/qSooACgkQ1ycZbhPLE2CVOACfSMYc6plMKsBz220qz1tw2/ox +3XwAn0rc7qgG2+o3R5302IJArpjGWFdz +=7Qa0 -----END PGP SIGNATURE----- diff --git a/sci-libs/libsvm/files/2.91-makefile.patch b/sci-libs/libsvm/files/2.91-makefile.patch deleted file mode 100644 index b9b97e8a7cbd..000000000000 --- a/sci-libs/libsvm/files/2.91-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.orig 2010-08-05 20:36:16.000000000 +0100 -+++ Makefile 2010-08-05 21:30:42.000000000 +0100 -@@ -1,19 +1,19 @@ --CXX ?= g++ --CFLAGS = -Wall -Wconversion -O3 -fPIC - SHVER = 1 -+PICFLAGS=-fPIC - --all: svm-train svm-predict svm-scale -+all: svm-train svm-predict svm-scale lib - - lib: svm.o -- $(CXX) -shared -dynamiclib svm.o -o libsvm.so.$(SHVER) -+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -lm && \ -+ ln -s libsvm.so.$(SHVER) libsvm.so - - svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm - svm-train: svm-train.c svm.o -- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm - svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp - clean: - rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) diff --git a/sci-libs/libsvm/files/3.0-makefile.patch b/sci-libs/libsvm/files/3.0-makefile.patch deleted file mode 100644 index 25a1eaebbca7..000000000000 --- a/sci-libs/libsvm/files/3.0-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.orig 2010-12-02 19:44:31.000000000 +0000 -+++ Makefile 2010-12-02 19:43:59.000000000 +0000 -@@ -1,19 +1,21 @@ - CXX ?= g++ --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CFLAGS ?= -Wall -Wconversion -O3 - SHVER = 2 -+PICFLAGS ?= -fPIC - --all: svm-train svm-predict svm-scale -+all: svm-train svm-predict svm-scale lib - - lib: svm.o -- $(CXX) -shared -dynamiclib svm.o -o libsvm.so.$(SHVER) -+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -lm && \ -+ ln -s libsvm.so.$(SHVER) libsvm.so - - svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm - svm-train: svm-train.c svm.o -- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm - svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp - clean: -- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) -+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/libsvm/files/3.1-openmp.patch b/sci-libs/libsvm/files/3.1-openmp.patch deleted file mode 100644 index b50ad94ecf60..000000000000 --- a/sci-libs/libsvm/files/3.1-openmp.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- svm.cpp.orig 2011-03-08 08:25:57.000000000 -0500 -+++ svm.cpp 2011-04-25 18:07:09.000000000 -0400 -@@ -1267,6 +1267,9 @@ public: - int start, j; - if((start = cache->get_data(i,&data,len)) < len) - { -+#ifdef OPENMP -+#pragma omp parallel for private(j) -+#endif - for(j=start;j<len;j++) - data[j] = (Qfloat)(y[i]*y[j]*(this->*kernel_function)(i,j)); - } -@@ -2445,8 +2448,11 @@ double svm_predict_values(const svm_mode - model->param.svm_type == NU_SVR) - { - double *sv_coef = model->sv_coef[0]; -- double sum = 0; -- for(int i=0;i<model->l;i++) -+ double sum = 0; int i; -+#ifdef OPENMP -+#pragma omp parallel for private(i) reduction(+:sum) -+#endif -+ for(i=0;i<model->l;i++) - sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param); - sum -= model->rho[0]; - *dec_values = sum; -@@ -2463,6 +2469,9 @@ double svm_predict_values(const svm_mode - int l = model->l; - - double *kvalue = Malloc(double,l); -+#ifdef OPENMP -+#pragma omp parallel for private(i) -+#endif - for(i=0;i<l;i++) - kvalue[i] = Kernel::k_function(x,model->SV[i],model->param); - diff --git a/sci-libs/libsvm/files/3.11-makefile.patch b/sci-libs/libsvm/files/3.11-makefile.patch deleted file mode 100644 index 9de043fe62c2..000000000000 --- a/sci-libs/libsvm/files/3.11-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.orig 2011-06-25 20:55:06.000000000 +0100 -+++ Makefile 2011-12-29 19:31:07.000000000 +0000 -@@ -1,19 +1,21 @@ - CXX ?= g++ --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CXXFLAGS ?= -Wall -Wconversion -O3 - SHVER = 2 -+PICFLAGS ?= -fPIC - --all: svm-train svm-predict svm-scale -+all: svm-train svm-predict svm-scale lib - - lib: svm.o -- $(CXX) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -+ $(CXX) $(LDFLAGS) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -lm && \ -+ ln -s libsvm.so.$(SHVER) libsvm.so - - svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm - svm-train: svm-train.c svm.o -- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm - svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp - clean: -- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) -+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/libsvm/files/3.12-makefile.patch b/sci-libs/libsvm/files/3.12-makefile.patch index 5dbce864b475..8577029f05c2 100644 --- a/sci-libs/libsvm/files/3.12-makefile.patch +++ b/sci-libs/libsvm/files/3.12-makefile.patch @@ -1,9 +1,14 @@ ---- Makefile.orig 2012-01-01 15:10:52.000000000 +0000 -+++ Makefile 2012-04-16 17:52:32.000000000 +0100 -@@ -1,9 +1,10 @@ + Makefile | 23 ++++++++++++----------- + 1 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 6b7b123..f7ec65d 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,25 +1,26 @@ CXX ?= g++ -CFLAGS = -Wall -Wconversion -O3 -fPIC -+CXXFLAGS ?= -Wall -Wconversion -O3 ++CXXFLAGS ?= -Wall -Wconversion SHVER = 2 OS = $(shell uname) +PICFLAGS ?= -fPIC @@ -13,9 +18,11 @@ lib: svm.o if [ "$(OS)" = "Darwin" ]; then \ -@@ -11,15 +12,15 @@ +- SHARED_LIB_FLAG="-dynamiclib -W1,-install_name,libsvm.so.$(SHVER)"; \ ++ SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)"; \ else \ - SHARED_LIB_FLAG="-shared -W1,-soname,libsvm.so.$(SHVER)"; \ +- SHARED_LIB_FLAG="-shared -W1,-soname,libsvm.so.$(SHVER)"; \ ++ SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \ fi; \ - $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) - diff --git a/sci-libs/libsvm/files/3.12-makefile2.patch b/sci-libs/libsvm/files/3.12-makefile2.patch deleted file mode 100644 index 8577029f05c2..000000000000 --- a/sci-libs/libsvm/files/3.12-makefile2.patch +++ /dev/null @@ -1,45 +0,0 @@ - Makefile | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index 6b7b123..f7ec65d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,25 +1,26 @@ - CXX ?= g++ --CFLAGS = -Wall -Wconversion -O3 -fPIC -+CXXFLAGS ?= -Wall -Wconversion - SHVER = 2 - OS = $(shell uname) -+PICFLAGS ?= -fPIC - --all: svm-train svm-predict svm-scale -+all: svm-train svm-predict svm-scale lib - - lib: svm.o - if [ "$(OS)" = "Darwin" ]; then \ -- SHARED_LIB_FLAG="-dynamiclib -W1,-install_name,libsvm.so.$(SHVER)"; \ -+ SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)"; \ - else \ -- SHARED_LIB_FLAG="-shared -W1,-soname,libsvm.so.$(SHVER)"; \ -+ SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \ - fi; \ -- $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) -- -+ $(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER); \ -+ ln -s libsvm.so.$(SHVER) libsvm.so - svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm - svm-train: svm-train.c svm.o -- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm - svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h -- $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp - clean: -- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) -+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/libsvm/libsvm-3.11.ebuild b/sci-libs/libsvm/libsvm-3.11.ebuild deleted file mode 100644 index db0de490b78d..000000000000 --- a/sci-libs/libsvm/libsvm-3.11.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.11.ebuild,v 1.2 2012/03/25 11:39:42 jlec Exp $ - -EAPI="4" -SUPPORT_PYTHON_ABIS="1" - -inherit eutils java-pkg-opt-2 python flag-o-matic toolchain-funcs - -DESCRIPTION="Library for Support Vector Machines" -HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/" -SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="java openmp python tools" - -DEPEND="java? ( >=virtual/jdk-1.4 )" -RDEPEND="${DEPEND} - tools? ( sci-visualization/gnuplot )" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - die "Need an OpenMP capable compiler" - else - append-ldflags -fopenmp - append-cxxflags -fopenmp - fi - append-cxxflags -DOPENMP - fi - use python && python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-{makefile,openmp}.patch - - sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \ - || die "Failed to fix paths in python files" - if use java; then - local JAVAC_FLAGS="$(java-pkg_javac-args)" - sed -i \ - -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \ - java/Makefile || die "Failed to fix java makefile" - fi -} - -src_compile() { - emake - use java && emake -C java -} - -src_install() { - dobin svm-train svm-predict svm-scale - dolib.so *.so* - insinto /usr/include - doins svm.h - dohtml FAQ.html - dodoc README - - if use tools; then - local t - for t in tools/*.py; do - newbin ${t} svm-$(basename ${t} .py) - done - newdoc tools/README README.tools - insinto /usr/share/doc/${PF} - doins heart_scale - doins -r svm-toy - fi - - if use python ; then - installation() { - insinto $(python_get_sitedir) - doins python/*.py - } - python_execute_function installation - newdoc python/README README.python - fi - - if use java; then - java-pkg_dojar java/libsvm.jar - dohtml java/test_applet.html - fi -} diff --git a/sci-libs/libsvm/libsvm-3.12.ebuild b/sci-libs/libsvm/libsvm-3.12.ebuild index 7b6b5a5805be..fc76d86178e3 100644 --- a/sci-libs/libsvm/libsvm-3.12.ebuild +++ b/sci-libs/libsvm/libsvm-3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.12.ebuild,v 1.2 2012/06/19 18:20:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.12.ebuild,v 1.3 2012/06/26 23:49:24 bicatali Exp $ EAPI=4 @@ -14,7 +14,7 @@ SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="java openmp python tools" DEPEND="java? ( >=virtual/jdk-1.4 )" @@ -38,7 +38,7 @@ pkg_setup() { src_prepare() { epatch \ "${FILESDIR}"/3.11-openmp.patch \ - "${FILESDIR}"/3.12-makefile2.patch + "${FILESDIR}"/3.12-makefile.patch sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \ || die "Failed to fix paths in python files" |