4 files changed, 9 insertions, 32 deletions
diff --git a/academic/avogadro/README b/academic/avogadro/README
index feefa1d039c4..87c5966647ed 100644
--- a/academic/avogadro/README
+++ b/academic/avogadro/README
@@ -1,7 +1,8 @@
-Avogadro is a molecular graphics and modelling system targeted at molecules 
+Avogadro is a molecular graphics and modelling system targeted at molecules
 and biomolecules. It can visualize properties like molecular orbitals or 
 electrostatic potentials and features an intuitive molecular builder.
 
 This requires openbabel.
 
 Optionally numpy can be installed for python support.
+
diff --git a/academic/avogadro/avogadro-1.0.1-sip-4.11.patch b/academic/avogadro/avogadro-1.0.1-sip-4.11.patch
deleted file mode 100644
index e0a6e69e5b29..000000000000
--- a/academic/avogadro/avogadro-1.0.1-sip-4.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libavogadro/src/python/sip.cpp.old	2010-11-14 14:55:44.928487067 -0800
-+++ libavogadro/src/python/sip.cpp	2010-11-14 15:37:31.589487066 -0800
-@@ -198,13 +198,19 @@
- #endif
-     
-     // reinterpret to sipWrapper
-+#if SIP_API_MAJOR_NR >= 8
-+    sipSimpleWrapper *wrapper = reinterpret_cast<sipSimpleWrapper*>(obj_ptr);
-+    return wrapper->data;
-+#else
-+
- #ifdef SIP_4_8
-     sipSimpleWrapper *wrapper = reinterpret_cast<sipSimpleWrapper*>(obj_ptr);
- #else
-     sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
-+     // return the C++ pointer
- #endif
--    // return the C++ pointer
-     return wrapper->u.cppPtr;
-+#endif
-   }
-     
-   QClass_converters()
diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild
index d66ea05c9a8f..f8021e664e92 100644
--- a/academic/avogadro/avogadro.SlackBuild
+++ b/academic/avogadro/avogadro.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=avogadro
-VERSION=1.0.1
+VERSION=1.0.3
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,10 +53,9 @@ find . \
 
 # Fix manpage directory.
 sed -i 's|share/man|man|' doc/CMakeLists.txt
-# Patch to work with sip 4.11.2
-patch -p0 < $CWD/avogadro-1.0.1-sip-4.11.patch
 
-mkdir build && cd build
+mkdir -p build
+cd build
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/academic/avogadro/avogadro.info b/academic/avogadro/avogadro.info
index 469349c9cff4..26775e2226fb 100644
--- a/academic/avogadro/avogadro.info
+++ b/academic/avogadro/avogadro.info
@@ -1,10 +1,10 @@
 PRGNAM="avogadro"
-VERSION="1.0.1"
+VERSION="1.0.3"
 HOMEPAGE="http://avogadro.openmolecules.net/wiki/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/avogadro/avogadro-1.0.1.tar.bz2"
-MD5SUM="0d5c391197101f0aab7be6b59f81e6fd"
+DOWNLOAD="http://downloads.sourceforge.net/avogadro/avogadro-1.0.3.tar.bz2"
+MD5SUM="92c2702c1980f70fb6d87a1a58147911"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"