public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2015-12-28 13:34 Justin Lecher
  0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-12-28 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0db137e6da3ecb14cebbb6ac595c235cba1c38b1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 10:04:33 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 13:34:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db137e6

sci-chemistry/avogadro: Drop old

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/avogadro/Manifest                 |  1 -
 sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild | 55 -------------------------
 sci-chemistry/avogadro/files/1.0.1-gl2ps.patch  | 39 ------------------
 3 files changed, 95 deletions(-)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index aad0cb8..b9a9c4d 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,2 +1 @@
-DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d

diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
deleted file mode 100644
index ae73ee5..0000000
--- a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2"
-
-RDEPEND="
-	>=sci-chemistry/openbabel-2.2.3
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
-	x11-libs/gl2ps
-	glsl? ( >=media-libs/glew-1.5.0 )
-	python? (
-		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.1-gl2ps.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
-		-DENABLE_RPATH=OFF
-		-DENABLE_UPDATE_CHECKER=OFF
-		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
-		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
deleted file mode 100644
index d8a0c0f..0000000
--- a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
-index 75b6dfb..d87ac2c 100644
---- a/avogadro/src/CMakeLists.txt
-+++ b/avogadro/src/CMakeLists.txt
-@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
- FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
- set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
- # Add GL2PS to the executable
--set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
-+#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
- 
- if( WIN32 )
-   set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
-diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
-index 66785fd..2933953 100644
---- a/avogadro/src/mainwindow.cpp
-+++ b/avogadro/src/mainwindow.cpp
-@@ -51,7 +51,7 @@
- //#endif
- 
- // Include the GL2PS header
--#include "../gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- 
- #include <avogadro/pluginmanager.h>
- 
-diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
-index cce8ece..cc084fb 100644
---- a/libavogadro/src/CMakeLists.txt
-+++ b/libavogadro/src/CMakeLists.txt
-@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
- add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
--target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-+target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
- 
- install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
- install(FILES ${libavogadro_HDRS}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2015-12-28 13:34 Justin Lecher
  0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-12-28 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     093f23a979872f8e794498c24cdf121e32cec879
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 13:33:02 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 13:34:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093f23a9

sci-chemistry/avogadro: Version Bump & fix linking problems with openbabel

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=569896

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/avogadro/Manifest                    |  1 +
 sci-chemistry/avogadro/avogadro-1.1.0.ebuild       |  1 +
 ...avogadro-1.1.0.ebuild => avogadro-1.1.1.ebuild} | 28 +++++++++---
 .../avogadro/files/avogadro-1.1.1-eigen3.patch     | 51 ++++++++++++++++++++++
 .../files/avogadro-1.1.1-mkspecs-dir.patch         | 12 +++++
 .../avogadro/files/avogadro-1.1.1-no-strip.patch   | 12 +++++
 .../avogadro/files/avogadro-1.1.1-openbabel.patch  | 16 +++++++
 .../files/avogadro-1.1.1-pkgconfig_eigen.patch     |  8 ++++
 8 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index b9a9c4d..9dbb71c 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1 +1,2 @@
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
+DIST avogadro-1.1.1.tar.bz2 11118046 SHA256 fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 WHIRLPOOL 6bea2c25675ba29729785b561cbaed33929aeb4638180454b1aed8913160cd6d0315bb09e6ee4033a8d27ce84fd7a4573851fd02c76b64b6aa86e615a19b8c38

diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
index 0de1b83..4f7720d 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
@@ -37,6 +37,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${P}-textrel.patch
 	"${FILESDIR}"/${P}-xlibs.patch
+	"${FILESDIR}"/${PN}-1.1.1-openbabel.patch
 )
 
 pkg_setup() {

diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
similarity index 60%
copy from sci-chemistry/avogadro/avogadro-1.1.0.ebuild
copy to sci-chemistry/avogadro/avogadro-1.1.1.ebuild
index 0de1b83..090d99c 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
@@ -6,11 +6,11 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils python-single-r1
+inherit cmake-utils eutils flag-o-matic python-single-r1
 
 DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
 HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,8 +19,8 @@ IUSE="+glsl python cpu_flags_x86_sse2 test"
 
 RDEPEND="
 	>=sci-chemistry/openbabel-2.3.0
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
+	>=dev-qt/qtgui-4.8.5:4
+	>=dev-qt/qtopengl-4.8.5:4
 	x11-libs/gl2ps
 	glsl? ( >=media-libs/glew-1.5.0 )
 	python? (
@@ -35,17 +35,31 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-textrel.patch
-	"${FILESDIR}"/${P}-xlibs.patch
+	#"${FILESDIR}"/${PN}-1.1.0-textrel.patch
+	"${FILESDIR}"/${PN}-1.1.0-xlibs.patch
+	"${FILESDIR}"/${P}-eigen3.patch
+	"${FILESDIR}"/${P}-mkspecs-dir.patch
+	"${FILESDIR}"/${P}-no-strip.patch
+	"${FILESDIR}"/${P}-pkgconfig_eigen.patch
+	"${FILESDIR}"/${P}-openbabel.patch
 )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	sed \
+		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
+		-i CMakeLists.txt || die
+	# warning: "Eigen2 support is deprecated in Eigen 3.2.x and it will be removed in Eigen 3.3."
+	append-cppflags -DEIGEN_NO_EIGEN2_DEPRECATED_WARNING
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
+		-DENABLE_THREADEDGL=OFF
 		-DENABLE_RPATH=OFF
 		-DENABLE_UPDATE_CHECKER=OFF
 		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch
new file mode 100644
index 0000000..dc07d69
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch
@@ -0,0 +1,51 @@
+--- avogadro-1.1.1/CMakeLists.txt.omv~	2014-01-30 13:58:22.999443609 +0100
++++ avogadro-1.1.1/CMakeLists.txt	2014-01-30 13:59:31.086106925 +0100
+@@ -230,13 +230,15 @@ if(NOT Linguist_FOUND)
+   message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+ endif()
+ 
+-find_package(Eigen3) # find and setup Eigen3 if available
++find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available
+ if(NOT EIGEN3_FOUND)
+    message(STATUS "Cannot find Eigen3, trying Eigen2")
+-   find_package(Eigen2 REQUIRED) # Some version is required
++   find_package(Eigen2) # Some version is required
+ else()
+ # Use Stage10 Eigen3 support
+    set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
++   add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API)
++   set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
+ endif()
+ 
+ find_package(ZLIB REQUIRED)
+--- avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~	2014-01-30 14:12:33.859401753 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt	2014-01-30 14:15:07.652727522 +0100
+@@ -4,6 +4,8 @@ set(LINK_LIBS avogadro)
+ set(PLUGIN_LABEL extensions)
+ set(PLUGIN_TARGET extensions)
+ 
++add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11)
++
+ set(qtaimextension_SRCS
+     qtaimextension.cpp
+ #    qtaimdialog.cpp
+--- avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~	2014-01-30 13:59:05.889441500 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt	2014-01-30 13:59:08.832774688 +0100
+@@ -1,5 +1,5 @@
+ find_package(Qt4 4.6 REQUIRED)
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+ 
+ include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR})
+ 
+--- avogadro-1.1.1/cmake/modules/AvogadroUse.cmake.orig	2014-10-13 20:13:59.909828034 +0100
++++ avogadro-1.1.1/cmake/modules/AvogadroUse.cmake	2014-10-13 20:15:09.492822908 +0100
+@@ -12,7 +12,7 @@
+ 
+ # Add the Avogadro modules directory to the CMake module path
+ set(CMAKE_MODULE_PATH ${Avogadro_PLUGIN_DIR}/cmake ${CMAKE_MODULE_PATH})
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+ include_directories(${EIGEN2_INCLUDE_DIR})
+ if(Avogadro_ENABLE_GLSL)
+   find_package(GLEW)

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
new file mode 100644
index 0000000..45c6164
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
@@ -0,0 +1,12 @@
+diff -up avogadro-1.1.1/CMakeLists.txt.mkspecs-dir avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.mkspecs-dir	2014-01-24 23:43:01.618510517 -0600
++++ avogadro-1.1.1/CMakeLists.txt	2014-01-24 23:44:03.236844746 -0600
+@@ -547,7 +547,7 @@ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+ #    )
+     install(FILES
+       "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
+-      DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
++      DESTINATION "${QT_MKSPECS_DIR}/features"
+     )
+ #  endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/")
+ else()

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
new file mode 100644
index 0000000..490dd58
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
@@ -0,0 +1,12 @@
+diff -up avogadro-1.1.1/CMakeLists.txt.no-strip avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.no-strip	2014-01-24 23:14:44.473840038 -0600
++++ avogadro-1.1.1/CMakeLists.txt	2014-01-24 23:15:46.869166459 -0600
+@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+   # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
+   # they will not replace them.
+-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s")
++  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+     "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
+   set(CMAKE_CXX_FLAGS_DEBUG   "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
new file mode 100644
index 0000000..4bdc6b2e
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
@@ -0,0 +1,16 @@
+ libavogadro/src/python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavogadro/src/python/CMakeLists.txt b/libavogadro/src/python/CMakeLists.txt
+index efb518a..1a3d91a 100644
+--- a/libavogadro/src/python/CMakeLists.txt
++++ b/libavogadro/src/python/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (WIN32)
+   target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
+ else()
+   target_link_libraries(python-module stdc++ avogadro
+-    ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
++    ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${OPENBABEL2_LIBRARIES})
+ endif()
+ 
+ # Let's try to use this instead:

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
new file mode 100644
index 0000000..93dbe2f
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
@@ -0,0 +1,8 @@
+diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in
+--- avogadro-1.1.1/avogadro.pc.in.eigen	2013-12-06 09:50:04.000000000 -0600
++++ avogadro-1.1.1/avogadro.pc.in	2014-01-25 00:37:45.732007852 -0600
+@@ -9,3 +9,4 @@ Description: Avogadro libraries
+ Version: @Avogadro_VERSION_FULL@
+ Libs: -L${libdir} -lavogadro
+ Cflags: -I${pkgincludedir}
++Requires.private: eigen3


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2015-12-28 19:20 Justin Lecher
  0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-12-28 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2337c391c8eef3fa7af39ac32045dbf124433b28
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 19:15:02 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 19:19:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2337c391

Revert "sci-chemistry/avogadro: Drop old"

This reverts commit 0db137e6da3ecb14cebbb6ac595c235cba1c38b1.

 sci-chemistry/avogadro/Manifest                 |  1 +
 sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild | 55 +++++++++++++++++++++++++
 sci-chemistry/avogadro/files/1.0.1-gl2ps.patch  | 39 ++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 9dbb71c..9a4d897 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,2 +1,3 @@
+DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
 DIST avogadro-1.1.1.tar.bz2 11118046 SHA256 fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 WHIRLPOOL 6bea2c25675ba29729785b561cbaed33929aeb4638180454b1aed8913160cd6d0315bb09e6ee4033a8d27ce84fd7a4573851fd02c76b64b6aa86e615a19b8c38

diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
new file mode 100644
index 0000000..ae73ee5
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-single-r1
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+glsl python cpu_flags_x86_sse2"
+
+RDEPEND="
+	>=sci-chemistry/openbabel-2.2.3
+	>=dev-qt/qtgui-4.5.3:4
+	>=dev-qt/qtopengl-4.5.3:4
+	x11-libs/gl2ps
+	glsl? ( >=media-libs/glew-1.5.0 )
+	python? (
+		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:2"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.1-gl2ps.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_THREADGL=OFF
+		-DENABLE_RPATH=OFF
+		-DENABLE_UPDATE_CHECKER=OFF
+		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
+		$(cmake-utils_use_enable glsl)
+		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+		$(cmake-utils_use_enable python)
+	)
+
+	cmake-utils_src_configure
+}

diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
new file mode 100644
index 0000000..d8a0c0f
--- /dev/null
+++ b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
@@ -0,0 +1,39 @@
+diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
+index 75b6dfb..d87ac2c 100644
+--- a/avogadro/src/CMakeLists.txt
++++ b/avogadro/src/CMakeLists.txt
+@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
+ FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
+ set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
+ # Add GL2PS to the executable
+-set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
++#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
+ 
+ if( WIN32 )
+   set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
+diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
+index 66785fd..2933953 100644
+--- a/avogadro/src/mainwindow.cpp
++++ b/avogadro/src/mainwindow.cpp
+@@ -51,7 +51,7 @@
+ //#endif
+ 
+ // Include the GL2PS header
+-#include "../gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ 
+ #include <avogadro/pluginmanager.h>
+ 
+diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
+index cce8ece..cc084fb 100644
+--- a/libavogadro/src/CMakeLists.txt
++++ b/libavogadro/src/CMakeLists.txt
+@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
+ add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
+ set_target_properties(avogadro
+   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
+-target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
++target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
+ 
+ install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES ${libavogadro_HDRS}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2016-04-03 12:44 David Seifert
  0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2016-04-03 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     b2e1971f890bbe832d0661d24d7aff08b71023d2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 12:44:05 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 12:44:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e1971f

sci-chemistry/avogadro: Fix BOOST_JOIN with >=dev-libs/boost-1.58.0

Gentoo-Bug: 578896
* EAPI=6

Package-Manager: portage-2.2.28

 sci-chemistry/avogadro/avogadro-1.1.1.ebuild       | 15 +++--
 .../files/avogadro-1.1.1-boost-join-moc.patch      | 78 ++++++++++++++++++++++
 2 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
index 1fc2121..6986a69 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils flag-o-matic python-single-r1
+inherit cmake-utils flag-o-matic python-single-r1
 
 DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
 HOMEPAGE="http://avogadro.openmolecules.net/"
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-no-strip.patch
 	"${FILESDIR}"/${P}-pkgconfig_eigen.patch
 	"${FILESDIR}"/${P}-openbabel.patch
+	"${FILESDIR}"/${P}-boost-join-moc.patch
 )
 
 pkg_setup() {
@@ -65,10 +66,10 @@ src_configure() {
 		-DENABLE_UPDATE_CHECKER=OFF
 		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
 		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
+		-DENABLE_glsl="$(usex glsl)"
+		-DENABLE_TESTS="$(usex test)"
+		-DWITH_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DENABLE_python="$(usex python)"
 	)
 
 	cmake-utils_src_configure

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch
new file mode 100644
index 0000000..a464fda
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch
@@ -0,0 +1,78 @@
+Add include guards to all boost includes, as qt's moc trips
+over nested BOOST_JOIN macros:
+* usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
+* libavogadro/src/CMakeFiles/avogadro.dir/build.make:217: recipe for target 'libavogadro/src/moc_pythonengine_p.cxx' failed
+See also: https://bugs.gentoo.org/show_bug.cgi?id=578896
+
+--- avogadro-1.1.1/libavogadro/src/pythonengine_p.h
++++ avogadro-1.1.1/libavogadro/src/pythonengine_p.h
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/engine.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ namespace Avogadro {
+ 
+--- avogadro-1.1.1/libavogadro/src/pythonextension_p.h
++++ avogadro-1.1.1/libavogadro/src/pythonextension_p.h
+@@ -29,7 +29,9 @@
+ #include <avogadro/extension.h>
+ #include <avogadro/primitive.h>
+ #include <avogadro/glwidget.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QWidget>
+ #include <QList>
+--- avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
++++ avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
+@@ -26,7 +26,9 @@
+ #define PYTHONINTERPRETER_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ #include <avogadro/primitive.h>
+ #include <QString>
+ 
+--- avogadro-1.1.1/libavogadro/src/pythonscript.h
++++ avogadro-1.1.1/libavogadro/src/pythonscript.h
+@@ -27,7 +27,9 @@
+ #define PYTHONSCRIPT_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include "pythonerror.h"
+ 
+--- avogadro-1.1.1/libavogadro/src/pythonthread_p.h
++++ avogadro-1.1.1/libavogadro/src/pythonthread_p.h
+@@ -26,7 +26,9 @@
+ #define PYTHONTHREAD_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ namespace Avogadro {
+ 
+--- avogadro-1.1.1/libavogadro/src/pythontool_p.h
++++ avogadro-1.1.1/libavogadro/src/pythontool_p.h
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/tool.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QObject>
+ #include <QAction>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2018-01-14  9:43 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-01-14  9:43 UTC (permalink / raw
  To: gentoo-commits

commit:     63b820bd77d76e5aa5a1a50717716d11c0c84bc3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 23:53:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 09:42:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b820bd

sci-chemistry/avogadro: Fix cmake w/ >=GCC-6

Using the upstream patch, even if it is not the proper solution.

Closes: https://bugs.gentoo.org/619544
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-chemistry/avogadro/avogadro-1.1.1.ebuild       |  3 ++-
 .../files/avogadro-1.1.1-gcc-version.patch         | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
index 5e9225721e1..63150ada5fa 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-pkgconfig_eigen.patch
 	"${FILESDIR}"/${P}-openbabel.patch
 	"${FILESDIR}"/${P}-boost-join-moc.patch
+	"${FILESDIR}"/${P}-gcc-version.patch
 )
 
 pkg_setup() {

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch
new file mode 100644
index 00000000000..48840204a8a
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch
@@ -0,0 +1,23 @@
+From a8bf7bcd7881147c3bcec97d247a2fa4160019d9 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 5 Jul 2016 00:10:26 +0200
+Subject: [PATCH] Fix detection of gcc6's version number
+
+...and be safe for further new versions.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cbeb8f10..8d2958739 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   # Now check if we can use visibility to selectively export symbols
+   # Get the GCC version - from KDE4 cmake files
+   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE	_gcc_version_info)
+-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+   # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+   # patch level, handle this here:
+   if (NOT _gcc_version)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2018-01-14  9:43 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-01-14  9:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f61e0491df5e176272901e250dde3525478dab51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 01:29:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 09:42:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61e0491

sci-chemistry/avogadro: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-chemistry/avogadro/Manifest                    |  2 -
 sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild    | 56 -------------------
 sci-chemistry/avogadro/avogadro-1.1.0.ebuild       | 62 ----------------------
 sci-chemistry/avogadro/files/1.0.1-gl2ps.patch     | 39 --------------
 .../avogadro/files/avogadro-1.1.0-textrel.patch    | 29 ----------
 5 files changed, 188 deletions(-)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 9fb4e9f1187..5badc8a7886 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,3 +1 @@
-DIST avogadro-1.0.3.tar.bz2 4971989 BLAKE2B 1cebca8c36c265475e68adbcd3dd451088654095545d9546c1d786920d13d312c035b9d6f7f34ea655e7778d392feaf5dedf36fe93775b18f0d644f97229c47d SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210
-DIST avogadro-1.1.0.tar.bz2 10741835 BLAKE2B 1427eb5c060f4566b431ecbd3847526d6ea4cc22067fa78e2e55ae113550c818959d96f1441432872eb5e96bae13f23e17d0a6640c7b034c90140da3e92df073 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a
 DIST avogadro-1.1.1.tar.bz2 11118046 BLAKE2B 358eda508c56247fb34e9cf4b4d790859cc156e000fa10f9e2f2700e9e295557dd5e615ca626227a918fa4f699c089bee23596d186f613f8934a73b8cfeeb358 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827

diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
deleted file mode 100644
index ce624e4ae71..00000000000
--- a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sci-chemistry/openbabel-2.2.3
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
-	x11-libs/gl2ps
-	glsl? ( >=media-libs/glew-1.5.0:0= )
-	python? (
-		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.1-gl2ps.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
-		-DENABLE_RPATH=OFF
-		-DENABLE_UPDATE_CHECKER=OFF
-		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
-		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
deleted file mode 100644
index ff3a9036301..00000000000
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2 test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sci-chemistry/openbabel-2.3.0
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
-	x11-libs/gl2ps
-	glsl? ( >=media-libs/glew-1.5.0:0= )
-	python? (
-		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2"
-
-# https://sourceforge.net/p/avogadro/bugs/653/
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-textrel.patch
-	"${FILESDIR}"/${P}-xlibs.patch
-	"${FILESDIR}"/${PN}-1.1.1-openbabel.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
-		-DENABLE_RPATH=OFF
-		-DENABLE_UPDATE_CHECKER=OFF
-		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
-		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
deleted file mode 100644
index d8a0c0f758e..00000000000
--- a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
-index 75b6dfb..d87ac2c 100644
---- a/avogadro/src/CMakeLists.txt
-+++ b/avogadro/src/CMakeLists.txt
-@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
- FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
- set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
- # Add GL2PS to the executable
--set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
-+#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
- 
- if( WIN32 )
-   set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
-diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
-index 66785fd..2933953 100644
---- a/avogadro/src/mainwindow.cpp
-+++ b/avogadro/src/mainwindow.cpp
-@@ -51,7 +51,7 @@
- //#endif
- 
- // Include the GL2PS header
--#include "../gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- 
- #include <avogadro/pluginmanager.h>
- 
-diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
-index cce8ece..cc084fb 100644
---- a/libavogadro/src/CMakeLists.txt
-+++ b/libavogadro/src/CMakeLists.txt
-@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
- add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
--target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-+target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
- 
- install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
- install(FILES ${libavogadro_HDRS}

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
deleted file mode 100644
index 6d4536ef7c9..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
- libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-index fb88316..2ddcfdf 100644
---- a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-+++ b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
- set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
- 
- # Set -fPIC on x86_64
--if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64|ppc|ppc64)$")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
- endif()
-diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-index 0cd0c3e..9e89daf 100644
---- a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-+++ b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
- set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
- 
- # Set -fPIC on x86_64
--if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64|ppc|ppc64)$")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC"  )
- endif()


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2018-01-16 13:05 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-01-16 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     de6524a1b675617ebcf587d9fb5ba515eb675026
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 13:03:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 13:04:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de6524a1

sci-chemistry/avogadro: 1.2.0_p20170207 version bump

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

 sci-chemistry/avogadro/Manifest                    |  1 +
 .../avogadro/avogadro-1.2.0_p20170207.ebuild       | 80 ++++++++++++++++++++++
 .../avogadro/files/avogadro-1.2.0-numpy.patch      | 13 ++++
 3 files changed, 94 insertions(+)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 5badc8a7886..bce09655f56 100644
--- 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
index 00000000000..e24622bdb62
--- /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
index 00000000000..4869fa4ea79
--- /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)
+ 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/
@ 2018-05-07 22:26 Mikle Kolyada
  0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2018-05-07 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     eb9a93f86bfb9c892d99268f6812e7b13660f851
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  7 22:24:59 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  7 22:24:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9a93f8

sci-chemistry/avogadro: remove last rited package

Closes: https://bugs.gentoo.org/645030
Closes: https://bugs.gentoo.org/447532
Closes: https://bugs.gentoo.org/649500

 sci-chemistry/avogadro/Manifest                    |  1 -
 .../avogadro/avogadro-1.2.0_p20170207.ebuild       | 90 ----------------------
 .../files/avogadro-1.1.1-boost-join-moc.patch      | 78 -------------------
 .../files/avogadro-1.1.1-mkspecs-dir.patch         | 12 ---
 .../avogadro/files/avogadro-1.1.1-no-strip.patch   | 12 ---
 .../avogadro/files/avogadro-1.1.1-openbabel.patch  | 16 ----
 .../files/avogadro-1.1.1-pkgconfig_eigen.patch     |  8 --
 .../avogadro/files/avogadro-1.2.0-numpy.patch      | 13 ----
 sci-chemistry/avogadro/metadata.xml                | 20 -----
 9 files changed, 250 deletions(-)

diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
deleted file mode 100644
index 32c26192890..00000000000
--- a/sci-chemistry/avogadro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 28d5724b0e5..00000000000
--- a/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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 xdg-utils
-
-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
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch
deleted file mode 100644
index a464fdac42c..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.1-boost-join-moc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Add include guards to all boost includes, as qt's moc trips
-over nested BOOST_JOIN macros:
-* usr/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
-* libavogadro/src/CMakeFiles/avogadro.dir/build.make:217: recipe for target 'libavogadro/src/moc_pythonengine_p.cxx' failed
-See also: https://bugs.gentoo.org/show_bug.cgi?id=578896
-
---- avogadro-1.1.1/libavogadro/src/pythonengine_p.h
-+++ avogadro-1.1.1/libavogadro/src/pythonengine_p.h
-@@ -27,7 +27,9 @@
- 
- #include <avogadro/global.h>
- #include <avogadro/engine.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- namespace Avogadro {
- 
---- avogadro-1.1.1/libavogadro/src/pythonextension_p.h
-+++ avogadro-1.1.1/libavogadro/src/pythonextension_p.h
-@@ -29,7 +29,9 @@
- #include <avogadro/extension.h>
- #include <avogadro/primitive.h>
- #include <avogadro/glwidget.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include <QWidget>
- #include <QList>
---- avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
-+++ avogadro-1.1.1/libavogadro/src/pythoninterpreter.h
-@@ -26,7 +26,9 @@
- #define PYTHONINTERPRETER_H
- 
- #include <avogadro/global.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- #include <avogadro/primitive.h>
- #include <QString>
- 
---- avogadro-1.1.1/libavogadro/src/pythonscript.h
-+++ avogadro-1.1.1/libavogadro/src/pythonscript.h
-@@ -27,7 +27,9 @@
- #define PYTHONSCRIPT_H
- 
- #include <avogadro/global.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include "pythonerror.h"
- 
---- avogadro-1.1.1/libavogadro/src/pythonthread_p.h
-+++ avogadro-1.1.1/libavogadro/src/pythonthread_p.h
-@@ -26,7 +26,9 @@
- #define PYTHONTHREAD_H
- 
- #include <avogadro/global.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- namespace Avogadro {
- 
---- avogadro-1.1.1/libavogadro/src/pythontool_p.h
-+++ avogadro-1.1.1/libavogadro/src/pythontool_p.h
-@@ -27,7 +27,9 @@
- 
- #include <avogadro/global.h>
- #include <avogadro/tool.h>
-+#ifndef Q_MOC_RUN
- #include <boost/python.hpp>
-+#endif
- 
- #include <QObject>
- #include <QAction>

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
deleted file mode 100644
index 45c616422ef..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up avogadro-1.1.1/CMakeLists.txt.mkspecs-dir avogadro-1.1.1/CMakeLists.txt
---- avogadro-1.1.1/CMakeLists.txt.mkspecs-dir	2014-01-24 23:43:01.618510517 -0600
-+++ avogadro-1.1.1/CMakeLists.txt	2014-01-24 23:44:03.236844746 -0600
-@@ -547,7 +547,7 @@ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
- #    )
-     install(FILES
-       "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
--      DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
-+      DESTINATION "${QT_MKSPECS_DIR}/features"
-     )
- #  endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/")
- else()

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
deleted file mode 100644
index 490dd58907d..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up avogadro-1.1.1/CMakeLists.txt.no-strip avogadro-1.1.1/CMakeLists.txt
---- avogadro-1.1.1/CMakeLists.txt.no-strip	2014-01-24 23:14:44.473840038 -0600
-+++ avogadro-1.1.1/CMakeLists.txt	2014-01-24 23:15:46.869166459 -0600
-@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-   endif()
-   # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
-   # they will not replace them.
--  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s")
-+  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-     "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
-   set(CMAKE_CXX_FLAGS_DEBUG   "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
deleted file mode 100644
index 4bdc6b2e780..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libavogadro/src/python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavogadro/src/python/CMakeLists.txt b/libavogadro/src/python/CMakeLists.txt
-index efb518a..1a3d91a 100644
---- a/libavogadro/src/python/CMakeLists.txt
-+++ b/libavogadro/src/python/CMakeLists.txt
-@@ -21,7 +21,7 @@ if (WIN32)
-   target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
- else()
-   target_link_libraries(python-module stdc++ avogadro
--    ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
-+    ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${OPENBABEL2_LIBRARIES})
- endif()
- 
- # Let's try to use this instead:

diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
deleted file mode 100644
index 93dbe2ff4ec..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in
---- avogadro-1.1.1/avogadro.pc.in.eigen	2013-12-06 09:50:04.000000000 -0600
-+++ avogadro-1.1.1/avogadro.pc.in	2014-01-25 00:37:45.732007852 -0600
-@@ -9,3 +9,4 @@ Description: Avogadro libraries
- Version: @Avogadro_VERSION_FULL@
- Libs: -L${libdir} -lavogadro
- Cflags: -I${pkgincludedir}
-+Requires.private: eigen3

diff --git a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
deleted file mode 100644
index 4869fa4ea79..00000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
- 

diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml
deleted file mode 100644
index 693df91c051..00000000000
--- a/sci-chemistry/avogadro/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<longdescription>
-		Avogadro is an advanced molecular editor designed for cross-platform use in
-		computational chemistry, molecular modeling, bioinformatics, materials
-		science, and related areas. It offers flexible rendering and a powerful
-		plugin architecture.
-	</longdescription>
-	<use>
-		<flag name="glsl">Enable glsl features via GLEW.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">avogadro</remote-id>
-	</upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-05-07 22:26 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-16 13:05 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/avogadro/, sci-chemistry/avogadro/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-05-07 22:26 Mikle Kolyada
2018-01-14  9:43 Andreas Sturmlechner
2018-01-14  9:43 Andreas Sturmlechner
2016-04-03 12:44 David Seifert
2015-12-28 19:20 Justin Lecher
2015-12-28 13:34 Justin Lecher
2015-12-28 13:34 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox