* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molsketch/, sci-chemistry/molsketch/files/
@ 2017-06-03 8:39 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2017-06-03 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 6ab0c4e462358187dbd1071f2025dc2a7b97fb33
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 3 08:39:24 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 08:39:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab0c4e4
sci-chemistry/molsketch: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=605870
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-chemistry/molsketch/Manifest | 2 +-
.../files/molsketch-0.2.0-openbabel-231.patch | 54 ----------------------
.../files/molsketch-0.4.1-more-quotes.patch | 11 +++++
.../files/molsketch-0.4.1-no-quotes.patch | 16 +++++++
...etch-0.2.0-r1.ebuild => molsketch-0.4.1.ebuild} | 37 +++++++++------
5 files changed, 52 insertions(+), 68 deletions(-)
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 28ee7103bdb..41bf8871317 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -1,2 +1,2 @@
-DIST Molsketch-0.2.0-Source.tar.gz 276809 SHA256 05e058bf71fc99e5dda56ef1779a82c8885b2001d1af5dce92d959bf56d8a5d0 SHA512 e72c3b2103d70964ada8bd57cc40c16ae30d0a7c2c45521ca3c7a4c4586270e06707e5d662983a2d0f214b16b12afbfa439b58568873537f70f8ac735aa28d26 WHIRLPOOL 1711ef1e45aa09eda1b6dfa44589b0f235ac533914b343b3802d44faae1f658b668e418014d81a5a797f06132c0c72085eb64b9e8c1f7e22650d4655783cca46
DIST Molsketch-0.3.0-src.tar.gz 337388 SHA256 078b05bfd591930430bc1e5df802af27bdf40718b9218ba6435eadc209d4d1bc SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4 WHIRLPOOL 659717039bf294072117a8e7dc1cb590c6804d3dbde625aa16451bfdb6371933c71f6241fee1e38cec696bdb89e19111c30cf6ed17810daf09b75272080fbb31
+DIST Molsketch-0.4.1-src.tar.gz 1499842 SHA256 6b183ed3ba92f89f1318879657a79c09d7135c99af28eee8758f46f131e05a30 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26 WHIRLPOOL 383e9fffd1cd2db195e962f58e97d0ffd858dc14353c99ed0bdd7e577413e5ac991ed18a41b5d4ee4b926887a6a2654fe30167f82759142b21b753c30e41cbd7
diff --git a/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch b/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
deleted file mode 100644
index 41ddf01df5f..00000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
+++ /dev/null
@@ -1,54 +0,0 @@
- CMakeLists.txt | 12 ++++++------
- libmolsketch/src/stereocenteritem.cpp | 2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4b5d29..f472b40 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,10 +12,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
- # compiler issues are fixed and more warnings are issued. #
- ###########################################################
- if (CMAKE_COMPILER_IS_GNUCXX)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align")
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts")
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security")
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common")
- 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")
-@@ -32,7 +32,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build;/.git")
- include(CPack)
-
- # Unit testing, mainly useful for developers and so defaults to off
--option(ENABLE_TESTS "Enable unit testing" ON)
-+option(ENABLE_TESTS "Enable unit testing" OFF)
- if(ENABLE_TESTS)
- set(QT_USE_QTTEST TRUE)
- enable_testing()
-@@ -48,7 +48,7 @@ configure_file("${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
- add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
- # Enabling debugging symbols
--set(CMAKE_BUILD_TYPE Debug)
-+# set(CMAKE_BUILD_TYPE Debug)
-
- # Enabling shared libraries
- set(BUILD_SHARED_LIBS OFF)
-diff --git a/libmolsketch/src/stereocenteritem.cpp b/libmolsketch/src/stereocenteritem.cpp
-index 44a8015..20f2a4a 100644
---- a/libmolsketch/src/stereocenteritem.cpp
-+++ b/libmolsketch/src/stereocenteritem.cpp
-@@ -63,7 +63,7 @@ namespace Molsketch {
- graphsym.GetSymmetry(symmetry_classes);
-
- //std::vector<unsigned long> atomIds = FindTetrahedralAtoms(obmol, symmetry_classes);
-- std::vector<OpenBabel::StereogenicUnit> units = FindStereogenicUnits(obmol, symmetry_classes);
-+ OpenBabel::OBStereoUnitSet units = FindStereogenicUnits(obmol, symmetry_classes);
-
- for (unsigned int i = 0; i < units.size(); ++i) {
- if (units.at(i).type == OpenBabel::OBStereo::Tetrahedral) {
diff --git a/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch
new file mode 100644
index 00000000000..c32b975778e
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch
@@ -0,0 +1,11 @@
+--- a/libmolsketch/src/molscene.cpp
++++ b/libmolsketch/src/molscene.cpp
+@@ -842,7 +842,7 @@
+ void MolScene::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+ {
+ if (!event->mimeData() || !event->mimeData()->hasFormat(mimeType())) return;
+- if (!event->proposedAction() == Qt::CopyAction) return;
++ if ((!event->proposedAction()) == Qt::CopyAction) return;
+ event->accept();
+ for (genericAction* action : sceneActions())
+ action->setChecked(false);
diff --git a/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
new file mode 100644
index 00000000000..1b63ed51ede
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64c18a2..75c2fb7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,7 +97,7 @@ endif(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5PrintSupport_FO
+ if(FORCEQt4)
+ add_definitions(-DQTVERSIONSUFFIX="")
+ else(FORCEQt4)
+- add_definitions(-DQTVERSIONSUFFIX="\\\"-qt5\\\"")
++ add_definitions(-DQTVERSIONSUFFIX="-qt5")
+ endif(FORCEQt4)
+
+ ################ Reading version and default paths
diff --git a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.4.1.ebuild
similarity index 52%
rename from sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
rename to sci-chemistry/molsketch/molsketch-0.4.1.ebuild
index 626c32f9216..1cd4ab221ee 100644
--- a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.4.1.ebuild
@@ -1,38 +1,43 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit cmake-utils multilib
+CMAKE_MAKEFILE_GENERATOR=ninja
-MY_P=${P/m/M}-Source
+inherit cmake-utils multilib qmake-utils
+
+MY_P=${P/m/M}-src
DESCRIPTION="A drawing tool for 2D molecular structures"
HOMEPAGE="http://molsketch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/${PN}/Molsketch/Beryllium-7%20${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="test"
DEPEND="
>=sci-chemistry/openbabel-2.2
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qttest:4
- >=dev-qt/qthelp-4.7.0:4[compat]"
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ "
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${MY_P%%-src}
PATCHES=(
- "${FILESDIR}"/${P}-openbabel-231.patch
+ "${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 libmolsketch/src/CMakeLists.txt || die #351246
+ -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
@@ -42,6 +47,12 @@ 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")
)
cmake-utils_src_configure
}
+
+src_install() {
+ cmake-utils_src_install
+ dosym ${PN}-qt5 /usr/bin/${PN}
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molsketch/, sci-chemistry/molsketch/files/
@ 2022-06-09 7:04 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2022-06-09 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 9d51e4910533c866deae3e23e2e71feefcd73384
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 07:04:44 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 07:04:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d51e491
sci-chemistry/molsketch: drop 0.4.1-r1
Closes: https://bugs.gentoo.org/830529
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-chemistry/molsketch/Manifest | 1 -
.../files/molsketch-0.4.1-more-quotes.patch | 11 ----
sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild | 60 ----------------------
3 files changed, 72 deletions(-)
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index adf2a2ef3279..3dd6281fb472 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -1,2 +1 @@
-DIST Molsketch-0.4.1-src.tar.gz 1499842 BLAKE2B 22584f012e838037f9e23c16da6c63984604002884d279b2b6012d80eb08af9ee18b4d364fa29327572854fccad34840f97413b29b487cfbeb6496a2a8003d17 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26
DIST Molsketch-0.7.2-src.tar.gz 1907992 BLAKE2B 6bd099d963f352e66f73741273e9dee17f2fb299aec32b053ca39aa731a27f6a73093f98a4dbde2b6a97b85015016d1136fa4ead5f564006991b83072009ee6a SHA512 5e06f177ed4e7e8457215e07b623b1d92fa111f696fd7a106b0a6e8c56cc9c7d953fc33e0c0955c19766599d41a82519db95e12c0c49d3e4d3392311af3cc034
diff --git a/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch
deleted file mode 100644
index c32b975778eb..000000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libmolsketch/src/molscene.cpp
-+++ b/libmolsketch/src/molscene.cpp
-@@ -842,7 +842,7 @@
- void MolScene::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
- {
- if (!event->mimeData() || !event->mimeData()->hasFormat(mimeType())) return;
-- if (!event->proposedAction() == Qt::CopyAction) return;
-+ if ((!event->proposedAction()) == Qt::CopyAction) return;
- event->accept();
- for (genericAction* action : sceneActions())
- action->setChecked(false);
diff --git a/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
deleted file mode 100644
index 5b997ba272bb..000000000000
--- a/sci-chemistry/molsketch/molsketch-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}/${P^}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
- >=sci-chemistry/openbabel-2.2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-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
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DOPENBABEL2_INCLUDE_DIR="${EPREFIX}"/usr/include/openbabel-2.0
- -DMSK_INSTALL_PREFIX=/usr
- -DMSK_INSTALL_DOCS="${EPREFIX}"/usr/share/doc/${PF}
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- dosym ${PN}-qt5 /usr/bin/${PN}
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-09 7:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-03 8:39 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molsketch/, sci-chemistry/molsketch/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2022-06-09 7:04 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox