gentoo auto-resync : 19:03:2025 - 00:30:03

5 files changed, 50 insertions, 43 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 270b2a033cd6..890572112082 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 31a281ab5086..98830b3f7a49 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -1,4 +1,4 @@
 AUX molsketch-0.3.0-_DEFAULT_SOURCE.patch 661 BLAKE2B 48e877f41de2b27d1c6bbdac34d68893b58bf22e3d2ca8fa3e777f950f6906b100471b0a1287205e65bb5e97e9b3bd40b64377f513750ec039ebffdddbd0ea22 SHA512 9fd409ca55d5df0c61e84d3d9941f4855b7dcd32fd7521f24204570858dc6205c70ca4c645c5eee31bdc446a315e02081fa947677a4f22addce16ec4dad64c10
-DIST Molsketch-0.7.2-src.tar.gz 1907992 BLAKE2B 6bd099d963f352e66f73741273e9dee17f2fb299aec32b053ca39aa731a27f6a73093f98a4dbde2b6a97b85015016d1136fa4ead5f564006991b83072009ee6a SHA512 5e06f177ed4e7e8457215e07b623b1d92fa111f696fd7a106b0a6e8c56cc9c7d953fc33e0c0955c19766599d41a82519db95e12c0c49d3e4d3392311af3cc034
-EBUILD molsketch-0.7.2-r1.ebuild 862 BLAKE2B 9d52e722bb59e349655731e585e8f4c569217662ff850569056710470173f0a48c061b86a3a25725a8dd4f946adf0a20fd35651df559be21947af852951156f2 SHA512 599745fe7da5651cf43b95fab09ec3cc0f8a31802b7380b3b773bf5146aaa1aa9114847a3b2673fe0d6a66e73c5f6ca6a590651c26f4769d845dbad25e63ccd1
-MISC metadata.xml 610 BLAKE2B f7e80a8160010e450b7808ab92056dc1f514a5cd985c335e853f0a92d1d86a0d5818a8d95c4ac5b26eb68fe67309bf1231f2455b2498209b840eea04a0006c20 SHA512 fc7180beb4202b3fd4cecb9e384fc8617e89e173e92d62bdcb8e2cb68c32ef57802e34a906ea5a7cc216a1f5b52579309a9a944a4307b31de4b2d1f3fcadf846
+DIST Molsketch-0.8.1-src.tar.gz 1852967 BLAKE2B 127ab637934a30a8682b4e15c5d07d8135f581e9311d485403e8d504d2b81cf2057e965be2eb2547d8caa0d9137122d053a7dd8e62272baa229bf26c20ee744c SHA512 c92f99276ff56f46a04f59218124ec3db911a8a8615632fe7642c1ab139cf083540da77b3a1c48176af0896bdd6ccadfd4ca5571e095f76fd96cf504ee3245fb
+EBUILD molsketch-0.8.1.ebuild 987 BLAKE2B e1398269d7448f364b2ba467b679a0fcf8f57df5bcb74b31e69f4c5127cfb24b661818f93852feaf199e028a168922abf59eca6f483bb0d5f6ef34f5ae3ce57e SHA512 6c990f1d63624a800b7a713e8308a3db9305f98504c29668049166f9f6a056f842f2896c3f7852ef0819fc194feaac69371c5e41072d206dfe12a26f49d3bb6a
+MISC metadata.xml 807 BLAKE2B efcc6197ebf9af48b9c0114afb99b23c5ca2710f78183cb480974809c6a8c966397df6718c54ddcc2cf00dfd56edeeaaa6067b3fd0fe53df66cf616616d4f0ac SHA512 94d1e59403edf474637562fd1936b82c68a14cc120d2527250a3393bacd38a964222c5c3c04d36f503e2f30ccce1598b542eb8ca696724af971b61e42f0075a1
diff --git a/sci-chemistry/molsketch/metadata.xml b/sci-chemistry/molsketch/metadata.xml
index cc6c6d647153..180494b54d2f 100644
--- a/sci-chemistry/molsketch/metadata.xml
+++ b/sci-chemistry/molsketch/metadata.xml
@@ -10,7 +10,11 @@
 		molecules quick and easily. Of course you're creation can be exported
 		afterwards in high quality in a number of vector and bitmap formats.
 	</longdescription>
+	<use>
+		<flag name="openbabel">Interface for <pkg>sci-chemistry/openbabel</pkg> to support many file formats</flag>
+	</use>
 	<upstream>
-		<remote-id type="sourceforge">molsketch</remote-id>
+		<remote-id type="sourceforge">molsketch</remote-id><!-- old -->
+		<remote-id type="github">hvennekate/Molsketch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/molsketch/molsketch-0.7.2-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.7.2-r1.ebuild
deleted file mode 100644
index 9c26861226c3..000000000000
--- a/sci-chemistry/molsketch/molsketch-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A drawing tool for 2D molecular structures"
-HOMEPAGE="http://molsketch.sourceforge.net/"
-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"
-
-DEPEND="
-	>=sci-chemistry/openbabel-3:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.0-_DEFAULT_SOURCE.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# fix the doc dir, this is relative to the install dir (i.e. /usr/)
-		-DMSK_INSTALL_DOCS="/share/doc/${PF}"
-	)
-	cmake_src_configure
-}
diff --git a/sci-chemistry/molsketch/molsketch-0.8.1.ebuild b/sci-chemistry/molsketch/molsketch-0.8.1.ebuild
new file mode 100644
index 000000000000..c0580aff5233
--- /dev/null
+++ b/sci-chemistry/molsketch/molsketch-0.8.1.ebuild
@@ -0,0 +1,42 @@
+# 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
+)
+
+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]"
+}