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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

6 files changed, 126 insertions, 9 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/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}
+}