From 5457eacc747fc3f91e10a1f452230b1feac39eff Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 19 Jun 2011 02:48:26 +0000 Subject: Sun Jun 19 02:48:26 UTC 2011 --- community-testing/courier-mta/PKGBUILD | 113 - community-testing/courier-mta/courier-mta.conf.d | 18 - community-testing/courier-mta/courier-mta.install | 46 - community-testing/courier-mta/courier-mta.rc.d | 60 - .../courier-webmail-cleancache.cron.hourly | 6 - community-testing/vhba-module/PKGBUILD | 27 - .../vhba-module/vhba-kernel2.6.37.patch | 56 - community-testing/vhba-module/vhba-module.install | 16 - community-testing/virtualbox/10-vboxdrv.rules | 5 - community-testing/virtualbox/18-system-xorg.patch | 277 -- community-testing/virtualbox/60-vboxguest.rules | 2 - community-testing/virtualbox/LocalConfig.kmk | 19 - community-testing/virtualbox/PKGBUILD | 217 -- .../virtualbox/change_default_driver_dir.patch | 18 - .../virtualbox/vboxdrv-reference.patch | 45 - community-testing/virtualbox/vboxdrv.sh | 80 - .../virtualbox/virtualbox-4-makeself-check.patch | 10 - .../virtualbox/virtualbox-4-mkisofs-check.patch | 10 - .../virtualbox/virtualbox-guest-modules.install | 24 - community-testing/virtualbox/virtualbox.install | 65 - community/camlp5-transitional/PKGBUILD | 47 - community/compizconfig-backend-kconfig/PKGBUILD | 34 - community/libtrash/PKGBUILD | 35 - community/libtrash/libtrash.install | 15 - community/libtrash/libtrash.patch | 11 - community/libtrash/libtrash.sh | 3 - community/mediastreamer/PKGBUILD | 25 - community/mediastreamer/disable-v4l1.patch | 50 - community/mongodb/gcc46fixes.diff | 132 - community/mongodb/gcc46fixes2.diff | 26 - community/python-pycurl/PKGBUILD | 22 - community/sfml/use-system-libs.patch | 70 - community/synfigstudio/images-makefile.patch | 49 - extra/alpine/2.00-lpam.patch | 13 - extra/alpine/CVE-2008-5514.patch | 20 - extra/alpine/PKGBUILD | 44 - extra/anjuta-extras/PKGBUILD | 26 - extra/anjuta-extras/anjuta-extras.install | 17 - extra/aufs2-util/PKGBUILD | 25 - extra/aufs2-util/create-tarball.sh | 11 - extra/bochs/2.4.5-fetchcode.patch | 45 - extra/celestia/libpng14.patch | 12 - extra/fbida/ChangeLog | 21 - extra/fbida/jinclude.h | 91 - extra/fbida/libpng-1.4.patch | 17 - extra/fbida/transupp.c | 1583 --------- extra/fbida/transupp.h | 210 -- extra/fvwm-devel/PKGBUILD | 37 - extra/fvwm-devel/fvwm-devel.desktop | 6 - extra/fvwm/fvwm2.desktop | 8 - extra/icewm/ChangeLog | 15 - extra/icewm/icewm.desktop | 6 - extra/indent/indent-2.2.9-file.diff | 12 - extra/libindi/linking-pthread.patch | 11 - extra/moc/curl-streams.diff | 28 - extra/mousepad/PKGBUILD | 28 - extra/mousepad/mousepad.install | 16 - extra/mousepad/resensitize-find-button.patch | 28 - extra/python2/CVE-2011-1521.patch | 98 - ...ython-2.7.1-fix-decimal-in-turkish-locale.patch | 48 - extra/rcs/rcs-5.7.patch | 67 - extra/xfprint/PKGBUILD | 35 - extra/xfprint/xfprint-manager-fix.diff | 29 - extra/xfprint/xfprint.install | 11 - multilib-testing/lib32-llvm/PKGBUILD | 153 - .../lib32-llvm/cindexer-clang-path.patch | 10 - .../lib32-llvm/clang-plugin-loader-registry.patch | 11 - multilib-testing/lib32-llvm/clang-pure64.patch | 38 - .../lib32-llvm/clang-toolchains-gcc-versions.patch | 12 - multilib-testing/lib32-llvm/enable-lto.patch | 36 - staging/kdeaccessibility/PKGBUILD | 98 - staging/kdeaccessibility/kdeaccessibility.install | 11 - staging/kdeadmin/PKGBUILD | 80 - staging/kdeadmin/kdeadmin.install | 11 - staging/kdeadmin/syslog-path.patch | 11 - staging/kdeartwork/PKGBUILD | 102 - staging/kdebase-runtime/PKGBUILD | 38 - staging/kdebase-runtime/kdebase-runtime.install | 12 - staging/kdebase-workspace/PKGBUILD | 72 - staging/kdebase-workspace/fixpath.patch | 34 - staging/kdebase-workspace/kde-np.pam | 7 - staging/kdebase-workspace/kde.pam | 7 - .../kdebase-workspace/kdebase-workspace.install | 25 - staging/kdebase-workspace/kdm | 36 - staging/kdebase-workspace/kdm-zsh-profile.patch | 11 - staging/kdebase-workspace/kscreensaver.pam | 1 - staging/kdebase-workspace/terminate-server.patch | 11 - staging/kdebase/PKGBUILD | 129 - staging/kdebase/kdebase.install | 11 - staging/kdebindings/PKGBUILD | 71 - staging/kdeedu/PKGBUILD | 270 -- staging/kdeedu/gpsd-2.96.patch | 43 - staging/kdeedu/kdeedu.install | 11 - staging/kdegames/PKGBUILD | 514 --- staging/kdegames/kdegames-kbattleship.install | 24 - staging/kdegames/kdegames-kfourinline.install | 12 - staging/kdegames/kdegames-kigo.install | 12 - staging/kdegames/kdegames-kolf.install | 12 - staging/kdegames/kdegames-kreversi.install | 22 - staging/kdegames/kdegames-kspaceduel.install | 12 - staging/kdegames/kdegames-ksquares.install | 22 - staging/kdegames/kdegames-ktuberling.install | 12 - staging/kdegames/kdegames-lskat.install | 12 - staging/kdegames/kdegames-palapeli.install | 13 - staging/kdegames/kdegames.install | 11 - staging/kdegraphics/PKGBUILD | 141 - staging/kdegraphics/kdegraphics.install | 11 - staging/kdelibs/PKGBUILD | 63 - staging/kdelibs/abs-syntax-highlight.patch | 12 - staging/kdelibs/archlinux-menu.patch | 22 - staging/kdelibs/kde-applications-menu.patch | 22 - staging/kdelibs/kdelibs.install | 12 - staging/kdemultimedia/PKGBUILD | 109 - staging/kdemultimedia/kdemultimedia.install | 11 - staging/kdemultimedia/mplayerthumbs.config | 2 - staging/kdenetwork/PKGBUILD | 116 - staging/kdenetwork/kdenetwork.install | 11 - staging/kdepim-runtime/PKGBUILD | 32 - staging/kdepim-runtime/kdepim-runtime.install | 12 - staging/kdepim/PKGBUILD | 253 -- staging/kdepim/kdepim-kleopatra.install | 12 - staging/kdepim/kdepim-kmail.install | 12 - staging/kdepim/kdepim-korganizer.install | 12 - staging/kdepim/kdepim.install | 11 - staging/kdepimlibs/PKGBUILD | 32 - staging/kdepimlibs/kdepimlibs.install | 11 - staging/kdeplasma-addons/PKGBUILD | 603 ---- .../kdeplasma-addons-applets-lancelot.install | 12 - .../kdeplasma-addons-applets.install | 11 - staging/kdesdk/PKGBUILD | 243 -- staging/kdesdk/fix-python2-path.patch | 64 - staging/kdesdk/kdesdk-kate.install | 12 - staging/kdesdk/kdesdk-okteta.install | 12 - staging/kdesdk/kdesdk.install | 11 - staging/kdetoys/PKGBUILD | 56 - staging/kdetoys/kdetoys.install | 11 - staging/kdeutils/PKGBUILD | 180 - staging/kdeutils/kdeutils.install | 11 - staging/kdewebdev/PKGBUILD | 67 - staging/kdewebdev/kdewebdev.install | 11 - staging/libmtp/PKGBUILD | 27 - staging/rhythmbox/PKGBUILD | 43 - staging/rhythmbox/rhythmbox.install | 22 - testing/coreutils/PKGBUILD | 69 - testing/coreutils/coreutils-pam.patch | 428 --- testing/coreutils/coreutils-uname.patch | 173 - testing/coreutils/coreutils.install | 21 - testing/coreutils/su.pam | 9 - testing/libevent/PKGBUILD | 33 - testing/links/PKGBUILD | 49 - testing/links/links.desktop | 7 - testing/lirc/PKGBUILD | 103 - testing/lirc/irexec.conf | 5 - testing/lirc/irexecd | 38 - testing/lirc/kernel-2.6.39.patch | 54 - testing/lirc/lirc.install | 16 - testing/lirc/lirc.logrotate | 5 - testing/lirc/lirc_atiusb-kfifo.patch | 31 - testing/lirc/lirc_wpc8769l.patch | 88 - testing/lirc/lircd | 52 - testing/lirc/lircd-handle-large-config.patch | 39 - testing/lirc/lircd.conf | 8 - testing/lirc/lircmd | 36 - testing/moc/PKGBUILD | 44 - testing/moc/gcc-undefined-symbols.diff | 12 - testing/mpd/PKGBUILD | 56 - testing/mpd/mpd | 36 - testing/mpd/mpd.install | 18 - testing/net-tools/PKGBUILD | 44 - testing/net-tools/gcc340.patch | 46 - .../net-tools/net-tools-1.60-2.6-compilefix.patch | 23 - testing/net-tools/net-tools-1.60-miiioctl.patch | 17 - testing/net-tools/net-tools-1.60-nameif.patch | 58 - .../net-tools/net-tools-1.60-nameif_strncpy.patch | 13 - testing/net-tools/net-tools.install | 12 - testing/net-tools/net-tools.patch | 52 - testing/nouveau-drm-lts/COPYING | 48 - testing/nouveau-drm-lts/Makefile | 102 - testing/nouveau-drm-lts/PKGBUILD | 47 - .../nouveau-drm-lts/dont_check_for_pthread.patch | 49 - testing/nouveau-drm-lts/nouveau-drm.install | 16 - testing/openssh/PKGBUILD | 71 - testing/openssh/authfile.c.patch | 198 -- testing/openssh/sshd | 48 - testing/openssh/sshd.confd | 4 - testing/openssh/sshd.pam | 11 - testing/python2/PKGBUILD | 87 - testing/python2/python-2.7-db51.patch | 42 - testing/re-alpine/PKGBUILD | 38 - testing/re-alpine/maildir.patch | 3712 -------------------- 190 files changed, 14774 deletions(-) delete mode 100644 community-testing/courier-mta/PKGBUILD delete mode 100644 community-testing/courier-mta/courier-mta.conf.d delete mode 100644 community-testing/courier-mta/courier-mta.install delete mode 100644 community-testing/courier-mta/courier-mta.rc.d delete mode 100644 community-testing/courier-mta/courier-webmail-cleancache.cron.hourly delete mode 100644 community-testing/vhba-module/PKGBUILD delete mode 100644 community-testing/vhba-module/vhba-kernel2.6.37.patch delete mode 100644 community-testing/vhba-module/vhba-module.install delete mode 100644 community-testing/virtualbox/10-vboxdrv.rules delete mode 100644 community-testing/virtualbox/18-system-xorg.patch delete mode 100644 community-testing/virtualbox/60-vboxguest.rules delete mode 100644 community-testing/virtualbox/LocalConfig.kmk delete mode 100644 community-testing/virtualbox/PKGBUILD delete mode 100644 community-testing/virtualbox/change_default_driver_dir.patch delete mode 100644 community-testing/virtualbox/vboxdrv-reference.patch delete mode 100755 community-testing/virtualbox/vboxdrv.sh delete mode 100644 community-testing/virtualbox/virtualbox-4-makeself-check.patch delete mode 100644 community-testing/virtualbox/virtualbox-4-mkisofs-check.patch delete mode 100644 community-testing/virtualbox/virtualbox-guest-modules.install delete mode 100644 community-testing/virtualbox/virtualbox.install delete mode 100644 community/camlp5-transitional/PKGBUILD delete mode 100644 community/compizconfig-backend-kconfig/PKGBUILD delete mode 100644 community/libtrash/PKGBUILD delete mode 100644 community/libtrash/libtrash.install delete mode 100644 community/libtrash/libtrash.patch delete mode 100644 community/libtrash/libtrash.sh delete mode 100644 community/mediastreamer/PKGBUILD delete mode 100644 community/mediastreamer/disable-v4l1.patch delete mode 100644 community/mongodb/gcc46fixes.diff delete mode 100644 community/mongodb/gcc46fixes2.diff delete mode 100644 community/python-pycurl/PKGBUILD delete mode 100644 community/sfml/use-system-libs.patch delete mode 100644 community/synfigstudio/images-makefile.patch delete mode 100644 extra/alpine/2.00-lpam.patch delete mode 100644 extra/alpine/CVE-2008-5514.patch delete mode 100644 extra/alpine/PKGBUILD delete mode 100644 extra/anjuta-extras/PKGBUILD delete mode 100644 extra/anjuta-extras/anjuta-extras.install delete mode 100644 extra/aufs2-util/PKGBUILD delete mode 100755 extra/aufs2-util/create-tarball.sh delete mode 100644 extra/bochs/2.4.5-fetchcode.patch delete mode 100644 extra/celestia/libpng14.patch delete mode 100644 extra/fbida/ChangeLog delete mode 100644 extra/fbida/jinclude.h delete mode 100644 extra/fbida/libpng-1.4.patch delete mode 100644 extra/fbida/transupp.c delete mode 100644 extra/fbida/transupp.h delete mode 100644 extra/fvwm-devel/PKGBUILD delete mode 100644 extra/fvwm-devel/fvwm-devel.desktop delete mode 100644 extra/fvwm/fvwm2.desktop delete mode 100644 extra/icewm/ChangeLog delete mode 100644 extra/icewm/icewm.desktop delete mode 100644 extra/indent/indent-2.2.9-file.diff delete mode 100644 extra/libindi/linking-pthread.patch delete mode 100644 extra/moc/curl-streams.diff delete mode 100644 extra/mousepad/PKGBUILD delete mode 100644 extra/mousepad/mousepad.install delete mode 100644 extra/mousepad/resensitize-find-button.patch delete mode 100644 extra/python2/CVE-2011-1521.patch delete mode 100644 extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch delete mode 100644 extra/rcs/rcs-5.7.patch delete mode 100644 extra/xfprint/PKGBUILD delete mode 100644 extra/xfprint/xfprint-manager-fix.diff delete mode 100644 extra/xfprint/xfprint.install delete mode 100644 multilib-testing/lib32-llvm/PKGBUILD delete mode 100644 multilib-testing/lib32-llvm/cindexer-clang-path.patch delete mode 100644 multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch delete mode 100644 multilib-testing/lib32-llvm/clang-pure64.patch delete mode 100644 multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch delete mode 100644 multilib-testing/lib32-llvm/enable-lto.patch delete mode 100644 staging/kdeaccessibility/PKGBUILD delete mode 100644 staging/kdeaccessibility/kdeaccessibility.install delete mode 100644 staging/kdeadmin/PKGBUILD delete mode 100644 staging/kdeadmin/kdeadmin.install delete mode 100644 staging/kdeadmin/syslog-path.patch delete mode 100644 staging/kdeartwork/PKGBUILD delete mode 100644 staging/kdebase-runtime/PKGBUILD delete mode 100644 staging/kdebase-runtime/kdebase-runtime.install delete mode 100644 staging/kdebase-workspace/PKGBUILD delete mode 100644 staging/kdebase-workspace/fixpath.patch delete mode 100644 staging/kdebase-workspace/kde-np.pam delete mode 100644 staging/kdebase-workspace/kde.pam delete mode 100644 staging/kdebase-workspace/kdebase-workspace.install delete mode 100644 staging/kdebase-workspace/kdm delete mode 100644 staging/kdebase-workspace/kdm-zsh-profile.patch delete mode 100644 staging/kdebase-workspace/kscreensaver.pam delete mode 100644 staging/kdebase-workspace/terminate-server.patch delete mode 100644 staging/kdebase/PKGBUILD delete mode 100644 staging/kdebase/kdebase.install delete mode 100644 staging/kdebindings/PKGBUILD delete mode 100644 staging/kdeedu/PKGBUILD delete mode 100644 staging/kdeedu/gpsd-2.96.patch delete mode 100644 staging/kdeedu/kdeedu.install delete mode 100644 staging/kdegames/PKGBUILD delete mode 100644 staging/kdegames/kdegames-kbattleship.install delete mode 100644 staging/kdegames/kdegames-kfourinline.install delete mode 100644 staging/kdegames/kdegames-kigo.install delete mode 100644 staging/kdegames/kdegames-kolf.install delete mode 100644 staging/kdegames/kdegames-kreversi.install delete mode 100644 staging/kdegames/kdegames-kspaceduel.install delete mode 100644 staging/kdegames/kdegames-ksquares.install delete mode 100644 staging/kdegames/kdegames-ktuberling.install delete mode 100644 staging/kdegames/kdegames-lskat.install delete mode 100644 staging/kdegames/kdegames-palapeli.install delete mode 100644 staging/kdegames/kdegames.install delete mode 100644 staging/kdegraphics/PKGBUILD delete mode 100644 staging/kdegraphics/kdegraphics.install delete mode 100644 staging/kdelibs/PKGBUILD delete mode 100644 staging/kdelibs/abs-syntax-highlight.patch delete mode 100644 staging/kdelibs/archlinux-menu.patch delete mode 100644 staging/kdelibs/kde-applications-menu.patch delete mode 100644 staging/kdelibs/kdelibs.install delete mode 100644 staging/kdemultimedia/PKGBUILD delete mode 100644 staging/kdemultimedia/kdemultimedia.install delete mode 100644 staging/kdemultimedia/mplayerthumbs.config delete mode 100644 staging/kdenetwork/PKGBUILD delete mode 100644 staging/kdenetwork/kdenetwork.install delete mode 100644 staging/kdepim-runtime/PKGBUILD delete mode 100644 staging/kdepim-runtime/kdepim-runtime.install delete mode 100644 staging/kdepim/PKGBUILD delete mode 100644 staging/kdepim/kdepim-kleopatra.install delete mode 100644 staging/kdepim/kdepim-kmail.install delete mode 100644 staging/kdepim/kdepim-korganizer.install delete mode 100644 staging/kdepim/kdepim.install delete mode 100644 staging/kdepimlibs/PKGBUILD delete mode 100644 staging/kdepimlibs/kdepimlibs.install delete mode 100644 staging/kdeplasma-addons/PKGBUILD delete mode 100644 staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install delete mode 100644 staging/kdeplasma-addons/kdeplasma-addons-applets.install delete mode 100644 staging/kdesdk/PKGBUILD delete mode 100644 staging/kdesdk/fix-python2-path.patch delete mode 100644 staging/kdesdk/kdesdk-kate.install delete mode 100644 staging/kdesdk/kdesdk-okteta.install delete mode 100644 staging/kdesdk/kdesdk.install delete mode 100644 staging/kdetoys/PKGBUILD delete mode 100644 staging/kdetoys/kdetoys.install delete mode 100644 staging/kdeutils/PKGBUILD delete mode 100644 staging/kdeutils/kdeutils.install delete mode 100644 staging/kdewebdev/PKGBUILD delete mode 100644 staging/kdewebdev/kdewebdev.install delete mode 100644 staging/libmtp/PKGBUILD delete mode 100644 staging/rhythmbox/PKGBUILD delete mode 100644 staging/rhythmbox/rhythmbox.install delete mode 100644 testing/coreutils/PKGBUILD delete mode 100644 testing/coreutils/coreutils-pam.patch delete mode 100644 testing/coreutils/coreutils-uname.patch delete mode 100644 testing/coreutils/coreutils.install delete mode 100644 testing/coreutils/su.pam delete mode 100644 testing/libevent/PKGBUILD delete mode 100644 testing/links/PKGBUILD delete mode 100644 testing/links/links.desktop delete mode 100644 testing/lirc/PKGBUILD delete mode 100644 testing/lirc/irexec.conf delete mode 100755 testing/lirc/irexecd delete mode 100644 testing/lirc/kernel-2.6.39.patch delete mode 100644 testing/lirc/lirc.install delete mode 100644 testing/lirc/lirc.logrotate delete mode 100644 testing/lirc/lirc_atiusb-kfifo.patch delete mode 100644 testing/lirc/lirc_wpc8769l.patch delete mode 100755 testing/lirc/lircd delete mode 100644 testing/lirc/lircd-handle-large-config.patch delete mode 100644 testing/lirc/lircd.conf delete mode 100755 testing/lirc/lircmd delete mode 100644 testing/moc/PKGBUILD delete mode 100644 testing/moc/gcc-undefined-symbols.diff delete mode 100644 testing/mpd/PKGBUILD delete mode 100755 testing/mpd/mpd delete mode 100644 testing/mpd/mpd.install delete mode 100644 testing/net-tools/PKGBUILD delete mode 100644 testing/net-tools/gcc340.patch delete mode 100644 testing/net-tools/net-tools-1.60-2.6-compilefix.patch delete mode 100644 testing/net-tools/net-tools-1.60-miiioctl.patch delete mode 100644 testing/net-tools/net-tools-1.60-nameif.patch delete mode 100644 testing/net-tools/net-tools-1.60-nameif_strncpy.patch delete mode 100644 testing/net-tools/net-tools.install delete mode 100644 testing/net-tools/net-tools.patch delete mode 100644 testing/nouveau-drm-lts/COPYING delete mode 100644 testing/nouveau-drm-lts/Makefile delete mode 100644 testing/nouveau-drm-lts/PKGBUILD delete mode 100644 testing/nouveau-drm-lts/dont_check_for_pthread.patch delete mode 100644 testing/nouveau-drm-lts/nouveau-drm.install delete mode 100644 testing/openssh/PKGBUILD delete mode 100644 testing/openssh/authfile.c.patch delete mode 100755 testing/openssh/sshd delete mode 100644 testing/openssh/sshd.confd delete mode 100644 testing/openssh/sshd.pam delete mode 100644 testing/python2/PKGBUILD delete mode 100644 testing/python2/python-2.7-db51.patch delete mode 100644 testing/re-alpine/PKGBUILD delete mode 100644 testing/re-alpine/maildir.patch diff --git a/community-testing/courier-mta/PKGBUILD b/community-testing/courier-mta/PKGBUILD deleted file mode 100644 index 6ac1618dc..000000000 --- a/community-testing/courier-mta/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ -# Maintainer: Sven-Hendrik Haase -# Contributor: tobias -# Contributor: Tobias Kieslich - -# ----------- NOTE TO ALL USERS ------------ -# Go read http://www.courier-mta.org/install.html b4 running or building courier - - -pkgname=courier-mta -pkgver=0.66.1 -pkgrel=2 -pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" -arch=(i686 x86_64) -license=('GPL2') -backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ - 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ - 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ - 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ - 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ - 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ - 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ - 'etc/conf.d/courier-mta') -url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') -optdepends=('libldap') -makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') -provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') -options=('!libtool') -install=courier-mta.install -source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 - courier-mta.rc.d - courier-mta.conf.d) -md5sums=('79250d71d88ba2bcb630b7356f0250cd' - 'e140f320968e57cfe459cd7a3b4017e0' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') - -build() { - cd ${srcdir}/courier-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - # courier is more about configuring than compiling :-), lets start the mess - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var/spool/courier \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --enable-mimetypes=/etc/mime.types \ - --with-piddir=/var/run/courier \ - --with-locking-method=lockf \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-random=/dev/urandom --without-ispell \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-certdb=/etc/ssl/certs/ - make -} - -package() { - cd ${srcdir}/courier-${pkgver} - - #chown mail.mail ${pkgdir}/var/spool/courier - make DESTDIR=${pkgdir} install - # docs say we can get rid of those after make - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - # install the perftest-script for testings - install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) - done - # install pam files according to the layout used in Archlinux - for pamfile in ${pkgdir}/etc/courier/*.authpam; do - sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} - #echo "password required pam_unix.so" >> $pamfile - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") - rm -f ${pamfile} - done - - ############################################################################### - # Arch Linux specific tweaks to make things easier for the user - # create passwordfile for webadmin -> standard archwebadmin - sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile - yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password - # arch specific scripts - install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta - install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta - #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ - # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache - # bug http://bugs.archlinux.org/task/5154 - find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; - # fixing some permissions - chown -R courier:courier ${pkgdir}/usr/lib/courier/modules - rm -r ${pkgdir}/var/run - #chown -R courier:courier ${pkgdir}/var/run/courier - chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} - # make a link to /usr/sbin/sendmail - install -dm 755 ${pkgdir}/usr/sbin - cd ${pkgdir}/usr/sbin - ln -s ../bin/sendmail ./sendmail -} diff --git a/community-testing/courier-mta/courier-mta.conf.d b/community-testing/courier-mta/courier-mta.conf.d deleted file mode 100644 index 5856a5cda..000000000 --- a/community-testing/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild -# -CI_DAEMONS="courier esmtpd imapd pop3d" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community-testing/courier-mta/courier-mta.install b/community-testing/courier-mta/courier-mta.install deleted file mode 100644 index eac627867..000000000 --- a/community-testing/courier-mta/courier-mta.install +++ /dev/null @@ -1,46 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - --> if you are using LDAP services to provide lookup in sqwebmail or aliases - --> then you have to install: - libldap -EOM - # create the *.dat files - makealiases - makesmtpaccess -} - -pre_upgrade() { - pre_remove $1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - - -pre_remove() { - # manual backup, since courier is always processing the whole directory - # - so it would process "system" AND "system.pacsave" -> bad - [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup - cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system - cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default - cat << EOM - --> the /etc/courier/aliase/system and the /etc/courier/smtpaccess/default - --> files have been backed up to /etc/courier/_backup since the *.pacsave - --> files cannot stay in place. Read about couriers alias handling from the - --> documentation! -EOM -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/community-testing/courier-mta/courier-mta.rc.d b/community-testing/courier-mta/courier-mta.rc.d deleted file mode 100644 index 6c5fbc914..000000000 --- a/community-testing/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if [ ! -f /var/run/daemons/authdaemond ]; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/sbin/${daemon} start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/sbin/${daemon} stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly deleted file mode 100644 index 6c541321e..000000000 --- a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Cleans the cache of the sqwebmail server -if [ -x /usr/share/sqwebmail/cleancache.pl ]; then - su -c "/usr/share/sqwebmail/cleancache.pl" bin -fi diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD deleted file mode 100644 index 43fa2bc67..000000000 --- a/community-testing/vhba-module/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $ -# Maintainer: Mateusz Herych -# Contributor: Charles Lindsay - -pkgname=vhba-module -pkgver=20100822 -_kernver='2.6.39-ARCH' -pkgrel=5 -pkgdesc="Kernel module that emulates SCSI devices" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/" -license=('GPL2') -depends=('kernel26>=2.6.39' 'kernel26<2.6.40') -makedepends=('kernel26-headers>=2.6.39' 'git') -install=vhba-module.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz - vhba-kernel2.6.37.patch) -md5sums=('1d2f06ae33c5d15b7c29e467e4658aa2' - 'f0499fc54f6ef9b8d6ca0b9e940c5906') - -build() { - cd "$srcdir/$pkgname-$pkgver" - git apply -p2 ../vhba-kernel2.6.37.patch - make -j1 KDIR=/usr/src/linux-${_kernver} || return 1 - install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" || return 1 - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" -} diff --git a/community-testing/vhba-module/vhba-kernel2.6.37.patch b/community-testing/vhba-module/vhba-kernel2.6.37.patch deleted file mode 100644 index e2b619c74..000000000 --- a/community-testing/vhba-module/vhba-kernel2.6.37.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 6 Jan 2011 03:39:26 -0500 -Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API - -Due to the SCSI host lock push-down changes introduced in 2.6.37 (see -http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a -for more details), trying to use current vhba on 2.6.37 leads to oopses -and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753 - -Add some #ifdefs to enable compatibility both with 2.6.37 and older API. -Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this -issue will need to be revisited. - -Signed-off-by: Alexandre Rostovtsev ---- - vhba-module/vhba.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c -index 059f6ce..9d13016 100644 ---- a/vhba-module/vhba.c -+++ b/vhba-module/vhba.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #ifdef CONFIG_COMPAT - #include - #endif -@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd) - spin_unlock_irqrestore(&vhost->cmd_lock, flags); - } - --static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) -+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) - { - struct vhba_device *vdev; - int retval; -@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn - return retval; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+DEF_SCSI_QCMD(vhba_queuecommand) -+#else -+#define vhba_queuecommand vhba_queuecommand_lck -+#endif -+ - static int vhba_abort(struct scsi_cmnd *cmd) - { - struct vhba_device *vdev; --- -1.7.3.4 - diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install deleted file mode 100644 index c3bcbca3f..000000000 --- a/community-testing/vhba-module/vhba-module.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." - echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.37-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 -} - -post_upgrade() { - post_install -} - -post_remove() { - KERNEL_VERSION='2.6.37-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 -} - diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules deleted file mode 100644 index 37403ae2f..000000000 --- a/community-testing/virtualbox/10-vboxdrv.rules +++ /dev/null @@ -1,5 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" -SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/18-system-xorg.patch b/community-testing/virtualbox/18-system-xorg.patch deleted file mode 100644 index 4a28b93b6..000000000 --- a/community-testing/virtualbox/18-system-xorg.patch +++ /dev/null @@ -1,277 +0,0 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes , Felix Geyer - -diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -40,8 +40,8 @@ LIBRARIES += \ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -+# LIBRARIES += \ -+# VBoxGuestR3LibXFree86 - endif - endif - LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 -diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ -- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ -- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ -- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ -- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ -- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_MESA_INCS) \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ /usr/include/drm \ -+ /usr/include/libdrm - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - -diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk ---- a/src/VBox/Additions/x11/Makefile.kmk -+++ b/src/VBox/Additions/x11/Makefile.kmk -@@ -17,6 +17,10 @@ - SUB_DEPTH = ../../../.. - include $(KBUILD_PATH)/subheader.kmk - -+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) -+ XSERVER_VERSION := 17 -+endif -+ - # Include sub-makefiles. - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk -diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxmouse_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxmouse_drv - vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxmouse_drv_DEFS.linux = linux - vboxmouse_drv_DEFS.x86 += __i386__ -@@ -59,7 +58,6 @@ endif - # - # vboxmouse_drv_70 - # --DLLS += vboxmouse_drv_70 - vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_70_DEFS = \ - XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE -@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ - # - # vboxmouse_drv_71 - # --DLLS += vboxmouse_drv_71 - vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) - vboxmouse_drv_71_INCS := \ -@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ - # - # vboxmouse_drv_13 - # --DLLS += vboxmouse_drv_13 - vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_13_INCS := \ -@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ - # - # vboxmouse_drv_14 - # --DLLS += vboxmouse_drv_14 - vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_14_INCS := \ -@@ -126,7 +121,6 @@ endif - # - # vboxmouse_drv_15 - # --DLLS += vboxmouse_drv_15 - vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_15_INCS := \ -@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ - # - # vboxmouse_drv_16 - # --DLLS += vboxmouse_drv_16 - vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_16_INCS := \ -@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ - # - # vboxmouse_drv_17 - # --DLLS += vboxmouse_drv_17 - vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ - # - # vboxmouse_drv_18 - # --DLLS += vboxmouse_drv_18 - vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ - # - # vboxmouse_drv_19 - # --DLLS += vboxmouse_drv_19 - vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ - # - # vboxmouse_drv_110 - # --DLLS += vboxmouse_drv_110 - vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ - vboxmouse_15.c - - -+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv -+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 -+DLLS += vboxmouse_drv_$(XSERVER_VERSION) -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES -diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxvideo_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxvideo_drv - endif # target linux - vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxvideo_drv_DEFS.linux = linux -@@ -89,7 +88,6 @@ endif # target linux - # base keywords instead of using .solaris or .linux. - # Also it is *important* to use := and not = when deriving a property. - # --DLLS += vboxvideo_drv_70 - vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - if1of ($(KBUILD_TARGET), linux) - vboxvideo_drv_70_CFLAGS += \ -@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_71 - # --DLLS += vboxvideo_drv_71 - vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) -@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_13 - # --DLLS += vboxvideo_drv_13 - vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 -@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ - # - # vboxvideo_drv_14 - # --DLLS += vboxvideo_drv_14 - vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) -@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) - # - # vboxvideo_drv_15 - # --DLLS += vboxvideo_drv_15 - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ -@@ -192,7 +186,6 @@ endif - # - # vboxvideo_drv_16 - # --DLLS += vboxvideo_drv_16 - vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_17 - # --DLLS += vboxvideo_drv_17 - vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_18 - # --DLLS += vboxvideo_drv_18 - vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_19 - # --DLLS += vboxvideo_drv_19 - vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_110 - # --DLLS += vboxvideo_drv_110 - vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ - vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) - - -+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv -+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/xorg \ -+ /usr/include/x11 \ -+ /usr/include/pixman-1 \ -+ /usr/include/X11/dri \ -+ /usr/include/drm \ -+ /usr/include/libdrm -+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include -+DLLS += vboxvideo_drv_$(XSERVER_VERSION) -+ -+# required for lenny backports -+ifeq ($(XSERVER_VERSION),14) -+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg -+endif -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES diff --git a/community-testing/virtualbox/60-vboxguest.rules b/community-testing/virtualbox/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/community-testing/virtualbox/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk deleted file mode 100644 index d0e939ad4..000000000 --- a/community-testing/virtualbox/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /opt/java -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD deleted file mode 100644 index d989f61e0..000000000 --- a/community-testing/virtualbox/PKGBUILD +++ /dev/null @@ -1,217 +0,0 @@ -# $Id: PKGBUILD 47272 2011-05-20 17:46:19Z ibiru $ -#Maintainer: Ionut Biru -pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.8 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' -'xorg-server-devel' 'xf86driproto' 'libxcomposite') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf - virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch - change_default_driver_dir.patch) -_kernver=2.6.39-ARCH - -build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" - - patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" - patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" - patch -Np1 -i "$srcdir/vboxdrv-reference.patch" - patch -Np1 -i "$srcdir/18-system-xorg.patch" - patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure --disable-docs \ - --enable-webservice \ - --enable-vde \ - --with-linux=/usr/src/linux-${_kernver} - source ./env.sh - kmk all - - export KERN_DIR=/usr/src/linux-${_kernver} - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" -} - -package_virtualbox() { - pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') - optdepends=('libxt: for shared clipboard' - 'python2: for python support' - 'qt: for VirtualBox GUI' - 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: developer kit') - - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - install=virtualbox.install - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} - - #doc - install -m 0644 "$srcdir/UserManual.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" - - #Binaries and Wrapper with Launchers - install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless" - ln -sf VBox "$pkgdir/usr/bin/vboxheadless" - ln -sf VBox "$pkgdir/usr/bin/VBoxManage" - ln -sf VBox "$pkgdir/usr/bin/vboxmanage" - ln -sf VBox "$pkgdir/usr/bin/VBoxSDL" - ln -sf VBox "$pkgdir/usr/bin/vboxsdl" - ln -sf VBox "$pkgdir/usr/bin/VirtualBox" - ln -sf VBox "$pkgdir/usr/bin/virtualbox" - ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv" - - install -m 0755 VBoxTunctl "$pkgdir/usr/bin" - - #components - install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - #lib - install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - - #setuid root binaries - install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" - #other binaries - install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - #language - install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - #useless scripts - install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - #icons - install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd - - #desktop - install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - mkdir -p "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ - "$pkgdir/usr/share/licenses/virtualbox/LICENSE" - install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ - "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" - - #sources for modules - cp -r src ${pkgdir}/usr/lib/virtualbox - #install compilation script - install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv" -} - -package_virtualbox-sdk() { - pkgdesc=" VirtualBox Software Developer Kit (SDK)" - - mkdir -p "$pkgdir/usr/lib/virtualbox" - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - #python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" - popd - rm -rf sdk/installer - mv sdk "$pkgdir/usr/lib/virtualbox" -} -package_virtualbox-guest-additions(){ - pkgdesc="VirtualBox user-space tools for Linux guests" - depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') - replaces=('virtualbox-ose-additions') - conflicts=('virtualbox-ose-additions') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - - install -d "$pkgdir/usr/bin" - install -d "$pkgdir/sbin" - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" - - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ - "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ - "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv.so \ - "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv.so \ - "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" - install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" - -} -package_virtualbox-guest-modules(){ - pkgdesc="VirtualBox kernel modules for Linux guests" - license=('GPL') - install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.39' 'kernel26<2.6.40') - replaces=('virtualbox-ose-additions-modules') - conflicts=('virtualbox-ose-additions-modules') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - cd vboxguest - install -D -m644 vboxguest.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - - cd ../vboxsf - install -D -m644 vboxsf.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - - cd ../vboxvideo - install -D -m644 vboxvideo.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" -} -md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' - '39712ccbc16b04c1cda209ae16446bf2' - '44efb3c4be214daa453a317d527f1f30' - '32a232b43852b9a08cb11a7bcd64b347' - '5f85710e0b8606de967716ded7b2d351' - 'ed1341881437455d9735875ddf455fbe' - '9bde5b7dfba5abcd49768052c5409800' - 'c1a07f044c476a190af8486fe78bee0f' - '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b' - 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch deleted file mode 100644 index 71930f062..000000000 --- a/community-testing/virtualbox/change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 -+++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 -@@ -36,13 +36,8 @@ - //#define DEBUG_DRI_CALLS - - //@todo this could be different... --#ifdef RT_ARCH_AMD64 --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch deleted file mode 100644 index e7a9179a9..000000000 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 -@@ -75,9 +75,8 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing

" -- " '/etc/init.d/vboxdrv setup'

" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -+ " '/etc/rc.d/vboxdrv setup'

" -+ "as root. This package keeps track of Linux kernel changes and" - "recompiles the vboxdrv kernel module if necessary." - ); - -@@ -92,7 +91,7 @@ - "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing

" -- " '/etc/init.d/vboxdrv setup'

" -+ " '/etc/rc.d/vboxdrv setup'

" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." - ); -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 -@@ -34,7 +34,7 @@ - available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by - -- sudo /etc/init.d/vboxdrv setup -+ /etc/rc.d/vboxdrv setup - - You will not be able to start VMs until this problem is fixed. - EOF -@@ -42,7 +42,7 @@ - cat << EOF - WARNING: The character device /dev/vboxdrv does not exist. Try - -- sudo /etc/init.d/vboxdrv restart -+ /etc/rc.d/vboxdrv restart - - and if that is not successful, try to re-install the package. - diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh deleted file mode 100755 index 8de14b97f..000000000 --- a/community-testing/virtualbox/vboxdrv.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg - -MODLIST=() -LOG="/var/log/vbox-install.log" - -if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" - BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" -else - echo "missing vbox.cfg" - exit 0 -fi - -case "$1" in - setup) - stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{netflt,netadp,drv}; do - if grep -q "^${module}" /proc/modules; then - MODLIST+=($module) - modprobe -r $module - fi - done - stat_done - for p in /lib/modules/*; do - if [ ! -d "$p/kernel" ]; then - if [ -e "$p/misc/vboxdrv.ko" ]; then - stat_busy "Removing old VirtualBox kernel modules from $p" - rm -f "$p/misc/vbox"{drv,netadp,netflt}.ko 2>/dev/null - rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null - stat_done - fi - fi - done - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - stat_busy "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then - stat_busy "Removing old VirtualBox netflt kernel module" - find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then - stat_busy "Removing old VirtualBox kernel module" - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - stat_busy "Recompiling VirtualBox kernel modules" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install > $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETFLT \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - stat_done - stat_busy "Reloading VirtualBox kernel modules" - for module in "${MODLIST[@]}"; do - modprobe $module - done - stat_done - ;; - *) - echo "usage: $0 {setup}" -esac diff --git a/community-testing/virtualbox/virtualbox-4-makeself-check.patch b/community-testing/virtualbox/virtualbox-4-makeself-check.patch deleted file mode 100644 index e1fcb8c2f..000000000 --- a/community-testing/virtualbox/virtualbox-4-makeself-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2527,7 +2527,6 @@ - check_compiler_h - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit - # tools/common/makeself* -- [ $OSE -ge 1 ] && check_makeself - fi - - [ -n "$SETUP_WINE" ] && setup_wine diff --git a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch deleted file mode 100644 index 8b0d59123..000000000 --- a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2499,7 +2499,6 @@ - # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs - # [ "$OS" != "darwin" ] && check_yasm - [ "$OS" != "darwin" ] && check_xsltproc --[ "$OS" != "darwin" ] && check_mkisofs - - # the libraries - [ "$OS" != "darwin" ] && check_pthread diff --git a/community-testing/virtualbox/virtualbox-guest-modules.install b/community-testing/virtualbox/virtualbox-guest-modules.install deleted file mode 100644 index ae05bd1ba..000000000 --- a/community-testing/virtualbox/virtualbox-guest-modules.install +++ /dev/null @@ -1,24 +0,0 @@ -KERNEL_VERSION='2.6.39-ARCH' - -post_install() { - cat << EOM - -===> virtualbox-guest-modules post-install message: -===> -===> You may want to load vboxguest, vboxsf and vboxvideo -===> -===> To load them automatically, add them -===> to the MODULES array in /etc/rc.conf. - -EOM - - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_remove() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_upgrade() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install deleted file mode 100644 index e70757685..000000000 --- a/community-testing/virtualbox/virtualbox.install +++ /dev/null @@ -1,65 +0,0 @@ -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi -} - -post_install() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF - -===> In order to run VirtualBox, you have to be in the 'vboxusers' group. -===> -===> If you want to be able to install guest additions, you have to install -===> 'virtualbox-additions' package. -===> -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must load vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must load vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To compile the modules do /etc/rc.d/vboxdrv setup *** - -EOF - utils -} - -post_upgrade() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF -===> You must reload vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must reload vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must reload vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To recompile the modules do /etc/rc.d/vboxdrv setup *** -EOF - utils -} - -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} diff --git a/community/camlp5-transitional/PKGBUILD b/community/camlp5-transitional/PKGBUILD deleted file mode 100644 index b027132fc..000000000 --- a/community/camlp5-transitional/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: George Giorgidze -# Contributor: Massimiliano Brocchini - -pkgname=camlp5-transitional -pkgver=6.02.2 -pkgrel=1 -pkgdesc='Camlp5 is a preprocessor-pretty-printer of OCaml.' -arch=('i686' 'x86_64') -url='http://pauillac.inria.fr/~ddr/camlp5/' -license=('BSD') -depends=('sh') -makedepends=('ocaml') -conflicts=('camlp5') -options=('!makeflags') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz" - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3') -md5sums=('b495bf26355451186c6725ee01add0da' - '3acab547f3c0acb3c09d1d707e6c5ee3' - '2e911c01e7da967bf68deee13e9712c8' - '6fa59ec7c684919b6c8e2eb2bcabcf93') - -build() { - cd camlp5-${pkgver} - - patch -Np0 -i ${srcdir}/patch-6.02.2-1 - patch -Np0 -i ${srcdir}/patch-6.02.2-2 - patch -Np0 -i ${srcdir}/patch-6.02.2-3 - - ./configure \ - -prefix '/usr' \ - -mandir '/usr/share/man' \ - -transitional - - make world.opt -} - -package() { - cd camlp5-${pkgver} - - make DESTDIR=${pkgdir} install - - install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/compizconfig-backend-kconfig/PKGBUILD b/community/compizconfig-backend-kconfig/PKGBUILD deleted file mode 100644 index 78c52556d..000000000 --- a/community/compizconfig-backend-kconfig/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 4448 2009-10-23 09:02:36Z rvanharen $ -# Maintainer: Ronald van Haren -# Contributor: JJDaNiMoTh -# Contributor: kasa - -pkgname=compizconfig-backend-kconfig -pkgver=0.8.4 -pkgrel=1 -pkgdesc="Compizconfig backend for kconfig" -arch=('i686' 'x86_64') -url="http://opencompositing.org" -license=('GPL') -depends=('libcompizconfig' 'kdelibs3' 'qt3') -makedepends=('intltool' 'pkgconfig') -conflicts=('compizconfig-backend-gconf-git') -groups=('compiz-fusion-kde' 'compiz-fusion') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a96a30aba5e5faf7aa7db440fe4891ca') - -build() { - source /etc/profile.d/kde3.sh - source /etc/profile.d/qt3.sh - cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --prefix=/opt/kde \ - --without-arts \ - --with-kde-includes=/opt/kde/includes - - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - -} - diff --git a/community/libtrash/PKGBUILD b/community/libtrash/PKGBUILD deleted file mode 100644 index b870d83ae..000000000 --- a/community/libtrash/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 24969 2010-08-29 20:08:31Z jlichtblau $ -# Contributor: Jaroslaw Swierczynski -# Contributor: arjan -# Contributor: Tom Newsom - -pkgname=libtrash -pkgver=3.2 -pkgrel=2 -pkgdesc="A shared, preloaded library that implements a trash can under Linux" -arch=('i686' 'x86_64') -url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/" -license=('GPL') -depends=('glibc') -makedepends=('patch' 'python') -install=$pkgname.install -source=(http://pages.stern.nyu.edu/~marriaga/software/libtrash/$pkgname-latest.tgz libtrash.patch libtrash.sh) -md5sums=('147f645738088c83738259376737bc42' - '662e030819f2954b59e7646c77855f6c' - 'de716ae481adc8e88ddd32ea72808230') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - patch -Np1 -i $startdir/src/libtrash.patch - - install -d ${pkgdir}/usr/lib ${pkgdir}/etc/profile.d - make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc install - install -D -m 644 ${srcdir}/libtrash.sh ${pkgdir}/etc/profile.d/libtrash.sh -} diff --git a/community/libtrash/libtrash.install b/community/libtrash/libtrash.install deleted file mode 100644 index 9b1d1db9d..000000000 --- a/community/libtrash/libtrash.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo ">> To enable libtrash at login:" - echo ">> chmod 755 /etc/profile.d/libtrash.sh" - echo ">> To enable libtrash at any moment:" - echo ">> . /etc/profile.d/libtrash.sh" - echo ">> To disable libtrash at any moment:" - echo ">> unset LD_PRELOAD" - echo ">> WARNING: fakeroot will not work while libtrash is enabled." - echo ">> Disable libtrash before using fakeroot!" -} - -post_upgrade() { - post_install -} - diff --git a/community/libtrash/libtrash.patch b/community/libtrash/libtrash.patch deleted file mode 100644 index df08f9174..000000000 --- a/community/libtrash/libtrash.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN libtrash-2.1/src/Makefile libtrash-2.1-new/src/Makefile ---- libtrash-2.1/src/Makefile 2003-06-24 16:35:25.000000000 -0700 -+++ libtrash-2.1-new/src/Makefile 2003-07-13 01:35:35.000000000 -0700 -@@ -29,7 +29,6 @@ - TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION} - TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so - TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE} -- ldconfig - - clean: - rm -f *~ diff --git a/community/libtrash/libtrash.sh b/community/libtrash/libtrash.sh deleted file mode 100644 index d2850a56e..000000000 --- a/community/libtrash/libtrash.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export LD_PRELOAD=/usr/lib/libtrash.so.3.2 diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD deleted file mode 100644 index 4b97dc151..000000000 --- a/community/mediastreamer/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 44001 2011-04-01 15:25:02Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Adrià Arrufat - -pkgname=mediastreamer -pkgver=2.7.3 -pkgrel=1 -pkgdesc="A library written in C that allows you to create and run audio and video streams." -arch=('i686' 'x86_64') -url="http://www.linphone.org" -license=('GPL') -depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') -makedepends=('cmake' 'automoc4') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz" - "disable-v4l1.patch") -md5sums=('5213307f557d86aa648f1a53a885138c' - '7ee15689eed1adbdcf0ddab8fadca34a') - -build() { - cd "$srcdir"/$pkgname-$pkgver/ - patch -p2 <$srcdir/disable-v4l1.patch - ./configure --prefix=/usr - make - make DESTDIR=${pkgdir} install -} diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch deleted file mode 100644 index 9f6cb84d4..000000000 --- a/community/mediastreamer/disable-v4l1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am ---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000 -@@ -117,7 +117,7 @@ - endif - - if BUILD_V4L --libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c -+libmediastreamer_la_SOURCES+=msv4l2.c - endif - - if BUILD_WIN32 -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in ---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000 -@@ -54,7 +54,7 @@ - @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c - @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c - @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \ -@@ -135,7 +135,7 @@ - audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \ - msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \ - msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \ -- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \ -+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \ - drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \ - sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \ - h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \ -@@ -156,7 +156,7 @@ - @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo - @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \ - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo -@@ -600,7 +600,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@ diff --git a/community/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff deleted file mode 100644 index 487c88f16..000000000 --- a/community/mongodb/gcc46fixes.diff +++ /dev/null @@ -1,132 +0,0 @@ -commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e -Author: Mathias Stearn -Date: Sun Apr 3 19:10:36 2011 -0400 - - g++ 4.6 compile (new -Wunused-but-set-variable warning) - -diff --git a/db/btree.cpp b/db/btree.cpp -index 2758f72..4162d6a 100644 ---- a/db/btree.cpp -+++ b/db/btree.cpp -@@ -1226,8 +1226,6 @@ namespace mongo { - out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' ' - << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl; - -- DiskLoc oldLoc = thisLoc; -- - if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) { - // If basicInsert() fails, the bucket will be packed as required by split(). - thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx); -diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp -index 2580f86..56c0fce 100644 ---- a/db/dbcommands.cpp -+++ b/db/dbcommands.cpp -@@ -1460,7 +1460,7 @@ namespace mongo { - uassert( 13049, "godinsert must specify a collection", !coll.empty() ); - string ns = dbname + "." + coll; - BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck(); -- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); -+ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true ); - return true; - } - } cmdGodInsert; -diff --git a/db/index.cpp b/db/index.cpp -index c696e27..218ecb3 100644 ---- a/db/index.cpp -+++ b/db/index.cpp -@@ -127,7 +127,6 @@ namespace mongo { - void getIndexChanges(vector& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) { - int z = d.nIndexesBeingBuilt(); - v.resize(z); -- NamespaceDetails::IndexIterator i = d.ii(); - for( int i = 0; i < z; i++ ) { - IndexDetails& idx = d.idx(i); - BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 } -diff --git a/db/update.cpp b/db/update.cpp -index e173902..85c3f9c 100644 ---- a/db/update.cpp -+++ b/db/update.cpp -@@ -992,7 +992,7 @@ namespace mongo { - BSONObj newObj = mss->createNewFromMods(); - checkTooLarge(newObj); - assert(nsdt); -- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); -+ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug); - } - - if ( logop ) { -diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp -index acf9217..2d6f752 100644 ---- a/dbtests/queryoptimizertests.cpp -+++ b/dbtests/queryoptimizertests.cpp -@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests { - theDataFileMgr.insertWithObjMod( ns(), temp ); - } - BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); -- BSONElement hintElt = hint.firstElement(); - auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) ); - QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); - boost::shared_ptr c = qp.newCursor(); -@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests { - theDataFileMgr.insertWithObjMod( ns(), temp ); - } - BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); -- BSONElement hintElt = hint.firstElement(); - auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) ); - QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); - boost::shared_ptr c = qp.newCursor(); -diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp -index 6c398ef..53484fd 100644 ---- a/shell/shell_utils.cpp -+++ b/shell/shell_utils.cpp -@@ -260,7 +260,7 @@ namespace mongo { - BSONElement e = oneArg(args); - bool found = false; - -- path root( args.firstElement().valuestrsafe() ); -+ path root( e.valuestrsafe() ); - if ( boost::filesystem::exists( root ) ) { - found = true; - boost::filesystem::remove_all( root ); -diff --git a/tools/tool.cpp b/tools/tool.cpp -index 92a4bd4..150481b 100644 ---- a/tools/tool.cpp -+++ b/tools/tool.cpp -@@ -413,14 +413,14 @@ namespace mongo { - ProgressMeter m( fileLength ); - - while ( read < fileLength ) { -- int readlen = fread(buf, 4, 1, file); -+ fread(buf, 4, 1, file); - int size = ((int*)buf)[0]; - if ( size >= BUF_SIZE ) { - cerr << "got an object of size: " << size << " terminating..." << endl; - } - uassert( 10264 , "invalid object size" , size < BUF_SIZE ); - -- readlen = fread(buf+4, size-4, 1, file); -+ fread(buf+4, size-4, 1, file); - - BSONObj o( buf ); - if ( _objcheck && ! o.valid() ) { -diff --git a/util/ramlog.h b/util/ramlog.h -index fc588e6..b2f3aa0 100644 ---- a/util/ramlog.h -+++ b/util/ramlog.h -@@ -108,7 +108,6 @@ namespace mongo { - vector v; - get( v ); - -- bool first = true; - s << "
\n";
-             for( int i = 0; i < (int)v.size(); i++ ) {
-                 assert( strlen(v[i]) > 20 );
-@@ -126,7 +125,7 @@ namespace mongo {
-                         stringstream r;
-                         if( nr == 1 ) r << "repeat last line";
-                         else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15);
--                        first = false; s << html::a("", r.str(), clean(v,i,x.str()));
-+                        s << html::a("", r.str(), clean(v,i,x.str()));
-                     }
-                     else s << x.str();
-                     s << '\n';
diff --git a/community/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff
deleted file mode 100644
index 17257b136..000000000
--- a/community/mongodb/gcc46fixes2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb
-Author: Eliot Horowitz 
-Date:   Wed Mar 30 01:01:18 2011 -0400
-
-    remove unused variable
-
-diff --git a/db/commands.cpp b/db/commands.cpp
-index c301fb3..0bbd765 100644
---- a/db/commands.cpp
-+++ b/db/commands.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
-         if ( strcmp(p, ".$cmd") != 0 ) return false;
- 
-         bool ok = false;
--        bool valid = false;
- 
-         BSONElement e = jsobj.firstElement();
-         map::iterator i;
-@@ -138,7 +137,6 @@ namespace mongo {
-            migrated over to the command object format.
-            */
-         else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) {
--            valid = true;
-             string errmsg;
-             Command *c = i->second;
-             if ( c->adminOnly() && !startsWith(ns, "admin.") ) {
diff --git a/community/python-pycurl/PKGBUILD b/community/python-pycurl/PKGBUILD
deleted file mode 100644
index 2ffd177d5..000000000
--- a/community/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
-# Maintainer: Sergej Pupykin 
-# Contributor: Angel 'angvp' Velasquez  
-# Contributor: kontrast  
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=5
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
-  cd ${srcdir}/pycurl-${pkgver}
-  python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
diff --git a/community/sfml/use-system-libs.patch b/community/sfml/use-system-libs.patch
deleted file mode 100644
index 5d3200225..000000000
--- a/community/sfml/use-system-libs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
-Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
-diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
---- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp	2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp	2010-08-16 12:27:33.983627625 +0200
-@@ -28,10 +28,10 @@
- #include 
- extern "C"
- {
--    #include 
--    #include 
-+    #include 
-+    #include 
- }
--#include 
-+#include 
- #include 
- #include 
- 
-Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
-diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
---- SFML-1.6-old/src/SFML/Graphics/Makefile	2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/Makefile	2010-08-16 12:25:13.663501212 +0200
-@@ -1,15 +1,5 @@
- SRC     = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG  = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ     = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG  = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
- 
- ifeq ($(STATIC), yes)
-     LIB     = libsfml-graphics-s.a
-@@ -23,22 +13,19 @@
- 
- all: $(LIB)
- 
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
--	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ) 
-+	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
- 
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ) 
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
- 
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
--	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
- 
- clean:
--	@rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+	@rm -rf $(OBJ)
- 
- mrproper: clean
- 	@rm -rf $(LIBNAME)
-Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej
diff --git a/community/synfigstudio/images-makefile.patch b/community/synfigstudio/images-makefile.patch
deleted file mode 100644
index cb209b40e..000000000
--- a/community/synfigstudio/images-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- images-old/Makefile	2008-10-22 23:16:32.000000000 -0700
-+++ images/Makefile	2008-10-22 23:15:16.000000000 -0700
-@@ -223,7 +223,7 @@
- top_builddir = ..
- top_srcdir = ..
- SYNFIG = synfig
--EXT = png
-+EXT = mng
- EXTRA_DIST = installer_logo.sif installer_logo_osx.sif \
- 	splash_screen.sifz splash_screen-0.61.08.sif \
- 	splash_screen-0.61.07.sif about_icon.sif angle_icon.sif \
-@@ -650,31 +650,37 @@
- 	$(SYNFIG) -q $< -o $@ --time 0
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- .sifz.$(EXT):
- 	$(SYNFIG) -q $< -o $@ --time 0
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- 	$(SYNFIG) -q $< -o $@ --time 0
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- 	$(SYNFIG) -q $< -o $@ --time 0 -c PastOnly
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- 	$(SYNFIG) -q $< -o $@ --time 0 -c FutureOnly
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- 	$(SYNFIG) -q $< -o $@ --time 0 -c Disabled
- 	echo "  File \"images\\$@\"" >>./images.nsh
- 	echo "  Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+	mogrify -format png $@
- 
- #.sif.png:
- #	$(SYNFIG) -q $< -o $@ --time 0
diff --git a/extra/alpine/2.00-lpam.patch b/extra/alpine/2.00-lpam.patch
deleted file mode 100644
index 69e66d7ef..000000000
--- a/extra/alpine/2.00-lpam.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- alpine-2.00.orig/alpine/Makefile.in
-+++ alpine-2.00/alpine/Makefile.in
-@@ -169,7 +169,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lpam
- LIBTOOL = @LIBTOOL@
- LN = @LN@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
diff --git a/extra/alpine/CVE-2008-5514.patch b/extra/alpine/CVE-2008-5514.patch
deleted file mode 100644
index 594bea0b2..000000000
--- a/extra/alpine/CVE-2008-5514.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- alpine-2.00/imap/src/c-client/rfc822.c
-+++ alpine-2.00/imap/src/c-client/rfc822.c
-@@ -1351,6 +1351,7 @@
- 
- static long rfc822_output_char (RFC822BUFFER *buf,int c)
- {
-+  if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
-   *buf->cur++ = c;		/* add character, soutr buffer if full */
-   return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
- }
-@@ -1374,7 +1375,8 @@
-       len -= i;
-     }
- 				/* soutr buffer now if full */
--    if (len && !rfc822_output_flush (buf)) return NIL;
-+    if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
-+      return NIL;
-   }
-   return LONGT;
- }
diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD
deleted file mode 100644
index 6b2f9ee73..000000000
--- a/extra/alpine/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $
-# Maintainer: Eric Bélanger 
-
-pkgname=alpine
-pkgver=2.00
-pkgrel=13
-_patchlevel=79
-pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
-arch=('i686' 'x86_64')
-url="http://www.washington.edu/alpine/"
-license=('APACHE')
-depends=('libldap' 'krb5' 'gettext')
-optdepends=('aspell: for spell-checking support')
-provides=('pine')
-conflicts=('pine')
-replaces=('pine')
-options=('!makeflags')
-source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
-        http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
-        2.00-lpam.patch CVE-2008-5514.patch)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52'
-         'd7dffd121c9a1cac4c458c0ff71df1ce'
-         'cd3911c16fc6a072e853c0ccfc35857c'
-         '1b52a54a656979116c09fb1d948a4325')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4'
-          'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294'
-          '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3'
-          'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../all_${_patchlevel}.patch
-  patch -p1 < ../2.00-lpam.patch
-  patch -p1 < ../CVE-2008-5514.patch
-  ./configure --prefix=/usr --without-passfile --without-tcl \
-    --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
-    --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
deleted file mode 100644
index 0d1eea2e5..000000000
--- a/extra/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 105124 2011-01-06 17:19:56Z ibiru $
-# Mantainer: Jan de Groot 
-
-pkgname=anjuta-extras
-pkgver=2.32.1.1
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta>=2.32.0.0' 'libgnomecanvas>=2.30.2' 'graphviz>=2.26.3' 'valgrind')
-makedepends=('intltool')
-install=anjuta-extras.install
-url="http://anjuta.sourceforge.net/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('0461b78eaa11b7a930001024c4db2484863b35f5f52acaa23c568bc6355414a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain anjuta-extras ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/anjuta-extras/anjuta-extras.install b/extra/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index 2c23edf15..000000000
--- a/extra/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=anjuta
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/aufs2-util/PKGBUILD b/extra/aufs2-util/PKGBUILD
deleted file mode 100644
index 3d2e23fed..000000000
--- a/extra/aufs2-util/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 114820 2011-03-16 06:31:06Z tpowa $
-# Contributor: Paul Mattal 
-# Maintainer: Paul Mattal 
-pkgname=aufs2-util
-pkgver=20110314
-pkgrel=1
-pkgdesc="Another Unionfs Implementation that supports NFS branches"
-arch=('i686' 'x86_64')
-url="http://aufs.sourceforge.net/"
-license=('GPL2')
-depends=('glibc')
-makedepends=('aufs2>=2.6.38_20110314' 'kernel26-headers')
-replaces=('aufs-utils')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('bf0f9c86361e12a3181fb3891e57cd8d')
diff --git a/extra/aufs2-util/create-tarball.sh b/extra/aufs2-util/create-tarball.sh
deleted file mode 100755
index 361cbbc38..000000000
--- a/extra/aufs2-util/create-tarball.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-GITSNAPSHOT=20110314
-# aufs2 (no -xx) for the latest -rc version.
-git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git aufs2-util.git
-cd aufs2-util.git
-#git checkout origin/aufs2${AUFS2VERSION}
-git checkout origin/aufs2.1
-cd ..
-rm -rf aufs2-util-${GITSNAPSHOT}
-cp -a aufs2-util.git aufs2-util-${GITSNAPSHOT}
-tar -czf aufs2-util-${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-util-${GITSNAPSHOT}
diff --git a/extra/bochs/2.4.5-fetchcode.patch b/extra/bochs/2.4.5-fetchcode.patch
deleted file mode 100644
index ef980a340..000000000
--- a/extra/bochs/2.4.5-fetchcode.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- cpu/fetchdecode.cc.orig	2010-04-16 15:52:44.000000000 -0400
-+++ cpu/fetchdecode.cc	2010-10-07 13:23:06.000000000 -0400
-@@ -1,5 +1,5 @@
- /////////////////////////////////////////////////////////////////////////
--// $Id: fetchdecode.cc,v 1.266 2010/04/16 19:52:44 sshwarts Exp $
-+// $Id: fetchdecode.cc,v 1.267 2010/04/29 21:04:23 sshwarts Exp $
- /////////////////////////////////////////////////////////////////////////
- //
- //  Copyright (C) 2001-2009  The Bochs Project
-@@ -474,7 +474,7 @@
-   /* 0F 0D /wr */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
-   /* 0F 0E /wr */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
--  /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+  /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
-   /* 0F 0F /wr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1025,7 +1025,7 @@
-   /* 0F 0D /dr */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
-   /* 0F 0E /dr */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
--  /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+  /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
-   /* 0F 0F /dr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1583,7 +1583,7 @@
-   /* 0F 0D /wm */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
-   /* 0F 0E /wm */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
--  /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+  /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
-   /* 0F 0F /wm */ { 0, BX_IA_ERROR },
- #endif
-@@ -2134,7 +2134,7 @@
-   /* 0F 0D /dm */ { 0, BX_IA_PREFETCHW },       // 3DNow! PREFETCH on AMD, NOP on Intel
-   /* 0F 0E /dm */ { 0, BX_IA_FEMMS },           // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
--  /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+  /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
-   /* 0F 0F /dm */ { 0, BX_IA_ERROR },
- #endif
diff --git a/extra/celestia/libpng14.patch b/extra/celestia/libpng14.patch
deleted file mode 100644
index 1d47637b9..000000000
--- a/extra/celestia/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur celestia-1.6.0.orig/src/celengine/image.cpp celestia-1.6.0/src/celengine/image.cpp
---- celestia-1.6.0.orig/src/celengine/image.cpp	2009-06-22 18:44:08.000000000 +0300
-+++ celestia-1.6.0/src/celengine/image.cpp	2010-01-18 23:27:55.000000000 +0200
-@@ -737,7 +737,7 @@
- 
-     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-     {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/extra/fbida/ChangeLog b/extra/fbida/ChangeLog
deleted file mode 100644
index 7e67308c0..000000000
--- a/extra/fbida/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-02  Eric Belanger  
-
-	* fbida 2.07-5
-	* Fixed exiftran (close FS#18302)
-	* Removed backup array
-
-2010-01-17  Eric Belanger  
-
-	* fbida 2.07-4
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-08-10  Eric Belanger  
-
-	* fbida 2.07-3
-	* Fixed compatibility problem with libjpeg 7 (close FS#15875)
-
-2009-07-01  Eric Belanger  
-
-	* fbida 2.07-2
-	* Rebuild against libjpeg 7
-	* Added ChangeLog
diff --git a/extra/fbida/jinclude.h b/extra/fbida/jinclude.h
deleted file mode 100644
index 0a4f15146..000000000
--- a/extra/fbida/jinclude.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * jinclude.h
- *
- * Copyright (C) 1991-1994, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file exists to provide a single place to fix any problems with
- * including the wrong system include files.  (Common problems are taken
- * care of by the standard jconfig symbols, but on really weird systems
- * you may have to edit this file.)
- *
- * NOTE: this file is NOT intended to be included by applications using the
- * JPEG library.  Most applications need only include jpeglib.h.
- */
-
-
-/* Include auto-config file to find out which system include files we need. */
-
-#include "jconfig.h"		/* auto configuration options */
-#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
-
-/*
- * We need the NULL macro and size_t typedef.
- * On an ANSI-conforming system it is sufficient to include .
- * Otherwise, we get them from  or ; we may have to
- * pull in  as well.
- * Note that the core JPEG library does not require ;
- * only the default error handler and data source/destination modules do.
- * But we must pull it in because of the references to FILE in jpeglib.h.
- * You can remove those references if you want to compile without .
- */
-
-#ifdef HAVE_STDDEF_H
-#include 
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include 
-#endif
-
-#ifdef NEED_SYS_TYPES_H
-#include 
-#endif
-
-#include 
-
-/*
- * We need memory copying and zeroing functions, plus strncpy().
- * ANSI and System V implementations declare these in .
- * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
- * Some systems may declare memset and memcpy in .
- *
- * NOTE: we assume the size parameters to these functions are of type size_t.
- * Change the casts in these macros if not!
- */
-
-#ifdef NEED_BSD_STRINGS
-
-#include 
-#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))
-#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))
-
-#else /* not BSD, assume ANSI/SysV string lib */
-
-#include 
-#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))
-#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))
-
-#endif
-
-/*
- * In ANSI C, and indeed any rational implementation, size_t is also the
- * type returned by sizeof().  However, it seems there are some irrational
- * implementations out there, in which sizeof() returns an int even though
- * size_t is defined as long or unsigned long.  To ensure consistent results
- * we always use this SIZEOF() macro in place of using sizeof() directly.
- */
-
-#define SIZEOF(object)	((size_t) sizeof(object))
-
-/*
- * The modules that use fread() and fwrite() always invoke them through
- * these macros.  On some systems you may need to twiddle the argument casts.
- * CAUTION: argument order is different from underlying functions!
- */
-
-#define JFREAD(file,buf,sizeofbuf)  \
-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf)  \
-  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
diff --git a/extra/fbida/libpng-1.4.patch b/extra/fbida/libpng-1.4.patch
deleted file mode 100644
index f8a80d4b2..000000000
--- a/extra/fbida/libpng-1.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur fbida-2.07-orig/rd/read-png.c fbida-2.07/rd/read-png.c
---- fbida-2.07-orig/rd/read-png.c	2010-01-18 00:02:02.000000000 -0500
-+++ fbida-2.07/rd/read-png.c	2010-01-18 00:06:09.000000000 -0500
-@@ -69,8 +69,11 @@
-     if (h->color_type == PNG_COLOR_TYPE_PALETTE)
- 	png_set_palette_to_rgb(h->png);
-     if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--	png_set_gray_1_2_4_to_8(h->png);
--
-+#if PNG_LIBPNG_VER < 10400
-+      png_set_gray_1_2_4_to_8(h->png);
-+#else
-+    png_set_expand_gray_1_2_4_to_8(h->png);
-+#endif
-     if (png_get_bKGD(h->png, h->info, &file_bg)) {
- 	png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);
-     } else {
diff --git a/extra/fbida/transupp.c b/extra/fbida/transupp.c
deleted file mode 100644
index 406054482..000000000
--- a/extra/fbida/transupp.c
+++ /dev/null
@@ -1,1583 +0,0 @@
-/*
- * transupp.c
- *
- * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains image transformation routines and other utility code
- * used by the jpegtran sample application.  These are NOT part of the core
- * JPEG library.  But we keep these routines separate from jpegtran.c to
- * ease the task of maintaining jpegtran-like programs that have other user
- * interfaces.
- */
-
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h"		/* My own external interface */
-#include 		/* to declare isdigit() */
-
-
-#if TRANSFORMS_SUPPORTED
-
-/*
- * Lossless image transformation routines.  These routines work on DCT
- * coefficient arrays and thus do not require any lossy decompression
- * or recompression of the image.
- * Thanks to Guido Vollbeding for the initial design and code of this feature,
- * and to Ben Jackson for introducing the cropping feature.
- *
- * Horizontal flipping is done in-place, using a single top-to-bottom
- * pass through the virtual source array.  It will thus be much the
- * fastest option for images larger than main memory.
- *
- * The other routines require a set of destination virtual arrays, so they
- * need twice as much memory as jpegtran normally does.  The destination
- * arrays are always written in normal scan order (top to bottom) because
- * the virtual array manager expects this.  The source arrays will be scanned
- * in the corresponding order, which means multiple passes through the source
- * arrays for most of the transforms.  That could result in much thrashing
- * if the image is larger than main memory.
- *
- * If cropping or trimming is involved, the destination arrays may be smaller
- * than the source arrays.  Note it is not possible to do horizontal flip
- * in-place when a nonzero Y crop offset is specified, since we'd have to move
- * data from one block row to another but the virtual array manager doesn't
- * guarantee we can touch more than one row at a time.  So in that case,
- * we have to use a separate destination array.
- *
- * Some notes about the operating environment of the individual transform
- * routines:
- * 1. Both the source and destination virtual arrays are allocated from the
- *    source JPEG object, and therefore should be manipulated by calling the
- *    source's memory manager.
- * 2. The destination's component count should be used.  It may be smaller
- *    than the source's when forcing to grayscale.
- * 3. Likewise the destination's sampling factors should be used.  When
- *    forcing to grayscale the destination's sampling factors will be all 1,
- *    and we may as well take that as the effective iMCU size.
- * 4. When "trim" is in effect, the destination's dimensions will be the
- *    trimmed values but the source's will be untrimmed.
- * 5. When "crop" is in effect, the destination's dimensions will be the
- *    cropped values but the source's will be uncropped.  Each transform
- *    routine is responsible for picking up source data starting at the
- *    correct X and Y offset for the crop region.  (The X and Y offsets
- *    passed to the transform routines are measured in iMCU blocks of the
- *    destination.)
- * 6. All the routines assume that the source and destination buffers are
- *    padded out to a full iMCU boundary.  This is true, although for the
- *    source buffer it is an undocumented property of jdcoefct.c.
- */
-
-
-LOCAL(void)
-do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	 JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	 jvirt_barray_ptr *src_coef_arrays,
-	 jvirt_barray_ptr *dst_coef_arrays)
-/* Crop.  This is only used when no rotate/flip is requested with the crop. */
-{
-  JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;
-  int ci, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  jpeg_component_info *compptr;
-
-  /* We simply have to copy the right amount of data (the destination's
-   * image size) starting at the given X and Y offsets in the source.
-   */
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      src_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	 dst_blk_y + y_crop_blocks,
-	 (JDIMENSION) compptr->v_samp_factor, FALSE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
-			dst_buffer[offset_y],
-			compptr->width_in_blocks);
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-		   JDIMENSION x_crop_offset,
-		   jvirt_barray_ptr *src_coef_arrays)
-/* Horizontal flip; done in-place, so no separate dest array is required.
- * NB: this only works when y_crop_offset is zero.
- */
-{
-  JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks;
-  int ci, k, offset_y;
-  JBLOCKARRAY buffer;
-  JCOEFPTR ptr1, ptr2;
-  JCOEF temp1, temp2;
-  jpeg_component_info *compptr;
-
-  /* Horizontal mirroring of DCT blocks is accomplished by swapping
-   * pairs of blocks in-place.  Within a DCT block, we perform horizontal
-   * mirroring by changing the signs of odd-numbered columns.
-   * Partial iMCUs at the right edge are left untouched.
-   */
-  MCU_cols = srcinfo->output_width /
-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    for (blk_y = 0; blk_y < compptr->height_in_blocks;
-	 blk_y += compptr->v_samp_factor) {
-      buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	/* Do the mirroring */
-	for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {
-	  ptr1 = buffer[offset_y][blk_x];
-	  ptr2 = buffer[offset_y][comp_width - blk_x - 1];
-	  /* this unrolled loop doesn't need to know which row it's on... */
-	  for (k = 0; k < DCTSIZE2; k += 2) {
-	    temp1 = *ptr1;	/* swap even column */
-	    temp2 = *ptr2;
-	    *ptr1++ = temp2;
-	    *ptr2++ = temp1;
-	    temp1 = *ptr1;	/* swap odd column with sign change */
-	    temp2 = *ptr2;
-	    *ptr1++ = -temp2;
-	    *ptr2++ = -temp1;
-	  }
-	}
-	if (x_crop_blocks > 0) {
-	  /* Now left-justify the portion of the data to be kept.
-	   * We can't use a single jcopy_block_row() call because that routine
-	   * depends on memcpy(), whose behavior is unspecified for overlapping
-	   * source and destination areas.  Sigh.
-	   */
-	  for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) {
-	    jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,
-			    buffer[offset_y] + blk_x,
-			    (JDIMENSION) 1);
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	   jvirt_barray_ptr *src_coef_arrays,
-	   jvirt_barray_ptr *dst_coef_arrays)
-/* Horizontal flip in general cropping case */
-{
-  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, k, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JBLOCKROW src_row_ptr, dst_row_ptr;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Here we must output into a separate array because we can't touch
-   * different rows of a single virtual array simultaneously.  Otherwise,
-   * this is essentially the same as the routine above.
-   */
-  MCU_cols = srcinfo->output_width /
-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      src_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	 dst_blk_y + y_crop_blocks,
-	 (JDIMENSION) compptr->v_samp_factor, FALSE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	dst_row_ptr = dst_buffer[offset_y];
-	src_row_ptr = src_buffer[offset_y];
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
-	  if (x_crop_blocks + dst_blk_x < comp_width) {
-	    /* Do the mirrorable blocks */
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
-	    /* this unrolled loop doesn't need to know which row it's on... */
-	    for (k = 0; k < DCTSIZE2; k += 2) {
-	      *dst_ptr++ = *src_ptr++;	 /* copy even column */
-	      *dst_ptr++ = - *src_ptr++; /* copy odd column with sign change */
-	    }
-	  } else {
-	    /* Copy last partial block(s) verbatim */
-	    jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
-			    dst_row_ptr + dst_blk_x,
-			    (JDIMENSION) 1);
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	   jvirt_barray_ptr *src_coef_arrays,
-	   jvirt_barray_ptr *dst_coef_arrays)
-/* Vertical flip */
-{
-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JBLOCKROW src_row_ptr, dst_row_ptr;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* We output into a separate array because we can't touch different
-   * rows of the source virtual array simultaneously.  Otherwise, this
-   * is a pretty straightforward analog of horizontal flip.
-   * Within a DCT block, vertical mirroring is done by changing the signs
-   * of odd-numbered rows.
-   * Partial iMCUs at the bottom edge are copied verbatim.
-   */
-  MCU_rows = srcinfo->output_height /
-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      if (y_crop_blocks + dst_blk_y < comp_height) {
-	/* Row is within the mirrorable area. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   comp_height - y_crop_blocks - dst_blk_y -
-	   (JDIMENSION) compptr->v_samp_factor,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      } else {
-	/* Bottom-edge blocks will be copied verbatim. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   dst_blk_y + y_crop_blocks,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      }
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	if (y_crop_blocks + dst_blk_y < comp_height) {
-	  /* Row is within the mirrorable area. */
-	  dst_row_ptr = dst_buffer[offset_y];
-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
-	  src_row_ptr += x_crop_blocks;
-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	       dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    src_ptr = src_row_ptr[dst_blk_x];
-	    for (i = 0; i < DCTSIZE; i += 2) {
-	      /* copy even row */
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = *src_ptr++;
-	      /* copy odd row with sign change */
-	      for (j = 0; j < DCTSIZE; j++)
-		*dst_ptr++ = - *src_ptr++;
-	    }
-	  }
-	} else {
-	  /* Just copy row verbatim. */
-	  jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
-			  dst_buffer[offset_y],
-			  compptr->width_in_blocks);
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	      JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	      jvirt_barray_ptr *src_coef_arrays,
-	      jvirt_barray_ptr *dst_coef_arrays)
-/* Transpose source into destination */
-{
-  JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Transposing pixels within a block just requires transposing the
-   * DCT coefficients.
-   * Partial iMCUs at the edges require no special treatment; we simply
-   * process all the available DCT blocks for every component.
-   */
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	     dst_blk_x + x_crop_blocks,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks];
-	    for (i = 0; i < DCTSIZE; i++)
-	      for (j = 0; j < DCTSIZE; j++)
-		dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	   JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	   jvirt_barray_ptr *src_coef_arrays,
-	   jvirt_barray_ptr *dst_coef_arrays)
-/* 90 degree rotation is equivalent to
- *   1. Transposing the image;
- *   2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Because of the horizontal mirror step, we can't process partial iMCUs
-   * at the (output) right edge properly.  They just get transposed and
-   * not mirrored.
-   */
-  MCU_cols = srcinfo->output_height /
-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  if (x_crop_blocks + dst_blk_x < comp_width) {
-	    /* Block is within the mirrorable area. */
-	    src_buffer = (*srcinfo->mem->access_virt_barray)
-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	       comp_width - x_crop_blocks - dst_blk_x -
-	       (JDIMENSION) compptr->h_samp_factor,
-	       (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  } else {
-	    /* Edge blocks are transposed but not mirrored. */
-	    src_buffer = (*srcinfo->mem->access_virt_barray)
-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	       dst_blk_x + x_crop_blocks,
-	       (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  }
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    if (x_crop_blocks + dst_blk_x < comp_width) {
-	      /* Block is within the mirrorable area. */
-	      src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
-		[dst_blk_y + offset_y + y_crop_blocks];
-	      for (i = 0; i < DCTSIZE; i++) {
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		i++;
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-	      }
-	    } else {
-	      /* Edge blocks are transposed but not mirrored. */
-	      src_ptr = src_buffer[offset_x]
-		[dst_blk_y + offset_y + y_crop_blocks];
-	      for (i = 0; i < DCTSIZE; i++)
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	    JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	    jvirt_barray_ptr *src_coef_arrays,
-	    jvirt_barray_ptr *dst_coef_arrays)
-/* 270 degree rotation is equivalent to
- *   1. Horizontal mirroring;
- *   2. Transposing the image.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  /* Because of the horizontal mirror step, we can't process partial iMCUs
-   * at the (output) bottom edge properly.  They just get transposed and
-   * not mirrored.
-   */
-  MCU_rows = srcinfo->output_width /
-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  src_buffer = (*srcinfo->mem->access_virt_barray)
-	    ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	     dst_blk_x + x_crop_blocks,
-	     (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    if (y_crop_blocks + dst_blk_y < comp_height) {
-	      /* Block is within the mirrorable area. */
-	      src_ptr = src_buffer[offset_x]
-		[comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
-	      for (i = 0; i < DCTSIZE; i++) {
-		for (j = 0; j < DCTSIZE; j++) {
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  j++;
-		  dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		}
-	      }
-	    } else {
-	      /* Edge blocks are transposed but not mirrored. */
-	      src_ptr = src_buffer[offset_x]
-		[dst_blk_y + offset_y + y_crop_blocks];
-	      for (i = 0; i < DCTSIZE; i++)
-		for (j = 0; j < DCTSIZE; j++)
-		  dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	    JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	    jvirt_barray_ptr *src_coef_arrays,
-	    jvirt_barray_ptr *dst_coef_arrays)
-/* 180 degree rotation is equivalent to
- *   1. Vertical mirroring;
- *   2. Horizontal mirroring.
- * These two steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JBLOCKROW src_row_ptr, dst_row_ptr;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  MCU_cols = srcinfo->output_width /
-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-  MCU_rows = srcinfo->output_height /
-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      if (y_crop_blocks + dst_blk_y < comp_height) {
-	/* Row is within the vertically mirrorable area. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   comp_height - y_crop_blocks - dst_blk_y -
-	   (JDIMENSION) compptr->v_samp_factor,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      } else {
-	/* Bottom-edge rows are only mirrored horizontally. */
-	src_buffer = (*srcinfo->mem->access_virt_barray)
-	  ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	   dst_blk_y + y_crop_blocks,
-	   (JDIMENSION) compptr->v_samp_factor, FALSE);
-      }
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	dst_row_ptr = dst_buffer[offset_y];
-	if (y_crop_blocks + dst_blk_y < comp_height) {
-	  /* Row is within the mirrorable area. */
-	  src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
-	    dst_ptr = dst_row_ptr[dst_blk_x];
-	    if (x_crop_blocks + dst_blk_x < comp_width) {
-	      /* Process the blocks that can be mirrored both ways. */
-	      src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
-	      for (i = 0; i < DCTSIZE; i += 2) {
-		/* For even row, negate every odd column. */
-		for (j = 0; j < DCTSIZE; j += 2) {
-		  *dst_ptr++ = *src_ptr++;
-		  *dst_ptr++ = - *src_ptr++;
-		}
-		/* For odd row, negate every even column. */
-		for (j = 0; j < DCTSIZE; j += 2) {
-		  *dst_ptr++ = - *src_ptr++;
-		  *dst_ptr++ = *src_ptr++;
-		}
-	      }
-	    } else {
-	      /* Any remaining right-edge blocks are only mirrored vertically. */
-	      src_ptr = src_row_ptr[x_crop_blocks + dst_blk_x];
-	      for (i = 0; i < DCTSIZE; i += 2) {
-		for (j = 0; j < DCTSIZE; j++)
-		  *dst_ptr++ = *src_ptr++;
-		for (j = 0; j < DCTSIZE; j++)
-		  *dst_ptr++ = - *src_ptr++;
-	      }
-	    }
-	  }
-	} else {
-	  /* Remaining rows are just mirrored horizontally. */
-	  src_row_ptr = src_buffer[offset_y];
-	  for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
-	    if (x_crop_blocks + dst_blk_x < comp_width) {
-	      /* Process the blocks that can be mirrored. */
-	      dst_ptr = dst_row_ptr[dst_blk_x];
-	      src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
-	      for (i = 0; i < DCTSIZE2; i += 2) {
-		*dst_ptr++ = *src_ptr++;
-		*dst_ptr++ = - *src_ptr++;
-	      }
-	    } else {
-	      /* Any remaining right-edge blocks are only copied. */
-	      jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
-			      dst_row_ptr + dst_blk_x,
-			      (JDIMENSION) 1);
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-LOCAL(void)
-do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	       JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
-	       jvirt_barray_ptr *src_coef_arrays,
-	       jvirt_barray_ptr *dst_coef_arrays)
-/* Transverse transpose is equivalent to
- *   1. 180 degree rotation;
- *   2. Transposition;
- * or
- *   1. Horizontal mirroring;
- *   2. Transposition;
- *   3. Horizontal mirroring.
- * These steps are merged into a single processing routine.
- */
-{
-  JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
-  JDIMENSION x_crop_blocks, y_crop_blocks;
-  int ci, i, j, offset_x, offset_y;
-  JBLOCKARRAY src_buffer, dst_buffer;
-  JCOEFPTR src_ptr, dst_ptr;
-  jpeg_component_info *compptr;
-
-  MCU_cols = srcinfo->output_height /
-    (dstinfo->max_h_samp_factor * dstinfo->min_DCT_h_scaled_size);
-  MCU_rows = srcinfo->output_width /
-    (dstinfo->max_v_samp_factor * dstinfo->min_DCT_v_scaled_size);
-
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    comp_width = MCU_cols * compptr->h_samp_factor;
-    comp_height = MCU_rows * compptr->v_samp_factor;
-    x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
-    y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
-    for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
-	 dst_blk_y += compptr->v_samp_factor) {
-      dst_buffer = (*srcinfo->mem->access_virt_barray)
-	((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
-	 (JDIMENSION) compptr->v_samp_factor, TRUE);
-      for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
-	for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
-	     dst_blk_x += compptr->h_samp_factor) {
-	  if (x_crop_blocks + dst_blk_x < comp_width) {
-	    /* Block is within the mirrorable area. */
-	    src_buffer = (*srcinfo->mem->access_virt_barray)
-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	       comp_width - x_crop_blocks - dst_blk_x -
-	       (JDIMENSION) compptr->h_samp_factor,
-	       (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  } else {
-	    src_buffer = (*srcinfo->mem->access_virt_barray)
-	      ((j_common_ptr) srcinfo, src_coef_arrays[ci],
-	       dst_blk_x + x_crop_blocks,
-	       (JDIMENSION) compptr->h_samp_factor, FALSE);
-	  }
-	  for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
-	    dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
-	    if (y_crop_blocks + dst_blk_y < comp_height) {
-	      if (x_crop_blocks + dst_blk_x < comp_width) {
-		/* Block is within the mirrorable area. */
-		src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
-		  [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		  }
-		  i++;
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  }
-		}
-	      } else {
-		/* Right-edge blocks are mirrored in y only */
-		src_ptr = src_buffer[offset_x]
-		  [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++) {
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		    j++;
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		  }
-		}
-	      }
-	    } else {
-	      if (x_crop_blocks + dst_blk_x < comp_width) {
-		/* Bottom-edge blocks are mirrored in x only */
-		src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
-		  [dst_blk_y + offset_y + y_crop_blocks];
-		for (i = 0; i < DCTSIZE; i++) {
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-		  i++;
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = -src_ptr[i*DCTSIZE+j];
-		}
-	      } else {
-		/* At lower right corner, just transpose, no mirroring */
-		src_ptr = src_buffer[offset_x]
-		  [dst_blk_y + offset_y + y_crop_blocks];
-		for (i = 0; i < DCTSIZE; i++)
-		  for (j = 0; j < DCTSIZE; j++)
-		    dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
-	      }
-	    }
-	  }
-	}
-      }
-    }
-  }
-}
-
-
-/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec.
- * Returns TRUE if valid integer found, FALSE if not.
- * *strptr is advanced over the digit string, and *result is set to its value.
- */
-
-LOCAL(boolean)
-jt_read_integer (const char ** strptr, JDIMENSION * result)
-{
-  const char * ptr = *strptr;
-  JDIMENSION val = 0;
-
-  for (; isdigit(*ptr); ptr++) {
-    val = val * 10 + (JDIMENSION) (*ptr - '0');
-  }
-  *result = val;
-  if (ptr == *strptr)
-    return FALSE;		/* oops, no digits */
-  *strptr = ptr;
-  return TRUE;
-}
-
-
-/* Parse a crop specification (written in X11 geometry style).
- * The routine returns TRUE if the spec string is valid, FALSE if not.
- *
- * The crop spec string should have the format
- *	x{+-}{+-}
- * where width, height, xoffset, and yoffset are unsigned integers.
- * Each of the elements can be omitted to indicate a default value.
- * (A weakness of this style is that it is not possible to omit xoffset
- * while specifying yoffset, since they look alike.)
- *
- * This code is loosely based on XParseGeometry from the X11 distribution.
- */
-
-GLOBAL(boolean)
-jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
-{
-  info->crop = FALSE;
-  info->crop_width_set = JCROP_UNSET;
-  info->crop_height_set = JCROP_UNSET;
-  info->crop_xoffset_set = JCROP_UNSET;
-  info->crop_yoffset_set = JCROP_UNSET;
-
-  if (isdigit(*spec)) {
-    /* fetch width */
-    if (! jt_read_integer(&spec, &info->crop_width))
-      return FALSE;
-    info->crop_width_set = JCROP_POS;
-  }
-  if (*spec == 'x' || *spec == 'X') {	
-    /* fetch height */
-    spec++;
-    if (! jt_read_integer(&spec, &info->crop_height))
-      return FALSE;
-    info->crop_height_set = JCROP_POS;
-  }
-  if (*spec == '+' || *spec == '-') {
-    /* fetch xoffset */
-    info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
-    spec++;
-    if (! jt_read_integer(&spec, &info->crop_xoffset))
-      return FALSE;
-  }
-  if (*spec == '+' || *spec == '-') {
-    /* fetch yoffset */
-    info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
-    spec++;
-    if (! jt_read_integer(&spec, &info->crop_yoffset))
-      return FALSE;
-  }
-  /* We had better have gotten to the end of the string. */
-  if (*spec != '\0')
-    return FALSE;
-  info->crop = TRUE;
-  return TRUE;
-}
-
-
-/* Trim off any partial iMCUs on the indicated destination edge */
-
-LOCAL(void)
-trim_right_edge (jpeg_transform_info *info, JDIMENSION full_width)
-{
-  JDIMENSION MCU_cols;
-
-  MCU_cols = info->output_width / info->iMCU_sample_width;
-  if (MCU_cols > 0 && info->x_crop_offset + MCU_cols ==
-      full_width / info->iMCU_sample_width)
-    info->output_width = MCU_cols * info->iMCU_sample_width;
-}
-
-LOCAL(void)
-trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height)
-{
-  JDIMENSION MCU_rows;
-
-  MCU_rows = info->output_height / info->iMCU_sample_height;
-  if (MCU_rows > 0 && info->y_crop_offset + MCU_rows ==
-      full_height / info->iMCU_sample_height)
-    info->output_height = MCU_rows * info->iMCU_sample_height;
-}
-
-
-/* Request any required workspace.
- *
- * This routine figures out the size that the output image will be
- * (which implies that all the transform parameters must be set before
- * it is called).
- *
- * We allocate the workspace virtual arrays from the source decompression
- * object, so that all the arrays (both the original data and the workspace)
- * will be taken into account while making memory management decisions.
- * Hence, this routine must be called after jpeg_read_header (which reads
- * the image dimensions) and before jpeg_read_coefficients (which realizes
- * the source's virtual arrays).
- *
- * This function returns FALSE right away if -perfect is given
- * and transformation is not perfect.  Otherwise returns TRUE.
- */
-
-GLOBAL(boolean)
-jtransform_request_workspace (j_decompress_ptr srcinfo,
-			      jpeg_transform_info *info)
-{
-  jvirt_barray_ptr *coef_arrays;
-  boolean need_workspace, transpose_it;
-  jpeg_component_info *compptr;
-  JDIMENSION xoffset, yoffset;
-  JDIMENSION width_in_iMCUs, height_in_iMCUs;
-  JDIMENSION width_in_blocks, height_in_blocks;
-  int ci, h_samp_factor, v_samp_factor;
-
-  /* Determine number of components in output image */
-  if (info->force_grayscale &&
-      srcinfo->jpeg_color_space == JCS_YCbCr &&
-      srcinfo->num_components == 3)
-    /* We'll only process the first component */
-    info->num_components = 1;
-  else
-    /* Process all the components */
-    info->num_components = srcinfo->num_components;
-
-  /* Compute output image dimensions and related values. */
-  jpeg_core_output_dimensions(srcinfo);
-
-  /* Return right away if -perfect is given and transformation is not perfect.
-   */
-  if (info->perfect) {
-    if (info->num_components == 1) {
-      if (!jtransform_perfect_transform(srcinfo->output_width,
-	  srcinfo->output_height,
-	  srcinfo->min_DCT_h_scaled_size,
-	  srcinfo->min_DCT_v_scaled_size,
-	  info->transform))
-	return FALSE;
-    } else {
-      if (!jtransform_perfect_transform(srcinfo->output_width,
-	  srcinfo->output_height,
-	  srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size,
-	  srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size,
-	  info->transform))
-	return FALSE;
-    }
-  }
-
-  /* If there is only one output component, force the iMCU size to be 1;
-   * else use the source iMCU size.  (This allows us to do the right thing
-   * when reducing color to grayscale, and also provides a handy way of
-   * cleaning up "funny" grayscale images whose sampling factors are not 1x1.)
-   */
-  switch (info->transform) {
-  case JXFORM_TRANSPOSE:
-  case JXFORM_TRANSVERSE:
-  case JXFORM_ROT_90:
-  case JXFORM_ROT_270:
-    info->output_width = srcinfo->output_height;
-    info->output_height = srcinfo->output_width;
-    if (info->num_components == 1) {
-      info->iMCU_sample_width = srcinfo->min_DCT_v_scaled_size;
-      info->iMCU_sample_height = srcinfo->min_DCT_h_scaled_size;
-    } else {
-      info->iMCU_sample_width =
-	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
-      info->iMCU_sample_height =
-	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
-    }
-    break;
-  default:
-    info->output_width = srcinfo->output_width;
-    info->output_height = srcinfo->output_height;
-    if (info->num_components == 1) {
-      info->iMCU_sample_width = srcinfo->min_DCT_h_scaled_size;
-      info->iMCU_sample_height = srcinfo->min_DCT_v_scaled_size;
-    } else {
-      info->iMCU_sample_width =
-	srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size;
-      info->iMCU_sample_height =
-	srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size;
-    }
-    break;
-  }
-
-  /* If cropping has been requested, compute the crop area's position and
-   * dimensions, ensuring that its upper left corner falls at an iMCU boundary.
-   */
-  if (info->crop) {
-    /* Insert default values for unset crop parameters */
-    if (info->crop_xoffset_set == JCROP_UNSET)
-      info->crop_xoffset = 0;	/* default to +0 */
-    if (info->crop_yoffset_set == JCROP_UNSET)
-      info->crop_yoffset = 0;	/* default to +0 */
-    if (info->crop_xoffset >= info->output_width ||
-	info->crop_yoffset >= info->output_height)
-      ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
-    if (info->crop_width_set == JCROP_UNSET)
-      info->crop_width = info->output_width - info->crop_xoffset;
-    if (info->crop_height_set == JCROP_UNSET)
-      info->crop_height = info->output_height - info->crop_yoffset;
-    /* Ensure parameters are valid */
-    if (info->crop_width <= 0 || info->crop_width > info->output_width ||
-	info->crop_height <= 0 || info->crop_height > info->output_height ||
-	info->crop_xoffset > info->output_width - info->crop_width ||
-	info->crop_yoffset > info->output_height - info->crop_height)
-      ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
-    /* Convert negative crop offsets into regular offsets */
-    if (info->crop_xoffset_set == JCROP_NEG)
-      xoffset = info->output_width - info->crop_width - info->crop_xoffset;
-    else
-      xoffset = info->crop_xoffset;
-    if (info->crop_yoffset_set == JCROP_NEG)
-      yoffset = info->output_height - info->crop_height - info->crop_yoffset;
-    else
-      yoffset = info->crop_yoffset;
-    /* Now adjust so that upper left corner falls at an iMCU boundary */
-    info->output_width =
-      info->crop_width + (xoffset % info->iMCU_sample_width);
-    info->output_height =
-      info->crop_height + (yoffset % info->iMCU_sample_height);
-    /* Save x/y offsets measured in iMCUs */
-    info->x_crop_offset = xoffset / info->iMCU_sample_width;
-    info->y_crop_offset = yoffset / info->iMCU_sample_height;
-  } else {
-    info->x_crop_offset = 0;
-    info->y_crop_offset = 0;
-  }
-
-  /* Figure out whether we need workspace arrays,
-   * and if so whether they are transposed relative to the source.
-   */
-  need_workspace = FALSE;
-  transpose_it = FALSE;
-  switch (info->transform) {
-  case JXFORM_NONE:
-    if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
-      need_workspace = TRUE;
-    /* No workspace needed if neither cropping nor transforming */
-    break;
-  case JXFORM_FLIP_H:
-    if (info->trim)
-      trim_right_edge(info, srcinfo->output_width);
-    if (info->y_crop_offset != 0)
-      need_workspace = TRUE;
-    /* do_flip_h_no_crop doesn't need a workspace array */
-    break;
-  case JXFORM_FLIP_V:
-    if (info->trim)
-      trim_bottom_edge(info, srcinfo->output_height);
-    /* Need workspace arrays having same dimensions as source image. */
-    need_workspace = TRUE;
-    break;
-  case JXFORM_TRANSPOSE:
-    /* transpose does NOT have to trim anything */
-    /* Need workspace arrays having transposed dimensions. */
-    need_workspace = TRUE;
-    transpose_it = TRUE;
-    break;
-  case JXFORM_TRANSVERSE:
-    if (info->trim) {
-      trim_right_edge(info, srcinfo->output_height);
-      trim_bottom_edge(info, srcinfo->output_width);
-    }
-    /* Need workspace arrays having transposed dimensions. */
-    need_workspace = TRUE;
-    transpose_it = TRUE;
-    break;
-  case JXFORM_ROT_90:
-    if (info->trim)
-      trim_right_edge(info, srcinfo->output_height);
-    /* Need workspace arrays having transposed dimensions. */
-    need_workspace = TRUE;
-    transpose_it = TRUE;
-    break;
-  case JXFORM_ROT_180:
-    if (info->trim) {
-      trim_right_edge(info, srcinfo->output_width);
-      trim_bottom_edge(info, srcinfo->output_height);
-    }
-    /* Need workspace arrays having same dimensions as source image. */
-    need_workspace = TRUE;
-    break;
-  case JXFORM_ROT_270:
-    if (info->trim)
-      trim_bottom_edge(info, srcinfo->output_width);
-    /* Need workspace arrays having transposed dimensions. */
-    need_workspace = TRUE;
-    transpose_it = TRUE;
-    break;
-  }
-
-  /* Allocate workspace if needed.
-   * Note that we allocate arrays padded out to the next iMCU boundary,
-   * so that transform routines need not worry about missing edge blocks.
-   */
-  if (need_workspace) {
-    coef_arrays = (jvirt_barray_ptr *)
-      (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
-		SIZEOF(jvirt_barray_ptr) * info->num_components);
-    width_in_iMCUs = (JDIMENSION)
-      jdiv_round_up((long) info->output_width,
-		    (long) info->iMCU_sample_width);
-    height_in_iMCUs = (JDIMENSION)
-      jdiv_round_up((long) info->output_height,
-		    (long) info->iMCU_sample_height);
-    for (ci = 0; ci < info->num_components; ci++) {
-      compptr = srcinfo->comp_info + ci;
-      if (info->num_components == 1) {
-	/* we're going to force samp factors to 1x1 in this case */
-	h_samp_factor = v_samp_factor = 1;
-      } else if (transpose_it) {
-	h_samp_factor = compptr->v_samp_factor;
-	v_samp_factor = compptr->h_samp_factor;
-      } else {
-	h_samp_factor = compptr->h_samp_factor;
-	v_samp_factor = compptr->v_samp_factor;
-      }
-      width_in_blocks = width_in_iMCUs * h_samp_factor;
-      height_in_blocks = height_in_iMCUs * v_samp_factor;
-      coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
-	((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
-	 width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor);
-    }
-    info->workspace_coef_arrays = coef_arrays;
-  } else
-    info->workspace_coef_arrays = NULL;
-
-  return TRUE;
-}
-
-
-/* Transpose destination image parameters */
-
-LOCAL(void)
-transpose_critical_parameters (j_compress_ptr dstinfo)
-{
-  int tblno, i, j, ci, itemp;
-  jpeg_component_info *compptr;
-  JQUANT_TBL *qtblptr;
-  JDIMENSION jtemp;
-  UINT16 qtemp;
-
-  /* Transpose image dimensions */
-  jtemp = dstinfo->image_width;
-  dstinfo->image_width = dstinfo->image_height;
-  dstinfo->image_height = jtemp;
-  itemp = dstinfo->min_DCT_h_scaled_size;
-  dstinfo->min_DCT_h_scaled_size = dstinfo->min_DCT_v_scaled_size;
-  dstinfo->min_DCT_v_scaled_size = itemp;
-
-  /* Transpose sampling factors */
-  for (ci = 0; ci < dstinfo->num_components; ci++) {
-    compptr = dstinfo->comp_info + ci;
-    itemp = compptr->h_samp_factor;
-    compptr->h_samp_factor = compptr->v_samp_factor;
-    compptr->v_samp_factor = itemp;
-  }
-
-  /* Transpose quantization tables */
-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
-    qtblptr = dstinfo->quant_tbl_ptrs[tblno];
-    if (qtblptr != NULL) {
-      for (i = 0; i < DCTSIZE; i++) {
-	for (j = 0; j < i; j++) {
-	  qtemp = qtblptr->quantval[i*DCTSIZE+j];
-	  qtblptr->quantval[i*DCTSIZE+j] = qtblptr->quantval[j*DCTSIZE+i];
-	  qtblptr->quantval[j*DCTSIZE+i] = qtemp;
-	}
-      }
-    }
-  }
-}
-
-
-/* Adjust Exif image parameters.
- *
- * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible.
- */
-
-LOCAL(void)
-adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
-			JDIMENSION new_width, JDIMENSION new_height)
-{
-  boolean is_motorola; /* Flag for byte order */
-  unsigned int number_of_tags, tagnum;
-  unsigned int firstoffset, offset;
-  JDIMENSION new_value;
-
-  if (length < 12) return; /* Length of an IFD entry */
-
-  /* Discover byte order */
-  if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)
-    is_motorola = FALSE;
-  else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)
-    is_motorola = TRUE;
-  else
-    return;
-
-  /* Check Tag Mark */
-  if (is_motorola) {
-    if (GETJOCTET(data[2]) != 0) return;
-    if (GETJOCTET(data[3]) != 0x2A) return;
-  } else {
-    if (GETJOCTET(data[3]) != 0) return;
-    if (GETJOCTET(data[2]) != 0x2A) return;
-  }
-
-  /* Get first IFD offset (offset to IFD0) */
-  if (is_motorola) {
-    if (GETJOCTET(data[4]) != 0) return;
-    if (GETJOCTET(data[5]) != 0) return;
-    firstoffset = GETJOCTET(data[6]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[7]);
-  } else {
-    if (GETJOCTET(data[7]) != 0) return;
-    if (GETJOCTET(data[6]) != 0) return;
-    firstoffset = GETJOCTET(data[5]);
-    firstoffset <<= 8;
-    firstoffset += GETJOCTET(data[4]);
-  }
-  if (firstoffset > length - 2) return; /* check end of data segment */
-
-  /* Get the number of directory entries contained in this IFD */
-  if (is_motorola) {
-    number_of_tags = GETJOCTET(data[firstoffset]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset+1]);
-  } else {
-    number_of_tags = GETJOCTET(data[firstoffset+1]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[firstoffset]);
-  }
-  if (number_of_tags == 0) return;
-  firstoffset += 2;
-
-  /* Search for ExifSubIFD offset Tag in IFD0 */
-  for (;;) {
-    if (firstoffset > length - 12) return; /* check end of data segment */
-    /* Get Tag number */
-    if (is_motorola) {
-      tagnum = GETJOCTET(data[firstoffset]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset+1]);
-    } else {
-      tagnum = GETJOCTET(data[firstoffset+1]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[firstoffset]);
-    }
-    if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */
-    if (--number_of_tags == 0) return;
-    firstoffset += 12;
-  }
-
-  /* Get the ExifSubIFD offset */
-  if (is_motorola) {
-    if (GETJOCTET(data[firstoffset+8]) != 0) return;
-    if (GETJOCTET(data[firstoffset+9]) != 0) return;
-    offset = GETJOCTET(data[firstoffset+10]);
-    offset <<= 8;
-    offset += GETJOCTET(data[firstoffset+11]);
-  } else {
-    if (GETJOCTET(data[firstoffset+11]) != 0) return;
-    if (GETJOCTET(data[firstoffset+10]) != 0) return;
-    offset = GETJOCTET(data[firstoffset+9]);
-    offset <<= 8;
-    offset += GETJOCTET(data[firstoffset+8]);
-  }
-  if (offset > length - 2) return; /* check end of data segment */
-
-  /* Get the number of directory entries contained in this SubIFD */
-  if (is_motorola) {
-    number_of_tags = GETJOCTET(data[offset]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[offset+1]);
-  } else {
-    number_of_tags = GETJOCTET(data[offset+1]);
-    number_of_tags <<= 8;
-    number_of_tags += GETJOCTET(data[offset]);
-  }
-  if (number_of_tags < 2) return;
-  offset += 2;
-
-  /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */
-  do {
-    if (offset > length - 12) return; /* check end of data segment */
-    /* Get Tag number */
-    if (is_motorola) {
-      tagnum = GETJOCTET(data[offset]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[offset+1]);
-    } else {
-      tagnum = GETJOCTET(data[offset+1]);
-      tagnum <<= 8;
-      tagnum += GETJOCTET(data[offset]);
-    }
-    if (tagnum == 0xA002 || tagnum == 0xA003) {
-      if (tagnum == 0xA002)
-	new_value = new_width; /* ExifImageWidth Tag */
-      else
-	new_value = new_height; /* ExifImageHeight Tag */
-      if (is_motorola) {
-	data[offset+2] = 0; /* Format = unsigned long (4 octets) */
-	data[offset+3] = 4;
-	data[offset+4] = 0; /* Number Of Components = 1 */
-	data[offset+5] = 0;
-	data[offset+6] = 0;
-	data[offset+7] = 1;
-	data[offset+8] = 0;
-	data[offset+9] = 0;
-	data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF);
-	data[offset+11] = (JOCTET)(new_value & 0xFF);
-      } else {
-	data[offset+2] = 4; /* Format = unsigned long (4 octets) */
-	data[offset+3] = 0;
-	data[offset+4] = 1; /* Number Of Components = 1 */
-	data[offset+5] = 0;
-	data[offset+6] = 0;
-	data[offset+7] = 0;
-	data[offset+8] = (JOCTET)(new_value & 0xFF);
-	data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF);
-	data[offset+10] = 0;
-	data[offset+11] = 0;
-      }
-    }
-    offset += 12;
-  } while (--number_of_tags);
-}
-
-
-/* Adjust output image parameters as needed.
- *
- * This must be called after jpeg_copy_critical_parameters()
- * and before jpeg_write_coefficients().
- *
- * The return value is the set of virtual coefficient arrays to be written
- * (either the ones allocated by jtransform_request_workspace, or the
- * original source data arrays).  The caller will need to pass this value
- * to jpeg_write_coefficients().
- */
-
-GLOBAL(jvirt_barray_ptr *)
-jtransform_adjust_parameters (j_decompress_ptr srcinfo,
-			      j_compress_ptr dstinfo,
-			      jvirt_barray_ptr *src_coef_arrays,
-			      jpeg_transform_info *info)
-{
-  /* If force-to-grayscale is requested, adjust destination parameters */
-  if (info->force_grayscale) {
-    /* First, ensure we have YCbCr or grayscale data, and that the source's
-     * Y channel is full resolution.  (No reasonable person would make Y
-     * be less than full resolution, so actually coping with that case
-     * isn't worth extra code space.  But we check it to avoid crashing.)
-     */
-    if (((dstinfo->jpeg_color_space == JCS_YCbCr &&
-	  dstinfo->num_components == 3) ||
-	 (dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
-	  dstinfo->num_components == 1)) &&
-	srcinfo->comp_info[0].h_samp_factor == srcinfo->max_h_samp_factor &&
-	srcinfo->comp_info[0].v_samp_factor == srcinfo->max_v_samp_factor) {
-      /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
-       * properly.  Among other things, it sets the target h_samp_factor &
-       * v_samp_factor to 1, which typically won't match the source.
-       * We have to preserve the source's quantization table number, however.
-       */
-      int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;
-      jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);
-      dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;
-    } else {
-      /* Sorry, can't do it */
-      ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);
-    }
-  } else if (info->num_components == 1) {
-    /* For a single-component source, we force the destination sampling factors
-     * to 1x1, with or without force_grayscale.  This is useful because some
-     * decoders choke on grayscale images with other sampling factors.
-     */
-    dstinfo->comp_info[0].h_samp_factor = 1;
-    dstinfo->comp_info[0].v_samp_factor = 1;
-  }
-
-  /* Correct the destination's image dimensions as necessary
-   * for rotate/flip, resize, and crop operations.
-   */
-  dstinfo->jpeg_width = info->output_width;
-  dstinfo->jpeg_height = info->output_height;
-
-  /* Transpose destination image parameters */
-  switch (info->transform) {
-  case JXFORM_TRANSPOSE:
-  case JXFORM_TRANSVERSE:
-  case JXFORM_ROT_90:
-  case JXFORM_ROT_270:
-    transpose_critical_parameters(dstinfo);
-    break;
-  default:
-    break;
-  }
-
-  /* Adjust Exif properties */
-  if (srcinfo->marker_list != NULL &&
-      srcinfo->marker_list->marker == JPEG_APP0+1 &&
-      srcinfo->marker_list->data_length >= 6 &&
-      GETJOCTET(srcinfo->marker_list->data[0]) == 0x45 &&
-      GETJOCTET(srcinfo->marker_list->data[1]) == 0x78 &&
-      GETJOCTET(srcinfo->marker_list->data[2]) == 0x69 &&
-      GETJOCTET(srcinfo->marker_list->data[3]) == 0x66 &&
-      GETJOCTET(srcinfo->marker_list->data[4]) == 0 &&
-      GETJOCTET(srcinfo->marker_list->data[5]) == 0) {
-    /* Suppress output of JFIF marker */
-    dstinfo->write_JFIF_header = FALSE;
-    /* Adjust Exif image parameters */
-    if (dstinfo->jpeg_width != srcinfo->image_width ||
-	dstinfo->jpeg_height != srcinfo->image_height)
-      /* Align data segment to start of TIFF structure for parsing */
-      adjust_exif_parameters(srcinfo->marker_list->data + 6,
-	srcinfo->marker_list->data_length - 6,
-	dstinfo->jpeg_width, dstinfo->jpeg_height);
-  }
-
-  /* Return the appropriate output data set */
-  if (info->workspace_coef_arrays != NULL)
-    return info->workspace_coef_arrays;
-  return src_coef_arrays;
-}
-
-
-/* Execute the actual transformation, if any.
- *
- * This must be called *after* jpeg_write_coefficients, because it depends
- * on jpeg_write_coefficients to have computed subsidiary values such as
- * the per-component width and height fields in the destination object.
- *
- * Note that some transformations will modify the source data arrays!
- */
-
-GLOBAL(void)
-jtransform_execute_transform (j_decompress_ptr srcinfo,
-			      j_compress_ptr dstinfo,
-			      jvirt_barray_ptr *src_coef_arrays,
-			      jpeg_transform_info *info)
-{
-  jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;
-
-  /* Note: conditions tested here should match those in switch statement
-   * in jtransform_request_workspace()
-   */
-  switch (info->transform) {
-  case JXFORM_NONE:
-    if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
-      do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-	      src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_FLIP_H:
-    if (info->y_crop_offset != 0)
-      do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-		src_coef_arrays, dst_coef_arrays);
-    else
-      do_flip_h_no_crop(srcinfo, dstinfo, info->x_crop_offset,
-			src_coef_arrays);
-    break;
-  case JXFORM_FLIP_V:
-    do_flip_v(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-	      src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_TRANSPOSE:
-    do_transpose(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-		 src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_TRANSVERSE:
-    do_transverse(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-		  src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_90:
-    do_rot_90(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-	      src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_180:
-    do_rot_180(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-	       src_coef_arrays, dst_coef_arrays);
-    break;
-  case JXFORM_ROT_270:
-    do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
-	       src_coef_arrays, dst_coef_arrays);
-    break;
-  }
-}
-
-/* jtransform_perfect_transform
- *
- * Determine whether lossless transformation is perfectly
- * possible for a specified image and transformation.
- *
- * Inputs:
- *   image_width, image_height: source image dimensions.
- *   MCU_width, MCU_height: pixel dimensions of MCU.
- *   transform: transformation identifier.
- * Parameter sources from initialized jpeg_struct
- * (after reading source header):
- *   image_width = cinfo.image_width
- *   image_height = cinfo.image_height
- *   MCU_width = cinfo.max_h_samp_factor * cinfo.block_size
- *   MCU_height = cinfo.max_v_samp_factor * cinfo.block_size
- * Result:
- *   TRUE = perfect transformation possible
- *   FALSE = perfect transformation not possible
- *           (may use custom action then)
- */
-
-GLOBAL(boolean)
-jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
-			     int MCU_width, int MCU_height,
-			     JXFORM_CODE transform)
-{
-  boolean result = TRUE; /* initialize TRUE */
-
-  switch (transform) {
-  case JXFORM_FLIP_H:
-  case JXFORM_ROT_270:
-    if (image_width % (JDIMENSION) MCU_width)
-      result = FALSE;
-    break;
-  case JXFORM_FLIP_V:
-  case JXFORM_ROT_90:
-    if (image_height % (JDIMENSION) MCU_height)
-      result = FALSE;
-    break;
-  case JXFORM_TRANSVERSE:
-  case JXFORM_ROT_180:
-    if (image_width % (JDIMENSION) MCU_width)
-      result = FALSE;
-    if (image_height % (JDIMENSION) MCU_height)
-      result = FALSE;
-    break;
-  default:
-    break;
-  }
-
-  return result;
-}
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/* Setup decompression object to save desired markers in memory.
- * This must be called before jpeg_read_header() to have the desired effect.
- */
-
-GLOBAL(void)
-jcopy_markers_setup (j_decompress_ptr srcinfo, JCOPY_OPTION option)
-{
-#ifdef SAVE_MARKERS_SUPPORTED
-  int m;
-
-  /* Save comments except under NONE option */
-  if (option != JCOPYOPT_NONE) {
-    jpeg_save_markers(srcinfo, JPEG_COM, 0xFFFF);
-  }
-  /* Save all types of APPn markers iff ALL option */
-  if (option == JCOPYOPT_ALL) {
-    for (m = 0; m < 16; m++)
-      jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0xFFFF);
-  }
-#endif /* SAVE_MARKERS_SUPPORTED */
-}
-
-/* Copy markers saved in the given source object to the destination object.
- * This should be called just after jpeg_start_compress() or
- * jpeg_write_coefficients().
- * Note that those routines will have written the SOI, and also the
- * JFIF APP0 or Adobe APP14 markers if selected.
- */
-
-GLOBAL(void)
-jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-		       JCOPY_OPTION option)
-{
-  jpeg_saved_marker_ptr marker;
-
-  /* In the current implementation, we don't actually need to examine the
-   * option flag here; we just copy everything that got saved.
-   * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
-   * if the encoder library already wrote one.
-   */
-  for (marker = srcinfo->marker_list; marker != NULL; marker = marker->next) {
-    if (dstinfo->write_JFIF_header &&
-	marker->marker == JPEG_APP0 &&
-	marker->data_length >= 5 &&
-	GETJOCTET(marker->data[0]) == 0x4A &&
-	GETJOCTET(marker->data[1]) == 0x46 &&
-	GETJOCTET(marker->data[2]) == 0x49 &&
-	GETJOCTET(marker->data[3]) == 0x46 &&
-	GETJOCTET(marker->data[4]) == 0)
-      continue;			/* reject duplicate JFIF */
-    if (dstinfo->write_Adobe_marker &&
-	marker->marker == JPEG_APP0+14 &&
-	marker->data_length >= 5 &&
-	GETJOCTET(marker->data[0]) == 0x41 &&
-	GETJOCTET(marker->data[1]) == 0x64 &&
-	GETJOCTET(marker->data[2]) == 0x6F &&
-	GETJOCTET(marker->data[3]) == 0x62 &&
-	GETJOCTET(marker->data[4]) == 0x65)
-      continue;			/* reject duplicate Adobe */
-#ifdef NEED_FAR_POINTERS
-    /* We could use jpeg_write_marker if the data weren't FAR... */
-    {
-      unsigned int i;
-      jpeg_write_m_header(dstinfo, marker->marker, marker->data_length);
-      for (i = 0; i < marker->data_length; i++)
-	jpeg_write_m_byte(dstinfo, marker->data[i]);
-    }
-#else
-    jpeg_write_marker(dstinfo, marker->marker,
-		      marker->data, marker->data_length);
-#endif
-  }
-}
diff --git a/extra/fbida/transupp.h b/extra/fbida/transupp.h
deleted file mode 100644
index 7c16c19c4..000000000
--- a/extra/fbida/transupp.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * transupp.h
- *
- * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for image transformation routines and
- * other utility code used by the jpegtran sample application.  These are
- * NOT part of the core JPEG library.  But we keep these routines separate
- * from jpegtran.c to ease the task of maintaining jpegtran-like programs
- * that have other user interfaces.
- *
- * NOTE: all the routines declared here have very specific requirements
- * about when they are to be executed during the reading and writing of the
- * source and destination files.  See the comments in transupp.c, or see
- * jpegtran.c for an example of correct usage.
- */
-
-/* If you happen not to want the image transform support, disable it here */
-#ifndef TRANSFORMS_SUPPORTED
-#define TRANSFORMS_SUPPORTED 1		/* 0 disables transform code */
-#endif
-
-/*
- * Although rotating and flipping data expressed as DCT coefficients is not
- * hard, there is an asymmetry in the JPEG format specification for images
- * whose dimensions aren't multiples of the iMCU size.  The right and bottom
- * image edges are padded out to the next iMCU boundary with junk data; but
- * no padding is possible at the top and left edges.  If we were to flip
- * the whole image including the pad data, then pad garbage would become
- * visible at the top and/or left, and real pixels would disappear into the
- * pad margins --- perhaps permanently, since encoders & decoders may not
- * bother to preserve DCT blocks that appear to be completely outside the
- * nominal image area.  So, we have to exclude any partial iMCUs from the
- * basic transformation.
- *
- * Transpose is the only transformation that can handle partial iMCUs at the
- * right and bottom edges completely cleanly.  flip_h can flip partial iMCUs
- * at the bottom, but leaves any partial iMCUs at the right edge untouched.
- * Similarly flip_v leaves any partial iMCUs at the bottom edge untouched.
- * The other transforms are defined as combinations of these basic transforms
- * and process edge blocks in a way that preserves the equivalence.
- *
- * The "trim" option causes untransformable partial iMCUs to be dropped;
- * this is not strictly lossless, but it usually gives the best-looking
- * result for odd-size images.  Note that when this option is active,
- * the expected mathematical equivalences between the transforms may not hold.
- * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim
- * followed by -rot 180 -trim trims both edges.)
- *
- * We also offer a lossless-crop option, which discards data outside a given
- * image region but losslessly preserves what is inside.  Like the rotate and
- * flip transforms, lossless crop is restricted by the JPEG format: the upper
- * left corner of the selected region must fall on an iMCU boundary.  If this
- * does not hold for the given crop parameters, we silently move the upper left
- * corner up and/or left to make it so, simultaneously increasing the region
- * dimensions to keep the lower right crop corner unchanged.  (Thus, the
- * output image covers at least the requested region, but may cover more.)
- *
- * We also provide a lossless-resize option, which is kind of a lossless-crop
- * operation in the DCT coefficient block domain - it discards higher-order
- * coefficients and losslessly preserves lower-order coefficients of a
- * sub-block.
- *
- * Rotate/flip transform, resize, and crop can be requested together in a
- * single invocation.  The crop is applied last --- that is, the crop region
- * is specified in terms of the destination image after transform/resize.
- *
- * We also offer a "force to grayscale" option, which simply discards the
- * chrominance channels of a YCbCr image.  This is lossless in the sense that
- * the luminance channel is preserved exactly.  It's not the same kind of
- * thing as the rotate/flip transformations, but it's convenient to handle it
- * as part of this package, mainly because the transformation routines have to
- * be aware of the option to know how many components to work on.
- */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jtransform_parse_crop_spec	jTrParCrop
-#define jtransform_request_workspace	jTrRequest
-#define jtransform_adjust_parameters	jTrAdjust
-#define jtransform_execute_transform	jTrExec
-#define jtransform_perfect_transform	jTrPerfect
-#define jcopy_markers_setup		jCMrkSetup
-#define jcopy_markers_execute		jCMrkExec
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/*
- * Codes for supported types of image transformations.
- */
-
-typedef enum {
-	JXFORM_NONE,		/* no transformation */
-	JXFORM_FLIP_H,		/* horizontal flip */
-	JXFORM_FLIP_V,		/* vertical flip */
-	JXFORM_TRANSPOSE,	/* transpose across UL-to-LR axis */
-	JXFORM_TRANSVERSE,	/* transpose across UR-to-LL axis */
-	JXFORM_ROT_90,		/* 90-degree clockwise rotation */
-	JXFORM_ROT_180,		/* 180-degree rotation */
-	JXFORM_ROT_270		/* 270-degree clockwise (or 90 ccw) */
-} JXFORM_CODE;
-
-/*
- * Codes for crop parameters, which can individually be unspecified,
- * positive, or negative.  (Negative width or height makes no sense, though.)
- */
-
-typedef enum {
-	JCROP_UNSET,
-	JCROP_POS,
-	JCROP_NEG
-} JCROP_CODE;
-
-/*
- * Transform parameters struct.
- * NB: application must not change any elements of this struct after
- * calling jtransform_request_workspace.
- */
-
-typedef struct {
-  /* Options: set by caller */
-  JXFORM_CODE transform;	/* image transform operator */
-  boolean perfect;		/* if TRUE, fail if partial MCUs are requested */
-  boolean trim;			/* if TRUE, trim partial MCUs as needed */
-  boolean force_grayscale;	/* if TRUE, convert color image to grayscale */
-  boolean crop;			/* if TRUE, crop source image */
-
-  /* Crop parameters: application need not set these unless crop is TRUE.
-   * These can be filled in by jtransform_parse_crop_spec().
-   */
-  JDIMENSION crop_width;	/* Width of selected region */
-  JCROP_CODE crop_width_set;
-  JDIMENSION crop_height;	/* Height of selected region */
-  JCROP_CODE crop_height_set;
-  JDIMENSION crop_xoffset;	/* X offset of selected region */
-  JCROP_CODE crop_xoffset_set;	/* (negative measures from right edge) */
-  JDIMENSION crop_yoffset;	/* Y offset of selected region */
-  JCROP_CODE crop_yoffset_set;	/* (negative measures from bottom edge) */
-
-  /* Internal workspace: caller should not touch these */
-  int num_components;		/* # of components in workspace */
-  jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
-  JDIMENSION output_width;	/* cropped destination dimensions */
-  JDIMENSION output_height;
-  JDIMENSION x_crop_offset;	/* destination crop offsets measured in iMCUs */
-  JDIMENSION y_crop_offset;
-  int iMCU_sample_width;	/* destination iMCU size */
-  int iMCU_sample_height;
-} jpeg_transform_info;
-
-
-#if TRANSFORMS_SUPPORTED
-
-/* Parse a crop specification (written in X11 geometry style) */
-EXTERN(boolean) jtransform_parse_crop_spec
-	JPP((jpeg_transform_info *info, const char *spec));
-/* Request any required workspace */
-EXTERN(boolean) jtransform_request_workspace
-	JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
-/* Adjust output image parameters */
-EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     jvirt_barray_ptr *src_coef_arrays,
-	     jpeg_transform_info *info));
-/* Execute the actual transformation, if any */
-EXTERN(void) jtransform_execute_transform
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     jvirt_barray_ptr *src_coef_arrays,
-	     jpeg_transform_info *info));
-/* Determine whether lossless transformation is perfectly
- * possible for a specified image and transformation.
- */
-EXTERN(boolean) jtransform_perfect_transform
-	JPP((JDIMENSION image_width, JDIMENSION image_height,
-	     int MCU_width, int MCU_height,
-	     JXFORM_CODE transform));
-
-/* jtransform_execute_transform used to be called
- * jtransform_execute_transformation, but some compilers complain about
- * routine names that long.  This macro is here to avoid breaking any
- * old source code that uses the original name...
- */
-#define jtransform_execute_transformation	jtransform_execute_transform
-
-#endif /* TRANSFORMS_SUPPORTED */
-
-
-/*
- * Support for copying optional markers from source to destination file.
- */
-
-typedef enum {
-	JCOPYOPT_NONE,		/* copy no optional markers */
-	JCOPYOPT_COMMENTS,	/* copy only comment (COM) markers */
-	JCOPYOPT_ALL		/* copy all optional markers */
-} JCOPY_OPTION;
-
-#define JCOPYOPT_DEFAULT  JCOPYOPT_COMMENTS	/* recommended default */
-
-/* Setup decompression object to save desired markers in memory */
-EXTERN(void) jcopy_markers_setup
-	JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
-/* Copy markers saved in the given source object to the destination object */
-EXTERN(void) jcopy_markers_execute
-	JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-	     JCOPY_OPTION option));
diff --git a/extra/fvwm-devel/PKGBUILD b/extra/fvwm-devel/PKGBUILD
deleted file mode 100644
index 42ea9293f..000000000
--- a/extra/fvwm-devel/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 122676 2011-05-06 03:54:22Z eric $
-# Maintainer: Eric Bélanger 
-
-pkgname=fvwm-devel
-pkgver=2.7.0
-pkgrel=2
-pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm.org"
-license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
-makedepends=('libxslt')
-conflicts=('fvwm')
-provides=("fvwm=${pkgver}")
-options=('!emptydirs')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop)
-md5sums=('c7dbb0c067f570e478005edb95dcccc3'
-         '3f5bcb246e035ff29aa5bf54487a3db4')
-sha1sums=('bc8f84902b0926df171d059eff75780a25c8a97a'
-          '17db773870637b410ceb4f68743dbd517bc5c599')
-
-build() {
-  cd "${srcdir}/fvwm-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library
-  make
-}
-
-package() {
-  cd "${srcdir}/fvwm-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/fvwm"
-  install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm"
-  rm -f "${pkgdir}"/etc/fvwm/Makefile*
-  install -D -m644 ../fvwm-devel.desktop "${pkgdir}/usr/share/xsessions/fvwm-devel.desktop"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/extra/fvwm-devel/fvwm-devel.desktop b/extra/fvwm-devel/fvwm-devel.desktop
deleted file mode 100644
index dac786fb8..000000000
--- a/extra/fvwm-devel/fvwm-devel.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm
-Name=fvwm-devel
diff --git a/extra/fvwm/fvwm2.desktop b/extra/fvwm/fvwm2.desktop
deleted file mode 100644
index 5df7750b1..000000000
--- a/extra/fvwm/fvwm2.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM2
-Comment=The fvwm2 window manager
-Exec=fvwm2
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/extra/icewm/ChangeLog b/extra/icewm/ChangeLog
deleted file mode 100644
index b3e46cb6f..000000000
--- a/extra/icewm/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2010-01-18  Eric Belanger  
-
-	* icewm 1.2.37-3
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-01-30  Eric Belanger  
-
-	* icewm 1.2.37-1
-	* Upstream update
-
-2008-10-18  Eric Belanger  
-
-	* icewm 1.2.36-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/extra/icewm/icewm.desktop b/extra/icewm/icewm.desktop
deleted file mode 100644
index e5ff5dce6..000000000
--- a/extra/icewm/icewm.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/icewm-session
-TryExec=/usr/bin/icewm-session
-Name=icewm
diff --git a/extra/indent/indent-2.2.9-file.diff b/extra/indent/indent-2.2.9-file.diff
deleted file mode 100644
index 511995c0b..000000000
--- a/extra/indent/indent-2.2.9-file.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur indent-2.2.9.orig/src/indent.h indent-2.2.9/src/indent.h
---- indent-2.2.9.orig/src/indent.h	2002-11-10 22:02:48.000000000 +0100
-+++ indent-2.2.9/src/indent.h	2005-10-30 11:53:10.000000000 +0100
-@@ -96,8 +96,6 @@
- /* Size of the input program, not including the ' \n\0' we add at the end */
- extern unsigned long in_prog_size;
- 
--/* The output file. */
--extern FILE *output;
- 
- 
- 
diff --git a/extra/libindi/linking-pthread.patch b/extra/libindi/linking-pthread.patch
deleted file mode 100644
index c012707a2..000000000
--- a/extra/libindi/linking-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/libindi/CMakeLists.txt	2010/11/20 11:45:07	397
-+++ trunk/libindi/CMakeLists.txt	2010/12/01 08:36:20	412
-@@ -164,7 +164,7 @@
- ############# INDI Client Library ################
- ##################################################
- add_library(indiclient STATIC ${indibase_SRCS})
--target_link_libraries(indiclient indi)
-+target_link_libraries(indiclient indi pthread)
- install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX})
- 
- #####################################
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff
deleted file mode 100644
index 2dbc38d54..000000000
--- a/extra/moc/curl-streams.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
---- a/io_curl.c	2007-07-08 08:54:45.000000000 +0200
-+++ b/io_curl.c	2011-05-18 09:09:40.000000000 +0200
-@@ -338,6 +338,8 @@
- 			fd_set read_fds, write_fds, exc_fds;
- 			int max_fd;
- 			int ret;
-+         long milliseconds;
-+         struct timeval timeout;
- 
- 			logit ("Doing select()...");
- 
-@@ -356,8 +358,14 @@
- 			if (s->curl.wake_up_pipe[0] > max_fd)
- 				max_fd = s->curl.wake_up_pipe[0];
- 
-+         curl_multi_timeout(s->curl.multi_handle, &milliseconds);
-+         if(milliseconds <= 0)
-+           milliseconds = 1000; /* just a cautionary default */
-+         timeout.tv_sec = milliseconds / 1000;
-+         timeout.tv_usec = (milliseconds % 1000) * 1000;
-+
- 			ret = select (max_fd + 1, &read_fds, &write_fds,
--					&exc_fds, NULL);
-+					&exc_fds, &timeout);
- 
- 			if (ret < 0 && errno == EINTR) {
- 				logit ("Interrupted");
diff --git a/extra/mousepad/PKGBUILD b/extra/mousepad/PKGBUILD
deleted file mode 100644
index 9b3e0a599..000000000
--- a/extra/mousepad/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 58320 2009-11-07 00:36:34Z allan $
-# Maintainer: tobias [tobias at archlinux.org]
-
-pkgname=mousepad
-pkgver=0.2.16
-pkgrel=2
-pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)" 
-arch=(i686 x86_64)
-groups=('xfce4') 
-license="GPL2" 
-depends=('libxfcegui4>=4.6.0' 'desktop-file-utils')
-makedepends=('pkgconfig' 'intltool' 'perl')
-options=('!libtool')
-url=('http://www.xfce.org/~benny/apps.html')
-install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/${pkgname}-${pkgver}.tar.bz2
-        resensitize-find-button.patch)
-md5sums=('d98854edb76d823ac20b266fdf5a64a1'
-         '1fbc153fbd47ebb95d93f7084dea93e0')
-
-build() { 
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/resensitize-find-button.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/extra/mousepad/mousepad.install b/extra/mousepad/mousepad.install
deleted file mode 100644
index e7ca93e53..000000000
--- a/extra/mousepad/mousepad.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/extra/mousepad/resensitize-find-button.patch b/extra/mousepad/resensitize-find-button.patch
deleted file mode 100644
index db79adc4d..000000000
--- a/extra/mousepad/resensitize-find-button.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mousepad-0.2.16.orig/src/search.c
-+++ mousepad-0.2.16/src/search.c
-@@ -210,8 +210,11 @@
- 		G_CALLBACK(toggle_sensitivity), NULL);
- 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
- 		G_CALLBACK(toggle_sensitivity), NULL);
--	 if (sd->search.string_find) 
-+	 if (sd->search.string_find) {
- 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+			GTK_RESPONSE_OK, TRUE);
-+	 }
- 
- 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- 	gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
-@@ -275,8 +278,11 @@
- 		G_CALLBACK(toggle_sensitivity), NULL);
- 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
- 		G_CALLBACK(toggle_sensitivity), NULL);
--	 if (sd->search.string_find) 
-+	 if (sd->search.string_find) {
- 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+			GTK_RESPONSE_OK, TRUE);
-+	}
- 	label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
- 	 gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
- 	 gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/extra/python2/CVE-2011-1521.patch b/extra/python2/CVE-2011-1521.patch
deleted file mode 100644
index d68ec3323..000000000
--- a/extra/python2/CVE-2011-1521.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur Python-2.7.1.ori/Lib/test/test_urllib2.py Python-2.7.1/Lib/test/test_urllib2.py
---- Python-2.7.1.ori/Lib/test/test_urllib2.py	2010-11-21 21:04:33.000000000 -0800
-+++ Python-2.7.1/Lib/test/test_urllib2.py	2011-04-15 05:02:13.278853672 -0700
-@@ -969,6 +969,27 @@
-             self.assertEqual(count,
-                              urllib2.HTTPRedirectHandler.max_redirections)
- 
-+    def test_invalid_redirect(self):
-+        from_url = "http://example.com/a.html"
-+        valid_schemes = ['http', 'https', 'ftp']
-+        invalid_schemes = ['file', 'imap', 'ldap']
-+        schemeless_url = "example.com/b.html"
-+        h = urllib2.HTTPRedirectHandler()
-+        o = h.parent = MockOpener()
-+        req = Request(from_url)
-+
-+        for scheme in invalid_schemes:
-+            invalid_url = scheme + '://' + schemeless_url
-+            self.assertRaises(urllib2.HTTPError, h.http_error_302,
-+                              req, MockFile(), 302, "Security Loophole",
-+                              MockHeaders({"location": invalid_url}))
-+
-+        for scheme in valid_schemes:
-+            valid_url = scheme + '://' + schemeless_url
-+            h.http_error_302(req, MockFile(), 302, "That's fine",
-+                MockHeaders({"location": valid_url}))
-+            self.assertEqual(o.req.get_full_url(), valid_url)
-+
-     def test_cookie_redirect(self):
-         # cookies shouldn't leak into redirected requests
-         from cookielib import CookieJar
-diff -Naur Python-2.7.1.ori/Lib/test/test_urllib.py Python-2.7.1/Lib/test/test_urllib.py
---- Python-2.7.1.ori/Lib/test/test_urllib.py	2010-11-21 05:34:58.000000000 -0800
-+++ Python-2.7.1/Lib/test/test_urllib.py	2011-04-15 05:02:13.278853672 -0700
-@@ -161,6 +161,20 @@
-         finally:
-             self.unfakehttp()
- 
-+    def test_invalid_redirect(self):
-+        # urlopen() should raise IOError for many error codes.
-+        self.fakehttp("""HTTP/1.1 302 Found
-+Date: Wed, 02 Jan 2008 03:03:54 GMT
-+Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
-+Location: file:README
-+Connection: close
-+Content-Type: text/html; charset=iso-8859-1
-+""")
-+        try:
-+            self.assertRaises(IOError, urllib.urlopen, "http://python.org/")
-+        finally:
-+            self.unfakehttp()
-+
-     def test_empty_socket(self):
-         # urlopen() raises IOError if the underlying socket does not send any
-         # data. (#1680230)
-diff -Naur Python-2.7.1.ori/Lib/urllib2.py Python-2.7.1/Lib/urllib2.py
---- Python-2.7.1.ori/Lib/urllib2.py	2010-11-20 03:24:08.000000000 -0800
-+++ Python-2.7.1/Lib/urllib2.py	2011-04-15 05:02:13.278853672 -0700
-@@ -579,6 +579,17 @@
- 
-         newurl = urlparse.urljoin(req.get_full_url(), newurl)
- 
-+        # For security reasons we do not allow redirects to protocols
-+        # other than HTTP, HTTPS or FTP.
-+        newurl_lower = newurl.lower()
-+        if not (newurl_lower.startswith('http://') or
-+                newurl_lower.startswith('https://') or
-+                newurl_lower.startswith('ftp://')):
-+            raise HTTPError(newurl, code,
-+                            msg + " - Redirection to url '%s' is not allowed" %
-+                            newurl,
-+                            headers, fp)
-+
-         # XXX Probably want to forget about the state of the current
-         # request, although that might interact poorly with other
-         # handlers that also use handler-specific request attributes
-diff -Naur Python-2.7.1.ori/Lib/urllib.py Python-2.7.1/Lib/urllib.py
---- Python-2.7.1.ori/Lib/urllib.py	2010-11-21 21:04:33.000000000 -0800
-+++ Python-2.7.1/Lib/urllib.py	2011-04-15 05:02:13.278853672 -0700
-@@ -644,6 +644,18 @@
-         fp.close()
-         # In case the server sent a relative URL, join with original:
-         newurl = basejoin(self.type + ":" + url, newurl)
-+
-+        # For security reasons we do not allow redirects to protocols
-+        # other than HTTP, HTTPS or FTP.
-+        newurl_lower = newurl.lower()
-+        if not (newurl_lower.startswith('http://') or
-+                newurl_lower.startswith('https://') or
-+                newurl_lower.startswith('ftp://')):
-+            raise IOError('redirect error', errcode,
-+                          errmsg + " - Redirection to url '%s' is not allowed" %
-+                          newurl,
-+                          headers)
-+
-         return self.open(newurl)
- 
-     def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
diff --git a/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch b/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
deleted file mode 100644
index 57f527f40..000000000
--- a/extra/python2/python-2.7.1-fix-decimal-in-turkish-locale.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale Python-2.7.1/Lib/decimal.py
---- Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale	2010-07-08 17:22:54.000000000 -0400
-+++ Python-2.7.1/Lib/decimal.py	2011-04-12 11:30:40.850350842 -0400
-@@ -1720,8 +1720,6 @@ class Decimal(object):
-         # here self was representable to begin with; return unchanged
-         return Decimal(self)
-
--    _pick_rounding_function = {}
--
-     # for each of the rounding functions below:
-     #   self is a finite, nonzero Decimal
-     #   prec is an integer satisfying 0 <= prec < len(self._int)
-@@ -1788,6 +1786,17 @@ class Decimal(object):
-         else:
-             return -self._round_down(prec)
-
-+    _pick_rounding_function = dict(
-+        ROUND_DOWN = '_round_down',
-+        ROUND_UP = '_round_up',
-+        ROUND_HALF_UP = '_round_half_up',
-+        ROUND_HALF_DOWN = '_round_half_down',
-+        ROUND_HALF_EVEN = '_round_half_even',
-+        ROUND_CEILING = '_round_ceiling',
-+        ROUND_FLOOR = '_round_floor',
-+        ROUND_05UP = '_round_05up',
-+    )
-+
-     def fma(self, other, third, context=None):
-         """Fused multiply-add.
-
-@@ -3705,18 +3714,6 @@ _numbers.Number.register(Decimal)
-
- ##### Context class #######################################################
-
--
--# get rounding method function:
--rounding_functions = [name for name in Decimal.__dict__.keys()
--                                    if name.startswith('_round_')]
--for name in rounding_functions:
--    # name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
--    globalname = name[1:].upper()
--    val = globals()[globalname]
--    Decimal._pick_rounding_function[val] = name
--
--del name, val, globalname, rounding_functions
--
- class _ContextManager(object):
-     """Context manager class to support localcontext().
diff --git a/extra/rcs/rcs-5.7.patch b/extra/rcs/rcs-5.7.patch
deleted file mode 100644
index 0f062b357..000000000
--- a/extra/rcs/rcs-5.7.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg
---- rcs-5.7-orig/src/conf.heg	1995-06-02 11:19:00.000000000 -0700
-+++ rcs-5.7/src/conf.heg	2004-11-29 12:41:37.000000000 -0800
-@@ -210,10 +210,10 @@
- /* Do struct stat s and t describe the same file?  Answer d if unknown.  */
- #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev)
- #define has_utimbuf 1 /* Does struct utimbuf work?  */
--#define CO "/usr/local/bin/co" /* name of 'co' program */
-+#define CO "/usr/bin/co" /* name of 'co' program */
- #define COMPAT2 0 /* Are version 2 files supported?  */
--#define DIFF "/usr/local/bin/diff" /* name of 'diff' program */
--#define DIFF3 "/usr/local/bin/diff3" /* name of 'diff3' program */
-+#define DIFF "/usr/bin/diff" /* name of 'diff' program */
-+#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */
- #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)?  */
- #define DIFFFLAGS "-an" /* Make diff output suitable for RCS.  */
- #define DIFF_L 1 /* Does diff -L work?  */
-@@ -221,7 +221,7 @@
- #define DIFF_FAILURE 1 /* DIFF status if differences are found */
- #define DIFF_TROUBLE 2 /* DIFF status if trouble */
- #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */
--#define MERGE "/usr/local/bin/merge" /* name of 'merge' program */
-+#define MERGE "/usr/bin/merge" /* name of 'merge' program */
- #define TMPDIR "/tmp" /* default directory for temporary files */
- #define SLASH '/' /* principal filename separator */
- #define SLASHes '/' /* `case SLASHes:' labels all filename separators */
-diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh
---- rcs-5.7-orig/src/conf.sh	1995-06-15 23:19:24.000000000 -0700
-+++ rcs-5.7/src/conf.sh	2004-11-29 12:42:28.000000000 -0800
-@@ -32,7 +32,7 @@
- # and can be inspected for clues otherwise.
- 
- # The Makefile overrides the following defaults.
--: ${RCSPREFIX=/usr/local/bin/}
-+: ${RCSPREFIX=/usr/bin/}
- : ${ALL_CFLAGS=-Dhas_conf_h}
- : ${CC=cc}
- : ${COMPAT2=0}
-@@ -42,8 +42,8 @@
- : ${DIFFFLAGS=-an}
- : ${DIFF_L=1}
- : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2}
--: ${ED=/bin/ed}
--: ${SENDMAIL='"/usr/lib/sendmail"'}
-+: ${ED=/usr/bin/ed}
-+: ${SENDMAIL='"/usr/sbin/sendmail"'}
- # : ${LDFLAGS=} ${LIBS=} tickles old shell bug
- 
- C="$CC $ALL_CFLAGS"
-@@ -73,17 +73,6 @@
- 	ech='echo -n' dots='... '
- esac
- 
--$ech >&3 "$0: testing permissions $dots"
--rm -f a.d &&
--date >a.d &&
--chmod 0 a.d &&
--{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
--	echo >&3 "$n$0: This command should not be run with superuser permissions."
--	exit 1
--}
--echo >&3 OK
--rm -f a.d || exit
--
- $ech >&3 "$0: testing compiler for plausibility $dots"
- echo 'main() { return 0; }' >a.c
- rm -f a.exe a.out || exit
diff --git a/extra/xfprint/PKGBUILD b/extra/xfprint/PKGBUILD
deleted file mode 100644
index 1d622e190..000000000
--- a/extra/xfprint/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 122851 2011-05-06 14:01:10Z stephane $
-# Maintainer: Tobias Kieslich 
-
-pkgname=xfprint
-pkgver=4.6.1
-pkgrel=5
-pkgdesc="A print dialog and a printer manager for Xfce"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'krb5'
-         'gnutls>=2.6.5' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/xfce/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
-        xfprint-manager-fix.diff)
-md5sums=('d92fca97a42816085080baf07a99a62e'
-         '69b3619a285e94d602a1d0ac08f4ca06')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # fix xfprint-manager not showing cups printers
-  # see http://bugs.archlinux.org/task/19965, http://bugs.gentoo.org/278047, http://bugzilla.xfce.org/show_bug.cgi?id=6089
-  patch -Np0 -i ${srcdir}/xfprint-manager-fix.diff
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/xfprint/xfprint-manager-fix.diff b/extra/xfprint/xfprint-manager-fix.diff
deleted file mode 100644
index 1bf0725f8..000000000
--- a/extra/xfprint/xfprint-manager-fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- xfprint-manager/main.c	2009-02-24 21:34:16.000000000 +0000
-+++ xfprint-manager/main.c.new	2010-07-15 21:30:51.098745852 +0000
-@@ -41,6 +41,7 @@
- #include 
- 
- #define CHANNEL         "xfprint"
-+#define PROP_PRINTING_SYSTEM  "/printing-system"
- 
- extern void mainwin_setup (void);
- 
-@@ -66,15 +67,15 @@
-   channel = xfconf_channel_new (CHANNEL);
-   if (channel) {
- 
--    if (xfconf_channel_has_property (channel, "/XfPrint/system")) {
--      const gchar *system_name = xfconf_channel_get_string (channel, "/XfPrint/system", "none");
-+    if (xfconf_channel_has_property (channel, PROP_PRINTING_SYSTEM)) {
-+      const gchar *system_name = xfconf_channel_get_string (channel, PROP_PRINTING_SYSTEM, "none");
-       if (g_ascii_strcasecmp (system_name, "none") != 0) {
-         ps = printing_system_new (system_name);
-         if (ps == NULL);
-           g_warning ("Unable to load printing system module %s", system_name);
-       }
-     } else {
--      g_warning ("%s: XfPrint/system is not set", PACKAGE);
-+      g_warning ("%s: XfPrint/printing-system is not set", PACKAGE);
-     }
-   }
- 
diff --git a/extra/xfprint/xfprint.install b/extra/xfprint/xfprint.install
deleted file mode 100644
index 21b79d2d4..000000000
--- a/extra/xfprint/xfprint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD
deleted file mode 100644
index ff7f4f050..000000000
--- a/multilib-testing/lib32-llvm/PKGBUILD
+++ /dev/null
@@ -1,153 +0,0 @@
-# $Id: PKGBUILD 47129 2011-05-17 14:00:02Z lcarlier $
-# Maintainer: Evangelos Foutras 
-# Contributor: Jan "heftig" Steffens 
-# Contributor: Sebastian Nowicki 
-# Contributor: Devin Cofer 
-# Contributor: Tobias Kieslich 
-# Contributor: Geoffroy Carrier 
-# Contributor: Tomas Lindquist Olsen 
-# Contributor: Roberto Alsina 
-# Contributor: Gerardo Exequiel Pozzi 
-
-pkgname=('lib32-llvm')
-pkgver=2.9
-_gcc_ver=4.6.0
-pkgrel=1
-arch=('x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('gcc-libs-multilib' 'lib32-libffi' 'python2' "gcc-multilib=$_gcc_ver")
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz
-        http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
-        ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
-        clang-plugin-loader-registry.patch
-        cindexer-clang-path.patch
-        clang-toolchains-gcc-versions.patch
-        clang-pure64.patch
-        enable-lto.patch)
-md5sums=('793138412d2af2c7c7f54615f8943771'
-         '634de18d04b7a4ded19ec4c17d23cfca'
-         '70e23a3dc2b38ecb2bb4d2c48f47295d'
-         '02c23b4aaca3445b8bf39fddb2f9906e'
-         '87a7162dbe99e9ffce6c40bd09f5f4f0'
-         '8da236120a9a287a977b575b8b905c93'
-         '225ee6b531f8327f34f344a18cb4ec81'
-         '8f7582d7440e4a8342c3aea9ec714fb4')
-
-build() {
-  cd "$srcdir/llvm-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # Fix symbolic links from OCaml bindings to LLVM libraries
-  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
-  # Fix installation directories, ./configure doesn't seem to set them right
-  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Get the correct list of symbols to export
-  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
-  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
-  #patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
-  # Add GCC 4.6.0 to GccVersions (FS#23631)
-  #patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
-
-  # Adjust lib paths
-  #patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
-
-  # Make -flto work
-  # Use gold instead of default linker, and always use the plugin
-  #patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  # TODO: Uncomment when clang works with GCC 4.6+
-  #_cxx_headers="/usr/include/c++/$_gcc_ver"
-  #if [[ ! -d $_cxx_headers ]]; then
-  #  error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
-  #  return 1
-  #fi
-  _cxx_headers="/usr/include/c++/clang-$pkgver"
-
-  _32bit_headers=""
-  if [[ $CARCH == x86_64 ]]; then
-    # Important for multilib
-    _32bit_headers="32"
-  fi
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-cxx-include-root=$_cxx_headers \
-    --with-cxx-include-arch=$CHOST \
-    --with-cxx-include-32bit-dir=$_32bit_headers \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package() {
-  pkgdesc="Low Level Virtual Machine (32 bits version)"
-  depends=('perl' 'lib32-libffi' 'llvm')
-
-  cd "$srcdir/llvm-$pkgver"
-
-  # We move the clang directory out of the tree so it won't get installed and
-  # then we bring it back in for the clang package
-  # mv tools/clang "$srcdir"
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-  # mv "$srcdir/clang" tools
-
-  # OCaml bindings go to a separate package
-  # rm -rf "$srcdir"/{ocaml,ocamldoc}
-  # mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
-  # Remove duplicate files installed by the OCaml bindings
-  # rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib32/llvm/*.a
-
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  #sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-  sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config"
-  mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config"
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
-}
diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/multilib-testing/lib32-llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch
deleted file mode 100644
index da6178519..000000000
--- a/multilib-testing/lib32-llvm/clang-pure64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::arm)
-       CmdArgs.push_back("/lib/ld-linux.so.3");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1317,18 +1317,10 @@
-   if (Arch == llvm::Triple::x86)
-     Suffix64 = "/64";
- 
--  std::string Lib32 = "lib";
--
--  bool Exists;
--  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
--    Lib32 = "lib32";
--
-+  std::string Lib32 = "lib32";
-   std::string Lib64 = "lib";
--  bool Symlink;
--  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
--      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
--    Lib64 = "lib64";
- 
-+  bool Exists;
-   std::string GccTriple = "";
-   if (Arch == llvm::Triple::arm) {
-     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 2e527300d..000000000
--- a/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
-       GccTriple = "i586-suse-linux";
-   }
- 
--  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
-                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
-                                "4.2"};
diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch
deleted file mode 100644
index 40d93104a..000000000
--- a/multilib-testing/lib32-llvm/enable-lto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,11 +1398,11 @@
-     Lib = Lib64;
-   }
- 
--  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
-+  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
-   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
-     Linker = LinkerPath.str();
-   else
--    Linker = GetProgramPath("ld");
-+    Linker = GetProgramPath("ld.gold");
- 
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
-     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index 646a47d71..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 126536 2011-06-06 06:09:32Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-colorschemes'
-         'kdeaccessibility-iconthemes'
-         'kdeaccessibility-jovie'
-         'kdeaccessibility-kaccessible'
-         'kdeaccessibility-kmag'
-         'kdeaccessibility-kmousetool'
-         'kdeaccessibility-kmouth')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime'
-        'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('5a8ede86e6a483379ff62c1d85445c93c8400857')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_Opentts=OFF
-	make
-}
-
-package_kdeaccessibility-colorschemes() {
-	pkgdesc='KDE Accessibility color schemes'
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-iconthemes() {
-	pkgdesc='KDE Accessibility icon themes'
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-jovie() {
-	pkgdesc='A text to speech application'
-	depends=('kdebase-runtime' 'speech-dispatcher')
-    replaces=('kdeaccessibility-kttsd')
-	install='kdeaccessibility.install'
-	cd $srcdir/build/jovie
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/jovie
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
-    pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-    depends=('kdebase-runtime' 'speech-dispatcher')
-	install='kdeaccessibility.install'
-    cd $srcdir/build/kaccessible
-    make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
-	pkgdesc='Screen Magnifier'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmag/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmag
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmag
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
-	pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmousetool/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmousetool
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmousetool
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
-	pkgdesc='Speech Synthesizer Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kmouth/"
-	install='kdeaccessibility.install'
-	cd $srcdir/build/kmouth
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmouth
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index de420aef1..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 126537 2011-06-06 06:09:35Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser'
-         'kdeadmin-system-config-printer-kde')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
-	         'system-config-printer-common' 'python2-pyqt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'syslog-path.patch')
-sha1sums=('5f683dbdeec75b4baa025a987692a63912b7e4af'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_kpackage=OFF \
-		-DBUILD_knetworkconf=OFF \
-		-DBUILD_lilo-config=OFF \
-		-DBUILD_strigi-analyzer=OFF
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksystemlog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kuser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
-	pkgdesc='Configure local and remote Printers'
-	depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-
-    # Use the python2 executable
-    find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index d3e8a4147..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 126538 2011-06-06 06:09:39Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
-         'kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
-	     'kdebase-workspace' 'kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('460b8bff5f6799f0e2553e1b78112e3192ade2b3')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'kdegraphics-libs')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 4479b4d31..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 126530 2011-06-06 06:06:00Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgname=kdebase-runtime
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-        'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('63f30be47a4b592a0820ed200004543e7cba956d')
-
-build() {
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index f89ea885f..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 126875 2011-06-08 14:37:38Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgname=kdebase-workspace
-pkgver=4.6.4
-pkgrel=2
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# 	not detected by namcap because libgl depends on it
-#	but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
-         'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx'
-         'xorg-xsetroot' 'libxcomposite' 'libxinerama')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
-        'etc/pam.d/kde'
-        'etc/pam.d/kde-np'
-        'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch')
-sha1sums=('44aef9ad37cf291e9e7528b2c915f8fc129d735e'
-          '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'f7b38af38549242a240f1a90ab9964ca8a366129'
-          '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
-	patch -p0 -i ${srcdir}/fixpath.patch
-	patch -p0 -i ${srcdir}/terminate-server.patch
-
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xmms=OFF \
-		-DWITH_Googlegadgets=OFF \
-        -DWITH_NetworkManager=OFF
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-
-	install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
-	install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
-	install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
-	install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
-	install -d -m755 ${pkgdir}/usr/share/xsessions/
-	ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/
-	install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
-
-	install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_nologin.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
\ No newline at end of file
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
\ No newline at end of file
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c	2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c	2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- "    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- "    zhome=${ZDOTDIR:-$HOME}\n"
- "    # zshenv is always sourced automatically.\n"
--"    [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+"    [ -f /etc/profile ] && . /etc/profile\n"
- "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index c16031161..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 126534 2011-06-06 06:09:24Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
-         'kdebase-kdepasswd'
-         'kdebase-kdialog'
-         'kdebase-keditbookmarks'
-         'kdebase-kfind'
-         'kdebase-konqueror'
-         'kdebase-konsole'
-         'kdebase-kwrite'
-         'kdebase-lib'
-         'kdebase-plasma')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('aef0d3f2ed8cc54cbe1ae6025091c9e0a43235c4')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdebase-dolphin() {
-	pkgdesc='File Manager'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	optdepends=('ruby: servicemenu installation')
-	url="http://kde.org/applications/system/dolphin/"
-	cd $srcdir/build/dolphin
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dolphin
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
-	pkgdesc='Change Password'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	cd $srcdir/build/kdepasswd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdepasswd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
-	pkgdesc='A utility for displaying dialog boxes from shell scripts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kdialog
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
-	pkgdesc='Bookmark Organizer and Editor'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/keditbookmarks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
-	pkgdesc='Find Files/Folders'
-	depends=('kdebase-runtime' 'kdebase-lib')
-	url="http://kde.org/applications/utilities/kfind/"
-	install='kdebase.install'
-	cd $srcdir/build/kfind
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfind
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
-	pkgdesc='KDE File Manager & Web Browser'
-	depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-	optdepends=('kwebkitpart: to enable webkit engine')
-	url="http://kde.org/applications/internet/konqueror/"
-	install='kdebase.install'
-    conflicts=('kdebase-nsplugins')
-    replaces=('kdebase-nsplugins')
-    for i in konqueror doc/konqueror nsplugins; do
-        cd $srcdir/build/${i}
-        make DESTDIR=$pkgdir install
-    done
-}
-
-package_kdebase-konsole() {
-	pkgdesc='Terminal'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/konsole/"
-	cd $srcdir/build/konsole
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/konsole/doc/manual
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kwrite() {
-	pkgdesc='Text Editor'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/utilities/kwrite/"
-	cd $srcdir/build/kwrite
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwrite
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-lib() {
-	pkgdesc='KDE libraries for the basic desktop applications'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/lib
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
-	pkgdesc='Display the contents of folders (User´s home folder as default)'
-	depends=('kdebase-workspace' 'kdebase-lib')
-	cd $srcdir/build/plasma
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdebindings/PKGBUILD b/staging/kdebindings/PKGBUILD
deleted file mode 100644
index edd902881..000000000
--- a/staging/kdebindings/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdebindings
-pkgname=('kdebindings-csharp'
-         'kdebindings-python'
-         'kdebindings-ruby'
-         'kdebindings-smoke')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono'
-	         'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('ee5d85598e278bda76f7937c0a832723785ffe49')
-
-build() {
-	export MONO_SHARED_DIR="${srcdir}/build/.mono"
-	mkdir -p "$MONO_SHARED_DIR"
-
-	cd ${srcdir}/build
-
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DRUBY_SITE_LIB_DIR="/usr/lib/ruby/site_ruby/1.9.1" \
-        -DRUBY_SITE_ARCH_DIR="/usr/lib/ruby/site_ruby/1.9.1/${CARCH}-linux" \
-		-DBUILD_falcon=OFF \
-		-DBUILD_java=OFF \
-		-DBUILD_php=OFF \
-		-DWITH_PolkitQt=OFF
-	make
-}
-
-package_kdebindings-csharp() {
-	pkgdesc='KDE bindings for mono'
-	depends=('kdebindings-smoke' 'mono')
-	export MONO_SHARED_DIR="${srcdir}/build/.mono"
-	mkdir -p "$MONO_SHARED_DIR"
-	cd $srcdir/build/csharp
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-python() {
-	pkgdesc='KDE bindings for python'
-	depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-	cd $srcdir/build/python
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdebindings-ruby() {
-	pkgdesc='KDE Bindings for ruby'
-	depends=('kdebindings-smoke' 'ruby')
-	cd $srcdir/build/ruby
-	make DESTDIR=$pkgdir install
-}
-
-package_kdebindings-smoke() {
-	pkgdesc='Language independent library for Qt and KDE bindings'
-	depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
-	cd $srcdir/build/smoke
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/generator/smokebase
-    make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD
deleted file mode 100644
index 0dee4aeef..000000000
--- a/staging/kdeedu/PKGBUILD
+++ /dev/null
@@ -1,270 +0,0 @@
-# $Id: PKGBUILD 126535 2011-06-06 06:09:28Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdeedu
-pkgname=('kdeedu-blinken'
-         'kdeedu-cantor'
-         'kdeedu-kalgebra'
-         'kdeedu-kalzium'
-         'kdeedu-kanagram'
-         'kdeedu-kbruch'
-         'kdeedu-kgeography'
-         'kdeedu-khangman'
-         'kdeedu-kig'
-         'kdeedu-kiten'
-         'kdeedu-klettres'
-         'kdeedu-kmplot'
-         'kdeedu-kstars'
-         'kdeedu-ktouch'
-         'kdeedu-kturtle'
-         'kdeedu-kwordquiz'
-         'kdeedu-libkdeedu'
-         'kdeedu-marble'
-         'kdeedu-parley'
-         'kdeedu-rocs'
-         'kdeedu-step')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd'
-	'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre'
-	'python2' 'avogadro')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
-sha1sums=('c58c2afbedccfa12d25e47202da995940cc9acb4'
-          'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}
-    patch -Np1 -i ${srcdir}/gpsd-2.96.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeedu-blinken() {
-	pkgdesc='A memory enhancement game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/blinken
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/blinken/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-cantor() {
-	pkgdesc='KDE Frontend to Mathematical Software'
-	depends=('kdeedu-libkdeedu' 'libspectre')
-	optdepends=('kdeedu-kalgebra: backend'
-		'maxima: backend'
-		'r: backend')
-	install='kdeedu.install'
-	cd $srcdir/build/cantor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/cantor/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalgebra() {
-	pkgdesc='Math Expression Solver and Plotter'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kalgebra
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kalgebra/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kalzium() {
-	pkgdesc='KDE Periodic Table of Elements'
-	depends=('kdebase-runtime'  'kdeedu-libkdeedu' 'avogadro')
-	install='kdeedu.install'
-	cd $srcdir/build/kalzium
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kalzium/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kanagram() {
-	pkgdesc='KDE Letter Order Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/kanagram
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kanagram/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kbruch() {
-	pkgdesc='Practice exercises with fractions'
-	depends=('kdelibs' 'kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kbruch
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kbruch/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kgeography() {
-	pkgdesc='A Geography Learning Program'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kgeography
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgeography/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-khangman() {
-	pkgdesc='KDE Hangman Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/khangman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/khangman/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kig() {
-	pkgdesc='Explore Geometric Constructions'
-	depends=('kdebase-runtime' 'boost-libs' 'python2')
-	install='kdeedu.install'
-	cd $srcdir/build/kig
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kig/doc
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py
-}
-
-package_kdeedu-kiten() {
-	pkgdesc='Japanese Reference and Study Tool'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kiten
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kiten/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-klettres() {
-	pkgdesc='a KDE program to learn the alphabet'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/klettres
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/klettres/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kmplot() {
-	pkgdesc='Function Plotter'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kmplot
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kmplot/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kstars() {
-	pkgdesc='Desktop Planetarium'
-	depends=('kdebase-runtime' 'libindi')
-	install='kdeedu.install'
-	cd $srcdir/build/kstars
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kstars/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-ktouch() {
-	pkgdesc='Touch Typing Tutor'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/ktouch
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ktouch/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kturtle() {
-	pkgdesc='Educational Programming Environment'
-	depends=('kdebase-runtime')
-	install='kdeedu.install'
-	cd $srcdir/build/kturtle
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kturtle/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-kwordquiz() {
-	pkgdesc='A flashcard and vocabulary learning program'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/kwordquiz
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwordquiz/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-libkdeedu() {
-	pkgdesc='Support library for KDE Educational Software'
-	groups=()
-	depends=('kdelibs')
-	install='kdeedu.install'
-    replaces=('kdeedu-data')
-    conflicts=('kdeedu-data')
-	cd $srcdir/build/libkdeedu
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-marble() {
-	pkgdesc='Desktop Globe'
-	depends=('kdebase-runtime' 'gpsd')
-	install='kdeedu.install'
-	cd $srcdir/build/marble
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/marble/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-parley() {
-	pkgdesc='Vocabulary Trainer'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
-	install='kdeedu.install'
-	cd $srcdir/build/parley
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/parley/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-rocs() {
-	pkgdesc='Graph Theory Tool for Professors and Students.'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
-	install='kdeedu.install'
-	cd $srcdir/build/rocs
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/rocs/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeedu-step() {
-	pkgdesc='Simulate physics experiments'
-	depends=('kdebase-runtime' 'gsl' 'libqalculate')
-	install='kdeedu.install'
-	cd $srcdir/build/step
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/step/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeedu/gpsd-2.96.patch b/staging/kdeedu/gpsd-2.96.patch
deleted file mode 100644
index ec515e99d..000000000
--- a/staging/kdeedu/gpsd-2.96.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,9 @@ using namespace Marble;
- 
- GpsdConnection::GpsdConnection( QObject* parent )
-     : QObject( parent ),
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+      m_gpsd("localhost", DEFAULT_GPSD_PORT),
-+#endif
-       m_timer( 0 )
- {
-     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- void GpsdConnection::initialize()
- {
-     m_timer.stop();
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    gps_data_t* data;
-+#else
-     gps_data_t* data = m_gpsd.open();
-+#endif
-     if ( data ) {
-         m_status = PositionProviderStatusAcquiring;
-         emit statusChanged( m_status );
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
- void GpsdConnection::update()
- {
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+    if ( m_gpsd.waiting(0) ) {
-+#else
-     if ( m_gpsd.waiting() ) {
-+#endif
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
-+        gps_data_t* data = m_gpsd.read();
-+#else
-         gps_data_t* data = m_gpsd.poll();
-+#endif
-         if ( data && data->set & PACKET_SET ) {
-             emit gpsdInfo( *data );
-         }
diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu/kdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index e57ff75ec..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,514 +0,0 @@
-# $Id: PKGBUILD 126539 2011-06-06 06:09:42Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kbattleship'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktron'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
-             'kdebindings-python' 'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a5f6d07d8149fe00dbb61ae667eea741887966f3')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbattleship
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
-		$pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames-kfourinline.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames-kigo.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames-kolf.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames-kreversi.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
-		$pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames-kspaceduel.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames-ksquares.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
-		$pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
-	install='kdegames.install'
-	cd $srcdir/build/ktron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktron
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames-ktuberling.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-	for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
-		install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
-	done
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames-lskat.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kfourinline.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/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kigo.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/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kolf.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/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kspaceduel.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/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-ktuberling.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/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-lskat.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/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics/PKGBUILD b/staging/kdegraphics/PKGBUILD
deleted file mode 100644
index 713f57cbd..000000000
--- a/staging/kdegraphics/PKGBUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# $Id: PKGBUILD 126531 2011-06-06 06:06:03Z andrea $
-# Maintainer: Andrea Scarpino 
-# Contributor: Pierre Schmitz 
-
-pkgbase=kdegraphics
-pkgname=('kdegraphics-gwenview'
-         'kdegraphics-kamera'
-         'kdegraphics-kcolorchooser'
-         'kdegraphics-kgamma'
-         'kdegraphics-kolourpaint'
-         'kdegraphics-kruler'
-         'kdegraphics-ksnapshot'
-         'kdegraphics-libs'
-         'kdegraphics-okular')
-pkgver=4.6.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms'
-        'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre'
-        'ebook-tools' 'kdebase-runtime')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a208cef52de6345996a7cc68b1c09944da7253aa')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdegraphics-gwenview() {
-	pkgdesc='A simple image viewer'
-	depends=('kdebase-runtime' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/gwenview/"
-	replaces=('gwenview' 'gwenview-i18n')
-	install='kdegraphics.install'
-	cd $srcdir/build/gwenview
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/gwenview/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kamera() {
-	pkgdesc='Configure Kamera'
-	depends=('kdelibs' 'libgphoto2')
-	cd $srcdir/build/kamera
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kamera/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kcolorchooser() {
-	pkgdesc='Color Chooser'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/graphics/kcolorchooser/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kcolorchooser
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kgamma() {
-	pkgdesc='A monitor calibration tool'
-	# note on libxxf86vm:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxxf86vm
-	depends=('kdebase-runtime' 'libxxf86vm')
-	install='kdegraphics.install'
-	cd $srcdir/build/kgamma
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kgamma/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kolourpaint() {
-	pkgdesc='Paint Program'
-	depends=('kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/kolourpaint/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kolourpaint
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kolourpaint/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-kruler() {
-	pkgdesc='Screen Ruler'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/graphics/kruler/"
-	install='kdegraphics.install'
-	cd $srcdir/build/kruler
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kruler/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-ksnapshot() {
-	pkgdesc='Screen Capture Program'
-	depends=('kdebase-runtime' 'kdegraphics-libs')
-	url="http://kde.org/applications/graphics/ksnapshot/"
-	install='kdegraphics.install'
-	cd $srcdir/build/ksnapshot
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ksnapshot/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegraphics-libs() {
-	pkgdesc='Support library for KDE Graphics Software'
-	groups=()
-	depends=('kdelibs' 'sane' 'lcms')
-	conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer'
-                   'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
-	replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin'
-                  'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
-	install='kdegraphics.install'
-	for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
-}
-
-package_kdegraphics-okular() {
-	pkgdesc='Document Viewer'
-	depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-		'ebook-tools' 'libspectre')
-	url="http://kde.org/applications/graphics/okular/"
-	install='kdegraphics.install'
-	cd $srcdir/build/okular
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okular
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegraphics/kdegraphics.install b/staging/kdegraphics/kdegraphics.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics/kdegraphics.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index 7368231c5..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 126527 2011-06-06 06:05:44Z andrea $
-# Maintainer: Andrea Scarpino 
-
-pkgname=kdelibs
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
-        'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
-        'docbook-xsl')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
-        'hspell')
-replaces=('arts' 'kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'abs-syntax-highlight.patch')
-sha1sums=('088778bdda8b8c7a7b192abbf0d2a0660a20626d'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
-
-build() {
-       cd ${srcdir}/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menu
-       patch -p1 -i $srcdir/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i $srcdir/archlinux-menu.patch
-       # add syntax highlightning for PKGBUILD and .install files
-       patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
-       cd ${srcdir}
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DKAUTH_BACKEND=PolkitQt-1
-       make
-}
-
-package() {
-       cd $srcdir/build
-       make DESTDIR=$pkgdir install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/abs-syntax-highlight.patch b/staging/kdelibs/abs-syntax-highlight.patch
deleted file mode 100644
index 477479a9b..000000000
--- a/staging/kdelibs/abs-syntax-highlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml	2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml	2009-07-30 13:24:01.000000000 +0200
-@@ -8,7 +8,7 @@
-                         
-              
- ]>
--
-+
- 
- 
-+ 
-+ 
-+ 
OPTION: 

-+ 
-+ 

-+ This option should be used only if you have a Maildir folder which you
-+ want to use as your INBOX. If this is not your case (or don't know what
-+ this is), you can safely ignore this option.
-+ 
-+ 

-+ This option overrides the default directory Pine uses to find the location of
-+ your INBOX, in case this is in Maildir format. The default value of this
-+ option is "Maildir", but in some systems, this directory could have been
-+ renamed (e.g. to ".maildir"). If this is your case use this option to change
-+ the default.
-+ 
-+ 

-+ The value of this option is prefixed with the "~/" string to determine the
-+ full path to your INBOX.
-+ 
-+ 

-+ You should probably read a few tips that 
-+ teach you how to configure your maildir for optimal performance. This
-+ version also has support for the 
-+ Courier style file system when a maildir collection is accessed locally.
-+ 
-+ 

-+ 

-+ <End of help on this topic>
-+ 
-+ 
-+ ====== h_config_maildir =====
-+ 
-+ 
-+ Maildir Support
-+ 
-+ 
-+ 
Maildir Support

-+ 
-+ This version of Alpine has been enhanced with Maildir support. This text is 
-+ intended to be a reference on its support.
-+ 

-+ 
-+ A Maildir folder is a directory that contains three directories called 
-+ cur, tmp and new. A program that delivers mail (e.g. postfix) will put new 
-+ mail in the new directory. A program that reads mail will look for for old 
-+ messages in the cur directory, while it will look for new mail in the new 
-+ directory.
-+ 

-+ 
-+ In order to use maildir support it is better to set your inbox-path to the 
-+ value "#md/inbox" (without quotes). This assumes that your mail 
-+ delivery agent is delivering new mail to ~/Maildir/new. If the directory 
-+ where new mail is being delivered is not called "Maildir", you can set the 
-+ name of the subdirectory of home where it is being delivered in the  configuration 
-+ variable. Most of the time you will not have to worry about the 
-+  variable, because it will probably be set by your 
-+ administrator in the pine.conf configuration file.
-+ 

-+ 
-+ One of the advantages of the Maildir support of this version of Alpine is 
-+ that you do not have to stop using folders in another styles (mbox, mbx, 
-+ etc.). This is desirable since the usage of a specific mail storage system 
-+ is a personal decision. Folders in the maildir format that are part of the 
-+ Mail collection will be recognized without any extra configuration of your 
-+ part. If your mail/ collection is located under the mail/ directory, then 
-+ creating a new maildir folder in this collection is done by pressing "A" 
-+ and entering the string "#driver.md/mail/newfolder". Observe that adding a 
-+ new folder as "newfolder" may not create such folder in maildir format.
-+ 
-+ 

-+ If you would like to have all folders created in the maildir format by 
-+ default, you do so by adding a Maildir Collection. In order to convert 
-+ your current mail/ collection into a maildir collection, edit the 
-+ collection and change the path variable from "mail/" to 
-+ "#md/mail". In a maildir collection folders of any other format 
-+ are ignored.
-+ 
-+ 
 Finally, This version also has 
-+ support for the Courier style file system 
-+ when a maildir collection is accessed locally.
-+ 
-+ 

-+ 

-+ <End of help on this topic>
-+ 
-+ 
-  ====== h_config_literal_sig =====
-  
-  
-***************
-*** 29126,29131 ****
---- 29222,29270 ----
-  

-  <End of help on this topic>
-  
-+ 
-+ ====== h_config_courier_list =====
-+ 
-+ 
-+ FEATURE: <!--#echo var="FEAT_courier-folder-list"-->
-+ 
-+ 
-+ 
FEATURE: 

-+ 
-+ In a maildir collection, a folder could be used as a directory to store 
-+ folders. In the Courier server if you create a folder, then a directory 
-+ with the same name is created. If you use this patch to access a 
-+ collection created by the Courier server, then the display of such 
-+ collection will look confusing. The best way to access a maildir 
-+ collection created by the Courier server is by using the "#mc/" 
-+ prefix instead of the "#md/" prefix. If you use this alternate 
-+ prefix, then this feature applies to you, otherwise you can safely ignore 
-+ the text that follows.
-+ 

-+ Depending on if you have enabled the option 
-+  
-+ a folder may be listed as "folder[.]", or as two entries in the 
-+ list by "folder" and "folder.".
-+ 

-+ If this option is disabled, Pine will list local folders that are in Courier
-+ style format, as "folder", and those that are also directories as
-+ "folder[.]". This makes the default display cleaner.
-+ 

-+ If this feature is enabled then creating folders in a maildir collection
-+ will create a directory with the same name. If this feature is disabled, then 
-+ a folder is considered a directory only if it contains subfolders, so you can
-+ not create a directory with the same name as an exisiting folder unless 
-+ you create a subfolder of that folder first (e.g. if you have a folder
-+ called "foo" simply add "foo.bar" directly. This will
-+ create the directory "foo" and the subfolder "bar" of it).
-+ 

-+ Observe that this feature works only for maildir collections that are accessed
-+ locally. If a collection is accessed remotely then this feature has no value,
-+ as the report is created in a server, and Pine only reports what received
-+ from the server in this case.
-+ 

-+ <End of help on this topic>
-+ 
-  
-  ====== h_config_verbose_post =====
-  
-diff -rc alpine-2.00/pith/send.c alpine-2.00.maildir/pith/send.c
-*** alpine-2.00/pith/send.c	2008-08-06 13:25:58.000000000 -0500
---- alpine-2.00.maildir/pith/send.c	2011-01-15 19:11:07.000000000 -0600
-***************
-*** 256,261 ****
---- 256,268 ----
-  
-      if(exists & FEX_ISFILE){
-  	context_apply(tmp, p_cntxt, mbox, sizeof(tmp));
-+ #ifndef _WINDOWS
-+         if (!struncmp(tmp, "#md/",4) || !struncmp(tmp, "#mc/", 4)){
-+ 	    char tmp2[MAILTMPLEN];
-+ 	    maildir_file_path(tmp, tmp2);
-+ 	    strcpy(tmp, tmp2);
-+ 	}
-+ #endif
-  	if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){
-  	    /*
-  	     * The mbox is relative to the home directory.
-diff -rc alpine-2.00/README.maildir alpine-2.00.maildir/README.maildir
-*** alpine-2.00/README.maildir	2011-01-24 19:38:50.000000000 -0600
---- alpine-2.00.maildir/README.maildir	2011-01-15 19:11:07.000000000 -0600
-***************
-*** 0 ****
---- 1,153 ----
-+ ---------------------------------------
-+ 
-+ Maildir Driver for Alpine 1.0
-+ By Eduardo Chappa 
-+ http://staff.washington.edu/chappa/alpine/
-+ 
-+ ---------------------------------------
-+ 1. General Information About This Patch
-+ ---------------------------------------
-+ 
-+ This patch adds support for the maildir format to Alpine. We take the 
-+ approach that this patch is one more driver among the number of formats 
-+ supported by Alpine (more generally c-client). This approach differs from 
-+ older versions of similar patches, in that once a maildir patch was 
-+ applied, it was assumed that all your folders would be created in the 
-+ maildir format. 
-+ 
-+ This patch does not assume that maildir is a preferred format, instead 
-+ puts maildir in equal footing with other formats (mbox, mbx, mix, etc), 
-+ and so a maildir folder in the mail/ collection is treated in the same way 
-+ as any other folder in any other format. In other words, just by reading 
-+ the name of a folder, or opening it, or doing any operation with it, you 
-+ can not know in which format the folder is.
-+ 
-+ This implies that if you want to add a folder in the maildir format to the 
-+ mail/ collection, then you must add by pressing "A" in the folder list 
-+ collection and enter "#driver.md/mail/name_maildir_folder".
-+ 
-+ If you only want to use maildir, however, you can do so too. In this case, 
-+ you must create a maildir collection. In that collection, only maildir 
-+ folders will be listed. If there is any folder in any other format, that 
-+ folder will be ignored. In another words, any folder listed there is in 
-+ maildir format and can be accessed through that collection, conversely, 
-+ any folder not listed there is not in maildir format and there is no way 
-+ to access it using this collection.
-+ 
-+ In order to create a maildir collection, you could press M S L, and "A" to 
-+ add a collection. Fill in the required fields as follows:
-+ 
-+ Nickname  : Anything
-+ Server    :
-+ Path      : #md/relative/path/to/maildir/collection/
-+ View      :
-+ 
-+ For example, if "path" is set to "#md/mail/", then Alpine will look for your 
-+ maildir folders that are in ~/mail/.
-+ 
-+ The code in this patch is mostly based in code for the unix driver plus 
-+ some combinations of the mh, mbx and nntp drivers for the c-client 
-+ library. Those drivers were designed by Mark Crispin, and bugs in this 
-+ code are not his bugs, but my own.
-+ 
-+   I got all the specification for this patch from 
-+ http://cr.yp.to/proto/maildir.html. If you know of a place with a better 
-+ specification for maildir format please let me know. The method this patch 
-+ uses to create a unique filename for a message is one of the "old 
-+ fashioned" methods. I realize that this is old fashioned, but it is 
-+ portable, and portability is the main reason why I decided to use an old 
-+ fashioned method (most methods are not portable. See the word 
-+ "Unfortunately" in that document).
-+ 
-+ --------------
-+ 2. Other Goals
-+ --------------
-+ 
-+   It is intended that this code will work well with any application 
-+ written using the c-client library. Of paramount importance is to make the 
-+ associated imap server work well when the server accesses a folder in 
-+ Maildir format. The program mailutil should also work flawlessly with this 
-+ implemetation of the driver.
-+ 
-+   It is intended that this driver be fast and stable. We intend not to 
-+ patch Alpine to make this driver do its work, unless such patching is for 
-+ fixing bugs in Alpine or to pass parameters to the driver.
-+ 
-+ ------------------------------------------------------------------------ 
-+ 3. What are the known bugs of this implementation of the Maildir driver? 
-+ ------------------------------------------------------------------------
-+ 
-+   I don't know any at this time. There have been bugs before, though, but 
-+ I try to fix bugs as soon as they are reported. A complete list of updates 
-+ for this patch, which includes bug fixes, improvements and addition of new 
-+ features can be found at
-+ 
-+  http://staff.washington.edu/chappa/alpine/updates/maildir.html
-+ 
-+ ----------
-+ 4. On UIDs
-+ ----------
-+ 
-+  This patch keeps uids in the name of the file that contains the message, 
-+ by adding a ",u=" string to the file name to save the uid of a message. A 
-+ file is kept between sessions to save information on the last uid assigned 
-+ and its time of validity. Only one session with writing access can write 
-+ uids, all others must wait for the other session to assign them. The 
-+ session assigning uids creates a ".uidtemp" file which other sessions must 
-+ not disturb.
-+ 
-+   Uid support appeared in Alpine 1.00 (snapshot 925), and is experimental,
-+ please report any problems.
-+ 
-+ --------------------------------------------
-+ 5. Configuring Alpine and Setting up a Maildir 
-+ --------------------------------------------
-+ 
-+ Once this approach was chosen, it implied the following:
-+ 
-+     * This patch assumes that your INBOX is located at "$HOME/Maildir".  
-+       This is a directory which should have three subdirectories "cur", 
-+       "tmp" and "new". Mail is delivered to 'new' and read from 'cur'. I 
-+       have added a configuration option "maildir-location" which can be 
-+       used to tell Alpine where your Maildir inbox is, in case your system 
-+       do not use the above directory (e.g. your system may use 
-+       "~/.maildir"). In this case define that variable to be the name of 
-+       the directory where your e-mail is being delivered (e.g.  
-+       ".maildir").
-+ 
-+     * If you want to use the above configuration as your inbox, you must 
-+       define your inbox-path as "#md/inbox" (no quotes).  You can define 
-+       the inbox-path like above even if you have changed the 
-+       maildir-location variable. That's the whole point of that variable.
-+ 
-+ -----------------------------------
-+ 6. What about Courier file systems?
-+ -----------------------------------
-+ 
-+ In a courier file system all folders are subfolders of a root folder 
-+ called INBOX. Normally INBOX is located at ~/Maildir and subfolders are 
-+ "dot" directories in ~/Maildir. For example ~/Maildir/.Trash is a 
-+ subfolder of INBOX and is accessed with the nickname "INBOX.Trash".
-+ 
-+ You can not access folders in this way unless you preceed them with the 
-+ string "#mc/". The purpose of the string "#mc/" is to warn Alpine that a 
-+ collection in the Courier format is going to be accessed, so you can 
-+ SELECT a folder like "#mc/INBOX.Trash", but not "INBOX.Trash"
-+ 
-+ You can access a collection through a server, but if you want to access a 
-+ collection of folders created using the Courier server, you MUST edit your
-+ ".pinerc" file and enter the definition of the collection as follows:
-+ 
-+ folder-collections="Anything you want" #mc/INBOX.[]
-+ 
-+ You can replace the string "#mc/INBOX." by something different, for example
-+ "#mc/Courier/." will make Alpine search for your collection in ~/Courier.
-+ 
-+ You can not add this directly into Alpine because Alpine fails to accept this 
-+ value from its input, but it takes it correctly when it is added through 
-+ the ".pinerc" file.
-+ 
-+ You can access your inbox as "#mc/INBOX" or "#md/INBOX". Both definitions 
-+ point to the same place.
-+ 
-+ Last Updated February 9, 2008
-- 
cgit v1.2.3-54-g00ecf