diff options
| -rw-r--r-- | sci-chemistry/avogadro/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-0.9.8.ebuild | 13 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-0.9.9.ebuild | 13 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-1.0.0.ebuild | 11 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-1.0.1.ebuild | 53 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/files/1.0.1-gl2ps.patch | 39 |
6 files changed, 126 insertions, 12 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog index 7aa8436697cf..ed5ec454685a 100644 --- a/sci-chemistry/avogadro/ChangeLog +++ b/sci-chemistry/avogadro/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-chemistry/avogadro # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.32 2010/02/25 14:59:39 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.33 2010/05/21 15:33:28 jlec Exp $ + +*avogadro-1.0.1 (21 May 2010) + + 21 May 2010; Justin Lecher <jlec@gentoo.org> +files/1.0.1-gl2ps.patch, + avogadro-0.9.8.ebuild, avogadro-0.9.9.ebuild, avogadro-1.0.0.ebuild, + +avogadro-1.0.1.ebuild: + Version Bump, unbundle gl2ps, fix for PYTHON ABI #316169 25 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> avogadro-1.0.0.ebuild, +files/avogadro-1.0.0-sip-4.10.patch: diff --git a/sci-chemistry/avogadro/avogadro-0.9.8.ebuild b/sci-chemistry/avogadro/avogadro-0.9.8.ebuild index c2ad06b6f93c..f9a5a3d34503 100644 --- a/sci-chemistry/avogadro/avogadro-0.9.8.ebuild +++ b/sci-chemistry/avogadro/avogadro-0.9.8.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.8.ebuild,v 1.1 2009/09/10 04:03:22 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.8.ebuild,v 1.2 2010/05/21 15:33:28 jlec Exp $ EAPI=2 -inherit cmake-utils eutils +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" HOMEPAGE="http://avogadro.sourceforge.net/" @@ -20,7 +22,6 @@ RDEPEND=">=sci-chemistry/openbabel-2.2.2 >=x11-libs/qt-opengl-4.5.2:4 glsl? ( >=media-libs/glew-1.5.0 ) python? ( - >=dev-lang/python-2.5 >=dev-libs/boost-1.35 >=dev-libs/boost-1.35.0-r5[python] dev-python/numpy @@ -30,6 +31,10 @@ DEPEND="${RDEPEND} dev-cpp/eigen:2 >=dev-util/cmake-2.6.2" +pkg_setup() { + python_set_active_version 2 +} + src_configure() { local mycmakeargs mycmakeargs="${mycmakeargs} diff --git a/sci-chemistry/avogadro/avogadro-0.9.9.ebuild b/sci-chemistry/avogadro/avogadro-0.9.9.ebuild index 4309ab13aa1d..285fe5e41839 100644 --- a/sci-chemistry/avogadro/avogadro-0.9.9.ebuild +++ b/sci-chemistry/avogadro/avogadro-0.9.9.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.9.ebuild,v 1.1 2009/10/20 00:02:58 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.9.ebuild,v 1.2 2010/05/21 15:33:28 jlec Exp $ EAPI=2 -inherit cmake-utils eutils +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" HOMEPAGE="http://avogadro.sourceforge.net/" @@ -20,7 +22,6 @@ RDEPEND=">=sci-chemistry/openbabel-2.2.2 >=x11-libs/qt-opengl-4.5.2:4 glsl? ( >=media-libs/glew-1.5.0 ) python? ( - >=dev-lang/python-2.5 >=dev-libs/boost-1.35 >=dev-libs/boost-1.35.0-r5[python] dev-python/numpy @@ -30,6 +31,10 @@ DEPEND="${RDEPEND} dev-cpp/eigen:2 >=dev-util/cmake-2.6.2" +pkg_setup() { + python_set_active_version 2 +} + src_configure() { local mycmakeargs mycmakeargs="${mycmakeargs} diff --git a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild b/sci-chemistry/avogadro/avogadro-1.0.0.ebuild index 3328bdc6376e..173dcdb61dc1 100644 --- a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild +++ b/sci-chemistry/avogadro/avogadro-1.0.0.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.0.ebuild,v 1.2 2010/02/25 14:59:39 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.0.ebuild,v 1.3 2010/05/21 15:33:28 jlec Exp $ EAPI=2 -inherit cmake-utils eutils +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" HOMEPAGE="http://avogadro.sourceforge.net/" @@ -20,7 +22,6 @@ RDEPEND=">=sci-chemistry/openbabel-2.2.2 >=x11-libs/qt-opengl-4.5.2:4 glsl? ( >=media-libs/glew-1.5.0 ) python? ( - >=dev-lang/python-2.5 >=dev-libs/boost-1.35 >=dev-libs/boost-1.35.0-r5[python] dev-python/numpy @@ -30,6 +31,10 @@ DEPEND="${RDEPEND} dev-cpp/eigen:2 >=dev-util/cmake-2.6.2" +pkg_setup() { + python_set_active_version 2 +} + src_prepare() { epatch "${FILESDIR}/${P}-sip-4.10.patch" } diff --git a/sci-chemistry/avogadro/avogadro-1.0.1.ebuild b/sci-chemistry/avogadro/avogadro-1.0.1.ebuild new file mode 100644 index 000000000000..b69dccd14937 --- /dev/null +++ b/sci-chemistry/avogadro/avogadro-1.0.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.1.ebuild,v 1.1 2010/05/21 15:33:28 jlec Exp $ + +EAPI=2 + +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python + +DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" +HOMEPAGE="http://avogadro.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+glsl python" + +RDEPEND=">=sci-chemistry/openbabel-2.2.3 + >=x11-libs/qt-gui-4.5.3:4 + >=x11-libs/qt-opengl-4.5.3:4 + x11-libs/gl2ps + glsl? ( >=media-libs/glew-1.5.0 ) + python? ( + >=dev-libs/boost-1.35 + >=dev-libs/boost-1.35.0-r5[python] + dev-python/numpy + dev-python/sip + )" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-2.0.9 + >=dev-util/cmake-2.6.2" + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-gl2ps.patch +} + +src_configure() { + local mycmakeargs + mycmakeargs="${mycmakeargs} + -DENABLE_THREADGL=FALSE + -DENABLE_RPATH=OFF + -DENABLE_UPDATE_CHECKER=OFF + $(cmake-utils_use_enable glsl GLSL) + $(cmake-utils_use_enable python 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 000000000000..d8a0c0f758e1 --- /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} |