From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-807214-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id D497B138CD3
for <garchives@archives.gentoo.org>; Sat, 6 Jun 2015 09:46:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 98D88E0893;
Sat, 6 Jun 2015 09:46:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 01BD6E0893
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jun 2015 09:46:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 340DF340F80
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jun 2015 09:46:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DE94CA2F
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Jun 2015 09:46:07 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1433510430.b6838f9538d4e226274a445db2c23e434b3e59ce.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/clfft/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-libs/clfft/ChangeLog sci-libs/clfft/clfft-0.9999.ebuild sci-libs/clfft/clfft-2.4.ebuild sci-libs/clfft/clfft-9999.ebuild
X-VCS-Directories: sci-libs/clfft/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: b6838f9538d4e226274a445db2c23e434b3e59ce
X-VCS-Branch: master
Date: Sat, 6 Jun 2015 09:46:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6881e43d-ca4b-41a1-adbf-bf46cad867f1
X-Archives-Hash: 2cb7d75c30f73650c1a8c46524f422ff
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 <marbre@linux.sungazer.de> clfft-0.9999.ebuild,
+ clfft-2.4.ebuild, clfft-9999.ebuild:
+ sci-libs/clfft: Cleanup ebuilds
+
05 Jun 2015; Justin Lecher <jlec@gentoo.org> 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