sci-chemistry/avogadro: 1.2.0_p20170207 version bump

Thanks-to: Michelangelo Scopelliti <kernelpanic@gmx.it>
Closes: https://bugs.gentoo.org/594630
Closes: https://bugs.gentoo.org/604604
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 5badc8a7886a9d930c0c98ecb7b28381fa704469..bce09655f56f0e6f77bce6d9d82ac995928ae9e7 100644 (file)
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1 +1,2 @@
 DIST avogadro-1.1.1.tar.bz2 11118046 BLAKE2B 358eda508c56247fb34e9cf4b4d790859cc156e000fa10f9e2f2700e9e295557dd5e615ca626227a918fa4f699c089bee23596d186f613f8934a73b8cfeeb358 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827
+DIST avogadro-1.2.0_p20170207.tar.gz 16805634 BLAKE2B 012ac0fa6e86bdff1ec117e81faf88ddda2e3264b36c3997ce60814f5a5900dc8722266a52bda70715279e640a3deb04a38bc2bfdfc4ae856182d94e25b7c705 SHA512 c5088ba1e1b48f3202766e38b1c3f2016c3facbf4ea544e24eedb0706328815e7500bcebdedfea2a330e665b97f76c7f86b669339c6f5a765533bfd3a88d7b51

diff --git a/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild b/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild
new file mode 100644 (file)
index 0000000..e24622b
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=258105b4d8957e0245a341cdf1dc12c72234c833
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils flag-o-matic python-single-r1 vcs-snapshot
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="https://github.com/cryos/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_sse2 +glsl python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+       dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       dev-qt/qtopengl:4
+       media-libs/glew:=
+       sci-chemistry/openbabel:=
+       virtual/glu
+       x11-libs/gl2ps
+       glsl? ( >=media-libs/glew-1.5.0:0= )
+       python? (
+               ${PYTHON_DEPS}
+               dev-libs/boost:=[${PYTHON_USEDEP}]
+               dev-python/numpy[${PYTHON_USEDEP}]
+               dev-python/sip[${PYTHON_USEDEP}]
+       )
+"
+DEPEND="${RDEPEND}
+       dev-cpp/eigen:3
+       virtual/pkgconfig
+"
+
+# https://sourceforge.net/p/avogadro/bugs/653/
+RESTRICT="test"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.1.1-mkspecs-dir.patch
+       "${FILESDIR}"/${PN}-1.1.1-no-strip.patch
+       "${FILESDIR}"/${PN}-1.1.1-pkgconfig_eigen.patch
+       "${FILESDIR}"/${PN}-1.1.1-openbabel.patch
+       "${FILESDIR}"/${PN}-1.1.1-boost-join-moc.patch
+       "${FILESDIR}"/${PN}-1.2.0-numpy.patch
+)
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       sed -e "s:_BSD_SOURCE:_DEFAULT_SOURCE:g" \
+               -i CMakeLists.txt || die
+
+       sed -e "/Version/s/1\.2/1\.0/" \
+               -i avogadro/src/avogadro.desktop || die
+
+       cmake-utils_src_prepare
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DENABLE_THREADEDGL=OFF
+               -DENABLE_RPATH=OFF
+               -DENABLE_UPDATE_CHECKER=OFF
+               -DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+               -DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+               -DENABLE_GLSL=$(usex glsl)
+               -DENABLE_PYTHON=$(usex python)
+               -DENABLE_TESTS=$(usex test)
+       )
+
+       QT_MKSPECS_RELATIVE=share/qt4/mkspecs cmake-utils_src_configure
+}

diff --git a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
new file mode 100644 (file)
index 0000000..4869fa4
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindNumpy.cmake b/cmake/modules/FindNumpy.cmake
+index b348418..49ba206 100644
+--- a/cmake/modules/FindNumpy.cmake
++++ b/cmake/modules/FindNumpy.cmake
+@@ -10,7 +10,7 @@
+ #endif (NUMPY_INCLUDE_DIR)
+ 
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 
+-    "import numpy; print numpy.get_include()"
++      "import numpy; print (numpy.get_include())"
+     OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+