Gentoo Archives: gentoo-commits

From: Nicolas Bock <nicolasbock@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/genfit/
Date: Mon, 31 Mar 2014 15:28:40
Message-Id: 1395966297.fb9e842d8deb636246306feb8d30b1996dbbbc74.nicolasbock@gentoo
1 commit: fb9e842d8deb636246306feb8d30b1996dbbbc74
2 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
3 AuthorDate: Fri Mar 28 00:24:57 2014 +0000
4 Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
5 CommitDate: Fri Mar 28 00:24:57 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fb9e842d
7
8 Unify the specialties between live and non-live ebuild so only one if-clause is needed, fixes code duplication.
9
10 ---
11 sci-physics/genfit/ChangeLog | 5 +++++
12 sci-physics/genfit/genfit-02.00.00.ebuild | 6 +++---
13 sci-physics/genfit/genfit-9999.ebuild | 6 +++---
14 3 files changed, 11 insertions(+), 6 deletions(-)
15
16 diff --git a/sci-physics/genfit/ChangeLog b/sci-physics/genfit/ChangeLog
17 index 99d6f82..deeb279 100644
18 --- a/sci-physics/genfit/ChangeLog
19 +++ b/sci-physics/genfit/ChangeLog
20 @@ -2,6 +2,11 @@
21 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
22 # $Header: $
23
24 + 28 Mar 2014; Oliver Freyermuth <o.freyermuth@××××××××××.com>
25 + genfit-02.00.00.ebuild, genfit-9999.ebuild:
26 + Unify the specialties between live and non-live ebuild so only one if-clause
27 + is needed.
28 +
29 *genfit-9999 (25 Mar 2014)
30
31 25 Mar 2014; Oliver Freyermuth <o.freyermuth@××××××××××.com>
32
33 diff --git a/sci-physics/genfit/genfit-02.00.00.ebuild b/sci-physics/genfit/genfit-02.00.00.ebuild
34 index 375e355..963de55 100644
35 --- a/sci-physics/genfit/genfit-02.00.00.ebuild
36 +++ b/sci-physics/genfit/genfit-02.00.00.ebuild
37 @@ -5,6 +5,7 @@
38 EAPI=5
39
40 inherit cmake-utils versionator
41 +
42 if [[ ${PV} == *9999* ]]; then
43 inherit subversion
44 ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk"
45 @@ -12,6 +13,8 @@ if [[ ${PV} == *9999* ]]; then
46 else
47 TAG_VER=${PN}-code-1688-tags-v$(replace_all_version_separators '-')
48 SRC_URI="http://sourceforge.net/code-snapshots/svn/g/ge/genfit/code/${TAG_VER}.zip"
49 + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
50 + S=${WORKDIR}/${TAG_VER}
51 fi
52
53 DESCRIPTION="a generic toolkit for track reconstruction for experiments in particle and nuclear physics"
54 @@ -19,7 +22,6 @@ HOMEPAGE="http://genfit.sourceforge.net/Main.html"
55
56 LICENSE="LGPL-3"
57 SLOT="0"
58 -[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
59 IUSE="doc examples"
60
61 RDEPEND="
62 @@ -28,8 +30,6 @@ RDEPEND="
63 DEPEND="${RDEPEND}
64 doc? ( app-doc/doxygen[dot] )"
65
66 -[[ ${PV} == *9999* ]] || S=${WORKDIR}/${TAG_VER}
67 -
68 src_compile() {
69 cmake-utils_src_compile
70 use doc && cmake-utils_src_compile doc
71
72 diff --git a/sci-physics/genfit/genfit-9999.ebuild b/sci-physics/genfit/genfit-9999.ebuild
73 index 375e355..963de55 100644
74 --- a/sci-physics/genfit/genfit-9999.ebuild
75 +++ b/sci-physics/genfit/genfit-9999.ebuild
76 @@ -5,6 +5,7 @@
77 EAPI=5
78
79 inherit cmake-utils versionator
80 +
81 if [[ ${PV} == *9999* ]]; then
82 inherit subversion
83 ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk"
84 @@ -12,6 +13,8 @@ if [[ ${PV} == *9999* ]]; then
85 else
86 TAG_VER=${PN}-code-1688-tags-v$(replace_all_version_separators '-')
87 SRC_URI="http://sourceforge.net/code-snapshots/svn/g/ge/genfit/code/${TAG_VER}.zip"
88 + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
89 + S=${WORKDIR}/${TAG_VER}
90 fi
91
92 DESCRIPTION="a generic toolkit for track reconstruction for experiments in particle and nuclear physics"
93 @@ -19,7 +22,6 @@ HOMEPAGE="http://genfit.sourceforge.net/Main.html"
94
95 LICENSE="LGPL-3"
96 SLOT="0"
97 -[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
98 IUSE="doc examples"
99
100 RDEPEND="
101 @@ -28,8 +30,6 @@ RDEPEND="
102 DEPEND="${RDEPEND}
103 doc? ( app-doc/doxygen[dot] )"
104
105 -[[ ${PV} == *9999* ]] || S=${WORKDIR}/${TAG_VER}
106 -
107 src_compile() {
108 cmake-utils_src_compile
109 use doc && cmake-utils_src_compile doc