commit: fb9e842d8deb636246306feb8d30b1996dbbbc74 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Fri Mar 28 00:24:57 2014 +0000 Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> CommitDate: Fri Mar 28 00:24:57 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb9e842d
Unify the specialties between live and non-live ebuild so only one if-clause is needed, fixes code duplication. --- sci-physics/genfit/ChangeLog | 5 +++++ sci-physics/genfit/genfit-02.00.00.ebuild | 6 +++--- sci-physics/genfit/genfit-9999.ebuild | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sci-physics/genfit/ChangeLog b/sci-physics/genfit/ChangeLog index 99d6f82..deeb279 100644 --- a/sci-physics/genfit/ChangeLog +++ b/sci-physics/genfit/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Mar 2014; Oliver Freyermuth <o.freyerm...@googlemail.com> + genfit-02.00.00.ebuild, genfit-9999.ebuild: + Unify the specialties between live and non-live ebuild so only one if-clause + is needed. + *genfit-9999 (25 Mar 2014) 25 Mar 2014; Oliver Freyermuth <o.freyerm...@googlemail.com> diff --git a/sci-physics/genfit/genfit-02.00.00.ebuild b/sci-physics/genfit/genfit-02.00.00.ebuild index 375e355..963de55 100644 --- a/sci-physics/genfit/genfit-02.00.00.ebuild +++ b/sci-physics/genfit/genfit-02.00.00.ebuild @@ -5,6 +5,7 @@ EAPI=5 inherit cmake-utils versionator + if [[ ${PV} == *9999* ]]; then inherit subversion ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk" @@ -12,6 +13,8 @@ if [[ ${PV} == *9999* ]]; then else TAG_VER=${PN}-code-1688-tags-v$(replace_all_version_separators '-') SRC_URI="http://sourceforge.net/code-snapshots/svn/g/ge/genfit/code/${TAG_VER}.zip" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S=${WORKDIR}/${TAG_VER} fi DESCRIPTION="a generic toolkit for track reconstruction for experiments in particle and nuclear physics" @@ -19,7 +22,6 @@ HOMEPAGE="http://genfit.sourceforge.net/Main.html" LICENSE="LGPL-3" SLOT="0" -[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" RDEPEND=" @@ -28,8 +30,6 @@ RDEPEND=" DEPEND="${RDEPEND} doc? ( app-doc/doxygen[dot] )" -[[ ${PV} == *9999* ]] || S=${WORKDIR}/${TAG_VER} - src_compile() { cmake-utils_src_compile use doc && cmake-utils_src_compile doc diff --git a/sci-physics/genfit/genfit-9999.ebuild b/sci-physics/genfit/genfit-9999.ebuild index 375e355..963de55 100644 --- a/sci-physics/genfit/genfit-9999.ebuild +++ b/sci-physics/genfit/genfit-9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 inherit cmake-utils versionator + if [[ ${PV} == *9999* ]]; then inherit subversion ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk" @@ -12,6 +13,8 @@ if [[ ${PV} == *9999* ]]; then else TAG_VER=${PN}-code-1688-tags-v$(replace_all_version_separators '-') SRC_URI="http://sourceforge.net/code-snapshots/svn/g/ge/genfit/code/${TAG_VER}.zip" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + S=${WORKDIR}/${TAG_VER} fi DESCRIPTION="a generic toolkit for track reconstruction for experiments in particle and nuclear physics" @@ -19,7 +22,6 @@ HOMEPAGE="http://genfit.sourceforge.net/Main.html" LICENSE="LGPL-3" SLOT="0" -[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples" RDEPEND=" @@ -28,8 +30,6 @@ RDEPEND=" DEPEND="${RDEPEND} doc? ( app-doc/doxygen[dot] )" -[[ ${PV} == *9999* ]] || S=${WORKDIR}/${TAG_VER} - src_compile() { cmake-utils_src_compile use doc && cmake-utils_src_compile doc