sci-chemistry/molsketch: Backport changes in order to fix some unknown build failure, #351232

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

5 files changed, 82 insertions, 22 deletions

diff --git a/sci-chemistry/molsketch/ChangeLog b/sci-chemistry/molsketch/ChangeLog
index c2676cc30aa2..0677108b4119 100644
--- a/sci-chemistry/molsketch/ChangeLog
+++ b/sci-chemistry/molsketch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/molsketch
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.3 2011/03/26 22:26:30 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.4 2012/06/24 08:13:25 jlec Exp $
+
+  24 Jun 2012; Justin Lecher <jlec@gentoo.org> molsketch-0.2.0-r1.ebuild,
+  +files/molsketch-0.2.0-openbabel-231.patch, metadata.xml:
+  Backport changes in order to fix some unknown build failure, #351232
 
   26 Mar 2011; Justin Lecher <jlec@gentoo.org> molsketch-0.2.0-r1.ebuild:
   Restrict openbabel version to 2.2*
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index eb114468e96a..5e293518fede 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX molsketch-0.2.0-openbabel-231.patch 2908 RMD160 435c68961cf7311df349a4269c96c59a2397585f SHA1 5f9b3c0d2c5bce5c8de0ec8c0770fdf12ad17291 SHA256 f9f0b28850fc8b8211100aed3fc0186e1094250ddb387b2e3edae1d2430bce5a
 DIST Molsketch-0.2.0-Source.tar.gz 276809 RMD160 1dd18878bc2f2ec2fdf6d2eb54e85f47512d5c07 SHA1 a70205f89f0bcfcb280239ee51832ba34b8b15bd SHA256 05e058bf71fc99e5dda56ef1779a82c8885b2001d1af5dce92d959bf56d8a5d0
-EBUILD molsketch-0.2.0-r1.ebuild 1109 RMD160 0b043ad1a0443f3a1fe73dcef001f7df73a5a83e SHA1 c97fe531e54976b1abd248ca80a28de235781bd8 SHA256 6c225dceaf7c3587aecba91affa9868ac2c14aa00ac02cf7f86942c98b40ba88
-MISC ChangeLog 884 RMD160 87a142ca3b251856ced1de5f070a65cdfddcfe7d SHA1 2dc98bae97b08cd04de6237b7fcb5a0125c5de5f SHA256 d9a6f9dea9da9ef5fec7926ccacd8acf8c9a347306806363146d2b25da8f3a4b
-MISC metadata.xml 624 RMD160 079d3f672dce0dee3a951152e6fb97e0579a15e8 SHA1 6f9367fe94191650e3110b64f005606cb887727b SHA256 b0963a279abd1d78745c6de3b2176c9c553bd3c1cbbf341be2cf7260af3d5844
+EBUILD molsketch-0.2.0-r1.ebuild 1181 RMD160 36a1f3a2859f2759c6cdfe763e59068e01d4e62b SHA1 fdf9169538f33fa4260f03a55d0d9943fd446add SHA256 4f5ecec282c8f312abd6e65f99e96e17d9eb89e21c530033426739825e94a0da
+MISC ChangeLog 1090 RMD160 d12ccea9554657856a618f221311e26d76860dd6 SHA1 2cae47157fc04f83ec5e7082933614323de65843 SHA256 96b65529ab81c1c751155fca66a2138f2215f31d9b60df1b64a1bdc11be78725
+MISC metadata.xml 493 RMD160 9d443aaf2529d9e0f35772c08dee6cbbb321137f SHA1 7cd4997d98c1b96d777ab02f7e91b97b544f5b46 SHA256 eec91eccf93cd177e1140f5c661ff8014b642da2f0a44fa59b5b920cb1486bae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk2OaB8ACgkQgAnW8HDreRZiWwCeJr3MUAMFkHew9G65mB0c+Q/6
-u9sAn00IpYw8SktL8RO2Gu5pysYEDwK3
-=Lu3U
+iEYEAREKAAYFAk/mzCoACgkQgAnW8HDreRbj0ACfQFTEQ5M/0u/HNCUt2hP6EVxj
+z4sAoJ0X0C4xQ9IVJWmsJiFOI7jxCR1e
+=9YBv
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..41ddf01df5f8
--- /dev/null
+++ b/sci-chemistry/molsketch/files/molsketch-0.2.0-openbabel-231.patch
@@ -0,0 +1,54 @@
+ 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/metadata.xml b/sci-chemistry/molsketch/metadata.xml
index 26890e8db91c..1439f1205607 100644
--- a/sci-chemistry/molsketch/metadata.xml
+++ b/sci-chemistry/molsketch/metadata.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-	<email>jlec@gentoo.org</email>
-	<description>Tree Proxy for Max</description>
-</maintainer>
-<maintainer>
-	<email>max-braeu@gmx.de</email>
-	<description></description>
-</maintainer>
-<longdescription lang="en">
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 	Molsketch is a 2D molecular editing tool. Its goal is to help you draw 
 	molecules quick and easily. Of course you're creation can be exported 
 	afterwards in high quality in a number of vector and bitmap formats. 
diff --git a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
index 6d39a1d2022a..f222c647e645 100644
--- a/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
+++ b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/03/26 22:26:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild,v 1.3 2012/06/24 08:13:25 jlec Exp $
 
 EAPI=3
 
@@ -28,11 +28,16 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-openbabel-231.patch
+	)
+
 src_prepare() {
 	sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \
 		-i libmolsketch/src/CMakeLists.txt || die #351246
 	sed -e "s:doc/molsketch:doc/${PF}:g" \
 		-i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die
+	base_src_prepare
 }
 
 src_configure() {