Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

3 files changed, 5 insertions, 77 deletions

diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 818044c6a..0e97d0b5c 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,35 +1,23 @@
-# $Id: PKGBUILD 111981 2011-03-02 21:41:10Z andrea $
+# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
-pkgver=1.0.1
-pkgrel=8
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
 depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'sip-4.11.patch'
-        'fix-pycapsule.patch')
-md5sums=('0d5c391197101f0aab7be6b59f81e6fd'
-        'e78c3f96d0dc702947f75de1c094f580'
-        '45b0f3be5913575311e92b74a5520966')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('92c2702c1980f70fb6d87a1a58147911')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/sip-4.11.patch
-  patch -Np1 -i ${srcdir}/fix-pycapsule.patch
-
   cd ${srcdir}
   mkdir build
   cd build
-
-  # use the cmake module in system to enable python 2.7 support
-  rm ../${pkgname}-${pkgver}/cmake/modules/FindPythonLibs.cmake
-
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr
@@ -39,7 +27,4 @@ build() {
 package() {
   cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
-
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/cmake/modules/FindAvogadro.cmake \
-    ${pkgdir}/usr/share/cmake-2.8/Modules/FindAvogadro.cmake
 }
diff --git a/extra/avogadro/fix-pycapsule.patch b/extra/avogadro/fix-pycapsule.patch
deleted file mode 100644
index de4e2ca75..000000000
--- a/extra/avogadro/fix-pycapsule.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- avogadro-1.0.1/libavogadro/src/python/sip.cpp	2010-05-02 17:31:22.000000000 +0100
-+++ avogadro-1.0.1-pycapsule/libavogadro/src/python/sip.cpp	2010-11-23 19:00:09.000000000 +0000
-@@ -62,12 +62,20 @@ bool init_sip_api()
-     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;
-   }
- 
-+#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;
- }
diff --git a/extra/avogadro/sip-4.11.patch b/extra/avogadro/sip-4.11.patch
deleted file mode 100644
index 0cd1e5b94..000000000
--- a/extra/avogadro/sip-4.11.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake
---- avogadro-1.0.1/cmake/modules/PythonDeps.cmake	2010-05-02 18:31:22.000000000 +0200
-+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake	2010-09-14 19:11:50.000000000 +0200
-@@ -59,10 +59,13 @@
-   if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
-     message(STATUS "Found sip.h header...")
-     execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION)
--    if (${SIP_VERSION} VERSION_GREATER "4.8")
-+    if (NOT ${SIP_VERSION} VERSION_LESS "4.11")
-+      message(STATUS "using sip version 4.11 or above...")
-+      add_definitions( -DSIP_4_11 -DSIP_4_8 )
-+    elseif (NOT ${SIP_VERSION} VERSION_LESS "4.8")
-       message(STATUS "using sip version 4.8 or above...")
-       add_definitions( -DSIP_4_8 )
--    endif (${SIP_VERSION} VERSION_GREATER "4.8")
-+    endif (NOT ${SIP_VERSION} VERSION_LESS "4.11")
-   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 -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp
---- avogadro-1.0.1/libavogadro/src/python/sip.cpp	2010-05-02 18:31:22.000000000 +0200
-+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp	2010-09-14 19:13:31.000000000 +0200
-@@ -204,7 +204,11 @@
-     sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
- #endif
-     // return the C++ pointer
-+#ifdef SIP_4_11
-+    return sip_API->api_get_address(wrapper);
-+#else
-     return wrapper->u.cppPtr;
-+#endif
-   }
-     
-   QClass_converters()