* [gentoo-commits] repo/gentoo:master commit in: sci-libs/itpp/, sci-libs/itpp/files/
@ 2015-10-30 12:25 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-10-30 12:25 UTC (permalink / raw
To: gentoo-commits
commit: ffbf53305a3ef8f92f033205425641a376c9d059
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 12:24:30 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 12:24:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbf5330
sci-libs/itpp: Drop old
obsoletes
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=561740
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/itpp/Manifest | 2 -
sci-libs/itpp/files/itpp-4.0.6-gcc44.patch | 60 --------------
.../itpp-4.0.7-fastica-fix-endless-loop.patch | 93 ----------------------
sci-libs/itpp/files/itpp-4.2-automake-1.12.patch | 16 ----
.../itpp/files/itpp-4.2-fastica-correct-dim.patch | 26 ------
sci-libs/itpp/files/itpp-4.2-pkg-config.patch | 27 -------
sci-libs/itpp/files/itpp-4.2-test-fftw.patch | 14 ----
sci-libs/itpp/itpp-4.2-r1.ebuild | 66 ---------------
sci-libs/itpp/itpp-4.2-r2.ebuild | 69 ----------------
sci-libs/itpp/itpp-4.3.0.ebuild | 45 -----------
sci-libs/itpp/itpp-4.3.1.ebuild | 45 -----------
11 files changed, 463 deletions(-)
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 9cead3b..880b00c 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,3 +1 @@
-DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7
-DIST itpp-4.3.0.tar.bz2 1196432 SHA256 009b38929eef60be12abd6f516da535d9ea01872cd4b8ec537cfe40311ad5f64 SHA512 e2ad944cdb1325676465920d692577f86885252f9e9eb068084b0edaca17dffd33793e5c502572c21f77b47f8d8f45522ea6a945eb5548553305ab23904a04fa WHIRLPOOL 87a823313363806e894297f23b20bb0cdc11e72cf3388d25cf57c27820793f7c5c41e4a593a954dc431d2f473052defc5bedbdc9e547830d5ceb54f31cb0e6b0
DIST itpp-4.3.1.tar.bz2 1289687 SHA256 50717621c5dfb5ed22f8492f8af32b17776e6e06641dfe3a3a8f82c8d353b877 SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd WHIRLPOOL e4791babcdb9e874a29b8f628af000e93fc316a7da0199713e7b840317d1b1109e4350c7582a3f88db3fe8be03ff8ee93b40712b77f61faa155acc668f39c0e0
diff --git a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch b/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch
deleted file mode 100644
index 6514363..0000000
--- a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur itpp-4.0.6.orig/itpp/base/timing.cpp itpp-4.0.6/itpp/base/timing.cpp
---- itpp-4.0.6.orig/itpp/base/timing.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/timing.cpp 2009-07-30 10:32:45.000000000 +0300
-@@ -27,6 +27,8 @@
- * -------------------------------------------------------------------------
- */
-
-+#include <cstdio>
-+
- #ifndef _MSC_VER
- # include <itpp/config.h>
- #else
-diff -ur itpp-4.0.6.orig/itpp/base/vec.cpp itpp-4.0.6/itpp/base/vec.cpp
---- itpp-4.0.6.orig/itpp/base/vec.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/vec.cpp 2009-07-30 10:35:45.000000000 +0300
-@@ -27,6 +27,8 @@
- * -------------------------------------------------------------------------
- */
-
-+#include <cstdio>
-+
- #include <itpp/base/vec.h>
- #include <itpp/base/converters.h>
- #include <limits>
-diff -ur itpp-4.0.6.orig/itpp/fixed/cfix.cpp itpp-4.0.6/itpp/fixed/cfix.cpp
---- itpp-4.0.6.orig/itpp/fixed/cfix.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/cfix.cpp 2009-07-30 10:37:21.000000000 +0300
-@@ -27,6 +27,8 @@
- * -------------------------------------------------------------------------
- */
-
-+#include <cstdio>
-+
- #include <itpp/fixed/cfix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fix.cpp itpp-4.0.6/itpp/fixed/fix.cpp
---- itpp-4.0.6.orig/itpp/fixed/fix.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fix.cpp 2009-07-30 10:37:39.000000000 +0300
-@@ -27,6 +27,8 @@
- * -------------------------------------------------------------------------
- */
-
-+#include <cstdio>
-+
- #include <itpp/fixed/fix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fixed.cpp itpp-4.0.6/itpp/fixed/fixed.cpp
---- itpp-4.0.6.orig/itpp/fixed/fixed.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fixed.cpp 2009-07-30 10:37:03.000000000 +0300
-@@ -27,6 +27,8 @@
- * -------------------------------------------------------------------------
- */
-
-+#include <cstdio>
-+
- #include <itpp/fixed/fixed.h>
-
-
diff --git a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch b/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch
deleted file mode 100644
index 8d232a4..0000000
--- a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ru libitpp-4.0.7/itpp/signal/fastica.cpp libitpp-4.0.7.patched/itpp/signal/fastica.cpp
---- libitpp-4.0.7/itpp/signal/fastica.cpp 2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.cpp 2010-07-08 16:32:04.000000000 +0200
-@@ -90,7 +90,7 @@
- static mat mpower(const mat A, const double y);
- static ivec getSamples(const int max, const double percentage);
- static vec sumcol(const mat A);
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
- /*! @} */
-
- namespace itpp
-@@ -124,7 +124,7 @@
- }
-
- // Call main function
--void Fast_ICA::separate(void)
-+bool Fast_ICA::separate(void)
- {
-
- int Dim = numOfIC;
-@@ -159,13 +159,14 @@
-
- }
-
-+ bool result = true;
- if (PCAonly == false) {
-
- Dim = whitesig.rows();
-
- if (numOfIC > Dim) numOfIC = Dim;
-
-- fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-+ result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-
- icasig = W * mixedSig;
-
-@@ -174,6 +175,7 @@
- else { // PCA only : returns E as IcaSig
- icasig = VecPr;
- }
-+ return result;
- }
-
- void Fast_ICA::set_approach(int in_approach) { approach = in_approach; if (approach == FICA_APPROACH_DEFL) finetune = true; }
-@@ -437,7 +439,7 @@
-
- }
-
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
- {
-
- int vectorSize = X.rows();
-@@ -511,7 +513,7 @@
- A = dewhiteningMatrix * B;
- W = transpose(B) * whiteningMatrix;
-
-- return;
-+ return false;
- }
-
- B = B * mpower(transpose(B) * B , -0.5);
-@@ -769,7 +771,7 @@
-
- } // IF round
-
-- break;
-+ return false;
-
- } // IF numFailures > failureLimit
-
-@@ -990,5 +992,5 @@
- } // While round <= numOfIC
-
- } // ELSE Deflation
--
-+ return true;
- } // FPICA
-diff -ru libitpp-4.0.7/itpp/signal/fastica.h libitpp-4.0.7.patched/itpp/signal/fastica.h
---- libitpp-4.0.7/itpp/signal/fastica.h 2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.h 2010-07-08 16:24:37.000000000 +0200
-@@ -134,8 +134,9 @@
- \brief Explicit launch of main FastICA function
-
- Explicit launch of the Fast_ICA algorithm.
-+ \returns true if algorithm converged and false otherwise
- */
-- void separate(void);
-+ bool separate(void);
-
- /*!
- \brief Set approach : FICA_APPROACH_DEFL or FICA_APPROACH_SYMM (default)
diff --git a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
deleted file mode 100644
index f383d6f..0000000
--- a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..a1e8448 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,8 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror])
-
-+AM_PROG_AR
-+
- # Shared library versioning
- GENERIC_LIBRARY_VERSION="7:0:0"
- # | | |
diff --git a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch
deleted file mode 100644
index a852abc..0000000
--- a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru itpp-4.2/itpp/signal/fastica.cpp itpp-4.2.new//itpp/signal/fastica.cpp
---- itpp-4.2/itpp/signal/fastica.cpp 2011-06-07 17:47:32.261000884 +0200
-+++ itpp-4.2.new//itpp/signal/fastica.cpp 2011-06-07 17:31:25.757000915 +0200
-@@ -147,6 +147,9 @@
-
- whitenv(mixedSigC, E, diag(D), whitesig, whiteningMatrix, dewhiteningMatrix);
-
-+ Dim = whitesig.rows();
-+
-+ if (numOfIC > Dim) numOfIC = Dim;
-
- ivec NcFirst = to_ivec(zeros(numOfIC));
- vec NcVp = D;
-@@ -161,10 +164,6 @@
- bool result = true;
- if (PCAonly == false) {
-
-- Dim = whitesig.rows();
--
-- if (numOfIC > Dim) numOfIC = Dim;
--
- result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-
- icasig = W * mixedSig;
-Nur in itpp-4.2/itpp/signal: fastica.cpp.orig.
-Nur in itpp-4.2/itpp/signal: fastica.h.orig.
diff --git a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
deleted file mode 100644
index 5a18952..0000000
--- a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- configure.ac | 2 +-
- itpp.pc.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..d3d7b76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,7 +322,7 @@ test "x$FFT_LIBS" != x && LIBS="$FFT_LIBS $LIBS"
- CPPFLAGS="`echo \"$CPPFLAGS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`"
- LDFLAGS="`echo \"$LDFLAGS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`"
- LIBS="`echo \"$LIBS\" | sed -e 's/ */ /g' -e 's/^ //' -e 's/ $//'`"
--LDLIBS="`echo \"$LDFLAGS $LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
-+LDLIBS="`echo \"$LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
-
- if test $enable_explicit_deps = yes; then
- EXPLICIT_LIBS=" $LDLIBS" # the leading space is important here...
-diff --git a/itpp.pc.in b/itpp.pc.in
-index 4018865..48a9543 100644
---- a/itpp.pc.in
-+++ b/itpp.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
- URL: http://itpp.sourceforge.net/
- Libs: -L${libdir} -l@PACKAGE@@EXPLICIT_LIBS@
- Libs.private:@PRIVATE_LIBS@
--Cflags: -I${includedir} @CXXFLAGS_OPT@
-+Cflags: -I${includedir}
diff --git a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch b/sci-libs/itpp/files/itpp-4.2-test-fftw.patch
deleted file mode 100644
index b7bb11d..0000000
--- a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- itpp/branches/itpp-4-2/tests/Makefile.am 2010/09/21 18:23:47 1807
-+++ itpp/branches/itpp-4-2/tests/Makefile.am 2010/12/30 23:47:09 1837
-@@ -20,9 +20,9 @@
-
- OPTIM_TESTS = newton_search_test
-
--SIGNAL_TESTS = filter_test source_test window_test
-+SIGNAL_TESTS = filter_test source_test
- SIGNAL_LAP_TESTS = fastica_test poly_test
--SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test
-+SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test window_test
- SIGNAL_LAP_FFT_TESTS = filter_design_test
-
- STAT_TESTS = histogram_test
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
deleted file mode 100644
index a438f03..0000000
--- a/sci-libs/itpp/itpp-4.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
- blas? ( virtual/blas lapack? ( virtual/lapack ) )
- !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
- blas? ( virtual/pkgconfig )
- doc? ( app-doc/doxygen virtual/latex-base )
- lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
- "${FILESDIR}"/${P}-fastica-correct-dim.patch
- "${FILESDIR}"/${P}-test-fftw.patch
- )
-
-src_prepare() {
- # turn off performance critical debug code
- use debug || append-cppflags -DNDEBUG
- sed \
- -e 's:-pipe::g' \
- -e 's:-Werror::g' \
- -i configure* || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local blasconf="no"
- use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
- local lapackconf="no"
- use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
- local myeconfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --enable-shared
- $(use_enable doc html-doc)
- $(use_enable debug)
- $(use_enable !minimal comm)
- $(use_enable !minimal fixed)
- $(use_enable !minimal optim)
- $(use_enable !minimal protocol)
- $(use_enable !minimal signal)
- $(use_enable !minimal srccode)
- $(use_with fftw fft)
- --with-blas="${blasconf}"
- --with-lapack="${lapackconf}"
- )
- autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild
deleted file mode 100644
index ee3ea76..0000000
--- a/sci-libs/itpp/itpp-4.2-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
- blas? ( virtual/blas lapack? ( virtual/lapack ) )
- !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
- >=sys-devel/automake-1.11.1
- blas? ( virtual/pkgconfig )
- doc? ( app-doc/doxygen virtual/latex-base )
- lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
- "${FILESDIR}"/${P}-fastica-correct-dim.patch
- "${FILESDIR}"/${P}-test-fftw.patch
- "${FILESDIR}"/${P}-automake-1.12.patch
- "${FILESDIR}"/${P}-pkg-config.patch
- )
-
-src_prepare() {
- # turn off performance critical debug code
- use debug || append-cppflags -DNDEBUG
- sed \
- -e 's:-pipe::g' \
- -e 's:-Werror::g' \
- -i configure* || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local blasconf="no"
- use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
- local lapackconf="no"
- use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
- local myeconfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --enable-shared
- $(use_enable doc html-doc)
- $(use_enable debug)
- $(use_enable !minimal comm)
- $(use_enable !minimal fixed)
- $(use_enable !minimal optim)
- $(use_enable !minimal protocol)
- $(use_enable !minimal signal)
- $(use_enable !minimal srccode)
- $(use_with fftw fft)
- --with-blas="${blasconf}"
- --with-lapack="${lapackconf}"
- )
- autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.3.0.ebuild b/sci-libs/itpp/itpp-4.3.0.ebuild
deleted file mode 100644
index db31a1c..0000000
--- a/sci-libs/itpp/itpp-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- virtual/blas
- virtual/lapack
- >=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
- # gentoo redefines the CMAKE_BUILD_TYPE
- sed -i \
- -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
- CMakeLists.txt || die
- # respect gentoo doc dir
- sed -i \
- -e "s:share/doc/itpp:share/doc/${PF}:" \
- itpp/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBLA_VENDOR=Generic
- $(cmake-utils_use doc HTML_DOCS)
- )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.3.1.ebuild b/sci-libs/itpp/itpp-4.3.1.ebuild
deleted file mode 100644
index 38ce5e1..0000000
--- a/sci-libs/itpp/itpp-4.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- virtual/blas
- virtual/lapack
- >=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
- # gentoo redefines the CMAKE_BUILD_TYPE
- sed -i \
- -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
- CMakeLists.txt || die
- # respect gentoo doc dir
- sed -i \
- -e "s:share/doc/itpp:share/doc/${PF}:" \
- itpp/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBLA_VENDOR=Generic
- $(cmake-utils_use doc HTML_DOCS)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/itpp/, sci-libs/itpp/files/
@ 2022-03-02 4:24 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-03-02 4:24 UTC (permalink / raw
To: gentoo-commits
commit: 81e3309856b2cd2cea8ef4a7c6809fbfbf0ae9ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 04:24:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 04:24:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e33098
sci-libs/itpp: update EAPI 6 -> 8
Bug: https://bugs.gentoo.org/834293
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../itpp/files/itpp-4.3.1-use-GNUInstallDirs.patch | 116 +++++++++++++++++++++
sci-libs/itpp/itpp-4.3.1-r2.ebuild | 40 +++++++
2 files changed, 156 insertions(+)
diff --git a/sci-libs/itpp/files/itpp-4.3.1-use-GNUInstallDirs.patch b/sci-libs/itpp/files/itpp-4.3.1-use-GNUInstallDirs.patch
new file mode 100644
index 000000000000..4fa9c464e4e5
--- /dev/null
+++ b/sci-libs/itpp/files/itpp-4.3.1-use-GNUInstallDirs.patch
@@ -0,0 +1,116 @@
+From 3ed973b46b50015108a9577a51feec503f06025f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 2 Mar 2022 04:10:20 +0000
+Subject: [PATCH] Use GNUInstallDirs
+
+---
+ CMakeLists.txt | 4 ----
+ itpp-config.cmake.in | 2 +-
+ itpp.pc.cmake.in | 2 +-
+ itpp/CMakeLists.txt | 23 ++++++++++++-----------
+ 4 files changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a2c6958..cd661d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,12 +172,8 @@ endif()
+ option(ITPP_SHARED_LIB "Building IT++ as shared library" on)
+ #set library name here to be available for all targets
+ if (ITPP_SHARED_LIB)
+- if ((CMAKE_BUILD_TYPE STREQUAL Release) OR (NOT CMAKE_BUILD_TYPE))
+ set (libitpp_target itpp)
+ set (CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
+- else()
+- set (libitpp_target itpp_debug)
+- endif()
+ else()
+ set (libitpp_target itpp_static)
+ endif()
+diff --git a/itpp-config.cmake.in b/itpp-config.cmake.in
+index d24b57f..7d31753 100644
+--- a/itpp-config.cmake.in
++++ b/itpp-config.cmake.in
+@@ -2,7 +2,7 @@
+
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include
+
+ debug_flag=no
+diff --git a/itpp.pc.cmake.in b/itpp.pc.cmake.in
+index d92ce96..ac62b88 100644
+--- a/itpp.pc.cmake.in
++++ b/itpp.pc.cmake.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+
+ Name: @PACKAGE_NAME@
+diff --git a/itpp/CMakeLists.txt b/itpp/CMakeLists.txt
+index e8c78d3..ee8f587 100644
+--- a/itpp/CMakeLists.txt
++++ b/itpp/CMakeLists.txt
+@@ -24,6 +24,7 @@
+ # with IT++. If not, see <http://www.gnu.org/licenses/>.
+ #
+ # -------------------------------------------------------------------------
++include(GNUInstallDirs)
+
+ file ( GLOB ITPP_SRCS
+ "base/*.cpp"
+@@ -68,18 +69,18 @@ set_target_properties(${libitpp_target} PROPERTIES VERSION ${LIBITPP_VERSION_STR
+
+ #library
+ install(TARGETS ${libitpp_target}
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ #headers
+-install(DIRECTORY ${CMAKE_SOURCE_DIR}/itpp DESTINATION include FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY ${CMAKE_SOURCE_DIR}/itpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
+ if (WIN32 AND NOT MINGW)
+- install(FILES ${CMAKE_BINARY_DIR}/itpp/config_msvc.h DESTINATION include/itpp)
++ install(FILES ${CMAKE_BINARY_DIR}/itpp/config_msvc.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/itpp)
+ else()
+- install(FILES ${CMAKE_BINARY_DIR}/itpp/config.h DESTINATION include/itpp)
++ install(FILES ${CMAKE_BINARY_DIR}/itpp/config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/itpp)
+ endif()
+-install(FILES ${CMAKE_BINARY_DIR}/itpp/itexports.h DESTINATION include/itpp)
++install(FILES ${CMAKE_BINARY_DIR}/itpp/itexports.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/itpp)
+
+ #extra files (MATLAB and python)
+ install(FILES ${CMAKE_SOURCE_DIR}/extras/itsave.m
+@@ -97,7 +98,7 @@ if (HTML_DOCS AND DOXYGEN_FOUND)
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Generating API documentation with Doxygen" VERBATIM)
+ file(COPY ${CMAKE_SOURCE_DIR}/doc/images/itpp_logo.png DESTINATION ${CMAKE_BINARY_DIR}/html)
+- install(DIRECTORY ${CMAKE_BINARY_DIR}/html DESTINATION share/doc/itpp)
++ install(DIRECTORY ${CMAKE_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/itpp)
+ endif()
+
+ #itpp-config script for UNIX-like systems
+@@ -108,8 +109,8 @@ if (UNIX)
+ configure_file(${CMAKE_SOURCE_DIR}/itpp-config.cmake.in ${CMAKE_BINARY_DIR}/itpp-config @ONLY)
+ configure_file(${CMAKE_SOURCE_DIR}/itpp-config.1.cmake.in ${CMAKE_BINARY_DIR}/itpp-config.1 @ONLY)
+ configure_file(${CMAKE_SOURCE_DIR}/itpp.pc.cmake.in ${CMAKE_BINARY_DIR}/itpp.pc @ONLY)
+- install(FILES ${CMAKE_BINARY_DIR}/itpp-config DESTINATION bin PERMISSIONS OWNER_READ OWNER_EXECUTE
++ install(FILES ${CMAKE_BINARY_DIR}/itpp-config DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+- install(FILES ${CMAKE_BINARY_DIR}/itpp-config.1 DESTINATION share/man/man1)
+- install(FILES ${CMAKE_BINARY_DIR}/itpp.pc DESTINATION lib/pkgconfig)
++ install(FILES ${CMAKE_BINARY_DIR}/itpp-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
++ install(FILES ${CMAKE_BINARY_DIR}/itpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+--
+2.35.1
+
diff --git a/sci-libs/itpp/itpp-4.3.1-r2.ebuild b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
new file mode 100644
index 000000000000..545434c5022b
--- /dev/null
+++ b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ library of mathematical, signal processing and communication"
+HOMEPAGE="http://itpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="sci-libs/fftw:3.0=
+ virtual/blas
+ virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ virtual/latex-base
+ )"
+
+DOCS=( ChangeLog NEWS AUTHORS README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-use-GNUInstallDirs.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBLA_VENDOR=Generic
+ -DHTML_DOCS=$(usex doc)
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-02 4:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-02 4:24 [gentoo-commits] repo/gentoo:master commit in: sci-libs/itpp/, sci-libs/itpp/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2015-10-30 12:25 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox