Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/bamtools/
Date: Wed, 13 Nov 2019 18:16:24
Message-Id: 1573668962.a217ed25f690d9d4ed7b492df1d0d4205830fa3f.soap@gentoo
1 commit: a217ed25f690d9d4ed7b492df1d0d4205830fa3f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 13 18:16:02 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 13 18:16:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a217ed25
7
8 sci-biology/bamtools: Remove USE="static-libs"
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sci-biology/bamtools/bamtools-2.5.1.ebuild | 33 +++---------------------------
14 sci-biology/bamtools/bamtools-9999.ebuild | 33 +++---------------------------
15 2 files changed, 6 insertions(+), 60 deletions(-)
16
17 diff --git a/sci-biology/bamtools/bamtools-2.5.1.ebuild b/sci-biology/bamtools/bamtools-2.5.1.ebuild
18 index 84c9dc83723..b5affe9f0fa 100644
19 --- a/sci-biology/bamtools/bamtools-2.5.1.ebuild
20 +++ b/sci-biology/bamtools/bamtools-2.5.1.ebuild
21 @@ -1,9 +1,9 @@
22 -# Copyright 1999-2018 Gentoo Authors
23 +# Copyright 1999-2019 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=7
27
28 -inherit cmake-utils multibuild
29 +inherit cmake-utils
30
31 DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
32 HOMEPAGE="https://github.com/pezmaster31/bamtools"
33 @@ -18,7 +18,6 @@ fi
34
35 LICENSE="MIT"
36 SLOT="0/${PV}" # no stable ABI yet
37 -IUSE="static-libs"
38
39 RDEPEND="
40 >=dev-libs/jsoncpp-1.8.0:=
41 @@ -26,35 +25,9 @@ RDEPEND="
42 DEPEND="${RDEPEND}"
43 BDEPEND="virtual/pkgconfig"
44
45 -pkg_setup() {
46 - [[ ${MERGE_TYPE} != binary ]] &&
47 - MULTIBUILD_VARIANTS=(
48 - $(usev static-libs)
49 - shared
50 - )
51 -}
52 -
53 src_prepare() {
54 # delete bundled libs, just to be safe
55 - rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die
56 + rm -rf src/third_party/{gtest-1.6.0,jsoncpp} || die
57
58 cmake-utils_src_prepare
59 }
60 -
61 -src_configure() {
62 - my_configure() {
63 - [[ ${MULTIBUILD_ID} == static-libs* ]] &&
64 - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
65 -
66 - cmake-utils_src_configure
67 - }
68 - multibuild_foreach_variant my_configure
69 -}
70 -
71 -src_compile() {
72 - multibuild_foreach_variant cmake-utils_src_compile
73 -}
74 -
75 -src_install() {
76 - multibuild_foreach_variant cmake-utils_src_install
77 -}
78
79 diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild
80 index 84c9dc83723..b5affe9f0fa 100644
81 --- a/sci-biology/bamtools/bamtools-9999.ebuild
82 +++ b/sci-biology/bamtools/bamtools-9999.ebuild
83 @@ -1,9 +1,9 @@
84 -# Copyright 1999-2018 Gentoo Authors
85 +# Copyright 1999-2019 Gentoo Authors
86 # Distributed under the terms of the GNU General Public License v2
87
88 EAPI=7
89
90 -inherit cmake-utils multibuild
91 +inherit cmake-utils
92
93 DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
94 HOMEPAGE="https://github.com/pezmaster31/bamtools"
95 @@ -18,7 +18,6 @@ fi
96
97 LICENSE="MIT"
98 SLOT="0/${PV}" # no stable ABI yet
99 -IUSE="static-libs"
100
101 RDEPEND="
102 >=dev-libs/jsoncpp-1.8.0:=
103 @@ -26,35 +25,9 @@ RDEPEND="
104 DEPEND="${RDEPEND}"
105 BDEPEND="virtual/pkgconfig"
106
107 -pkg_setup() {
108 - [[ ${MERGE_TYPE} != binary ]] &&
109 - MULTIBUILD_VARIANTS=(
110 - $(usev static-libs)
111 - shared
112 - )
113 -}
114 -
115 src_prepare() {
116 # delete bundled libs, just to be safe
117 - rm -r src/third_party/{gtest-1.6.0,jsoncpp} || die
118 + rm -rf src/third_party/{gtest-1.6.0,jsoncpp} || die
119
120 cmake-utils_src_prepare
121 }
122 -
123 -src_configure() {
124 - my_configure() {
125 - [[ ${MULTIBUILD_ID} == static-libs* ]] &&
126 - local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
127 -
128 - cmake-utils_src_configure
129 - }
130 - multibuild_foreach_variant my_configure
131 -}
132 -
133 -src_compile() {
134 - multibuild_foreach_variant cmake-utils_src_compile
135 -}
136 -
137 -src_install() {
138 - multibuild_foreach_variant cmake-utils_src_install
139 -}