# ChangeLog for sci-chemistry/avogadro
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.39 2011/07/20 16:01:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.40 2011/08/14 17:18:19 alexxy Exp $
+
+*avogadro-1.0.3-r1 (14 Aug 2011)
+
+ 14 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org>
+ -files/avogadro-0.9.7-shader-include.patch, -avogadro-1.0.0.ebuild,
+ -files/avogadro-1.0.0-sip-4.10.patch, -avogadro-1.0.1.ebuild,
+ -files/avogadro-1.0.1-sip-backport.patch, -avogadro-1.0.3.ebuild,
+ +avogadro-1.0.3-r1.ebuild:
+ Drop old versions and make it respect qt_mkspec
20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop maintainer due retirement, bug #70723
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
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
-AUX avogadro-1.0.1-sip-backport.patch 5070 RMD160 87bbc143642e405b908d910ffa5694016c2f7530 SHA1 606182a194f14298df110b6f1fdabb21434ac7d7 SHA256 badeb1f2fa4abb2364e1901fa321fa13d86d342dcfe48431d3a9228a7fd72e2c
-DIST avogadro-1.0.0.tar.bz2 4838702 RMD160 514225910de6b37e90fdd52b201b419c11413fc1 SHA1 9d7f2acfd15de5db68572a6221c67d5fc9e7b8e1 SHA256 a262da58c3aa183fca9a0bf3885709444cd35627b866f4a9d9a1b3bf7347d637
-DIST avogadro-1.0.1.tar.bz2 4891506 RMD160 ebd38279ae6e0cea16b85ac33a346b1aabfb5ad7 SHA1 ba45826d904f58161334b4182f092e07a021d4ff SHA256 e1bd3e29cf9658ecb2668c1707af62adc8fd472e08cc9e333c5bc7b4b1e0549e
DIST avogadro-1.0.3.tar.bz2 4971989 RMD160 67cdeae1b35e5b4cd4cdfd551379779295a0caf1 SHA1 ef108a5faacd46d8b7c20edf91f26292eb7da138 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468
-EBUILD avogadro-1.0.0.ebuild 1239 RMD160 108b8fba8bd1560de6628b04c4ad70bd7ffe83e4 SHA1 d737e207ecb08e1213002c9f865731a23b3f6f97 SHA256 29d480c90e7528fa36c62b13376a6d272761b9f4ba8399ba68917c4b174262ba
-EBUILD avogadro-1.0.1.ebuild 1299 RMD160 1ccafd44a63d9900e5b7e2c7fac7f518be0b5fdd SHA1 1b1ab5577dc8e264b2cd15fd21c7cc885345525c SHA256 03709be1803c11f2195fe66921bfd9a5c8223bb1f3cec9a8a1b0ea06a1c4a830
-EBUILD avogadro-1.0.3.ebuild 1197 RMD160 8bba1819a059fc505b745d1dd1840fd73da88825 SHA1 60a4c4134634f00394b5ad97a5e147cc946baf17 SHA256 e3b57ef90afbee16335b2b36e0588d54df3f83059a0d662b3aa20e78338a3209
-MISC ChangeLog 5957 RMD160 c57fc0d4dc70de4ad030882f3991959a6dbdadc3 SHA1 a5352283325691ba5c2525196ffaa5920fa07061 SHA256 ae00f96332a1ba84f8a939b2260da3802c02b4a5c7338658e40571893446ab60
+EBUILD avogadro-1.0.3-r1.ebuild 1295 RMD160 ea5c29d36c764ab039ef962d1e55f1114c034d5c SHA1 686fbd75af263223f3eda92a3737f2a2e2948c6c SHA256 57ccc0fe0915c51ec92e2bb00cdd7cfdc1edeb8cdf71525432a2a7c17e324bc9
+MISC ChangeLog 6325 RMD160 6d400e17f066d21f8f654098c5c6794b015a4d44 SHA1 73bf3d0da29ee0e5fee9f9d5785aa91059abdfca SHA256 ebe2988a461f9afad52ecc4bf9b58dc0d1e77fe05a03aef589b0984378ce4f38
MISC metadata.xml 533 RMD160 8da1d3bc8c61912c8c5cda149b647aa6d56e3512 SHA1 4ee939428b3b3d34ef86f36b50dd05b3666f1c7c SHA256 f0c611c081821a1a7e7ba42af53fc9bb4318119da01ae593c6fb96d866c31c8a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk4m++oACgkQCaWpQKGI+9QYgwCfUbx6B21+Evud/cfYJ3Aq9BnD
-0CkAn050rYBSJD0+XEd4psbE/5l69T0l
-=Kyez
+iQIcBAEBCAAGBQJOSANnAAoJEOf+E+/4L5LmhP4P/29y7w8wrSpKXzEU4jYlvIGi
+OUGrsvRRXTrlDGV2CF1ZxbBX16gQfjuae6WblmEjfy8K2NMZLy/oBBxgI0PYFbyD
+J8Q48KreBpVE9gMw358YuyZ3a+l3o5RImzm09vxyOGqcMqKZBIYtdGvSX4qqIo67
+EQIYXfc1JdqOncs+0l/kPsut7qR079xgklRyjpVoutKKfO76axG1s/9LD4gAFyrL
+XMMpYoDac41krwmmswwFxVkhhf5BrMRuu4IlY3b3qgRSbMrkFPdrLdbfZpgqME/J
+h5pAO+5p+CMZl/jFbX2tZUnvSmuz1GkL7lXSQ4lwi23usB4e4Gga3KfSzSEKiBDj
+TnTkDYIwrFQHWDwGAJlvXFYPVkTbBcfBYe89A6L79UVlx+SYWVRRDmVM7qC60J+O
+QFsCkG+9cq1Vkn5pa/9oebxFNaZnpz8hKRERa9bfdYpuhldzKXmIsIMbm6KfqgBg
+Dyo6/p8Y3HwIrVVsacnOGOEgtUiD8BQQtNcv6b8hpii1LTjyLqKhHJcEEEunH/JD
+Ri0v6nh1+PMb9ggp2D9KBkB+4GuolvdGFvTpRqaiA2aK4nAQuIsDix3s7izxaS1r
+6AuprGegTgHuRQ0/j+29f3sARE0ksdk7spgnw9itRnWiVBuAmCic3KaGbS76Lx8f
+NBDxWCuIrcD5fkx1MY9X
+=5kdi
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2011 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.4 2011/04/27 07:26:04 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 sse2"
-
-RDEPEND="
- >=sci-chemistry/openbabel-2.2.2
- >=x11-libs/qt-gui-4.5.2:4
- >=x11-libs/qt-opengl-4.5.2:4
- 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
- >=dev-util/cmake-2.6.2"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-sip-4.10.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_with sse2 SSE2)
- $(cmake-utils_use_enable python PYTHON)"
-
- cmake-utils_src_configure
-}
+++ /dev/null
-# Copyright 1999-2011 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.3 2011/04/27 07:26:04 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 sse2"
-
-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
- >=dev-util/cmake-2.6.2"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-gl2ps.patch \
- "${FILESDIR}"/${P}-sip-backport.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_with sse2 SSE2)
- $(cmake-utils_use_enable python PYTHON)"
-
- cmake-utils_src_configure
-}
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v 1.3 2011/04/28 14:22:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild,v 1.1 2011/08/14 17:18:19 alexxy Exp $
EAPI=3
"-DENABLE_THREADGL=FALSE"
"-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 sse2 SSE2)
$(cmake-utils_use_enable python)
+++ /dev/null
-diff --git a/libavogadro/src/extensions/shaderextension.cpp b/libavogadro/src/extensions/shaderextension.cpp
-index 117b0e7..1295cc1 100644
---- a/libavogadro/src/extensions/shaderextension.cpp
-+++ b/libavogadro/src/extensions/shaderextension.cpp
-@@ -28,8 +28,6 @@
- #include <GL/glew.h>
- #endif
-
--#include "../config.h"
--
- #include <avogadro/glwidget.h>
- #include <avogadro/toolgroup.h>
- #include <avogadro/engine.h>
-@@ -384,8 +382,8 @@ namespace Avogadro
- verts = QCoreApplication::applicationDirPath();
- verts.cd("shaders");
- #else
-- QString systemShadersPath = QString(INSTALL_PREFIX) + '/'
-- + "share/libavogadro/shaders";
-+ QString systemShadersPath = QCoreApplication::applicationDirPath() +
-+ "/../share/libavogadro/shaders";
- verts.cd(systemShadersPath);
- #endif
-
+++ /dev/null
---- avogadro-1.0.0.orig/cmake/modules/PythonDeps.cmake
-+++ avogadro-1.0.0/cmake/modules/PythonDeps.cmake
-@@ -67,6 +67,10 @@
- message(STATUS "using sip version 4.9...")
- add_definitions( -DSIP_4_8 )
- endif (${SIP_VERSION} MATCHES "4.9")
-+ if (${SIP_VERSION} MATCHES "4.10")
-+ message(STATUS "using sip version 4.10...")
-+ add_definitions( -DSIP_4_8 )
-+ endif (${SIP_VERSION} MATCHES "4.10")
- else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
- message(STATUS "sip.h header NOT found - Python support disabled")
- # message(STATUS "debian/ubuntu: install the python-sip4-dev package.")
+++ /dev/null
- libavogadro/src/python/sip.cpp | 54 ++++++++++++++++++++++++++--------------
- 1 files changed, 35 insertions(+), 19 deletions(-)
-
-diff --git a/libavogadro/src/python/sip.cpp b/libavogadro/src/python/sip.cpp
-index 7b265e9..b456443 100644
---- a/libavogadro/src/python/sip.cpp
-+++ b/libavogadro/src/python/sip.cpp
-@@ -61,14 +61,23 @@ bool init_sip_api()
- std::cout << "Could not find the _C_API entry in the sip python module dictionary." << std::endl;
- return false;
- }
--
-+#ifdef SIP_USE_PYCAPSULE
-+ if (!PyCapsule_IsValid(sip_capi_obj.ptr(), "sip._C_API")) {
-+#else
- if (!PyCObject_Check(sip_capi_obj.ptr())) {
-+#endif
- std::cout << "The _C_API object in the sip python module is invalid." << std::endl;
- return false;
- }
-
-- sip_API = reinterpret_cast<const sipAPIDef*>(PyCObject_AsVoidPtr(sip_capi_obj.ptr()));
--
-+#ifdef SIP_USE_PYCAPSULE
-+ sip_API =
-+ reinterpret_cast<const sipAPIDef*>(PyCapsule_GetPointer(sip_capi_obj.ptr(),
-+ "sip._C_API"));
-+#else
-+ sip_API =
-+ reinterpret_cast<const sipAPIDef*>(PyCObject_AsVoidPtr(sip_capi_obj.ptr()));
-+#endif
- return true;
- }
-
-@@ -131,7 +140,7 @@ struct QClass_converters
- {
- static PyObject* convert(const T& object)
- {
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- const sipTypeDef *type = sip_API->api_find_type(MetaData<T>::className());
- #else
- sipWrapperType *type = sip_API->api_find_class(MetaData<T>::className());
-@@ -139,7 +148,7 @@ struct QClass_converters
- if (!type)
- return incref(Py_None);
-
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- PyObject *sip_obj = sip_API->api_convert_from_type((void*)(&object), type, 0);
- #else
- PyObject *sip_obj = sip_API->api_convert_from_instance((void*)(&object), type, 0);
-@@ -155,7 +164,7 @@ struct QClass_converters
- if (!object)
- return incref(Py_None);
-
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- const sipTypeDef *type = sip_API->api_find_type(MetaData<T>::className());
- #else
- sipWrapperType *type = sip_API->api_find_class(MetaData<T>::className());
-@@ -163,7 +172,7 @@ struct QClass_converters
- if (!type)
- return incref(Py_None);
-
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- PyObject *sip_obj = sip_API->api_convert_from_type(object, type, 0);
- #else
- PyObject *sip_obj = sip_API->api_convert_from_instance(object, type, 0);
-@@ -183,28 +192,36 @@ struct QClass_converters
-
- static void* QClass_from_PyQt(PyObject *obj_ptr)
- {
--#ifdef SIP_4_8
-- if (!PyObject_TypeCheck(obj_ptr, sip_API->api_wrapper_type))
-+#if SIP_API_MAJOR_NR >=4
-+ if (!PyObject_TypeCheck(obj_ptr, sip_API->api_wrapper_type)) {
- #else
-- if (!sip_API->api_wrapper_check(obj_ptr))
-+ if (!sip_API->api_wrapper_check(obj_ptr)) {
- #endif
-+ std::cout << "Error - already set in QClass_from_PyQt.." << std::endl;
- throw_error_already_set();
-+ }
-
- // transfer ownership from python to C++
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- sip_API->api_transfer_to(obj_ptr, 0);
- #else
- sip_API->api_transfer(obj_ptr, 1);
- #endif
--
-+
- // reinterpret to sipWrapper
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >= 4
- sipSimpleWrapper *wrapper = reinterpret_cast<sipSimpleWrapper*>(obj_ptr);
- #else
- sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
- #endif
-- // return the C++ pointer
-+
-+#if (SIP_API_MAJOR_NR == 8 && SIP_API_MINOR_NR >= 1) || SIP_API_MAJOR_NR > 8
-+ return sip_API->api_get_address(wrapper);
-+#elif SIP_API_MAJOR_NR == 8
-+ return wrapper->data;
-+#else
- return wrapper->u.cppPtr;
-+#endif
- }
-
- QClass_converters()
-@@ -230,7 +247,7 @@ struct QList_QAction_to_python_list_PyQt
-
- static PyObject* convert(const QList<QAction*> &qList)
- {
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- const sipTypeDef *type = sip_API->api_find_type("QAction");
- #else
- sipWrapperType *type = sip_API->api_find_class("QAction");
-@@ -241,7 +258,7 @@ struct QList_QAction_to_python_list_PyQt
- boost::python::list pyList;
-
- foreach (QAction *action, qList) {
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- PyObject *sip_obj = sip_API->api_convert_from_type(action, type, 0);
- #else
- PyObject *sip_obj = sip_API->api_convert_from_instance(action, type, 0);
-@@ -369,7 +386,7 @@ PyObject* toPyQt(T *obj)
- return incref(Py_None);
- }
-
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- const sipTypeDef *type = sip_API->api_find_type(MetaData<T>::className());
- #else
- sipWrapperType *type = sip_API->api_find_class(MetaData<T>::className());
-@@ -379,7 +396,7 @@ PyObject* toPyQt(T *obj)
- return incref(Py_None);
- }
-
--#ifdef SIP_4_8
-+#if SIP_API_MAJOR_NR >=4
- PyObject *sip_obj = sip_API->api_convert_from_type(obj, type, 0);
- #else
- PyObject *sip_obj = sip_API->api_convert_from_instance(obj, type, 0);
-@@ -437,4 +454,3 @@ void export_sip()
- to_python_converter<QList<QAction*>, QList_QAction_to_python_list_PyQt>();
- QList_QAction_from_python_list_PyQt();
- }
--
projects / gentoo.git / commitdiff