Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel/files/, sci-chemistry/openbabel/
Date: Sun, 07 Nov 2021 15:42:09
Message-Id: 1636299701.21c3fd3140d7a6d0804ade3b238998a1bb4f2abf.asturm@gentoo
1 commit: 21c3fd3140d7a6d0804ade3b238998a1bb4f2abf
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 7 12:15:55 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 7 15:41:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c3fd31
7
8 sci-chemistry/openbabel: Drop 2.4.1-r1
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../openbabel-2.3.2-gcc-6_and_7-backport.patch | 13 ---
14 .../openbabel/files/openbabel-2.4.1-gcc-8.patch | 15 ---
15 sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild | 102 ---------------------
16 3 files changed, 130 deletions(-)
17
18 diff --git a/sci-chemistry/openbabel/files/openbabel-2.3.2-gcc-6_and_7-backport.patch b/sci-chemistry/openbabel/files/openbabel-2.3.2-gcc-6_and_7-backport.patch
19 deleted file mode 100644
20 index e23dc6020ee..00000000000
21 --- a/sci-chemistry/openbabel/files/openbabel-2.3.2-gcc-6_and_7-backport.patch
22 +++ /dev/null
23 @@ -1,13 +0,0 @@
24 -diff --git a/CMakeLists.txt b/CMakeLists.txt
25 -index 0ee545cf..7f4b944e 100755
26 ---- a/CMakeLists.txt
27 -+++ b/CMakeLists.txt
28 -@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T)
29 - # Get the GCC version - from KDE4 cmake files
30 - if(CMAKE_COMPILER_IS_GNUCXX)
31 - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
32 -- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
33 -+ string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
34 - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
35 - # patch level, handle this here:
36 - if (NOT _gcc_version)
37
38 diff --git a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch b/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch
39 deleted file mode 100644
40 index a4aa3947f2e..00000000000
41 --- a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch
42 +++ /dev/null
43 @@ -1,15 +0,0 @@
44 -https://bugs.gentoo.org/654800
45 -Fixed-by: milan hodoscek
46 -diff --git a/../old/CMakeLists.txt b/CMakeLists.txt
47 -index dc38d1b..801207e 100644
48 ---- a/../old/CMakeLists.txt
49 -+++ b/CMakeLists.txt
50 -@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T)
51 - # Get the GCC version - from KDE4 cmake files
52 - if(CMAKE_COMPILER_IS_GNUCXX)
53 - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
54 -- string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
55 -+ string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
56 - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
57 - # patch level, handle this here:
58 - if (NOT _gcc_version)
59
60 diff --git a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
61 deleted file mode 100644
62 index db8203212fa..00000000000
63 --- a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
64 +++ /dev/null
65 @@ -1,102 +0,0 @@
66 -# Copyright 1999-2020 Gentoo Authors
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=7
70 -WX_GTK_VER="3.0"
71 -
72 -inherit cmake-utils desktop optfeature toolchain-funcs wxwidgets
73 -
74 -DESCRIPTION="Interconverts file formats used in molecular modeling"
75 -HOMEPAGE="http://openbabel.org/wiki/Main_Page"
76 -SRC_URI="
77 - mirror://sourceforge/openbabel/${P}.tar.gz
78 - https://openbabel.org/docs/dev/_static/babel130.png -> ${PN}.png
79 -"
80 -
81 -# See src/CMakeLists.txt for LIBRARY_VERSION
82 -SLOT="0/5.0.0"
83 -LICENSE="GPL-2"
84 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
85 -IUSE="doc openmp test wxwidgets"
86 -RESTRICT="!test? ( test )"
87 -
88 -RDEPEND="
89 - dev-cpp/eigen:3
90 - dev-libs/libxml2:2
91 - sci-libs/inchi
92 - sys-libs/zlib
93 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
94 -"
95 -DEPEND="${RDEPEND}"
96 -BDEPEND="
97 - >=dev-util/cmake-2.4.8
98 - doc? ( app-doc/doxygen )
99 -"
100 -
101 -DOCS=( AUTHORS NEWS.md README.md THANKS doc/dioxin.{inc,mol2} doc/README.{dioxin.pov,povray} )
102 -
103 -PATCHES=(
104 - "${FILESDIR}"/${PN}-2.3.2-gcc-6_and_7-backport.patch
105 - "${FILESDIR}"/${P}-gcc-8.patch
106 -)
107 -
108 -pkg_setup() {
109 - if use openmp; then
110 - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
111 - ewarn "OpenMP is not available in your current selected gcc"
112 - die "need openmp capable gcc"
113 - fi
114 - FORTRAN_NEED_OPENMP=1
115 - fi
116 -}
117 -
118 -src_prepare() {
119 - sed \
120 - -e '/__GNUC__/s:== 4:>= 4:g' \
121 - -i include/openbabel/shared_ptr.h || die
122 - cmake-utils_src_prepare
123 -}
124 -
125 -src_configure() {
126 - use wxwidgets && setup-wxwidgets
127 - local mycmakeargs=(
128 - -DOPENBABEL_USE_SYSTEM_INCHI=ON
129 - -DENABLE_OPENMP=$(usex openmp)
130 - -DBUILD_GUI=$(usex wxwidgets)
131 - )
132 -
133 - cmake-utils_src_configure
134 -}
135 -
136 -src_install() {
137 - docinto html
138 - dodoc doc/{*.html,*.png}
139 - if use doc ; then
140 - docinto html/API
141 - dodoc -r doc/API/html/*
142 - fi
143 -
144 - make_desktop_entry obgui "Open Babel" "${PN}"
145 - doicon "${DISTDIR}/${PN}.png"
146 -
147 - cmake-utils_src_install
148 -}
149 -
150 -src_test() {
151 - local mycmakeargs=(
152 - -DOPENBABEL_USE_SYSTEM_INCHI=ON
153 - -DPYTHON_EXECUTABLE=false
154 - -DOPENMP=$(usex openmp)
155 - -DBUILD_GUI=$(usex wxwidgets)
156 - -DTESTS=$(usex test)
157 - )
158 -
159 - cmake-utils_src_configure
160 - cmake-utils_src_compile
161 - cmake-utils_src_test -E py
162 -}
163 -
164 -pkg_postinst() {
165 - optfeature "perl support" sci-chemistry/openbabel-perl
166 - optfeature "python support" sci-chemistry/openbabel-python
167 -}