commit: b6838f9538d4e226274a445db2c23e434b3e59ce Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Fri Jun 5 13:20:30 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Fri Jun 5 13:20:30 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b6838f95
sci-libs/clfft: Cleanup ebuilds Package-Manager: portage-2.2.18 sci-libs/clfft/ChangeLog | 4 ++++ sci-libs/clfft/clfft-0.9999.ebuild | 28 +++++++--------------------- sci-libs/clfft/clfft-2.4.ebuild | 27 +++++++-------------------- sci-libs/clfft/clfft-9999.ebuild | 26 ++++---------------------- 4 files changed, 22 insertions(+), 63 deletions(-) diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog index a30e2d4..1052fa2 100644 --- a/sci-libs/clfft/ChangeLog +++ b/sci-libs/clfft/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Jun 2015; Marius Brehler <[email protected]> clfft-0.9999.ebuild, + clfft-2.4.ebuild, clfft-9999.ebuild: + sci-libs/clfft: Cleanup ebuilds + 05 Jun 2015; Justin Lecher <[email protected]> metadata.xml: sci-libs/clfft: Add github to remote-id in metadata.xml diff --git a/sci-libs/clfft/clfft-0.9999.ebuild b/sci-libs/clfft/clfft-0.9999.ebuild index 994dad9..c2a4197 100644 --- a/sci-libs/clfft/clfft-0.9999.ebuild +++ b/sci-libs/clfft/clfft-0.9999.ebuild @@ -4,25 +4,14 @@ EAPI=5 -inherit cmake-utils +inherit cmake-utils git-r3 MY_PN="clFFT" DESCRIPTION="A software library containing FFT functions written in OpenCL" HOMEPAGE="https://github.com/clMathLibraries/clFFT"; - -if [ ${PV} == "9999" ] || [ ${PV} == "0.9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git" - S="${WORKDIR}/${P}/src" - if [ ${PV} == "9999" ]; then - EGIT_BRANCH="develop" - fi -else - SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${MY_PN}-${PV}/src" -fi +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" @@ -42,13 +31,10 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" -# Patches are only needed for the recent master and releases <= 2.4 -if [ ${PV} != "9999" ]; then - PATCHES=( - "${FILESDIR}"/clfft-client_CMakeLists.patch - "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch - ) -fi +PATCHES=( + "${FILESDIR}"/clfft-client_CMakeLists.patch + "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch +) pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then diff --git a/sci-libs/clfft/clfft-2.4.ebuild b/sci-libs/clfft/clfft-2.4.ebuild index 994dad9..52c3156 100644 --- a/sci-libs/clfft/clfft-2.4.ebuild +++ b/sci-libs/clfft/clfft-2.4.ebuild @@ -10,19 +10,9 @@ MY_PN="clFFT" DESCRIPTION="A software library containing FFT functions written in OpenCL" HOMEPAGE="https://github.com/clMathLibraries/clFFT"; - -if [ ${PV} == "9999" ] || [ ${PV} == "0.9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git" - S="${WORKDIR}/${P}/src" - if [ ${PV} == "9999" ]; then - EGIT_BRANCH="develop" - fi -else - SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${MY_PN}-${PV}/src" -fi +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" @@ -42,13 +32,10 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" -# Patches are only needed for the recent master and releases <= 2.4 -if [ ${PV} != "9999" ]; then - PATCHES=( - "${FILESDIR}"/clfft-client_CMakeLists.patch - "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch - ) -fi +PATCHES=( + "${FILESDIR}"/clfft-client_CMakeLists.patch + "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch +) pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild index 994dad9..b87b3fb 100644 --- a/sci-libs/clfft/clfft-9999.ebuild +++ b/sci-libs/clfft/clfft-9999.ebuild @@ -4,25 +4,15 @@ EAPI=5 -inherit cmake-utils +inherit cmake-utils git-r3 MY_PN="clFFT" DESCRIPTION="A software library containing FFT functions written in OpenCL" HOMEPAGE="https://github.com/clMathLibraries/clFFT"; - -if [ ${PV} == "9999" ] || [ ${PV} == "0.9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/clMathLibraries/${MY_PN}.git git://github.com/clMathLibraries/${MY_PN}.git" - S="${WORKDIR}/${P}/src" - if [ ${PV} == "9999" ]; then - EGIT_BRANCH="develop" - fi -else - SRC_URI="https://github.com/clMathLibraries/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${MY_PN}-${PV}/src" -fi +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" @@ -42,14 +32,6 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" -# Patches are only needed for the recent master and releases <= 2.4 -if [ ${PV} != "9999" ]; then - PATCHES=( - "${FILESDIR}"/clfft-client_CMakeLists.patch - "${FILESDIR}"/clfft-scripts_perf_CMakeLists.patch - ) -fi - pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then
