[gentoo-commits] proj/sci:master commit in: sci-libs/clfft/

[Justin Lecher]

commit:     280c06ecf91d57b80e671a7795307b3d6666b662
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 15:56:24 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 15:57:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=280c06ec

sci-libs/clfft: Drop old

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/clfft/clfft-0.9999.ebuild | 51 -----------------------------------
 sci-libs/clfft/clfft-2.4-r1.ebuild | 54 --------------------------------------
 sci-libs/clfft/clfft-2.6.1.ebuild  |  9 ++++---
 sci-libs/clfft/clfft-9999.ebuild   | 17 +++++++-----
 4 files changed, 16 insertions(+), 115 deletions(-)

diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild
deleted file mode 100644
index fa91bc5..0000000
--- a/sci-libs/clfft/clfft-0.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils git-r3
-
-MY_PN="clFFT"
-
-DESCRIPTION="A software library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=sys-devel/gcc-4.6:*
-	virtual/opencl
-	dev-libs/boost"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-cpp/gtest
-#		sci-libs/fftw:3.0
-#	)"
-
-# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/clfft-2.4-fix-cmake-config-install.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-			die "Compilation with gcc older than 4.6 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-	   $(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/clfft/clfft-2.4-r1.ebuild b/sci-libs/clfft/clfft-2.4-r1.ebuild
deleted file mode 100644
index 00f177e..0000000
--- a/sci-libs/clfft/clfft-2.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-MY_PN="clFFT"
-
-DESCRIPTION="A software library containing FFT functions written in OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/${MY_PN}-${PV}/src"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=sys-devel/gcc-4.6:*
-	virtual/opencl
-	dev-libs/boost"
-DEPEND="${RDEPEND}"
-#	test? (
-#		dev-cpp/gtest
-#		sci-libs/fftw:3.0
-#	)"
-
-# The tests only get compiled to an executable named Test, which is not recogniozed by cmake.
-# Therefore src_test() won't execute any test.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-client_CMakeLists.patch
-	"${FILESDIR}/${P}"-scripts_perf_CMakeLists.patch
-	"${FILESDIR}/${P}"-fix-cmake-config-install.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
-			die "Compilation with gcc older than 4.6 is not supported."
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-	   $(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/clfft/clfft-2.6.1.ebuild b/sci-libs/clfft/clfft-2.6.1.ebuild
index 0e70116..bbb7f4e 100644
--- a/sci-libs/clfft/clfft-2.6.1.ebuild
+++ b/sci-libs/clfft/clfft-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -8,14 +8,13 @@ inherit cmake-utils
 
 MY_PN="clFFT"
 
-DESCRIPTION="A software library containing FFT functions written in OpenCL"
+DESCRIPTION="Library containing FFT functions written in OpenCL"
 HOMEPAGE="https://github.com/clMathLibraries/clFFT"
 SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/${MY_PN}-${PV}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="+client examples test"
 
 RDEPEND="
@@ -32,6 +31,8 @@ DEPEND="${RDEPEND}"
 # Therefore src_test() won't execute any test.
 RESTRICT="test"
 
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
 PATCHES=(
 	"${FILESDIR}/${P}"-Install-cmake-configuration-to-lib-cmake-clFFT.patch
 	"${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch

diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild
index 3edc6c9..7c62a2c 100644
--- a/sci-libs/clfft/clfft-9999.ebuild
+++ b/sci-libs/clfft/clfft-9999.ebuild
@@ -8,14 +8,17 @@ inherit cmake-utils git-r3
 
 MY_PN="clFFT"
 
-DESCRIPTION="A software library containing FFT functions written in OpenCL"
+DESCRIPTION="Library containing FFT functions written in OpenCL"
 HOMEPAGE="https://github.com/clMathLibraries/clFFT"
-EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git"
+EGIT_REPO_URI="
+	https://github.com/clMathLibraries/${MY_PN}.git
+	git://github.com/clMathLibraries/${MY_PN}.git
+	"
 EGIT_BRANCH="develop"
-S="${WORKDIR}/${P}/src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS=""
 IUSE="+client examples test"
 
 RDEPEND="
@@ -32,6 +35,8 @@ DEPEND="${RDEPEND}"
 # Therefore src_test() won't execute any test.
 RESTRICT="test"
 
+S="${WORKDIR}/${P}/src"
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
@@ -42,9 +47,9 @@ pkg_pretend() {
 
 src_configure() {
 	local mycmakeargs=(
-        $(cmake-utils_use_build client CLIENT)
-        $(cmake-utils_use_build examples EXAMPLES)
-        $(cmake-utils_use_build test TEST)
+		$(cmake-utils_use_build client CLIENT)
+		$(cmake-utils_use_build examples EXAMPLES)
+		$(cmake-utils_use_build test TEST)
 	)
 	cmake-utils_src_configure
 }