1 |
commit: 6ab0c4e462358187dbd1071f2025dc2a7b97fb33 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 3 08:39:24 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 3 08:39:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab0c4e4 |
7 |
|
8 |
sci-chemistry/molsketch: Version Bump |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=605870 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
13 |
|
14 |
sci-chemistry/molsketch/Manifest | 2 +- |
15 |
.../files/molsketch-0.2.0-openbabel-231.patch | 54 ---------------------- |
16 |
.../files/molsketch-0.4.1-more-quotes.patch | 11 +++++ |
17 |
.../files/molsketch-0.4.1-no-quotes.patch | 16 +++++++ |
18 |
...etch-0.2.0-r1.ebuild => molsketch-0.4.1.ebuild} | 37 +++++++++------ |
19 |
5 files changed, 52 insertions(+), 68 deletions(-) |
20 |
|
21 |
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest |
22 |
index 28ee7103bdb..41bf8871317 100644 |
23 |
--- a/sci-chemistry/molsketch/Manifest |
24 |
+++ b/sci-chemistry/molsketch/Manifest |
25 |
@@ -1,2 +1,2 @@ |
26 |
-DIST Molsketch-0.2.0-Source.tar.gz 276809 SHA256 05e058bf71fc99e5dda56ef1779a82c8885b2001d1af5dce92d959bf56d8a5d0 SHA512 e72c3b2103d70964ada8bd57cc40c16ae30d0a7c2c45521ca3c7a4c4586270e06707e5d662983a2d0f214b16b12afbfa439b58568873537f70f8ac735aa28d26 WHIRLPOOL 1711ef1e45aa09eda1b6dfa44589b0f235ac533914b343b3802d44faae1f658b668e418014d81a5a797f06132c0c72085eb64b9e8c1f7e22650d4655783cca46 |
27 |
DIST Molsketch-0.3.0-src.tar.gz 337388 SHA256 078b05bfd591930430bc1e5df802af27bdf40718b9218ba6435eadc209d4d1bc SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4 WHIRLPOOL 659717039bf294072117a8e7dc1cb590c6804d3dbde625aa16451bfdb6371933c71f6241fee1e38cec696bdb89e19111c30cf6ed17810daf09b75272080fbb31 |
28 |
+DIST Molsketch-0.4.1-src.tar.gz 1499842 SHA256 6b183ed3ba92f89f1318879657a79c09d7135c99af28eee8758f46f131e05a30 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26 WHIRLPOOL 383e9fffd1cd2db195e962f58e97d0ffd858dc14353c99ed0bdd7e577413e5ac991ed18a41b5d4ee4b926887a6a2654fe30167f82759142b21b753c30e41cbd7 |
29 |
|
30 |
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 |
31 |
deleted file mode 100644 |
32 |
index 41ddf01df5f..00000000000 |
33 |
--- a/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch |
34 |
+++ /dev/null |
35 |
@@ -1,54 +0,0 @@ |
36 |
- CMakeLists.txt | 12 ++++++------ |
37 |
- libmolsketch/src/stereocenteritem.cpp | 2 +- |
38 |
- 2 files changed, 7 insertions(+), 7 deletions(-) |
39 |
- |
40 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
41 |
-index a4b5d29..f472b40 100644 |
42 |
---- a/CMakeLists.txt |
43 |
-+++ b/CMakeLists.txt |
44 |
-@@ -12,10 +12,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) |
45 |
- # compiler issues are fixed and more warnings are issued. # |
46 |
- ########################################################### |
47 |
- if (CMAKE_COMPILER_IS_GNUCXX) |
48 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align") |
49 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts") |
50 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security") |
51 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common") |
52 |
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align") |
53 |
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wchar-subscripts") |
54 |
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security") |
55 |
-+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -fno-common") |
56 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align") |
57 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security") |
58 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-check-new -fno-common") |
59 |
-@@ -32,7 +32,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build;/.git") |
60 |
- include(CPack) |
61 |
- |
62 |
- # Unit testing, mainly useful for developers and so defaults to off |
63 |
--option(ENABLE_TESTS "Enable unit testing" ON) |
64 |
-+option(ENABLE_TESTS "Enable unit testing" OFF) |
65 |
- if(ENABLE_TESTS) |
66 |
- set(QT_USE_QTTEST TRUE) |
67 |
- enable_testing() |
68 |
-@@ -48,7 +48,7 @@ configure_file("${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in" |
69 |
- add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") |
70 |
- |
71 |
- # Enabling debugging symbols |
72 |
--set(CMAKE_BUILD_TYPE Debug) |
73 |
-+# set(CMAKE_BUILD_TYPE Debug) |
74 |
- |
75 |
- # Enabling shared libraries |
76 |
- set(BUILD_SHARED_LIBS OFF) |
77 |
-diff --git a/libmolsketch/src/stereocenteritem.cpp b/libmolsketch/src/stereocenteritem.cpp |
78 |
-index 44a8015..20f2a4a 100644 |
79 |
---- a/libmolsketch/src/stereocenteritem.cpp |
80 |
-+++ b/libmolsketch/src/stereocenteritem.cpp |
81 |
-@@ -63,7 +63,7 @@ namespace Molsketch { |
82 |
- graphsym.GetSymmetry(symmetry_classes); |
83 |
- |
84 |
- //std::vector<unsigned long> atomIds = FindTetrahedralAtoms(obmol, symmetry_classes); |
85 |
-- std::vector<OpenBabel::StereogenicUnit> units = FindStereogenicUnits(obmol, symmetry_classes); |
86 |
-+ OpenBabel::OBStereoUnitSet units = FindStereogenicUnits(obmol, symmetry_classes); |
87 |
- |
88 |
- for (unsigned int i = 0; i < units.size(); ++i) { |
89 |
- if (units.at(i).type == OpenBabel::OBStereo::Tetrahedral) { |
90 |
|
91 |
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 |
92 |
new file mode 100644 |
93 |
index 00000000000..c32b975778e |
94 |
--- /dev/null |
95 |
+++ b/sci-chemistry/molsketch/files/molsketch-0.4.1-more-quotes.patch |
96 |
@@ -0,0 +1,11 @@ |
97 |
+--- a/libmolsketch/src/molscene.cpp |
98 |
++++ b/libmolsketch/src/molscene.cpp |
99 |
+@@ -842,7 +842,7 @@ |
100 |
+ void MolScene::dragEnterEvent(QGraphicsSceneDragDropEvent *event) |
101 |
+ { |
102 |
+ if (!event->mimeData() || !event->mimeData()->hasFormat(mimeType())) return; |
103 |
+- if (!event->proposedAction() == Qt::CopyAction) return; |
104 |
++ if ((!event->proposedAction()) == Qt::CopyAction) return; |
105 |
+ event->accept(); |
106 |
+ for (genericAction* action : sceneActions()) |
107 |
+ action->setChecked(false); |
108 |
|
109 |
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 |
110 |
new file mode 100644 |
111 |
index 00000000000..1b63ed51ede |
112 |
--- /dev/null |
113 |
+++ b/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch |
114 |
@@ -0,0 +1,16 @@ |
115 |
+ CMakeLists.txt | 2 +- |
116 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
117 |
+ |
118 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
119 |
+index 64c18a2..75c2fb7 100644 |
120 |
+--- a/CMakeLists.txt |
121 |
++++ b/CMakeLists.txt |
122 |
+@@ -97,7 +97,7 @@ endif(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5PrintSupport_FO |
123 |
+ if(FORCEQt4) |
124 |
+ add_definitions(-DQTVERSIONSUFFIX="") |
125 |
+ else(FORCEQt4) |
126 |
+- add_definitions(-DQTVERSIONSUFFIX="\\\"-qt5\\\"") |
127 |
++ add_definitions(-DQTVERSIONSUFFIX="-qt5") |
128 |
+ endif(FORCEQt4) |
129 |
+ |
130 |
+ ################ Reading version and default paths |
131 |
|
132 |
diff --git a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.4.1.ebuild |
133 |
similarity index 52% |
134 |
rename from sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild |
135 |
rename to sci-chemistry/molsketch/molsketch-0.4.1.ebuild |
136 |
index 626c32f9216..1cd4ab221ee 100644 |
137 |
--- a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild |
138 |
+++ b/sci-chemistry/molsketch/molsketch-0.4.1.ebuild |
139 |
@@ -1,38 +1,43 @@ |
140 |
-# Copyright 1999-2015 Gentoo Foundation |
141 |
+# Copyright 1999-2017 Gentoo Foundation |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
|
144 |
-EAPI=5 |
145 |
+EAPI=6 |
146 |
|
147 |
-inherit cmake-utils multilib |
148 |
+CMAKE_MAKEFILE_GENERATOR=ninja |
149 |
|
150 |
-MY_P=${P/m/M}-Source |
151 |
+inherit cmake-utils multilib qmake-utils |
152 |
+ |
153 |
+MY_P=${P/m/M}-src |
154 |
|
155 |
DESCRIPTION="A drawing tool for 2D molecular structures" |
156 |
HOMEPAGE="http://molsketch.sourceforge.net/" |
157 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" |
158 |
+SRC_URI="mirror://sourceforge/project/${PN}/Molsketch/Beryllium-7%20${PV}/${MY_P}.tar.gz" |
159 |
|
160 |
LICENSE="GPL-2" |
161 |
SLOT="0" |
162 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
163 |
-IUSE="" |
164 |
+IUSE="test" |
165 |
|
166 |
DEPEND=" |
167 |
>=sci-chemistry/openbabel-2.2 |
168 |
- dev-qt/qtcore:4 |
169 |
- dev-qt/qtgui:4 |
170 |
- dev-qt/qttest:4 |
171 |
- >=dev-qt/qthelp-4.7.0:4[compat]" |
172 |
+ dev-qt/qtcore:5 |
173 |
+ dev-qt/qtgui:5 |
174 |
+ dev-qt/qtprintsupport:5 |
175 |
+ dev-qt/qtsvg:5 |
176 |
+ dev-qt/qtwidgets:5 |
177 |
+ " |
178 |
RDEPEND="${DEPEND}" |
179 |
|
180 |
-S=${WORKDIR}/${MY_P} |
181 |
+S=${WORKDIR}/${MY_P%%-src} |
182 |
|
183 |
PATCHES=( |
184 |
- "${FILESDIR}"/${P}-openbabel-231.patch |
185 |
+ "${FILESDIR}"/${PN}-0.3.0-_DEFAULT_SOURCE.patch |
186 |
+ "${FILESDIR}"/${P}-more-quotes.patch |
187 |
) |
188 |
|
189 |
src_prepare() { |
190 |
sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \ |
191 |
- -i libmolsketch/src/CMakeLists.txt || die #351246 |
192 |
+ -i {obabeliface,libmolsketch/src}/CMakeLists.txt || die #351246 |
193 |
sed -e "s:doc/molsketch:doc/${PF}:g" \ |
194 |
-i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die |
195 |
cmake-utils_src_prepare |
196 |
@@ -42,6 +47,12 @@ src_configure() { |
197 |
local mycmakeargs=( |
198 |
-DOPENBABEL2_INCLUDE_DIR="${EPREFIX}/usr/include/openbabel-2.0" |
199 |
-DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON |
200 |
+ -DENABLE_TESTS=$(usex test "ON" "OFF") |
201 |
) |
202 |
cmake-utils_src_configure |
203 |
} |
204 |
+ |
205 |
+src_install() { |
206 |
+ cmake-utils_src_install |
207 |
+ dosym ${PN}-qt5 /usr/bin/${PN} |
208 |
+} |