diff options
author | 2015-07-28 14:06:52 +0000 | |
---|---|---|
committer | 2015-07-28 14:06:52 +0000 | |
commit | a3e0302a33873ca6c1fbd7976dd489ec3a51ea6d (patch) | |
tree | 0d8b38c4b9efa7128314ced69a0ea1e28b71b352 /sci-libs | |
parent | Changelog typo (diff) | |
download | gentoo-2-a3e0302a33873ca6c1fbd7976dd489ec3a51ea6d.tar.gz gentoo-2-a3e0302a33873ca6c1fbd7976dd489ec3a51ea6d.tar.bz2 gentoo-2-a3e0302a33873ca6c1fbd7976dd489ec3a51ea6d.zip |
Drop obsolete patches
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/libsvm/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/libsvm/files/2.90-fpic.patch | 26 | ||||
-rw-r--r-- | sci-libs/libsvm/files/2.90-ldflags.patch | 19 | ||||
-rw-r--r-- | sci-libs/libsvm/files/2.90-python3.patch | 13 | ||||
-rw-r--r-- | sci-libs/libsvm/files/3.12-makefile.patch | 45 |
5 files changed, 6 insertions, 104 deletions
diff --git a/sci-libs/libsvm/ChangeLog b/sci-libs/libsvm/ChangeLog index 2ed2fbe9e3cd..c0511fd90870 100644 --- a/sci-libs/libsvm/ChangeLog +++ b/sci-libs/libsvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/libsvm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.43 2015/05/28 06:18:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/ChangeLog,v 1.44 2015/07/28 14:06:52 jlec Exp $ + + 28 Jul 2015; Justin Lecher <jlec@gentoo.org> -files/2.90-fpic.patch, + -files/2.90-ldflags.patch, -files/2.90-python3.patch, + -files/3.12-makefile.patch: + Drop obsolete patches 28 May 2015; Justin Lecher <jlec@gentoo.org> -libsvm-3.17.ebuild: Drop old diff --git a/sci-libs/libsvm/files/2.90-fpic.patch b/sci-libs/libsvm/files/2.90-fpic.patch deleted file mode 100644 index c0ead5243262..000000000000 --- a/sci-libs/libsvm/files/2.90-fpic.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/python/Makefile b/python/Makefile -index 32268e7..dbc128f 100644 ---- a/python/Makefile -+++ b/python/Makefile -@@ -11,8 +11,8 @@ LDFLAGS = -shared - - all: svmc.so - --svmc.so: svmc_wrap.o ../svm.o -- $(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o ../svm.o -+svmc.so: svmc_wrap.o svm.o -+ $(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o - - svmc_wrap.o: svmc_wrap.c ../svm.h - $(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c -@@ -20,8 +20,8 @@ svmc_wrap.o: svmc_wrap.c ../svm.h - svmc_wrap.c: svmc.i - $(SWIG) -python -noproxy svmc.i - --../svm.o: ../svm.cpp ../svm.h -- cd ..; $(CXX) $(CFLAGS) -fPIC -c svm.cpp -+svm.o: ../svm.cpp ../svm.h -+ $(CXX) $(CFLAGS) -fPIC -c ../svm.cpp -o svm.o - - clean: - rm -f *~ *.o *.so *.pyc *.pyo diff --git a/sci-libs/libsvm/files/2.90-ldflags.patch b/sci-libs/libsvm/files/2.90-ldflags.patch deleted file mode 100644 index 08773d44ed41..000000000000 --- a/sci-libs/libsvm/files/2.90-ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile b/Makefile -index 3781264..ce53201 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,11 +8,11 @@ lib: svm.o - $(CXX) -shared svm.o -o libsvm.so.$(SHVER) - - svm-predict: svm-predict.c svm.o -- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm -+ $(CXX) $(CFLAGS) $(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) $(CFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm - svm-scale: svm-scale.c -- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale -+ $(CXX) $(CFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale - svm.o: svm.cpp svm.h - $(CXX) $(CFLAGS) -c svm.cpp - clean: diff --git a/sci-libs/libsvm/files/2.90-python3.patch b/sci-libs/libsvm/files/2.90-python3.patch deleted file mode 100644 index 764200498ed1..000000000000 --- a/sci-libs/libsvm/files/2.90-python3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/python/svmc_wrap.c b/python/svmc_wrap.c -index 22ea45d..c4282b1 100644 ---- a/python/svmc_wrap.c -+++ b/python/svmc_wrap.c -@@ -758,7 +758,7 @@ SWIG_Python_str_AsChar(PyObject *str) - #if PY_VERSION_HEX >= 0x03000000 - char *cstr; - char *newstr; -- int len; -+ Py_ssize_t len; - str = PyUnicode_AsUTF8String(str); - PyBytes_AsStringAndSize(str, &cstr, &len); - newstr = (char *) malloc(len+1); diff --git a/sci-libs/libsvm/files/3.12-makefile.patch b/sci-libs/libsvm/files/3.12-makefile.patch deleted file mode 100644 index 8577029f05c2..000000000000 --- a/sci-libs/libsvm/files/3.12-makefile.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 |