projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ee945f)
sci-libs/libsvm: Respect CC, #484200
authorJustin Lecher <jlec@gentoo.org>
Mon, 2 Feb 2015 08:09:52 +0000 (08:09 +0000)
committerJustin Lecher <jlec@gentoo.org>
Mon, 2 Feb 2015 08:09:52 +0000 (08:09 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

sci-libs/libsvm/ChangeLog patch | blob | history
sci-libs/libsvm/Manifest patch | blob | history
sci-libs/libsvm/libsvm-2.90-r1.ebuild [deleted file] patch | blob | history
sci-libs/libsvm/libsvm-3.17-r1.ebuild [moved from sci-libs/libsvm/libsvm-3.14.ebuild with 78% similarity] patch | blob | history
sci-libs/libsvm/metadata.xml patch | blob | history

diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog
index 027bba2504ca4fbee91fca61712f0dce3dd9396c..55cb0fe5a290229cf762723fa463550b12bdced0 100644 (file)
--- a/sci-libs/libsvm/ChangeLog
+++ b/sci-libs/libsvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libsvm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.36 2014/11/28 15:12:21 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.37 2015/02/02 08:09:51 jlec Exp $
+
+*libsvm-3.17-r1 (02 Feb 2015)
+
+  02 Feb 2015; Justin Lecher <jlec@gentoo.org> -libsvm-2.90-r1.ebuild,
+  -libsvm-3.14.ebuild, +libsvm-3.17-r1.ebuild, metadata.xml:
+  Respect CC, #484200
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> libsvm-3.17.ebuild:
   Support python 3.4
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 958dce14c1dc9e1a8e4cfe429b2cf68646d5e427..d37368648ec3cdc50d2d26a9bc55acd8cce33d21 100644 (file)
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.90-fpic.patch 713 SHA256 7b40aba4cf560488c464ede3374c455bb194b2ef6f15e7c447e823c81964fffc SHA512 c26dcbf22cde0ae16a75ef34085e589fe70cffaa412cc9e9b034cf246fb3073ac6197605076c01e250cd52f2f71711e82e6971850daabae3bb8160d59fe50697 WHIRLPOOL a0a539c336856cfadbfef396bdeccd041b845df0b5a57047a38ed90dda68402daa21eed293007ecc5793f4710811cc071b8944e17a9a41635a8ce6151ed1f2cf
 AUX 2.90-ldflags.patch 662 SHA256 0fb14dfeb3dc508210d2353bc9a1ab5081c7af11223f297b01c651d7a98c450b SHA512 f77944d2c41bc110ef69a556916a9acd5d602aa2b468edf9f75bb306ea23ad4fb306f5bcf855b3b95b9003c22990096f7b280b5d02e1c8eaf7eb2ce1768cb419 WHIRLPOOL 947bd3f0789a4c4c58154d253a252891b81b649bde9b53cdedf331eb4e73813d5973a1068bf453b36a4ce60698488506c20651662b9d537d66c1d746140b1827
@@ -7,18 +7,27 @@ AUX 2.90-python3.patch 408 SHA256 6c319490e6856fe5636de80a2fb89da3765511d9a1854d
 AUX 3.11-openmp.patch 939 SHA256 642c56ffaf5cd1415b0707b25dd1c3cf1009715938d298ddb7a612bc2f3854f0 SHA512 69428a119162f056f8cf94083a8bd257ef365ab2ae204b14d991eb5a4204a0ec49f5deb4b240e971a3c360474d4876cbc5c1b49c6bef9dc2939c1ffd7a2772c8 WHIRLPOOL 5e925d6b62d061700ac59755d90ab270623bb3172e00973869692184de9c01565d1407594e39528c3a231b21e10cc93a18e6d5e713ac4597f8e07da08ea45f87
 AUX 3.12-makefile.patch 1616 SHA256 a60c310fc0ecab6e33d45a1ab6d8cd2403e4a4d20d935f7ac91d1bc085959c42 SHA512 f10a8489628055e1e03f3e73c4f7ce22169024abcda8bc18f191fc21068a2494cb7f936c4f4187e8a464ca5cdfce71a6087cece90ed917a3dc5e1fd63cc97f87 WHIRLPOOL e3cbe0e75859dc0a2c851f7101bef74d4d9fcdfe2458f7f7e1f43dddfb2408f236132bb8f8face9eba2309aa7f9c8878f0b063623a0cede5edd43389a600f994
 AUX 3.14-makefile.patch 1630 SHA256 e8dbacc074d91cbfc4e0f523de1c27557848853580ed71582d5cbd600b8a809d SHA512 787b9f34f1bad7da78381a2ee68201e8340090d7c692d04e5e1e440471b8c5ac4fe05bb9385f5ddc5c74550258423cd81bad571a7499186ca8ccb57a7e1fe971 WHIRLPOOL c4e994847f37c5017451f02dabe0d3bd9e233d15ba5ac09973e1f8fa70ffd374f6c7bb3e1f83a5fa0ed3bfd33b894cd74c3ae82524d81c3153588217c97d1d2b
-DIST libsvm-2.9.tar.gz 563829 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757
-DIST libsvm-3.14.tar.gz 603819 SHA256 c968528b6360a8d420f259ce531f76c3c30070cf20f2d334652f828d04cd4aa3 SHA512 7d8681ba65ea754998fcfa702db4297cb2259e59f53a494e3d4e7aa06a9d2c67bc68bfc7a57d64d4008649523cae0ad7315c338036e9aa59416bb7a3486f33f6 WHIRLPOOL ede159ab92c2b60afe0092dee12386f28e8a9a4162e8300076b5e0917c6371c26dae4a4eb8575fa4200399789d3cd461c4e9212168f6da95d9c0d6e1c9a2f4d2
 DIST libsvm-3.17.tar.gz 607892 SHA256 46a4750d3506e6ccd8adf7e3e1f482d86ce9c5368f9c78e19c7923edf0067a12 SHA512 43f3e7cbee37b583cd65041465ef620ab7b3a24ad3f0e70cc2f41efea847e8c1c7319a92b53262bc5f721a46c0cfb4d51102d2e29c93b6ccae03ecf006e53d2d WHIRLPOOL 9518e2aeb5d2f0ac0945fa193edfaf7ba022729cc9ea91e5a773fed638fdcaef4d4bea0f284f1698571b570f5543afc8987ec81a54637d537c709b09474f6fbc
-EBUILD libsvm-2.90-r1.ebuild 2358 SHA256 0d0481f369bc12e3d91ada2ae9cf44dc6d53895a0b5d42c9767c8d39d97754e3 SHA512 44e83a8e3524ca1f783efc455aefb44c1f218d2d3663222a08bd342a95e5da38d10d695c66579fd55e188b3f7cc8128dde1c4df7a0fe3f5ed82bb5be2168e8f3 WHIRLPOOL af8883c731fa51b74fc12791deebf03a6598872949b57c79040ed1bd90ec64f3f5994401abae0c7e754a783b3224df46d4f41290efd6081e1c84c441f1f9ccbc
-EBUILD libsvm-3.14.ebuild 2128 SHA256 e212dd35d97339d26cd97d5c5abaaa7356a748050fd17e26eed5a65b52b7431e SHA512 412967e2894431f2c262e6da6906282915daef6f334b498916ec19950a13403a0ce6661a741eddbe141af1758782750bd4cc19110415d992085e9c9ec1c49313 WHIRLPOOL 625c8e3288651857734a02f090b2863adf7af954e75a22afc8a898ecd840ea7e035a0e85aea56f2c6a0cfd6b34337bfacedd4e857a5eca6a00d56557646eb0bb
+EBUILD libsvm-3.17-r1.ebuild 2153 SHA256 1a875f1ab0a93b1a64e22436657100690c0a37cf6b73d60398c341d6291f8773 SHA512 adc961ff7015faefcd326f449ebfae930f9166b06148981666d973545e77727890dc3f3c89e294747ceb2adffeb862a53537c39ef998094cfa2f80a7e80e3609 WHIRLPOOL 5aa03b9e532f330aefc4df60adbcf228eafd9fc1a22090d521ee1a15774412aa8f0d502bbde9831821c71c4cd5079e245ec430f62edcfa03ab6309384561bc1f
 EBUILD libsvm-3.17.ebuild 2150 SHA256 a7cf160521e4b5193cac7b4c8951a6a8423685c2466902eef1b821db343e1144 SHA512 643ce9ea9cb2a184c2a3ddb0491d87600c2141d97b81004ca35420f67a0589e41e5641a6289c1a4be201af39d8f42c7ea4d82a7d0e6b734613ac00255e9616b4 WHIRLPOOL 9751049af52e4a7d0462a02f319c5f0284ee68a9514467aa22d93e632a8027a9d318a51acd7e7cf05e03aebeec74f66c1494eabc51efd22037d5b9dc5d50c08e
-MISC ChangeLog 5699 SHA256 739d1224bd195bef74e0efc855dceb4faf777f388b3698f365694658c87caeee SHA512 a805efea10e553643ce0d2bf77cd0f06ab862563e3403ace59b5c1f8cec1c33188911872a76ca80323382bbff33453340d0e343d727408d8c546cce5df983b96 WHIRLPOOL 10b8c973d72cd2c09da1e92012a4b8967b11b5368ca57d15f2fb667d9f6a7ba42df1cf366082433540bc00981f9fb8cf78729c5648f9d8717a7a438683db9ec9
-MISC metadata.xml 608 SHA256 3ea9632635376991d0e7d46a2346dd9c9338df6d5619f3db9bf57c6f9c7c8545 SHA512 649f87f606cc2aed21d734df13207a43442985da0470e987c539660efd9e563aa7b5abcb8fc48b586d05aee218e591fe3bdff89590e951e0eba4a6e3caf13421 WHIRLPOOL df7635b2f164ad3fc672b73e1951a8d26a2992f888a9da1c44b3daa4af5c53dafbb4709ffa204979bfa4fcb9ec8eec736a1fcf7c9295d396d91f1c49e094df33
+MISC ChangeLog 5884 SHA256 2976405fb2d5e5066c01635f9f6a761fcf1f61c17f076518051c9dfd81c17681 SHA512 2abcce69afe2f63d0b3b60838e5540ef06fbdb271465a5341ca9e61a39ce48e3871d5dd5270e3e4958a60f17931765311d491bef3f3257742cb501a1665fbcdf WHIRLPOOL acc401e166bc78e9f8e1f5bebc372b119737a7cecb4382d1a0287e850143ba74f47e5dbd187d44313eb21ab3b365d03a67e943b29ad6a8f7b97c570224a0d878
+MISC metadata.xml 618 SHA256 f4d3b3da264ea448b8903176a0b748216691ef910bda5c96d1a04224e8de713b SHA512 9e3a2ecc1322424d0c713485541a1bf846ef5413436586a38dcbfb8341703ede56f1c33b2af3c572277d9da5d89e5601bacbc4abd951fc3fd0cafa38db28d898 WHIRLPOOL 7e50df91bb50a3fde8c8417a2adee3ed09d764918374da8703e8624a9c66a7c9ac3e85e3543f3fa1cde9bb053943ccc056f37139a47c4befefb300c1eaa6838c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlR4kNYACgkQCaWpQKGI+9QwIwCeMDhDW37mO8VFXmk2bTQtvEVs
-b5AAnir8cCw6Gpy/1s+uETg8uWDr0yzR
-=Q9OH
+iQJ8BAEBCgBmBQJUzzDPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruOwP/j6qEGPDVi2CJzFok/Wek8wi
+6XqdThPtNUg6cjkJeg9v39LRRHMf0XdCDnOOGxG9HrqGgWlt1Uj3VbGbcsxcLSHa
+JvwMOJz7G0Not/BF8gcyRvkrnj+LGkbsfIT5F+AkTPaOW1/SGlCQJ6Rj4a2GssX/
+iiCErmLHqaoxYVsLAROJHEaLGiZlZOWx5oR6ctB8RNFbAgIP8MEE8lETSQd6+J2i
+uElXR/CByE4SFjtWr2CZcC6dljNDsKwH24hFf0CCiVo2dlgyrgW7DnYbtqMklYFM
+OwK7OcjHEugQkHlDOeqok+7O7jxjARD7YTqaukocAIchgN36f2JlLejujr/HlGlc
+BViifeoGGi+ByH/+jVnpXU+F1SESGbZvUaZytxw7rfMYeHELJK1UVoFqOsWo4d1R
+c1/9EoCBIlGPTfuOjPVzr4XDNUeEg+wy5kwYZCNZMX3G8Fhhj3tQdZdjWIBx64VV
+arwaG+ObYE0RUJQLbalO125AfRPOCt8jlH4BS3LLoaNvo7hSKWEqM6GdFSnZtpjp
+txdVlF+CMJ8t4Q0I4HPMKugYFCzi8NJ3jX2fe8CYcYn4Y2p74nuiGifgYXwKVy5b
+5YdKjcuc1Y2nDoP/4qofs9O/0CnWoWIVBTSro4rA/ZHFmx9Yg1tZJAfNU9LqbDWh
+TD2ASrznlsNsNP+klPmW
+=Drah
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libsvm/libsvm-2.90-r1.ebuild b/sci-libs/libsvm/libsvm-2.90-r1.ebuild
deleted file mode 100644 (file)
index 845d72c..0000000
--- a/sci-libs/libsvm/libsvm-2.90-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-2.90-r1.ebuild,v 1.5 2010/04/18 17:37:00 nixnut Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils java-pkg-opt-2 python toolchain-funcs multilib
-
-MY_P="${PN}-${PV%0}"
-
-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/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="java python tools"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-       tools? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PV}-fpic.patch
-       epatch "${FILESDIR}"/${PV}-ldflags.patch
-       epatch "${FILESDIR}"/${PV}-python3.patch
-       python_copy_sources
-}
-
-src_compile() {
-       emake \
-               CXX="$(tc-getCXX)" \
-               LDFLAGS="${LDFLAGS}" \
-               CFLAGS="${CXXFLAGS}" \
-               || die "emake failed"
-
-       sed -i -e 's@\.\./@/usr/bin/@g' tools/*.py \
-               || die "Failed to fix paths in python files"
-
-       if use python ; then
-               compilation () {
-                       pushd python
-                       emake \
-                               CXX="$(tc-getCXX)" \
-                               LDFLAGS="${LDFLAGS} -shared" \
-                               CFLAGS="${CXXFLAGS} -I$(python_get_includedir) -I.." \
-                               all || die "emake for python modules failed"
-                       popd
-               }
-               python_execute_function -s compilation
-       fi
-
-       if use java ; then
-               pushd java
-               local JAVAC_FLAGS="$(java-pkg_javac-args)"
-               sed -i \
-                       -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-                       Makefile || die "Failed to fix java makefile"
-               emake || die "emake for java modules failed"
-               popd
-       fi
-}
-
-src_install() {
-       dobin svm-train svm-predict svm-scale \
-               || die "Failed to install binaries"
-       dohtml FAQ.html || die
-       dodoc README || die
-
-       if use tools; then
-               pushd tools
-               insinto /usr/share/${PN}/tools
-               doins easy.py grid.py subset.py \
-                       || die "Failed to install python tools"
-               docinto tools
-               dodoc README || die
-               popd
-       fi
-
-       if use python ; then
-               installation() {
-                       pushd python
-                       insinto $(python_get_sitedir)
-                       doins svmc.so svm.py \
-                               || die "Failed to install python scripts"
-                       docinto python
-                       dodoc README || die
-                       popd
-               }
-               python_execute_function -s installation
-       fi
-
-       if use java; then
-               pushd java
-               java-pkg_dojar libsvm.jar
-               docinto java
-               dohtml test_applet.html || die
-               popd
-       fi
-}
diff --git a/sci-libs/libsvm/libsvm-3.14.ebuild b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
similarity index 78%
rename from sci-libs/libsvm/libsvm-3.14.ebuild
rename to sci-libs/libsvm/libsvm-3.17-r1.ebuild
index 7e9bb55317a5497020e2630f582efa2501b95a5a..9c78c36810869c10452050328f5f51b6a1903703 100644 (file)
--- a/sci-libs/libsvm/libsvm-3.14.ebuild
+++ b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.14.ebuild,v 1.1 2012/11/29 19:04:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.17-r1.ebuild,v 1.1 2015/02/02 08:09:51 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
-inherit eutils java-pkg-opt-2 python flag-o-matic toolchain-funcs
+inherit eutils java-pkg-opt-2 python-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for Support Vector Machines"
 HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
@@ -29,11 +29,10 @@ pkg_setup() {
                        die "Need an OpenMP capable compiler"
                else
                        append-ldflags -fopenmp
-                       append-cxxflags -fopenmp
+                       append-flags -fopenmp
                fi
-               append-cxxflags -DOPENMP
+               append-flags -DOPENMP
        fi
-       use python && python_pkg_setup
 }
 
 src_prepare() {
@@ -49,7 +48,7 @@ src_prepare() {
                        -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
                        java/Makefile || die "Failed to fix java makefile"
        fi
-       tc-export CXX
+       tc-export CXX CC
 }
 
 src_compile() {
@@ -78,10 +77,11 @@ src_install() {
 
        if use python ; then
                installation() {
-                       insinto $(python_get_sitedir)
-                       doins python/*.py
+                       touch python/__init__.py || die
+                       python_moduleinto libsvm
+                       python_domodule python/*.py
                }
-               python_execute_function installation
+               python_foreach_impl installation
                newdoc python/README README.python
        fi
 
diff --git a/sci-libs/libsvm/metadata.xml b/sci-libs/libsvm/metadata.xml
index d3a52c3c71cce35c26c8373381cce600c6d20c93..3c124a8104e4dcdd3eab604f326089cfeeb26bf8 100644 (file)
--- a/sci-libs/libsvm/metadata.xml
+++ b/sci-libs/libsvm/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
  The LIBSVM library is used to calculate Support Vector Machine
  optimizations  with a great variety of options. It includes
  one-class, two-class, multiclass, regression-mode, and probablistic
  output functionality. It is primarily of interest to machine-learning
  researchers and artificial intelligence application developers.
 </longdescription>
-<use>
-  <flag name="tools">Install python based tool scripts</flag>
-</use>
+  <use>
+    <flag name="tools">Install python based tool scripts</flag>
+  </use>
 </pkgmetadata>
Unnamed repository; edit this file 'description' to name the repository.