commit: 619fe16007a61e72fcaa9a1cd47dbcc9f190d825 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Oct 13 13:49:01 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 18 13:18:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619fe160
sci-chemistry/molsketch: drop 0.8.1 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44162 Closes: https://github.com/gentoo/gentoo/pull/44162 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-chemistry/molsketch/Manifest | 1 - .../files/molsketch-0.3.0-_DEFAULT_SOURCE.patch | 16 -------- .../files/molsketch-0.8.1-obabel_namespace.patch | 37 ------------------ sci-chemistry/molsketch/molsketch-0.8.1.ebuild | 44 ---------------------- 4 files changed, 98 deletions(-) diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest index 77af86cf2e4a..f0a4638205b6 100644 --- a/sci-chemistry/molsketch/Manifest +++ b/sci-chemistry/molsketch/Manifest @@ -1,3 +1,2 @@ -DIST Molsketch-0.8.1-src.tar.gz 1852967 BLAKE2B 127ab637934a30a8682b4e15c5d07d8135f581e9311d485403e8d504d2b81cf2057e965be2eb2547d8caa0d9137122d053a7dd8e62272baa229bf26c20ee744c SHA512 c92f99276ff56f46a04f59218124ec3db911a8a8615632fe7642c1ab139cf083540da77b3a1c48176af0896bdd6ccadfd4ca5571e095f76fd96cf504ee3245fb DIST Molsketch-0.8.3-src.tar.gz 1855805 BLAKE2B 6f221c170d8f6c9af6ab5b9db479c9a1052047331455b13c7aaf00b851793ed0db9b6de66954734858a56c5a6bf0009582aa084c612161925315352c2e5401ab SHA512 336266f59ca119972bb3820b366abe57a524016658e715524d48570e2077dc4a211711e4de2df24b3f760a4e4826fff8966af53d2b4aad91f2755471c45cc728 DIST Molsketch-0.8.4-src.tar.gz 1855977 BLAKE2B 4cf2e7ae26da1b15a5feb7843a853557d0e8b1594ea080767a234ba2cc238f837e46651ba4eb5698330c5c56fc39695c5596278033d4287772dd22b6b26ee501 SHA512 14f544c8fc30ee9b11ff056c248890ca33bbc02a19d93142ae0106539cbba73eae04ba3c6506df8a3e6d997ef4a1f75c7a3490467a2023cd32c20e186e8a0188 diff --git a/sci-chemistry/molsketch/files/molsketch-0.3.0-_DEFAULT_SOURCE.patch b/sci-chemistry/molsketch/files/molsketch-0.3.0-_DEFAULT_SOURCE.patch deleted file mode 100644 index af3b5ceedac6..000000000000 --- a/sci-chemistry/molsketch/files/molsketch-0.3.0-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3cd0fe..64c18a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-check-new -fno-common") -- add_definitions(-D_BSD_SOURCE) -+ add_definitions(-D_DEFAULT_SOURCE) - endif (CMAKE_COMPILER_IS_GNUCXX) - - # Enable CPack diff --git a/sci-chemistry/molsketch/files/molsketch-0.8.1-obabel_namespace.patch b/sci-chemistry/molsketch/files/molsketch-0.8.1-obabel_namespace.patch deleted file mode 100644 index 2fb1a8412eae..000000000000 --- a/sci-chemistry/molsketch/files/molsketch-0.8.1-obabel_namespace.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/hvennekate/Molsketch/pull/17.patch - -From b3ecbef4766591dea4f8349c70f14cfb67d7400b Mon Sep 17 00:00:00 2001 -From: Nicolas PARLANT <[email protected]> -Date: Mon, 28 Apr 2025 19:25:24 +0000 -Subject: [PATCH] fix namespace for obabeliface - -openbabel has changed namespaces : -https://github.com/openbabel/openbabel/commit/a0ec8c96554d4ee4f9bf80b00165b1ce554c8621 - -> Molsketch-0.8.1/obabeliface/obabeliface.cpp:199:5: error: use of undeclared identifier 'impl'; did you mean 'OpenBabel::impl'? -> 199 | FOR_ATOMS_OF_MOL(obatom, molecule) { -> | ^ -> /usr/include/openbabel3/openbabel/obiter.h:417:49: note: expanded from macro 'FOR_ATOMS_OF_MOL' -> 417 | #define FOR_ATOMS_OF_MOL(a,m) for (auto a : impl::MolGetAtoms(m)) -> | ^ -> /usr/include/openbabel3/openbabel/obiter.h:401:13: note: 'OpenBabel::impl' declared here -> 401 | namespace impl { -> | ^ - -Signed-off-by: Nicolas PARLANT <[email protected]> ---- - obabeliface/obabeliface.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/obabeliface/obabeliface.cpp b/obabeliface/obabeliface.cpp -index 029f4e3..fad553a 100644 ---- a/obabeliface/obabeliface.cpp -+++ b/obabeliface/obabeliface.cpp -@@ -190,6 +190,7 @@ namespace Molsketch - - // TODO should be const, but OpenBabel iterator methods do not support const - bool hasCoordinates(OpenBabel::OBMol &molecule) { -+ using namespace OpenBabel; - FOR_ATOMS_OF_MOL(obatom, molecule) { - if (obatom->GetVector() != OpenBabel::VZero) - return true; diff --git a/sci-chemistry/molsketch/molsketch-0.8.1.ebuild b/sci-chemistry/molsketch/molsketch-0.8.1.ebuild deleted file mode 100644 index 65457e3c0fb1..000000000000 --- a/sci-chemistry/molsketch/molsketch-0.8.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake optfeature xdg - -DESCRIPTION="Drawing tool for 2D molecular structures" -HOMEPAGE="https://molsketch.sourceforge.io/ https://github.com/hvennekate/Molsketch/"; -SRC_URI="https://downloads.sourceforge.net/project/${PN}/Molsketch/${P^}-src.tar.gz"; -S="${WORKDIR}/${P^}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="openbabel" - -DEPEND=" - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - openbabel? ( >=sci-chemistry/openbabel-3:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="dev-qt/qttools:6[linguist]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.0-_DEFAULT_SOURCE.patch - # bug #955047, https://github.com/hvennekate/Molsketch/pull/17 - "${FILESDIR}"/${PN}-0.8.1-obabel_namespace.patch -) - -src_configure() { - local mycmakeargs=( - -DMSK_OBABELIFACE="$(usex openbabel)" - -DMSK_QT6=ON - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - use openbabel && optfeature "wikiquery support through openbabel inchi interface" "sci-chemistry/openbabel[inchi]" -}
