From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B2AD158086 for ; Sun, 7 Nov 2021 15:42:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91F16E0982; Sun, 7 Nov 2021 15:42:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96161E0391 for ; Sun, 7 Nov 2021 15:42:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFEB2342EB5 for ; Sun, 7 Nov 2021 15:41:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 182F71BD for ; Sun, 7 Nov 2021 15:41:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1636299701.21c3fd3140d7a6d0804ade3b238998a1bb4f2abf.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel/files/, sci-chemistry/openbabel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/openbabel/files/openbabel-2.3.2-gcc-6_and_7-backport.patch sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild X-VCS-Directories: sci-chemistry/openbabel/ sci-chemistry/openbabel/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 21c3fd3140d7a6d0804ade3b238998a1bb4f2abf X-VCS-Branch: master Date: Sun, 7 Nov 2021 15:41:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a063b3c3-2f63-4e33-bb2f-a1c8db17bcaf X-Archives-Hash: 5e599918a65acb110bb043f4d87d17ab commit: 21c3fd3140d7a6d0804ade3b238998a1bb4f2abf Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 7 12:15:55 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 7 15:41:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c3fd31 sci-chemistry/openbabel: Drop 2.4.1-r1 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../openbabel-2.3.2-gcc-6_and_7-backport.patch | 13 --- .../openbabel/files/openbabel-2.4.1-gcc-8.patch | 15 --- sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild | 102 --------------------- 3 files changed, 130 deletions(-) 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 deleted file mode 100644 index e23dc6020ee..00000000000 --- a/sci-chemistry/openbabel/files/openbabel-2.3.2-gcc-6_and_7-backport.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ee545cf..7f4b944e 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T) - # Get the GCC version - from KDE4 cmake files - if(CMAKE_COMPILER_IS_GNUCXX) - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - if (NOT _gcc_version) 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 deleted file mode 100644 index a4aa3947f2e..00000000000 --- a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/654800 -Fixed-by: milan hodoscek -diff --git a/../old/CMakeLists.txt b/CMakeLists.txt -index dc38d1b..801207e 100644 ---- a/../old/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -239,7 +239,7 @@ check_type_size(clock_t CLOCK_T) - # Get the GCC version - from KDE4 cmake files - if(CMAKE_COMPILER_IS_GNUCXX) - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - if (NOT _gcc_version) diff --git a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild deleted file mode 100644 index db8203212fa..00000000000 --- a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" - -inherit cmake-utils desktop optfeature toolchain-funcs wxwidgets - -DESCRIPTION="Interconverts file formats used in molecular modeling" -HOMEPAGE="http://openbabel.org/wiki/Main_Page" -SRC_URI=" - mirror://sourceforge/openbabel/${P}.tar.gz - https://openbabel.org/docs/dev/_static/babel130.png -> ${PN}.png -" - -# See src/CMakeLists.txt for LIBRARY_VERSION -SLOT="0/5.0.0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc openmp test wxwidgets" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/libxml2:2 - sci-libs/inchi - sys-libs/zlib - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/cmake-2.4.8 - doc? ( app-doc/doxygen ) -" - -DOCS=( AUTHORS NEWS.md README.md THANKS doc/dioxin.{inc,mol2} doc/README.{dioxin.pov,povray} ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.2-gcc-6_and_7-backport.patch - "${FILESDIR}"/${P}-gcc-8.patch -) - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - FORTRAN_NEED_OPENMP=1 - fi -} - -src_prepare() { - sed \ - -e '/__GNUC__/s:== 4:>= 4:g' \ - -i include/openbabel/shared_ptr.h || die - cmake-utils_src_prepare -} - -src_configure() { - use wxwidgets && setup-wxwidgets - local mycmakeargs=( - -DOPENBABEL_USE_SYSTEM_INCHI=ON - -DENABLE_OPENMP=$(usex openmp) - -DBUILD_GUI=$(usex wxwidgets) - ) - - cmake-utils_src_configure -} - -src_install() { - docinto html - dodoc doc/{*.html,*.png} - if use doc ; then - docinto html/API - dodoc -r doc/API/html/* - fi - - make_desktop_entry obgui "Open Babel" "${PN}" - doicon "${DISTDIR}/${PN}.png" - - cmake-utils_src_install -} - -src_test() { - local mycmakeargs=( - -DOPENBABEL_USE_SYSTEM_INCHI=ON - -DPYTHON_EXECUTABLE=false - -DOPENMP=$(usex openmp) - -DBUILD_GUI=$(usex wxwidgets) - -DTESTS=$(usex test) - ) - - cmake-utils_src_configure - cmake-utils_src_compile - cmake-utils_src_test -E py -} - -pkg_postinst() { - optfeature "perl support" sci-chemistry/openbabel-perl - optfeature "python support" sci-chemistry/openbabel-python -}