Version Bump, unbundle gl2ps, fix for PYTHON ABI #316169

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 143 insertions, 16 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/Manifest b/sci-chemistry/avogadro/Manifest
index 80d3a52590cf..eef04e3647d9 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.0.1-gl2ps.patch 1511 RMD160 b9e0ae01bf514c1dc738fd0c5d51ae9c83efb861 SHA1 eafb59894ef10d16b20c43b2a89b33c635273a12 SHA256 0aae5556233c8e413739fdd890b5d8453d9a1e39dd3251a5a7a7705227a13e7b
 AUX avogadro-0.9.7-shader-include.patch 836 RMD160 5f3df7190a19904d36303df43648103929da835d SHA1 3ed8f1ed9aefedc7a98462588e4bd1955a5d2a67 SHA256 c99f463acb26f8b0b295762935a1ac07062e214b96a18c8d1c5e5595442ecf15
 AUX avogadro-1.0.0-sip-4.10.patch 616 RMD160 269609b257ab06fd39a8d8c652c8c36e472e4886 SHA1 f7ea7f670ab27d7d9a6800e518d17caf0bc11897 SHA256 d17c125b081a68fc119d142721438ac1e67acd1b3136536fb32ece4940320de6
 DIST avogadro-0.9.8.tar.bz2 4815425 RMD160 29d734137ee4e522ebc6d1b6998bd4f13ea6d046 SHA1 78de2419a93af9427a0d31fc0f022a47e924b490 SHA256 105f86f049741d3a72e0e19d364113295975ad853d047bba01795a4496a8f847
 DIST avogadro-0.9.9.tar.bz2 4834645 RMD160 ed5a350377fd07bad5a1cee2343a8c350559c310 SHA1 37f53caa956b4f254ebb98a1df9183c98c6badb9 SHA256 a05efde188b11852098203550e276eaf9931ad001c4cdf1e04a747ed26529724
 DIST avogadro-1.0.0.tar.bz2 4838702 RMD160 514225910de6b37e90fdd52b201b419c11413fc1 SHA1 9d7f2acfd15de5db68572a6221c67d5fc9e7b8e1 SHA256 a262da58c3aa183fca9a0bf3885709444cd35627b866f4a9d9a1b3bf7347d637
-EBUILD avogadro-0.9.8.ebuild 1076 RMD160 c22b85a05b125f41cfadb9aeaf7c1d4c2d902274 SHA1 76863db36e38822cd857feab9277d2a75ab7a748 SHA256 cc868d2477db07a011684e47b3f592d89268a618d9d99d65fe66526686d62429
-EBUILD avogadro-0.9.9.ebuild 1076 RMD160 97139afc4df1afb72034f259edc01d87c172a82a SHA1 ad2057f12c4ba47a65bf5ba7876f903ba3fbb10c SHA256 18aadbb50db0640dc41e8db710a3f7adff7f486d497835fed1369a1bec991682
-EBUILD avogadro-1.0.0.ebuild 1137 RMD160 891c8c3ea6ec8aeb8849a5d1228a12f4a79b85de SHA1 1d5bb9ee5b8c328fea32082dea45e01f613caecd SHA256 961059f53aa67b0b9d9cfc03618576becce97cfa23680b0953a160333abf1e94
-MISC ChangeLog 4847 RMD160 bf894d4e5b38490fa8d7e156bbcc81b802d66f7c SHA1 5a9d58fa052a5abaa204573a68e9ce45d769e240 SHA256 28c20c1981a08d14faa6fee89b23dbab49a198c5a49f557691cc58c91fd29533
+DIST avogadro-1.0.1.tar.bz2 4891506 RMD160 ebd38279ae6e0cea16b85ac33a346b1aabfb5ad7 SHA1 ba45826d904f58161334b4182f092e07a021d4ff SHA256 e1bd3e29cf9658ecb2668c1707af62adc8fd472e08cc9e333c5bc7b4b1e0549e
+EBUILD avogadro-0.9.8.ebuild 1135 RMD160 9541ad405550ccef3b3ff9615a1c3b770a80d665 SHA1 3659980d4a3fb711606267c7bba9bd9d7fe0b3b0 SHA256 6afbb492cbb69b7c3cde33f0095153cff019b334bdc63e9810b4e82c492f91bf
+EBUILD avogadro-0.9.9.ebuild 1135 RMD160 51e57d5c7823e40b4d134ad94b570290fa388095 SHA1 1be7606e0cece6a28ab7bc95f5cc5523a45f05d3 SHA256 7d0e1aba1fbea9ef0a1638fe855958a800d3d024692f6c7670ca5ecf154d31de
+EBUILD avogadro-1.0.0.ebuild 1196 RMD160 f66bed6b2ffc1968f01011cd2ccb021512531827 SHA1 1fd33cbc75a216327f449f31438c7269556e1d63 SHA256 2dc5dbbe91b2472638e422e0f6ac43277038ca905747f142040403c5eead86c3
+EBUILD avogadro-1.0.1.ebuild 1216 RMD160 790821f1ad99a5e9e1176e2ee2a10ad5224200e0 SHA1 de2b2754ed65c4b396c8f2fca0c05c8d56e059b2 SHA256 9fb3919bf5d752a50ca81d0613a7612aa687ac33fcdc5e83c086a5c38dc2ce6b
+MISC ChangeLog 5107 RMD160 5e5933e970734d55dbd58f0668b150c6e190073a SHA1 341f62d0abba03851974d5b83db9e39d674e4fcf SHA256 b17845a21ef68e3de43d8e6225966ebbdfa9b34d719458586e2b59446f514d4e
 MISC metadata.xml 600 RMD160 d3559123f9438a9d0a49783ebb38027f91492e8d SHA1 f0dc9728b4196c6b09e8a0c4fdb02cd9f692cda4 SHA256 298cc4b9c2fc652f167bf9ae6e9faec1cfd1aa41a276295f4d1a6814912b58af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv2p88ACgkQgAnW8HDreRZvDACgqieXPfq0plCnnnpVWaCRPo51
+AlQAn1LESQD5orxFyI4NKJGuXcM9zUDl
+=qrer
+-----END PGP SIGNATURE-----
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}