[sci-chemistry/avogadro] Drop old versions and make it respect qt_mkspec

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

7 files changed, 13 insertions, 305 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index ad8244648cc3..ff1928f689b8 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,15 @@
 # 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
diff --git a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild b/sci-chemistry/avogadro/avogadro-1.0.0.ebuild
deleted file mode 100644
index 619febd7c81b..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-}
diff --git a/sci-chemistry/avogadro/avogadro-1.0.1.ebuild b/sci-chemistry/avogadro/avogadro-1.0.1.ebuild
deleted file mode 100644
index 84c5cd946cfc..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
-}
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild
index 2a402977f4b3..64c731a5f249 100644
--- a/sci-chemistry/avogadro/avogadro-1.0.3.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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
 
@@ -45,6 +45,8 @@ src_configure() {
 		"-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)
diff --git a/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch b/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch
deleted file mode 100644
index f8a3fab40316..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
- 
diff --git a/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch b/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch
deleted file mode 100644
index 55d21b98f390..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.0.0-sip-4.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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.")
diff --git a/sci-chemistry/avogadro/files/avogadro-1.0.1-sip-backport.patch b/sci-chemistry/avogadro/files/avogadro-1.0.1-sip-backport.patch
deleted file mode 100644
index c10cdb5257ed..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.0.1-sip-backport.patch
+++ /dev/null
@@ -1,155 +0,0 @@
- 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();
- }
--