Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/kdesvn/PKGBUILD
	community/lwm/PKGBUILD
	community/sakura/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/qt/PKGBUILD

54 files changed, 0 insertions, 2647 deletions

diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD
deleted file mode 100644
index 3cb3e08fc..000000000
--- a/staging/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151576 2012-02-27 18:21:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.7.0
-pkgrel=2
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('804309dca70ede35b4a654ab764e9079')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/alex/PKGBUILD b/staging/alex/PKGBUILD
deleted file mode 100644
index cc609e757..000000000
--- a/staging/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151489 2012-02-26 17:23:04Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.1
-pkgrel=1
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5dec239c89165d159faa2154bc0724cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD
deleted file mode 100644
index b7a8d537e..000000000
--- a/staging/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 151591 2012-02-27 18:55:34Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=5
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/staging/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/staging/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD
deleted file mode 100644
index 0f6be7ab1..000000000
--- a/staging/boost/PKGBUILD
+++ /dev/null
@@ -1,118 +0,0 @@
-# $Id: PKGBUILD 151566 2012-02-27 18:05:58Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.49.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        exceptions.patch)
-license=('custom')
-md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
-         '9b44c28b36303152050c8c82469569c5')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-  # https://svn.boost.org/trac/boost/ticket/5731
-  patch -p0 -i "${srcdir}/exceptions.patch"
-
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
-      toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
-      --layout=system \
-      ${MAKEFLAGS} \
-      install
-}
-
-package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
-
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/staging/boost/exceptions.patch b/staging/boost/exceptions.patch
deleted file mode 100644
index 9faa71526..000000000
--- a/staging/boost/exceptions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
---- boost/numeric/conversion/converter_policies.hpp~	2008-10-13 11:00:03.000000000 +0200
-+++ boost/numeric/conversion/converter_policies.hpp	2011-07-22 11:46:40.961876274 +0200
-@@ -20,6 +20,7 @@
- 
- #include "boost/mpl/if.hpp"
- #include "boost/mpl/integral_c.hpp"
-+#include "boost/throw_exception.hpp"
- 
- namespace boost { namespace numeric
- {
-@@ -159,9 +160,9 @@ struct def_overflow_handler
-   void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
-   {
-     if ( r == cNegOverflow )
--      throw negative_overflow() ;
-+      boost::throw_exception( negative_overflow() ) ;
-     else if ( r == cPosOverflow )
--           throw positive_overflow() ;
-+      boost::throw_exception( positive_overflow() ) ;
-   }
- } ;
- 
-
-Diff finished.  Fri Jul 22 11:46:49 2011
diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD
deleted file mode 100644
index 1faaf1fda..000000000
--- a/staging/ekiga/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 151595 2012-02-27 19:12:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.2
-pkgrel=3
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install
deleted file mode 100644
index b1d76a4a3..000000000
--- a/staging/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD
deleted file mode 100644
index 3e46660ea..000000000
--- a/staging/ghc/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 151083 2012-02-24 18:59:29Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-#   Also, due to dependency loop problems, haskell-ghc-paths and haddock
-#   do not carry version dependencies. You will have to remember to build them too.
-
-pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
-makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-groups=('haskell')
-provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.0.0'
-          'haskell-binary=0.5.1.0'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.9.2.1'
-          'haskell-containers=0.4.2.1'
-          'haskell-deepseq=1.3.0.0'
-          'haskell-directory=1.1.0.2'
-          'haskell-extensible-exceptions=0.1.1.4'
-          'haskell-filepath=1.3.0.0'
-          'haskell-ghc-prim=0.2.0.0'
-          'haskell-haskell2010=1.1.0.1'
-          'haskell-haskell98=2.0.0.1'
-          'haskell-hoopl=3.8.7.3'
-          'haskell-hpc=0.5.1.1'
-          'haskell-integer-gmp=0.4.0.0'
-          'haskell-old-locale=1.0.0.4'
-          'haskell-old-time=1.1.0.0'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.1'
-          'haskell-template-haskell=2.7.0.0'
-          'haskell-time=1.4'
-          'haskell-unix=2.5.1.0'
-          'haskell-cabal=1.14.0'
-         )
-replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.0.0'
-          'haskell-binary<0.5.1.0'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.9.2.1'
-          'haskell-containers<0.4.2.1'
-          'haskell-deepseq<1.3.0.0'
-          'haskell-directory<1.1.0.2'
-          'haskell-extensible-exceptions<0.1.1.4'
-          'haskell-filepath<1.3.0.0'
-          'haskell-ghc-prim<0.2.0.0'
-          'haskell-haskell2010<1.1.0.1'
-          'haskell-haskell98<2.0.0.1'
-          'haskell-hoopl<3.8.7.3'
-          'haskell-hpc<0.5.1.1'
-          'haskell-integer-gmp<0.4.0.0'
-          'haskell-old-locale<1.0.0.4'
-          'haskell-old-time<1.1.0.0'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.1'
-          'haskell-template-haskell<2.7.0.0'
-          'haskell-time<1.4'
-          'haskell-unix<2.5.1.0'
-          'haskell-cabal<1.14.0'
-         )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
-         '54bc9405c14c3226b6e3de3cd61e2777'
-         '82b67cdd24a2e434a4399f30f14b21a3')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make -j4 -l8
-}
-
-check() {
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  make THREADS=9 test
-  # might be some failures
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk
deleted file mode 100644
index bc26a21fe..000000000
--- a/staging/ghc/build.mk
+++ /dev/null
@@ -1,175 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
diff --git a/staging/ghc/ghc.install b/staging/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/staging/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/staging/ghc/print-provides-replaces.sh b/staging/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/staging/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/staging/happy/PKGBUILD b/staging/happy/PKGBUILD
deleted file mode 100644
index c84247e5a..000000000
--- a/staging/happy/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151112 2012-02-24 23:20:45Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.9
-pkgrel=4
-pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/haskell-html/PKGBUILD b/staging/haskell-html/PKGBUILD
deleted file mode 100644
index 44a3ea50b..000000000
--- a/staging/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=10
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-html/haskell-html.install b/staging/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/staging/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD
deleted file mode 100644
index 79de205cc..000000000
--- a/staging/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.2
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-http/haskell-http.install b/staging/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/staging/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD
deleted file mode 100644
index 315d81a73..000000000
--- a/staging/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.0.1.0
-pkgrel=4
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-mtl/haskell-mtl.install b/staging/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/staging/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD
deleted file mode 100644
index 59dc9334b..000000000
--- a/staging/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.0.11
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('cfe4922ac85685be9f86d4d34654f481')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-network/haskell-network.install b/staging/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/staging/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD
deleted file mode 100644
index e4f7da1e6..000000000
--- a/staging/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-parsec/haskell-parsec.install b/staging/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/staging/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-quickcheck/PKGBUILD b/staging/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index 7b27cfb0c..000000000
--- a/staging/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-quickcheck/haskell-quickcheck.install b/staging/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/staging/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD
deleted file mode 100644
index 3b929c3d6..000000000
--- a/staging/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=1
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/staging/haskell-random/haskell-random.install b/staging/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/staging/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-base/PKGBUILD b/staging/haskell-regex-base/PKGBUILD
deleted file mode 100644
index 3b8ecb4bb..000000000
--- a/staging/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=5
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-base/haskell-regex-base.install b/staging/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/staging/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-compat/PKGBUILD b/staging/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c880ff4f2..000000000
--- a/staging/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-compat/haskell-regex-compat.install b/staging/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/staging/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-posix/PKGBUILD b/staging/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 1bed15490..000000000
--- a/staging/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-posix/haskell-regex-posix.install b/staging/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/staging/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD
deleted file mode 100644
index c4c9664f7..000000000
--- a/staging/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.1.13
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/staging/haskell-text/haskell-text.install b/staging/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/staging/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD
deleted file mode 100644
index 8d4df2800..000000000
--- a/staging/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 151092 2012-02-24 20:41:57Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.2.2.0
-pkgrel=4
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('3470ac66116900cd1ba84d3744474e49')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-transformers/haskell-transformers.install b/staging/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/staging/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-xhtml/PKGBUILD b/staging/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 4ec98da52..000000000
--- a/staging/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.0.5
-pkgrel=1
-pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
-url="http://hackage.haskell.org/package/xhtml"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('d51e20de416b825aba6b874a221acfc4')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-xhtml/haskell-xhtml.install b/staging/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/staging/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD
deleted file mode 100644
index d47562b9d..000000000
--- a/staging/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=3
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'zlib' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-zlib/haskell-zlib.install b/staging/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/staging/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
deleted file mode 100644
index 2e55565d0..000000000
--- a/staging/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 151579 2012-02-27 18:26:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kig-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kig/kdeedu-kig.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index 262262751..000000000
--- a/staging/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151585 2012-02-27 18:44:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969')
-options=('!makeflags')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../rocs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD
deleted file mode 100644
index c97bd201d..000000000
--- a/staging/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151590 2012-02-27 18:55:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index f94ccd70c..000000000
--- a/staging/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151583 2012-02-27 18:40:10Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.15.10
-pkgrel=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS+=" -fvisibility=hidden"
-  export CXXFLAGS+=" -fvisibility=hidden"
-  ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD
deleted file mode 100644
index cd450a1e4..000000000
--- a/staging/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 151597 2012-02-27 20:17:39Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.3.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('2cd84ff24e1d9217dd3caf170f34e758')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/staging/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD
deleted file mode 100644
index 39d08ac9c..000000000
--- a/staging/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151593 2012-02-27 19:04:37Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.6
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('gcc-libs' 'bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('44856c15a5dc8694e30d92f640ed348f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/etc/bash_completion.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/staging/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}