Version Bump; fix version of openbabel in deps, bug #553512

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

7 files changed, 148 insertions, 26 deletions

diff --git a/sci-chemistry/molsketch/ChangeLog b/sci-chemistry/molsketch/ChangeLog
index d375b9ed92ef..f641064880b3 100644
--- a/sci-chemistry/molsketch/ChangeLog
+++ b/sci-chemistry/molsketch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/molsketch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.8 2014/09/17 11:58:04 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.9 2015/06/29 07:24:58 jlec Exp $
+
+*molsketch-0.3.0 (29 Jun 2015)
+
+  29 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/molsketch-0.3.0-_DEFAULT_SOURCE.patch,
+  +files/molsketch-0.3.0-desktop.patch, +files/molsketch-0.3.0-no-quotes.patch,
+  +molsketch-0.3.0.ebuild, molsketch-0.2.0-r1.ebuild:
+  Version Bump; fix version of openbabel in deps, bug #553512
 
   17 Sep 2014; Justin Lecher <jlec@gentoo.org> molsketch-0.2.0-r1.ebuild:
   Build with -DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON, #523020
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 62e9097148f0..f65081a32890 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -2,26 +2,31 @@
 Hash: SHA512
 
 AUX molsketch-0.2.0-openbabel-231.patch 2908 SHA256 f9f0b28850fc8b8211100aed3fc0186e1094250ddb387b2e3edae1d2430bce5a SHA512 a20a2814b88f0c6f3037facce423afc24c0bdd97032f3f9fa4d607b2815e8b82824c10d1cd01f4311349b01a49d563d38792649d8f7b57ebbab3e3aca0e1c974 WHIRLPOOL ed8d2be20af961cfefd6ebda0d8b8fcbcfab51ee4fe2d5302c39a3163812ee5b2d8818c7f820bc881239e03fddf9258526a59d78265d10b79f35b3b9e5e70932
+AUX molsketch-0.3.0-_DEFAULT_SOURCE.patch 661 SHA256 0ee57232a61e2ec9e44250b7a661bb2309f00f372ede8a6b1d9b51c139c90488 SHA512 9fd409ca55d5df0c61e84d3d9941f4855b7dcd32fd7521f24204570858dc6205c70ca4c645c5eee31bdc446a315e02081fa947677a4f22addce16ec4dad64c10 WHIRLPOOL bc1b6c740c22a866a375e08c002dcc39d3dae5e272dfaf531e79bee597a9d1053f7dbefd220bbb6911962f7651a1b1e9173eb28b33370bb3e3ee66480ad16b32
+AUX molsketch-0.3.0-desktop.patch 572 SHA256 6273aa20d8498ed522c3dbd5bcb966e7923e56f3497bff6441ff717a0f714486 SHA512 dbb074dd2bff41872ce9363241aa26bdc2537950c7635399c7a173845c30b8603de24bc6dcaf8a27a6eadbdc2c5249aa4cdd2bb63f059475d53f99b99acffd6a WHIRLPOOL 353f839287b5e58700cf25d788fb12b659bb345dbea714c59827957cd19c872660cec3b51619b90717fcc5755d21980258419f9de42586afdf5f1abd1ea6ce0a
+AUX molsketch-0.3.0-no-quotes.patch 490 SHA256 3979e7020f559665692fdade6a4dca2e0d5c840866b88c2a5615f9e908263875 SHA512 cf5028b8b99c77543943f517eee6eafbe8bc8a590fe8dbb9840001e568866a74c852fd59653714f507b0a5a556ce7c40dd1768c29df92af9cb8ff4131ac48e35 WHIRLPOOL 3f2a0999a706e9ec5ebce4697aeba8ce1ea22ec9442c947369afe2292bd2415cf7faceb72e1fe0c8c7dbd9aa9b9ba77382e6fbee052448939e7e7df11802df54
 DIST Molsketch-0.2.0-Source.tar.gz 276809 SHA256 05e058bf71fc99e5dda56ef1779a82c8885b2001d1af5dce92d959bf56d8a5d0 SHA512 e72c3b2103d70964ada8bd57cc40c16ae30d0a7c2c45521ca3c7a4c4586270e06707e5d662983a2d0f214b16b12afbfa439b58568873537f70f8ac735aa28d26 WHIRLPOOL 1711ef1e45aa09eda1b6dfa44589b0f235ac533914b343b3802d44faae1f658b668e418014d81a5a797f06132c0c72085eb64b9e8c1f7e22650d4655783cca46
-EBUILD molsketch-0.2.0-r1.ebuild 1207 SHA256 ca51033b4261adc9e6deb6436b963381c726bdc0bf5fddda419f78efbaafd34a SHA512 0eca695868911bf818914f2be7b5ac3904fc425ae3f6cf4c4ff103be88aa86452ab31f27325e94e6bffb0ce87ef64384d59d0dd01797a2390bf0e77e2be69fba WHIRLPOOL a177ad528b61ba85e941c2afa9877e207e69916af01aabbb03f0d2f47b87eac9a97d0477df94e732cd9498caa64b87d474f6208db98715082ece3d709c10e1c6
-MISC ChangeLog 1590 SHA256 0f1d5f821a27cac1e3d2cc7a6b54cef3a20bb8d40e0c30e6d358afbb150fcf1f SHA512 c04f1b85752db4e43f7bedbf87b933d5051a2166f61cc4d7163fbf3f6c4816d6e32dbe484d3df099566b1ae4c572e7ab60187b0d2368adfac91f705254680e67 WHIRLPOOL 787ff6b44e85ad5067ee458faad99c0f4ed0e76c3f2265020d87ff85215d2535c05fce49e011c366b47cb442ab2af49051f8833ab86a807ac5c39b3f7a032bab
+DIST Molsketch-0.3.0-src.tar.gz 337388 SHA256 078b05bfd591930430bc1e5df802af27bdf40718b9218ba6435eadc209d4d1bc SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4 WHIRLPOOL 659717039bf294072117a8e7dc1cb590c6804d3dbde625aa16451bfdb6371933c71f6241fee1e38cec696bdb89e19111c30cf6ed17810daf09b75272080fbb31
+EBUILD molsketch-0.2.0-r1.ebuild 1173 SHA256 eadff822f71cba9a4f8295f13ef3e566bdd0229c6ffbe1dcfdb5c5f28b875668 SHA512 d8da7153eba63c9d942d0ae4c735500ac38dde81a7e4fbb57206b084ad352a7522ec787df95683e47aeb0d09111f3e8793ae70a4679df8f527ffa0c627ba6455 WHIRLPOOL 0fe03d8772fd053cc90a7d8f1d9a0d95bcea13479b0fe8fca3025358334d825221cb9ab7feb8d7b3273cf0e0241ff046609b24ce87c4dad0389016e689fb1236
+EBUILD molsketch-0.3.0.ebuild 1471 SHA256 6621885ddf9dffc1beac4ac78878daa3cdd8b8d87d9141a068e622c4f59e5e12 SHA512 f28d550da8b3a3f2c2edcf686a5deb03e01741f2489e0288ff15e77bf38ddddbf696dd0029eaf7bfbf6a40a5c2d8c33426c05324221eb144205ed243f4680be6 WHIRLPOOL c6b91e6baa48d45ce0c16e4fffac55a6bdfb9124d3d4a21c131fe6f37505705a8786a59e377d96303aad3978ac2408bc3f0a58f78bc9e5598b51044bd8cde313
+MISC ChangeLog 1914 SHA256 6c5a568036ffbf415c7e20775fac372e1b58d991452ed26d508c49affaab5be3 SHA512 425528431c5f5024e126789276cdfd2c72a41eebb41fae603b3ecc17f8f37f78ac9ba9a6b648fe0343ebed13955f12996230112e4b89c954243d5e45ceb55697 WHIRLPOOL 66afd3262e5310709a7648482c0ac2b817dd05f6ad9d589483444ba8454780d590095a6fd717dcc5e23821b00f66d6eb62cd9f353b50c58a427adbe0c4aace37
 MISC metadata.xml 582 SHA256 ba889599410d153c232a7799f8c141394e08281c1a741b84951a287f2b947752 SHA512 2d231f0dd8effcaad36f935e5318182bcf184df6d55f1e94a5573ab38f28161f6b7b2e5ce59599774cff1c0dbe3478a7e895535c50099aa4828d8cd705e8d71a WHIRLPOOL 537366534d0b09d5cd0062253ff5dc9bc9e095c1a67f92882bc87c4b9e2cbbf31170b903fed181ecc26e49f7a6e0d4f87b215faea7d7bbc2e92bc53841ebd561
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfxvYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVkPLLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimpQQAIO471Oj0eP5Q/a2dM6yvWq+
-w/jsUsHJQph8Jn0gTyxENo+0dXUxhWkGRwi35SBJRh2NY8sUPhgKiWcmxVv6NmEH
-akgInGOaDy1+eSS6vqGaZzAxU9PebmlhswrpMp67DwmfBXfRuk1Jydf8SzgQ+qZT
-lGOmcJXm43dvp5zVsNHiELpR53uwci1mtF9sshc3uRhnx6nLM3+TNM1n69BWfT7m
-FZEi2yH2nRZqqzrUevQ1Mm3CAT7hnz8oCMb7/ariRgoq5b7c89TtzWTYPDSwKoHC
-Hq4jD0SAPiN1FTIn00wRgubTe0wxtAfLRkN3dywSFwOlCqklqqCmXZ+h3hRgqBVf
-bLvTQ4pthzFooNZa/wdpjOFS8tjMz7i1h5FznT79woPnUHrxcAI9/dGMh0FVbTA8
-6d7bayhb8ryaWWSwPdpX9SRU6liNW+7pfpOI2L4DI2I0oWdrA1FnrQMcNjhKM3N4
-nu6PpFWlA0H9kKoXEDP0v2vjjWuvXox/kE+bXblvVikxG89nFPW+3NNcQEH+Vupe
-V5VyGI9cQh+10W9P2BQm6Zz9FAuOKPf4Ue+DbI1jHRRWLUjtMgqqUQ8K6zEHiIWq
-7C9eqEBE6Gdry2xbY4Nk9gczdIxZympvvgDLFUPJGIdxmHNH13CiRS0W4qAs/dCZ
-lJDfdRmKtyoO9XF109/F
-=OVv2
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCa8P/0ObwyLwyzW5Zkz32fJZ6wzl
+GCbEX4DFmhNRv2PUQAVOppf/T58g53qL1bCjpCwqbUIgGXySoxNohqcfXt3Y1Mc/
+nJBzsUCxFsSgEoEnEw20SMgTq+2F05YIM81dZsvS7PljzLfcv3aE22BGN0NdwKE3
+lTV8PZBOXsQiosq9v2eZh8cQtMTO0DFjqtSFlNDi44Ywf4ZqRI8tCo3b6sgl+erZ
+1zIy7qfIMyDlNoY2r7f6F+R4wwpoUu8tKuvZB1EmaOM3+5ucpEHao9qDr5tUUk3i
+exrkBAJijVXvO+Pwihjvbm2kSMi3N7wbDbYVIh/VDP1CegARCVX0ePgPc7s6k5HX
+MuDEA6MoiLnakQdxRy/BamfGOJtFhxM23TskQNR0fvfJzpwQLk5UjPs3vQXrizxE
+UuB80toASGIGI9vC1QFEx59muyq6vu5o5FgDsjS6rEiTI3KP2oyf3qa/TKgaCVo5
+E1IGorK35kt0VuQbsOXet+XE4jgdsjVDmXEYiSDhLl7R6w+EvalzzODZt3Q+IR7m
+qFIaS6M3+/3Jw9Rqx3XjiKyDJpaqW0UkRpD++dfeIAe46HG9f4mzHNZFEwh69uE/
+2eS09stbmMDuwiMFZXlP77b21Zcuk5plEEHoIFiMy7uzrqYoLFbIAny2a7fqoLjR
+FuryKT4K36wujggJDqjE
+=paSr
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..af3b5ceedac6
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.3.0-_DEFAULT_SOURCE.patch
@@ -0,0 +1,16 @@
+ 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.3.0-desktop.patch b/sci-chemistry/molsketch/files/molsketch-0.3.0-desktop.patch
new file mode 100644
index 000000000000..fd44e88c7870
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.3.0-desktop.patch
@@ -0,0 +1,19 @@
+ molsketch/src/molsketch.desktop | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/molsketch/src/molsketch.desktop b/molsketch/src/molsketch.desktop
+index a4a5418..4e0a2ef 100644
+--- a/molsketch/src/molsketch.desktop
++++ b/molsketch/src/molsketch.desktop
+@@ -5,9 +5,9 @@ Type=Application
+ Name=molsKetch
+ TryExec=molsketch
+ Exec=molsketch
+-Icon=molsketch.png
++Icon=molsketch
+ DocPath=molsketch/index.html
+-MimeType=chemical/x-cml
++MimeType=chemical/x-cml;
+ Terminal=false
+ Categories=Qt;Education;Science;
+ GenericName=2D molecular structures editor
diff --git a/sci-chemistry/molsketch/files/molsketch-0.3.0-no-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.3.0-no-quotes.patch
new file mode 100644
index 000000000000..db7be800e385
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.3.0-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)
+ 
+ # and OpenBabel2
diff --git a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
index 03cccdcb0943..3bd7f3ec49b5 100644
--- a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild,v 1.7 2014/09/17 11:58:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild,v 1.8 2015/06/29 07:24:58 jlec Exp $
 
-EAPI=3
+EAPI=5
 
 inherit cmake-utils multilib
 
@@ -18,13 +18,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
-	=sci-chemistry/openbabel-2.2*
+	>=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/qthelp-4.7.0:4 )"
+	>=dev-qt/qthelp-4.7.0:4[compat]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sci-chemistry/molsketch/molsketch-0.3.0.ebuild b/sci-chemistry/molsketch/molsketch-0.3.0.ebuild
new file mode 100644
index 000000000000..b34c0dcaaa02
--- /dev/null
+++ b/sci-chemistry/molsketch/molsketch-0.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.3.0.ebuild,v 1.1 2015/06/29 07:24:58 jlec Exp $
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+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/project/${PN}/Molsketch/Lithium%20${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+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}/${MY_P%%-src}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-no-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
+}
+
+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}
+}