[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molsketch/

[Andreas Sturmlechner]

commit:     e1054d38e18cc30baed0f4997b451e44851a5ab0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 22:49:36 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 20 23:06:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1054d38

sci-chemistry/molsketch: Fix QA issues, switch to cmake.eclass, EAPI-7

Drop unused cmake vars
Drop unused multilib
Add missing xdg-utils and xdg_desktop_database_update
Fix indendation
No tests found
Replace defunct sed with cmake var.

Closes: https://bugs.gentoo.org/660272
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
index 87dc43370de..5b997ba272b 100644
--- a/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils multilib qmake-utils
-
-MY_P=${P/m/M}-src
+inherit cmake qmake-utils xdg-utils
 
 DESCRIPTION="A drawing tool for 2D molecular structures"
 HOMEPAGE="http://molsketch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/Molsketch/Beryllium-7%20${PV}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/${PN}/Molsketch/Beryllium-7%20${PV}/${P^}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
 
 DEPEND="
 	>=sci-chemistry/openbabel-2.2
@@ -26,35 +21,40 @@ DEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	"
+"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P%%-src}
+S="${WORKDIR}/${P^}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.0-_DEFAULT_SOURCE.patch
 	"${FILESDIR}"/${P}-more-quotes.patch
-	)
+)
 
 src_prepare() {
 	sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \
 		-i {obabeliface,libmolsketch/src}/CMakeLists.txt || die #351246
-	sed -e "s:doc/molsketch:doc/${PF}:g" \
-		-i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DOPENBABEL2_INCLUDE_DIR="${EPREFIX}/usr/include/openbabel-2.0"
-		-DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON
-		-DENABLE_TESTS=$(usex test "ON" "OFF")
+		-DOPENBABEL2_INCLUDE_DIR="${EPREFIX}"/usr/include/openbabel-2.0
 		-DMSK_INSTALL_PREFIX=/usr
+		-DMSK_INSTALL_DOCS="${EPREFIX}"/usr/share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dosym ${PN}-qt5 /usr/bin/${PN}
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}