unmaintained/: Purge packages unmaintained since v3.0

Removes packages that have been in aports/unmaintained since the 3.0-stable
branch.
Alpine Linux v3.0 was released on 2014-06-04 and EOL on 2016-05-01, so
these packages have not been touched since at least 23 months.
The files can still be recovered from the 3.3-stable branch.

147 files changed, 0 insertions, 9558 deletions

diff --git a/unmaintained/apache-couchdb/APKBUILD b/unmaintained/apache-couchdb/APKBUILD
deleted file mode 100644
index f2f9a02f7b..0000000000
--- a/unmaintained/apache-couchdb/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@gmail.com>
-# Maintainer:
-pkgname=apache-couchdb
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="A database for the web"
-url="http://couchdb.apache.org/"
-arch="all"
-license="Apache License 2.0"
-depends="erlang"
-depends_dev=
-makedepends="$depends_dev curl-dev erlang-dev js-dev icu-dev openssl-dev"
-install=
-pkgusers="couchdb"
-pkggroups="couchdb"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://apache.fastbull.org/couchdb/source/1.5.0/$pkgname-$pkgver.tar.gz
-	apache-couchdb.initd
-	apache-couchdb.confd
-	"
-
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	return 0
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-                --build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	install -m755 -D ../../$pkgname.initd "$pkgdir"/etc/init.d/couchdb
-	install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/couchdb
-	chown couchdb:couchdb "$pkgdir"/var/log/couchdb
-}
-
-md5sums="55a2f86469e0697817da8defee730f04  apache-couchdb-1.5.0.tar.gz
-1c20f57fcdf1e3cac3f1ffd814fcbe70  apache-couchdb.initd
-86ae8d25d121e5ce6a15ee2d8c52aa47  apache-couchdb.confd"
-sha256sums="abbdb2a6433124a4a4b902856f6a8a070d53bf7a55faa7aa8b6feb7127638fef  apache-couchdb-1.5.0.tar.gz
-b7d72e64aa36021527a0af1f094ebfd36b107bd4fd0ab3f5e599d3993b3cd484  apache-couchdb.initd
-056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a  apache-couchdb.confd"
-sha512sums="557f712cf927b8713285e716a9dce624960316af0c481c98553c12b310fc228d30b585d25bf2c3e3debde5b25fc3d94dbbedaf79a7ae480e92a847abff73c2de  apache-couchdb-1.5.0.tar.gz
-83dac6ff44b1d6f02c2def4836602798171c96fb47795820dc6187323daeb015d897b5a8d4727fbc1f4b56dc7bf3d07732dead1512137b7a087fef85bb5a6ec9  apache-couchdb.initd
-5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836  apache-couchdb.confd"
diff --git a/unmaintained/apache-couchdb/apache-couchdb.confd b/unmaintained/apache-couchdb/apache-couchdb.confd
deleted file mode 100644
index 94d50b35f3..0000000000
--- a/unmaintained/apache-couchdb/apache-couchdb.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Options for CouchDB
-
-EXEC="/usr/bin/couchdb"
-COUCHDB_USER="couchdb:couchdb"
-COUCHDB_PID_FILE="/var/run/couchdb/couchdb.pid"
-COUCHDB_STDOUT_FILE="/dev/null"
-COUCHDB_STDERR_FILE="/dev/null"
-#COUCHDB_RESPAWN_TIMEOUT=
-#COUCHDB_OPTIONS=
diff --git a/unmaintained/apache-couchdb/apache-couchdb.initd b/unmaintained/apache-couchdb/apache-couchdb.initd
deleted file mode 100644
index c3a136dfb8..0000000000
--- a/unmaintained/apache-couchdb/apache-couchdb.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Dirkjan Ochtman
-# Distributed under the terms of the Apache License, Version 2.0
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	args="-b"
-	if test -n "$COUCHDB_STDOUT_FILE"; then
-		args="$args -o $COUCHDB_STDOUT_FILE"
-	fi
-	if test -n "$COUCHDB_STDERR_FILE"; then
-		args="$args -e $COUCHDB_STDERR_FILE"
-	fi
-	if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
-		args="$args -r $COUCHDB_RESPAWN_TIMEOUT"
-	fi
-	if test -n "$COUCHDB_OPTIONS"; then
-		args="$args $COUCHDB_OPTIONS"
-	fi
-	if test -n "$COUCHDB_PID_FILE"; then
-	    args="$args -p $COUCHDB_PID_FILE"
-    else
-        echo "* ERROR: COUCHDB_PID_FILE must be set"
-        return -1
-    fi
-	if test -z "$COUCHDB_USER"; then
-        echo "* ERROR: COUCHDB_USER must be set"
-        return -1
-	fi
-
-	checkpath --directory --owner ${COUCHDB_USER} ${COUCHDB_PID_FILE%/*}
-
-	start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--user ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args
-
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--pidfile ${COUCHDB_PID_FILE}
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
deleted file mode 100755
index 1946d2b5b4..0000000000
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S couchdb 2>/dev/null
-adduser -S -D -h /var/run/couchdb -s /bin/false -G couchdb -g couchdb couchdb 2>/dev/null
-
-exit 0
diff --git a/unmaintained/blackmagic-grsec/APKBUILD b/unmaintained/blackmagic-grsec/APKBUILD
deleted file mode 100644
index 0fa38ce5e5..0000000000
--- a/unmaintained/blackmagic-grsec/APKBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-_flavor=grsec
-_kpkg=linux-$_flavor
-_kver=3.13.7
-_kpkgrel=0
-_mypkgrel=0
-
-# verify the kernel version before entering chroot
-if [ -f ../linux-${_flavor}/APKBUILD ]; then
-	. ../linux-${_flavor}/APKBUILD
-fi
-
-_kpkgver="$_kver-r$_kpkgrel"
-_abi_release=${_kver}-${_kpkgrel}-${_flavor}
-_realname=blackmagic
-
-pkgname=${_realname}-${_flavor}
-pkgver=$_kver
-# when chaning _bmdver we *must* bump _mypkgrel
-_bmdver=9.8
-pkgrel=$(( $_kpkgrel + $_mypkgrel ))
-pkgdesc="Black Magic Design video driver"
-url="http://blackmagicdesign.com"
-arch=""
-license="GPL"
-depends="linux-${_flavor}=${_kpkgver}"
-makedepends="linux-${_flavor}-dev=${_kpkgver}"
-install=
-subpackages=""
-source="
-http://software.blackmagicdesign.com/DesktopVideo/Blackmagic_Desktop_Video_Linux_$_bmdver.tar.gz
-	"
-
-_builddir="$srcdir"/desktopvideo-${_bmdver}a2-x86_64/usr/src/desktopvideo-${_bmdver}a2
-prepare() {
-	cd "$srcdir"
-	local _arch="$CARCH"
-	if [ "$CARCH" = "x86" ]; then
-		_arch="i386"
-	fi
-	msg "unpacking desktopvideo-$_bmdver-$_arch.tar.gz"
-	tar -zxf desktopvideo-$_bmdver-x86_64.tar.gz
-	for i in $source; do
-		case $i in
-		*.patch|*.diff)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
-}
-
-build() {
-	cd "$srcdir"/desktopvideo-*/usr/src/desktopvideo-*/
-	make KERNELRELEASE="${_abi_release}" \
-		|| return 1
-}
-
-package() {
-	cd "$srcdir"/desktopvideo-*/usr/src/desktopvideo-*/
-	make -C /lib/modules/$_abi_release/build M="$PWD" \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_PATH="$pkgdir"/boot \
-		modules_install
-
-}
-
-md5sums="2897ccc96fcf19e887fdf9c8f6d3d4f5  Blackmagic_Desktop_Video_Linux_9.8.tar.gz"
-sha256sums="6977360490c806f9952028d50bc10782d5878e5d42bd7c0f5eb070b3b6e1116c  Blackmagic_Desktop_Video_Linux_9.8.tar.gz"
-sha512sums="af4ccd5f9732633c4b3756766cd54c3329bf9edeb640462bb316e9c2b782550399806973a51e51c52fa47eaa018a11889b343cc3c1531282cc6524c6f630fce1  Blackmagic_Desktop_Video_Linux_9.8.tar.gz"
diff --git a/unmaintained/calibre/APKBUILD b/unmaintained/calibre/APKBUILD
deleted file mode 100644
index 627aeafee3..0000000000
--- a/unmaintained/calibre/APKBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=calibre
-pkgver=0.9.8
-pkgrel=0
-pkgdesc="Ebook management application"
-url="http://calibre-ebook.com/"
-arch="all"
-license="GPL3"
-depends=
-depends_dev="python-dev imagemagick-dev py-qt py-cssselect py-imaging libusb-dev
-	poppler-dev poppler-qt4-dev py-dbus py-pycountry py-lxml icu-dev py-sip-dev
-	desktop-file-utils py-sqlite sqlite-dev chmlib-dev podofo-dev py-netifaces
-	py-psutil py-dateutil py-cherrypy py-beautifulsoup py-mechanize py-cssutils
-	py-dnspython shared-mime-info unrar xdg-utils libmtp-dev libwmf-dev"
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	calibre.confd
-	calibre.initd"
-_builddir="$srcdir"/$pkgname
-build() {
-	cd "$_builddir"
-  	rm -rf src/cherrypy
-	sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
-	sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
-	$(find . -regex ".*.py\|.*.recipe")
-	python setup.py build || return 1
-	python setup.py resources || return 1
-	python setup.py translations
-}
-package() {
-	cd "$_builddir"
-	 # More on desktop integration (e.g. enforce arch defaults)
-	sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-		-e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
-		-e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
-		-e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
-		-e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
-	# Create a dir for ebook repository
-	mkdir -p "${pkgdir}/var/lib/calibre"
-	# Fix the environment module location
-	sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
-	install -d "${pkgdir}/usr/lib/python2.7/site-packages"
-	python setup.py install --root="${pkgdir}" --prefix=/usr \
-		--no-postinstall \
-		--staging-bindir="${pkgdir}/usr/bin" \
-		--staging-libdir="${pkgdir}/usr/lib" \
-		--staging-sharedir="${pkgdir}/usr/share"
-	install -m755 -D ../$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
-        install -m644 -D ../$pkgname.confd \
-                "$pkgdir"/etc/conf.d/$pkgname || return 1
-}
-md5sums="53ab4be53567b254099a48a31ecf41ec  calibre-0.9.8.tar.xz
-a53086675b33859da1d18cc21daa090b  calibre.confd
-96a7744a8b5d63ed8fbe3c4919b0e40f  calibre.initd"
diff --git a/unmaintained/calibre/calibre.confd b/unmaintained/calibre/calibre.confd
deleted file mode 100644
index c20e676990..0000000000
--- a/unmaintained/calibre/calibre.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/$NAME.pid
-CONTENT=/var/lib/calibre
-PORT=8080
-MAX_COVER=600x800
-DAEMON_ARGS="--auto-reload --with-library=$CONTENT --pidfile=$PIDFILE --port=$PORT --max-cover=$MAX_COVER --daemonize"
diff --git a/unmaintained/calibre/calibre.initd b/unmaintained/calibre/calibre.initd
deleted file mode 100644
index 25117ed375..0000000000
--- a/unmaintained/calibre/calibre.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	after firewall
-}
-start()  {
-	ebegin "Starting Calibre Server"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS
-	eend $?
-}  
- 
-stop() {  
-	ebegin "Stopping Calibre Server"
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE  
-	eend $?
-}  
diff --git a/unmaintained/cinnamon-control-center/APKBUILD b/unmaintained/cinnamon-control-center/APKBUILD
deleted file mode 100644
index 451f85adb6..0000000000
--- a/unmaintained/cinnamon-control-center/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-control-center
-pkgver=2.0.9
-pkgrel=0
-pkgdesc="The Control Center for Cinnamon"
-url="https://github.com/linuxmint/cinnamon-control-center"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="gnome-menus-dev libxslt-dev cinnamon-desktop-dev libnotify-dev upower-dev
-	cinnamon-settings-daemon-dev krb5-dev libxrandr-dev libxxf86misc-dev polkit-dev
-	libxkbfile-dev networkmanager-dev ibus-dev network-manager-applet-dev"
-makedepends="$depends_dev automake autoconf libtool intltool gnome-common"
-install=""
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-ibus \
-		--disable-update-mimedb \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la \
-		"$pkgdir"/usr/lib/*/*/*.la
-}
-
-md5sums="4f018678e7c72ee4528dad65bc6e4e53  cinnamon-control-center-2.0.9.tar.gz"
-sha256sums="63bb179a50d5f873ed1c19de97966592eedbc055ce2829e4298223a75fc33b4e  cinnamon-control-center-2.0.9.tar.gz"
-sha512sums="b1e248d582035f32b645a0110b4d84f261261c3e39f33bcbeeeea6aec816557e419a19828467fc6248986e5aafbbd654e25e0efcf65cdc0ffb83d719e2678a23  cinnamon-control-center-2.0.9.tar.gz"
diff --git a/unmaintained/cinnamon-desktop/APKBUILD b/unmaintained/cinnamon-desktop/APKBUILD
deleted file mode 100644
index 2d020330ac..0000000000
--- a/unmaintained/cinnamon-desktop/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-desktop
-pkgver=2.0.4
-pkgrel=1
-pkgdesc="Library with common API for various Cinnamon modules"
-url="https://github.com/linuxmint/cinnamon-desktop"
-arch="all"
-license="GPL"
-depends="xkeyboard-config"
-depends_dev="gobject-introspection-dev gdk-pixbuf-dev gtk+3.0-dev libxkbfile-dev"
-makedepends="$depends_dev gnome-common intltool autoconf automake libtool"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-subpackages="$pkgname-dev $pkgname-lang"
-source="${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/$pkgname \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="811e72122fdb2a4044135a1b932d2a36  cinnamon-desktop-2.0.4.tar.gz"
-sha256sums="039a789fc8fca52cf1ceaeec8b7ad9ccc122ea38990186cabea814118e8ddcb3  cinnamon-desktop-2.0.4.tar.gz"
-sha512sums="03259dd1d0188673fce7180e78f5084894c2f25ee700601ee8b479f161647faec7f999fe15488d1b926b7c9730ea1ffbf59aba47f57eeffadf452797dee70586  cinnamon-desktop-2.0.4.tar.gz"
diff --git a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-deinstall b/unmaintained/cinnamon-desktop/cinnamon-desktop.post-deinstall
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-deinstall
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-install b/unmaintained/cinnamon-desktop/cinnamon-desktop.post-install
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-upgrade b/unmaintained/cinnamon-desktop/cinnamon-desktop.post-upgrade
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-desktop/cinnamon-desktop.post-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-screensaver/APKBUILD b/unmaintained/cinnamon-screensaver/APKBUILD
deleted file mode 100644
index ac79e40665..0000000000
--- a/unmaintained/cinnamon-screensaver/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-screensaver
-pkgver=2.0.3
-pkgrel=0
-pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
-url="https://github.com/linuxmint/cinnamon-screensaver"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="cinnamon-desktop-dev dbus-dev libgnomekbd-dev linux-pam-dev
-	libxxf86vm-dev libxxf86misc-dev"
-makedepends="$depends_dev autoconf automake libtool intltool gnome-common"
-install=""
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="a809c075eaa009606618787d551b6035  cinnamon-screensaver-2.0.3.tar.gz"
-sha256sums="00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d  cinnamon-screensaver-2.0.3.tar.gz"
-sha512sums="8da589fcc4baac33642a192a562c00b3fe8cd5c602acf6a280dc322cb4d0c371d5fbcc0fbb315fc5603fbe198e5a7846a5fb9abbe27ac97936ba8833ce8f923b  cinnamon-screensaver-2.0.3.tar.gz"
diff --git a/unmaintained/cinnamon-session/APKBUILD b/unmaintained/cinnamon-session/APKBUILD
deleted file mode 100644
index b777d14df7..0000000000
--- a/unmaintained/cinnamon-session/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-session
-pkgver=2.0.6
-pkgrel=2
-pkgdesc="The Cinnamon Session Handler"
-url="https://github.com/linuxmint/cinnamon-session"
-arch="all"
-license="GPL"
-depends="cinnamon-desktop"
-depends_dev="cinnamon-settings-daemon-dev libnotify-dev dbus-dev gtk+3.0-dev
-	json-glib-dev librsvg-dev libgnome-keyring-dev libsm-dev upower-dev mesa-dev"
-makedepends="$depends_dev automake autoconf libtool xtrans gnome-common intltool"
-install=""
-subpackages="$pkgname-doc $pkgname-lang"
-source="${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
-	remove_sessionmigration.patch
-	timeout.patch"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="caa16ec2cd89cc5466e4131ab096a3bd  cinnamon-session-2.0.6.tar.gz
-e93d23d7a474dd741f3bb3035104d0a3  remove_sessionmigration.patch
-920db4d6afa20761339cd617cd6592f3  timeout.patch"
-sha256sums="831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567  cinnamon-session-2.0.6.tar.gz
-f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736  remove_sessionmigration.patch
-ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a  timeout.patch"
-sha512sums="2a17dc620d05b51bc2701f90dc95fb7413f4822e4641ede6eaefbc1397a9454bcbf0bdfc44866f4a629ff0a3ecb7452515488113ef4a2fe362ab29021212aa27  cinnamon-session-2.0.6.tar.gz
-a51ded6f09ac9efac2b201289635c63ae7ea0d1435ba50c60a33b9518752bb8e09ee76bf9c65a8b631cabd285e68cb8a5c7a8c56b5d98970611c0a6110872423  remove_sessionmigration.patch
-dc74cb6e98755e7ddad5e53a4be291ecd034d0537347ca1b436c6027beeefa711951a759057dc97200459a34cb0951340c7d7023e61422ea7cc7c42c33455ea7  timeout.patch"
diff --git a/unmaintained/cinnamon-session/cinnamon-session.post-deinstall b/unmaintained/cinnamon-session/cinnamon-session.post-deinstall
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-session/cinnamon-session.post-deinstall
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-session/cinnamon-session.post-install b/unmaintained/cinnamon-session/cinnamon-session.post-install
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-session/cinnamon-session.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-session/cinnamon-session.post-upgrade b/unmaintained/cinnamon-session/cinnamon-session.post-upgrade
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-session/cinnamon-session.post-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-session/remove_sessionmigration.patch b/unmaintained/cinnamon-session/remove_sessionmigration.patch
deleted file mode 100644
index 0016080dde..0000000000
--- a/unmaintained/cinnamon-session/remove_sessionmigration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/cinnamon-session/csm-session-fill.c
-+++ b/cinnamon-session/csm-session-fill.c
-@@ -228,15 +228,6 @@
- load_standard_apps (CsmManager *manager,
-                     GKeyFile   *keyfile)
- {
--        GError *error;
--
--        g_debug ("fill: *** Executing user migration");
--        error = NULL;
--        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
--                 g_warning ("Error while executing session-migration: %s", error->message);
--                 g_error_free (error);
--        }
--
-         g_debug ("fill: *** Adding required components");
-         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
-                                     append_required_components_helper, manager);
diff --git a/unmaintained/cinnamon-session/timeout.patch b/unmaintained/cinnamon-session/timeout.patch
deleted file mode 100644
index f4f5b64caf..0000000000
--- a/unmaintained/cinnamon-session/timeout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
---- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
---- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0
diff --git a/unmaintained/cinnamon-settings-daemon/APKBUILD b/unmaintained/cinnamon-settings-daemon/APKBUILD
deleted file mode 100644
index bbaf922f9c..0000000000
--- a/unmaintained/cinnamon-settings-daemon/APKBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-settings-daemon
-pkgver=2.0.8
-pkgrel=1
-pkgdesc="The Cinnamon Settings daemon"
-url="https://github.com/linuxmint/cinnamon-settings-daemon"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="ibus-dev cinnamon-desktop-dev lcms2-dev libgnomekbd-dev pulseaudio-dev
-	libcanberra-dev upower-dev colord-dev cups-dev libxslt-dev colord-dev nss-dev"
-makedepends="$depends_dev automake autoconf libtool gnome-common docbook-xsl"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la \
-		"$pkgdir"/usr/lib/*/*.la
-}
-
-md5sums="df29893cb1b61520ef3fbec021311e70  cinnamon-settings-daemon-2.0.8.tar.gz"
-sha256sums="6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd  cinnamon-settings-daemon-2.0.8.tar.gz"
-sha512sums="5e3c1987e23b4248faa1f84d7111a0896aacfa9a771eebe3c645cb52d8a89ce6c1797026ff504ccc83d3ac942fb6fa59674d19c262ab4f846811a7ca666e72d6  cinnamon-settings-daemon-2.0.8.tar.gz"
diff --git a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-deinstall b/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-deinstall
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-deinstall
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-install b/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-install
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-upgrade b/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-upgrade
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon-settings-daemon/cinnamon-settings-daemon.post-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon-translations/APKBUILD b/unmaintained/cinnamon-translations/APKBUILD
deleted file mode 100644
index 14ad5a82a6..0000000000
--- a/unmaintained/cinnamon-translations/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon-translations
-pkgver=2.0.3
-pkgrel=0
-pkgdesc="Translations for Cinnamon and Nemo"
-url="http://cinnamon.linuxmint.com/"
-arch="noarch"
-license="GPL2"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-translations/archive/${pkgver}.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
-
-package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/usr/share/cinnamon/locale/
-	cp -r mo-export/* \
-		"$pkgdir"/usr/share/cinnamon/locale/
-}
-
-md5sums="f3eac74f56adf99a32d6d2f2fd866bb3  cinnamon-translations-2.0.3.tar.gz"
-sha256sums="ec75f7414714e9f4144ffc8bba863b50a5bc43f3b1add94846d7e58e42d8831f  cinnamon-translations-2.0.3.tar.gz"
-sha512sums="fbbd40224d05640bf6c21fa01b44e937338a67adaa93cf9dba7c06e18078e2d90cc192292336b3c3a8c5e18a1be4bd0c8bae1b522f347bb34b02c307cf9d3c3e  cinnamon-translations-2.0.3.tar.gz"
diff --git a/unmaintained/cinnamon/APKBUILD b/unmaintained/cinnamon/APKBUILD
deleted file mode 100644
index 72363b9f06..0000000000
--- a/unmaintained/cinnamon/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=cinnamon
-pkgver=2.0.14
-pkgrel=2
-pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-url="http://cinnamon.linuxmint.com/"
-arch="all"
-license="GPL2"
-depends="gnome-themes-standard cinnamon-session nemo cinnamon-control-center
-	cinnamon-session cinnamon-settings-daemon cinnamon-screensaver
-	py-dbus py-pillow py-gobject py-gnome-gconf py-lxml"
-depends_dev="gettext-dev glib-dev gtk+3.0-dev dbus-dev gstreamer-dev clutter-dev
-	dbus-glib-dev gconf-dev muffin-dev cjs-dev gnome-menus-dev libsoup-dev
-	startup-notification-dev networkmanager-dev libgnome-keyring-dev
-	libcroco-dev pulseaudio-dev gobject-introspection-dev librsvg-dev upower-dev
-	accountsservice-dev polkit-dev pango-dev"
-makedepends="$depends_dev intltool automake autoconf libtool"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-
-_builddir="$srcdir/Cinnamon-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/cinnamon \
-		--disable-schemas-compile \
-		--enable-compile-warnings=yes \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la \
-		"$pkgdir"/usr/lib/*/*.la
-}
-
-md5sums="566129434434d3a2f81dfaa4f33a5abb  cinnamon-2.0.14.tar.gz"
-sha256sums="447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85  cinnamon-2.0.14.tar.gz"
-sha512sums="9e719397adf2b72ca2433f5c62ea22132e2b06de45d2821123611ea9109dab439711f1c31fe4d7413a86f1d9eb13d9d215a41ffe23b67f9a79ece83802725805  cinnamon-2.0.14.tar.gz"
diff --git a/unmaintained/cinnamon/cinnamon.post-deinstall b/unmaintained/cinnamon/cinnamon.post-deinstall
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon/cinnamon.post-deinstall
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon/cinnamon.post-install b/unmaintained/cinnamon/cinnamon.post-install
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon/cinnamon.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/cinnamon/cinnamon.post-upgrade b/unmaintained/cinnamon/cinnamon.post-upgrade
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/cinnamon/cinnamon.post-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/dovecot-deleted-to-trash-plugin/APKBUILD b/unmaintained/dovecot-deleted-to-trash-plugin/APKBUILD
deleted file mode 100644
index 91a8028ef9..0000000000
--- a/unmaintained/dovecot-deleted-to-trash-plugin/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dovecot-deleted-to-trash-plugin
-pkgver=0.3
-pkgrel=1
-pkgdesc="Copy deleted email to trash for broken IMAP clients (Outlook)"
-url="http://wiki2.dovecot.org/Plugins/deleted-to-trash"
-arch="all"
-license="unknown"
-depends=""
-makedepends="dovecot-dev"
-install=""
-subpackages=""
-source="http://dev.alpinelinux.org/archive/dovecot-deleted-to-trash-plugin/dovecot-deleted-to-trash-plugin-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/dovecot-deleted-to-trash-plugin-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make install DESTDIR="$pkgdir" \
-		DOVECOT_IMAP_PLUGIN_PATH=/usr/lib/dovecot
-}
-
-md5sums="63bdfa71312abc2dcaae5cfedd1db622  dovecot-deleted-to-trash-plugin-0.3.tar.bz2"
diff --git a/unmaintained/dvbsnoop/APKBUILD b/unmaintained/dvbsnoop/APKBUILD
deleted file mode 100644
index 70f94e089f..0000000000
--- a/unmaintained/dvbsnoop/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=dvbsnoop
-pkgver=1.4.50
-pkgrel=0
-pkgdesc="a DVB / MPEG stream analyzer"
-url="http://dvbsnoop.sourceforge.net"
-arch="all"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/sourceforge/dvbsnoop/dvbsnoop-$pkgver.tar.gz"
-
-_builddir="$srcdir"/dvbsnoop-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="68a5618c95b4372eea9ac5ec5005f299  dvbsnoop-1.4.50.tar.gz"
-sha256sums="7658498b26a5d2a0242e81f0cfafa0e43a2bec56f8674e7ac197dfc310866ec6  dvbsnoop-1.4.50.tar.gz"
-sha512sums="288b98e9205b9ee6638b65cd0d7c463c2c243c1f7e650a6df8592acd3f40eca3352a563cc8a1a04f0f2731b3718e6dc3d09f56f59da4b59fbe25b86acf434f81  dvbsnoop-1.4.50.tar.gz"
diff --git a/unmaintained/ejabberd-git/APKBUILD b/unmaintained/ejabberd-git/APKBUILD
deleted file mode 100644
index c97531e07e..0000000000
--- a/unmaintained/ejabberd-git/APKBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=ejabberd-git
-_pkgname=ejabberd
-pkgver=0_git20130607
-pkgrel=1
-pkgdesc="An erlang jabber server, git version"
-url="http://www.ejabberd.im"
-arch="all"
-license="GPL2+"
-depends="erlang util-linux"
-depends_dev="erlang-dev expat-dev libiconv-dev openssl-dev zlib-dev heimdal-dev"
-makedepends="$depends_dev"
-pkgusers="ejabberd"
-pkggroups="ejabberd"
-install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
-	$pkgname.initd
-	$pkgname.confd"
-giturl="git://github.com/processone/$_pkgname.git"
-disturl="dev.alpinelinux.org:/archive/$pkgname/"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"/src
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/src
-	make DESTDIR="$pkgdir" install
-
-	install -d ${pkgdir}/var/spool/$pkgname
-	install -d ${pkgdir}/var/lib/$pkgname
-	install -D -m0644 ../../../$pkgname.logrotate ${pkgdir}/etc/logrotate.d/$pkgname
-	install -m755 -D ../../../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D ../../../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	chown -R ejabberd.ejabberd "$pkgdir"/var/log/ejabberd
-	chown -R ejabberd.ejabberd "$pkgdir"/var/spool/ejabberd
-	chown -R ejabberd.ejabberd "$pkgdir"/var/lib/ejabberd
-	chgrp ejabberd "$pkgdir"/etc/ejabberd/ejabberd.cfg "$pkgdir"/etc/ejabberd/ejabberdctl.cfg "$pkgdir"/etc/ejabberd
-}
-
-md5sums="6cd08c03d22f70580cc06f836e0f65dd  ejabberd-git-0_git20130607.tar.gz
-e0ef3a939e87779737ce75469e79fef1  ejabberd-git.initd
-1681f2c06d35b5f09f52edadfcdf9ebb  ejabberd-git.confd"
-sha256sums="d52a1374e2be264ca821d3eac5ad34c2cf40a46f37591ac2c0c469259830d8f4  ejabberd-git-0_git20130607.tar.gz
-1c07fa02152b42bee44a8d1cd3f031596aeee37276ec4a36d765e3c54aa23075  ejabberd-git.initd
-0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386  ejabberd-git.confd"
-sha512sums="06283e49b6145d51629830568887ec3fd9f159c8174d5224f0918068dc778e8837e58414f8bb5745f2aa5ac07f6052df243402a25daff7f1c2238e16e184e721  ejabberd-git-0_git20130607.tar.gz
-1142b4f1ca240f20603ca9a64819780ff4a1d9fbde2940fd1dab6cbca1d2de5108cf35aa00ff1c037dc72a778c6502521e3908c6cde5a39c4bb3c9fc1c70aceb  ejabberd-git.initd
-07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb  ejabberd-git.confd"
diff --git a/unmaintained/ejabberd-git/ejabberd-git.confd b/unmaintained/ejabberd-git/ejabberd-git.confd
deleted file mode 100644
index b1e984e4d7..0000000000
--- a/unmaintained/ejabberd-git/ejabberd-git.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Please configure everything at /etc/jabber/ejabberdctl.cfg
-# Put here only command line arguments for ejabberdctl (if any are required)
-
-#EJABBERDCTL_OPTS=""
-
diff --git a/unmaintained/ejabberd-git/ejabberd-git.initd b/unmaintained/ejabberd-git/ejabberd-git.initd
deleted file mode 100644
index 2d6d44d3c3..0000000000
--- a/unmaintained/ejabberd-git/ejabberd-git.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.3 2010/06/02 07:12:27 pva Exp $
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-start() {
-	if ejabberdctl status >/dev/null 2>&1; then
-		ewarn "ejabberd is already started (manually?)."
-		return 0
-	fi
-	ebegin "Starting ejabberd"
-	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPT} start
-	eend $?
-}
-
-stop() {
-	ejabberdctl status >/dev/null 2>&1
-	if test $? = 3; then
-		ewarn "ejabberd is already stopped (manually?)."
-		return 0
-	fi
-	ebegin "Stopping ejabberd"
-	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
-		cnt=0
-		sleep 1
-		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
-			echo -n .
-			cnt=`expr $cnt + 1`
-			if [ $cnt -ge 60 ] ; then
-				eend 1
-				break
-			fi
-			sleep 1
-		done
-		eend 0
-	else
-		eend 1
-		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
-	fi
-	eend 0
-}
diff --git a/unmaintained/ejabberd-git/ejabberd-git.logrotate b/unmaintained/ejabberd-git/ejabberd-git.logrotate
deleted file mode 100644
index 03069078aa..0000000000
--- a/unmaintained/ejabberd-git/ejabberd-git.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
-     weekly
-     missingok
-     rotate 10
-     compress
-     delaycompress
-     ifempty
-     nomail
-     sharedscripts
-     postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
-     endscript
-}
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
deleted file mode 100644
index 61c3d72f73..0000000000
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null
-
-exit 0
diff --git a/unmaintained/esasl/APKBUILD b/unmaintained/esasl/APKBUILD
deleted file mode 100644
index 74ff8678e9..0000000000
--- a/unmaintained/esasl/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=esasl
-pkgver=0_git20130606
-pkgrel=1
-pkgdesc="Simple SASL library for Erlang"
-url="https://github.com/mikma/esasl/"
-arch="all"
-license="LGPL2+ BSD"
-depends=""
-depends_dev="erlang-dev libgsasl-dev"
-makedepends="$depends_dev autoconf automake"
-install=""
-subpackages=""
-source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz"
-giturl="https://github.com/mikma/esasl.git"
-disturl="dev.alpinelinux.org:/archive/$pkgname/"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./bootstrap
-	./configure --prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="7991ca8c2002afc42e40201eebb58193  esasl-0_git20130606.tar.gz"
-sha256sums="b5c9dccef065910c4a8de5081aa454e52853ce77480f27f00ef0f3b498062ebf  esasl-0_git20130606.tar.gz"
-sha512sums="bc194f84ab346651359c03496361f1953df18eb9a7823ee1cd015f1b6973e686fd9a59bca7fc3d7e3930e1e16728743d77b933c2ea4fabbe1bef1f50e88b4505  esasl-0_git20130606.tar.gz"
diff --git a/unmaintained/freetype-infinality/APKBUILD b/unmaintained/freetype-infinality/APKBUILD
deleted file mode 100644
index 95d1a0f0de..0000000000
--- a/unmaintained/freetype-infinality/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=freetype-infinality
-pkgver=2.5.1
-pkgrel=0
-pkgdesc="TrueType font rendering library with infinality patch"
-url="http://www.infinality.net"
-arch="all"
-license="GPL2+ BSD"
-depends=
-depends_dev="zlib-dev freetype-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-replaces="freetype"
-source="http://downloads.sourceforge.net/sourceforge/freetype/freetype-$pkgver.tar.bz2"
-
-_builddir="$srcdir/freetype-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man 
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm755 "$srcdir/infinality-settings" "$pkgdir/etc/profile.d/infinality-settings.sh"
-}
-
-md5sums="93eba7854094f46d7d98a9a2370af4d6  freetype-2.5.1.tar.bz2"
-sha256sums="d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45  freetype-2.5.1.tar.bz2"
-sha512sums="5507c3e0e238dd97621839095a3cf564baf2919a7f663c3dca11fbe117598a583b8e556deb0c8f06d971518eb6325a8d1bff32852118ef59f9dcfe82159666c1  freetype-2.5.1.tar.bz2"
diff --git a/unmaintained/freetype-infinality/freetype-2.2.1-enable-valid.patch b/unmaintained/freetype-infinality/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f6..0000000000
--- a/unmaintained/freetype-infinality/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/unmaintained/freetype-infinality/freetype-add-subpixel-hinting-infinality-20101114-1.patch b/unmaintained/freetype-infinality/freetype-add-subpixel-hinting-infinality-20101114-1.patch
deleted file mode 100644
index 05e9c4414c..0000000000
--- a/unmaintained/freetype-infinality/freetype-add-subpixel-hinting-infinality-20101114-1.patch
+++ /dev/null
@@ -1,2776 +0,0 @@
-Infinality Freetype Truetype Subpixel Hinting Patch
--------------------------------------------------------------------
-Should patch cleanly to freetype-2.4.3
-
-
-Changes for 2010-11-14:
- * Rule tweaks on various fonts.  Fixed the Cyrillic y issue and e issue
-   with Trebuchet, and the ^ issue with Arial.  Other issues
-   (firefox and @font-face) are still present to a degree.
-
- * A couple new rules to deal with various issues.  (work in progress)
-
- * Additional commenting.
-
- * Some cleanup of obsolete code.
-
- * Added some debugging code for potential future enhancements.  Please
-   ignore the mess.
-
-
-Changes for 2010-10-22:
- * I'm refocusing on just getting the subpixel looking nice, so I've stripped
-   back the rendering modes to just 2.  The standard SUBPIXEL_HINTING and
-   the ADDITIONAL_TWEAKS.  The rules structure is still in place. I recommend
-   using ADDITIONAL_TWEAKS mode.
-
- * Fixed an issue with monochrome rendering that made fonts look really bad.
-   There is still an issue with them, but they are at least tolerable to
-   look at now.
-
- * Added some testing code for detecting inline delta functions.  Not sure
-   if this is useful yet.
-
- * Added more rules to deal with certain artifacts on various fonts, like the
-   issue with < > and ^.  Created some "exception" rules for certain rules.
-
- * Reverted back to older rounding functions.  The new experimental ones I
-   was trying were causing artifacts on some fonts.
-
- * Some code cleanup.
-
-
-Changes for 2010-10-08:
- * Fix PDF crashes.
-
-Changes for 2010-10-04:
- * Update to freetype-2.4.3
-
-
-Changes for 2010-10-03:
- * There are lots of changes for this one, some big, some small, and some
-   that still are not implemented.  Not sure if I can remember them all
-   but I will try!  THIS IS A POINT RELEASE THAT IS NOT
-   INTENDED TO WORK 100%.  Some fonts and compile options may be broken
-   and the code may be inefficient and/or not syntactiacally correct.
-   That said, I do plan on using this on my system right away.
-
- * There are now "rendering modes" for the subpixel hinting, with the idea
-   that this will enventually be able to be controlled by fontconfig.  The 4
-   modes of enhanced hinting defined so far are:
-    1) NATIVE HINTING - this is what freetype TT interpreter does by default.
-    2) FIXED NATIVE HINTING - A slighly tweaked version of the above that
-       does "better" native rendering when displaying on LCD, for those
-       that still seem to like incorrect, thin fonts, which were only ever
-       there due to technical limitations.
-    3) SUBPIXEL OPTIMIZED HINTING - this is straight up subpixel hinting with
-       very few tweaks.  Just enough to get it working.
-    4) COMPATIBILITY MODE HINTING - this is the sweet spot I'm working on
-       that will hopefully supplant #3 because it will work so well with all
-       fonts.  The idea here is to tweak all available fonts so that each
-       renders well.
-   All of these modes either turn on or off switches in the interpreter
-   to make the fonts render properly for each mode.  Right now these are only
-   compile-time options.
-
- * Subpixel-related code has been broken out into its own files, so as to not
-   clutter up the existing code.
-
- * The rasterizer now pays attention to the additional bits of MS rasterizer
-   v. 37, meaning that it can now indicate to fonts that it can handle
-   subpixel rendering.
-
- * The rounding functions have been adapted to accept a grid resolution
-   variable, which lets them work on pixel and subpixel boundaries
-   automatically.  Y still needs to be implemented.
-
- * Additional conditions have been added to the switches, to further refine
-   how they are applied to different fonts.
-
- * What all this means qualitatively is that legacy fonts now render much
-   better.  There are still some that need a bit of love, like Courier New.
-
-   - Courier New has some fixes, and some breakage (Ghost pixels above bold
-     fonts, too thin on regular font)
-   - Times New Roman has some fixes and breakage (serifs, particularly)
-   - Tahoma and Trebuchet MS have been cleaned up
-   - Arial now snaps to grid better, but that causes breakage on a few glyphs
-   - Verdana 13 is now set to grid fit, but some glyhs are broken (mwxyz)
-   - Geneva and Geneva CY no longer look like turds
-   - Lucida Sans Unicode now looks arguably better than Lucida Grande
-
-
-
-Changes for 2010-09-16:
-
- * The changes from 2010-09-14 regarding subpixel when LIGHT hinting enabled
-   have been reverted due to problems.  The old behavior is back.
-
- * Disable grayscale when subpixel is enabled.  This results in better
-   behavior of some TT instructions within some fonts, like Times New Roman.
-
- * Some modification of the tweaks, in light of above.
-
-
-Changes for 2010-09-14:
-
- /************************** NO LONGER IN PLACE *****************************/
- * Subpixel hinting is now used when the LIGHT hinting method and the TT
-   hinting is called.  If FULL hinting is requested it will do the usual
-   behavior of the TT hinter.
-
-   This allows for all previously existing behavior, plus the new subpixel
-   hinting behavior, all in the same compile, and it makes sense in that
-   the slight hinting of the autohinter is essentially doing the same thing
-   as this, which is not forcing X-direction hints.
-
-   Previously, even if TT was selected, but LIGHT hinting was used, the
-   autohinter would still be forced. Other than this, autohint is not affected.
- /***************************************************************************/
-
- * Added a couple more conditionals around things to test whether subpixel
-   hinting is enabled.  There were a few missing that ended up causing some
-   goofy hinting if subpixel was not enabled, but compiled in.
-
-
-
-
-
-
-
-
-
-diff -Nur freetype-2.4.3.orig/include/freetype/config/ftoption.h freetype-2.4.3.new/include/freetype/config/ftoption.h
---- freetype-2.4.3.orig/include/freetype/config/ftoption.h  2010-07-04 23:38:55.000000000 -0500
-+++ freetype-2.4.3.new/include/freetype/config/ftoption.h 2010-10-23 21:47:20.476211579 -0500
-@@ -501,6 +501,48 @@
-
-   /*************************************************************************/
-   /*                                                                       */
-+  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING if you want to compile       */
-+  /* EXPERIMENTAL subpixel hinting support into the TrueType driver.       */
-+  /* This will replace the native TrueType hinting mechanism when          */
-+  /* anything but FT_RENDER_MODE_MONO is requested.                        */
-+  /*                                                                       */
-+  /* Enabling this causes the TrueType driver to ignore instructions       */
-+  /* under certain conditions.  This is done in accordance with the        */
-+  /* guide here, with some minor differences:                              */
-+  /*                                                                       */
-+  /* http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx  */
-+  /*                                                                       */
-+  /* By undefining this, you will only compile the code necessary to       */
-+  /* hint TrueType glyphs with native TT hinting.                          */
-+  /*                                                                       */
-+  /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
-+  /*   defined.                                                            */
-+  /*                                                                       */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* Define TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS if you     */
-+  /* want to enable additional subpixel hinting tweaks of individual fonts,*/
-+  /* glyphs, styles and sizes.  The idea here is that some glyphs and      */
-+  /* fonts still do not render in a desirable way with                     */
-+  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING.                                    */
-+  /*                                                                       */
-+  /* This is disabled by default, as some people may not care, or may not  */
-+  /* want the additional overhead involved in doing this.                  */
-+  /*                                                                       */
-+  /* By undefining this, you will only compile the code necessary to       */
-+  /* do subpixel hinting as defined above.                                 */
-+  /*                                                                       */
-+  /*   This option requires TT_CONFIG_OPTION_SUBPIXEL_HINTING to be        */
-+  /*   defined.                                                            */
-+  /*                                                                       */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS */
-+
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-   /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
-   /* of the TrueType bytecode interpreter is used that doesn't implement   */
-   /* any of the patented opcodes and algorithms.  The patents related to   */
-diff -Nur freetype-2.4.3.orig/include/freetype/internal/ftobjs.h freetype-2.4.3.new/include/freetype/internal/ftobjs.h
---- freetype-2.4.3.orig/include/freetype/internal/ftobjs.h  2010-07-18 11:07:31.000000000 -0500
-+++ freetype-2.4.3.new/include/freetype/internal/ftobjs.h 2010-11-07 11:18:19.681501081 -0600
-@@ -81,6 +81,14 @@
- #define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
- #define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
-
-+  /*
-+   *  These are used in ttinterp.c for subpixel hinting with an
-+   *  adjustable grids-per-pixel value.
-+   */
-+#define FT_PIX_FLOOR_GRID( x, n )     ( (x) & ~(64 / n - 1) )
-+#define FT_PIX_ROUND_GRID( x, n )     FT_PIX_FLOOR_GRID( (x) + 32 / n, n)
-+#define FT_PIX_CEIL_GRID( x, n )      FT_PIX_FLOOR_GRID( (x) + 63 / n, n)
-+
-
-   /*
-    *  Return the highest power of 2 that is <= value; this correspond to
-diff -Nur freetype-2.4.3.orig/src/truetype/rules.mk freetype-2.4.3.new/src/truetype/rules.mk
---- freetype-2.4.3.orig/src/truetype/rules.mk 2009-03-14 08:45:26.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/rules.mk  2010-10-22 19:25:46.060977607 -0500
-@@ -30,7 +30,8 @@
-               $(TT_DIR)/ttgload.c  \
-               $(TT_DIR)/ttinterp.c \
-               $(TT_DIR)/ttgxvar.c \
--              $(TT_DIR)/ttdriver.c
-+              $(TT_DIR)/ttdriver.c \
-+              $(TT_DIR)/ttsubpixel.c
-
- # TrueType driver headers
- #
-diff -Nur freetype-2.4.3.orig/src/truetype/truetype.c freetype-2.4.3.new/src/truetype/truetype.c
---- freetype-2.4.3.orig/src/truetype/truetype.c 2009-07-03 08:28:24.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/truetype.c  2010-10-22 19:25:46.061853066 -0500
-@@ -27,6 +27,7 @@
-
- #ifdef TT_USE_BYTECODE_INTERPRETER
- #include "ttinterp.c"
-+#include "ttsubpixel.c"
- #endif
-
- #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
-diff -Nur freetype-2.4.3.orig/src/truetype/ttgload.c freetype-2.4.3.new/src/truetype/ttgload.c
---- freetype-2.4.3.orig/src/truetype/ttgload.c  2010-09-14 02:00:35.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/ttgload.c 2010-11-14 09:07:50.835981062 -0600
-@@ -33,7 +33,7 @@
- #endif
-
- #include "tterrors.h"
--
-+#include "ttsubpixel.h"
-
-   /*************************************************************************/
-   /*                                                                       */
-@@ -166,6 +166,12 @@
-     loader->top_bearing  = top_bearing;
-     loader->vadvance     = advance_height;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( loader->exec ) loader->exec->sph_tweak_flags = 0x00000;
-+    /* this may not be the right place for this, but it works */
-+    if ( loader->exec && loader->exec->enhanced ) sph_set_tweaks( loader, glyph_index );
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     if ( !loader->linear_def )
-     {
-       loader->linear_def = 1;
-@@ -1683,13 +1689,23 @@
-          IS_HINTED( loader->load_flags ) )
-     {
-       FT_Byte*  widthp;
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      FT_Bool   enhanced;
-
-+      enhanced =
-+        FT_BOOL( FT_LOAD_TARGET_MODE( loader->load_flags )
-+                 != FT_RENDER_MODE_MONO );
-
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-       widthp = tt_face_get_device_metrics( face,
-                                            size->root.metrics.x_ppem,
-                                            glyph_index );
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      if ( ( !enhanced || BITMAP_WIDTHS ) && widthp )
-+#else
-       if ( widthp )
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-         glyph->metrics.horiAdvance = *widthp << 6;
-     }
-
-@@ -1883,8 +1899,13 @@
-     {
-       TT_ExecContext  exec;
-       FT_Bool         grayscale;
--
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      FT_Bool         subpixel_hinting;
-+      FT_Bool         grayscale_hinting;
-+      /*FT_Bool         compatible_widths;
-+      FT_Bool         symmetrical_smoothing;
-+      FT_Bool         bgr;*/
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-       if ( !size->cvt_ready )
-       {
-         FT_Error  error = tt_size_ready_bytecode( size );
-@@ -1898,20 +1919,75 @@
-       if ( !exec )
-         return TT_Err_Could_Not_Find_Context;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      subpixel_hinting =
-+        FT_BOOL( (FT_LOAD_TARGET_MODE( load_flags ) != FT_RENDER_MODE_MONO)
-+          && SET_SUBPIXEL );
-+
-+      if ( subpixel_hinting ) grayscale = grayscale_hinting = FALSE;
-+      else if ( SET_GRAYSCALE )
-+      {
-+        grayscale = grayscale_hinting = TRUE;
-+        subpixel_hinting = FALSE;
-+      }
-+
-+      exec->enhanced = ( subpixel_hinting
-+                      || grayscale_hinting );
-+
-+      exec->rasterizer_version = SET_RASTERIZER_VERSION;
-+
-+      exec->compatible_widths = SET_COMPATIBLE_WIDTHS;
-+        /*FT_BOOL( FT_LOAD_TARGET_MODE( load_flags )
-+                   != TT_LOAD_COMPATIBLE_WIDTHS );*/
-+
-+      exec->symmetrical_smoothing = FALSE;
-+        /*FT_BOOL( FT_LOAD_TARGET_MODE( load_flags )
-+                   != TT_LOAD_SYMMETRICAL_SMOOTHING );*/
-+
-+      exec->bgr = FALSE;
-+        /*FT_BOOL( FT_LOAD_TARGET_MODE( load_flags )
-+                   != TT_LOAD_BGR );*/
-+#else
-       grayscale =
-         FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != FT_RENDER_MODE_MONO );
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-       TT_Load_Context( exec, face, size );
-
--      /* a change from mono to grayscale rendering (and vice versa) */
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+
-+      /* a change from mono to subpixel rendering (and vice versa)  */
-       /* requires a re-execution of the CVT program                 */
--      if ( grayscale != exec->grayscale )
-+      if ( subpixel_hinting != exec->subpixel_hinting )
-+      {
-+        FT_UInt  i;
-+
-+        exec->subpixel_hinting = subpixel_hinting;
-+
-+        for ( i = 0; i < size->cvt_size; i++ )
-+          size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
-+        tt_size_run_prep( size );
-+      }
-+
-+      /* a change from mono to grayscale rendering (and vice versa)  */
-+      /* requires a re-execution of the CVT program                 */
-+      if ( grayscale != exec->grayscale_hinting )
-       {
-         FT_UInt  i;
-
-+        exec->grayscale_hinting = grayscale_hinting;
-
--        FT_TRACE4(( "tt_loader_init: grayscale change,"
--                    " re-executing `prep' table\n" ));
-+        for ( i = 0; i < size->cvt_size; i++ )
-+          size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
-+        tt_size_run_prep( size );
-+      }
-+#else
-+
-+      /* a change from mono to grayscale rendering (and vice versa) */
-+      /* requires a re-execution of the CVT program                 */
-+      if ( grayscale != exec->grayscale )
-+      {
-+        FT_UInt  i;
-
-         exec->grayscale = grayscale;
-
-@@ -1919,6 +1995,7 @@
-           size->cvt[i] = FT_MulFix( face->cvt[i], size->ttmetrics.scale );
-         tt_size_run_prep( size );
-       }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-       /* see whether the cvt program has disabled hinting */
-       if ( exec->GS.instruct_control & 1 )
-@@ -2050,6 +2127,7 @@
-           if ( face->postscript.isFixedPitch                             &&
-                ( load_flags & FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ) == 0 )
-             glyph->linearHoriAdvance = face->horizontal.advance_Width_Max;
-+
-         }
-
-         return TT_Err_Ok;
-@@ -2125,6 +2203,9 @@
-         }
-         else
-           glyph->outline.flags |= FT_OUTLINE_IGNORE_DROPOUTS;
-+
-+
-+
-       }
-
- #endif /* TT_USE_BYTECODE_INTERPRETER */
-diff -Nur freetype-2.4.3.orig/src/truetype/ttinterp.c freetype-2.4.3.new/src/truetype/ttinterp.c
---- freetype-2.4.3.orig/src/truetype/ttinterp.c 2010-10-01 01:08:19.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/ttinterp.c  2010-11-14 09:25:21.736322597 -0600
-@@ -27,10 +27,12 @@
-
- #include "tterrors.h"
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+#include "ttsubpixel.h"
-+#endif
-
- #ifdef TT_USE_BYTECODE_INTERPRETER
-
--
- #define TT_MULFIX           FT_MulFix
- #define TT_MULDIV           FT_MulDiv
- #define TT_MULDIV_NO_ROUND  FT_MulDiv_No_Round
-@@ -150,11 +152,11 @@
- #define NORMalize( x, y, v ) \
-           Normalize( EXEC_ARG_ x, y, v )
-
--#define SET_SuperRound( scale, flags ) \
--          SetSuperRound( EXEC_ARG_ scale, flags )
-+#define SET_SuperRound( scale, flags, res ) \
-+          SetSuperRound( EXEC_ARG_ scale, flags, res )
-
--#define ROUND_None( d, c ) \
--          Round_None( EXEC_ARG_ d, c )
-+#define ROUND_None( d, c, e ) \
-+          Round_None( EXEC_ARG_ d, c, e )
-
- #define INS_Goto_CodeRange( range, ip ) \
-           Ins_Goto_CodeRange( EXEC_ARG_ range, ip )
-@@ -165,8 +167,8 @@
- #define CUR_Func_move_orig( z, p, d ) \
-           CUR.func_move_orig( EXEC_ARG_ z, p, d )
-
--#define CUR_Func_round( d, c ) \
--          CUR.func_round( EXEC_ARG_ d, c )
-+#define CUR_Func_round( d, c, e ) \
-+          CUR.func_round( EXEC_ARG_ d, c, e )
-
- #define CUR_Func_read_cvt( index ) \
-           CUR.func_read_cvt( EXEC_ARG_ index )
-@@ -246,6 +248,12 @@
- #define GUESS_VECTOR( V )
- #endif
-
-+
-+    /*FT_Int             CUR.num_delta_funcs;*/
-+    /*FT_ULong           inline_delta_funcs[5];*/
-+    /*FT_Long            CUR.infunc;*/
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /*                        CODERANGE FUNCTIONS                            */
-@@ -1838,24 +1846,33 @@
-     FT_ASSERT( !CUR.face->unpatented_hinting );
- #endif
-
--    v = CUR.GS.freeVector.x;
--
--    if ( v != 0 )
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( !CUR.enhanced || CUR.sph_tweak_flags & SPH_TWEAK_ALLOW_DMOVE_FREEV )
-     {
--      zone->cur[point].x += TT_MULDIV( distance,
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-+      v = CUR.GS.freeVector.x;
-+
-+      if ( v != 0 )
-+      {
-+        zone->cur[point].x += TT_MULDIV( distance,
-                                        v * 0x10000L,
-                                        CUR.F_dot_P );
-
--      zone->tags[point] |= FT_CURVE_TAG_TOUCH_X;
-+        zone->tags[point] |= FT_CURVE_TAG_TOUCH_X;
-+      }
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-     }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-     v = CUR.GS.freeVector.y;
-
-     if ( v != 0 )
-     {
-       zone->cur[point].y += TT_MULDIV( distance,
--                                       v * 0x10000L,
--                                       CUR.F_dot_P );
-+                                      v * 0x10000L,
-+                                      CUR.F_dot_P );
-
-       zone->tags[point] |= FT_CURVE_TAG_TOUCH_Y;
-     }
-@@ -1895,18 +1912,17 @@
-
-     if ( v != 0 )
-       zone->org[point].x += TT_MULDIV( distance,
--                                       v * 0x10000L,
--                                       CUR.F_dot_P );
-+                                      v * 0x10000L,
-+                                      CUR.F_dot_P );
-
-     v = CUR.GS.freeVector.y;
-
-     if ( v != 0 )
-       zone->org[point].y += TT_MULDIV( distance,
--                                       v * 0x10000L,
--                                       CUR.F_dot_P );
-+                                      v * 0x10000L,
-+                                      CUR.F_dot_P );
-   }
-
--
-   /*************************************************************************/
-   /*                                                                       */
-   /* Special versions of Direct_Move()                                     */
-@@ -1923,9 +1939,16 @@
-                           FT_F26Dot6    distance )
-   {
-     FT_UNUSED_EXEC;
--
--    zone->cur[point].x += distance;
--    zone->tags[point]  |= FT_CURVE_TAG_TOUCH_X;
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( !CUR.enhanced
-+      || ( CUR.sph_tweak_flags & SPH_TWEAK_ALLOW_DMOVEX_FREEV ) )
-+      {
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+        zone->cur[point].x += distance;
-+        zone->tags[point]  |= FT_CURVE_TAG_TOUCH_X;
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-   }
-
-
-@@ -1940,7 +1963,6 @@
-     zone->tags[point]  |= FT_CURVE_TAG_TOUCH_Y;
-   }
-
--
-   /*************************************************************************/
-   /*                                                                       */
-   /* Special versions of Direct_Move_Orig()                                */
-@@ -1959,6 +1981,7 @@
-     FT_UNUSED_EXEC;
-
-     zone->org[point].x += distance;
-+
-   }
-
-
-@@ -1969,7 +1992,7 @@
-   {
-     FT_UNUSED_EXEC;
-
--    zone->org[point].y += distance;
-+      zone->org[point].y += distance;
-   }
-
-
-@@ -1997,7 +2020,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_None( EXEC_OP_ FT_F26Dot6  distance,
--                       FT_F26Dot6  compensation )
-+                       FT_F26Dot6  compensation,
-+                       FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2016,6 +2040,7 @@
-       if ( val > 0 )
-         val = 0;
-     }
-+
-     return val;
-   }
-
-@@ -2038,7 +2063,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_To_Grid( EXEC_OP_ FT_F26Dot6  distance,
--                          FT_F26Dot6  compensation )
-+                          FT_F26Dot6  compensation,
-+                          FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2047,15 +2073,15 @@
-
-     if ( distance >= 0 )
-     {
--      val = distance + compensation + 32;
-+      val = distance + compensation + 32 / resolution;
-       if ( distance && val > 0 )
--        val &= ~63;
-+        val &= ~(64 / resolution - 1);
-       else
-         val = 0;
-     }
-     else
-     {
--      val = -FT_PIX_ROUND( compensation - distance );
-+      val = -FT_PIX_ROUND_GRID( compensation - distance, resolution );
-       if ( val > 0 )
-         val = 0;
-     }
-@@ -2082,22 +2108,22 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_To_Half_Grid( EXEC_OP_ FT_F26Dot6  distance,
--                               FT_F26Dot6  compensation )
-+                               FT_F26Dot6  compensation,
-+                               FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-     FT_UNUSED_EXEC;
-
--
-     if ( distance >= 0 )
-     {
--      val = FT_PIX_FLOOR( distance + compensation ) + 32;
-+      val = FT_PIX_FLOOR_GRID( distance + compensation, resolution ) + 32 / resolution;
-       if ( distance && val < 0 )
-         val = 0;
-     }
-     else
-     {
--      val = -( FT_PIX_FLOOR( compensation - distance ) + 32 );
-+      val = -( FT_PIX_FLOOR_GRID( compensation - distance, resolution ) + 32 / resolution );
-       if ( val > 0 )
-         val = 0;
-     }
-@@ -2124,7 +2150,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_Down_To_Grid( EXEC_OP_ FT_F26Dot6  distance,
--                               FT_F26Dot6  compensation )
-+                               FT_F26Dot6  compensation,
-+                               FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2135,13 +2162,13 @@
-     {
-       val = distance + compensation;
-       if ( distance && val > 0 )
--        val &= ~63;
-+        val &= ~(64 / resolution - 1 );
-       else
-         val = 0;
-     }
-     else
-     {
--      val = -( ( compensation - distance ) & -64 );
-+      val = -( ( compensation - distance ) & -(64 / resolution) );
-       if ( val > 0 )
-         val = 0;
-     }
-@@ -2168,7 +2195,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_Up_To_Grid( EXEC_OP_ FT_F26Dot6  distance,
--                             FT_F26Dot6  compensation )
-+                             FT_F26Dot6  compensation,
-+                             FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2177,15 +2205,15 @@
-
-     if ( distance >= 0 )
-     {
--      val = distance + compensation + 63;
-+      val = distance + compensation + (64 / resolution - 1);
-       if ( distance && val > 0 )
--        val &= ~63;
-+        val &= ~(64 / resolution - 1);
-       else
-         val = 0;
-     }
-     else
-     {
--      val = - FT_PIX_CEIL( compensation - distance );
-+      val = - FT_PIX_CEIL_GRID( compensation - distance, resolution );
-       if ( val > 0 )
-         val = 0;
-     }
-@@ -2212,24 +2240,26 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_To_Double_Grid( EXEC_OP_ FT_F26Dot6  distance,
--                                 FT_F26Dot6  compensation )
-+                                 FT_F26Dot6  compensation,
-+                                 FT_Int      resolution )
-   {
-     FT_F26Dot6 val;
-
-     FT_UNUSED_EXEC;
-
-
--    if ( distance >= 0 )
-+   if ( distance >= 0 )
-     {
--      val = distance + compensation + 16;
-+      val = distance + compensation + 16 / resolution ;
-       if ( distance && val > 0 )
--        val &= ~31;
-+        val &= ~(32 / resolution - 1);
-       else
-         val = 0;
-     }
-     else
-     {
--      val = -FT_PAD_ROUND( compensation - distance, 32 );
-+
-+      val = -FT_PAD_ROUND( compensation - distance, 32 / resolution );
-       if ( val > 0 )
-         val = 0;
-     }
-@@ -2262,7 +2292,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_Super( EXEC_OP_ FT_F26Dot6  distance,
--                        FT_F26Dot6  compensation )
-+                        FT_F26Dot6  compensation,
-+                        FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2310,7 +2341,8 @@
-   /*                                                                       */
-   static FT_F26Dot6
-   Round_Super_45( EXEC_OP_ FT_F26Dot6  distance,
--                           FT_F26Dot6  compensation )
-+                           FT_F26Dot6  compensation,
-+                           FT_Int      resolution )
-   {
-     FT_F26Dot6  val;
-
-@@ -2401,7 +2433,8 @@
-   /*                                                                       */
-   static void
-   SetSuperRound( EXEC_OP_ FT_F26Dot6  GridPeriod,
--                          FT_Long     selector )
-+                          FT_Long     selector,
-+                          FT_Int      resolution )
-   {
-     switch ( (FT_Int)( selector & 0xC0 ) )
-     {
-@@ -3061,13 +3094,13 @@
-
-
- #define DO_SROUND                                \
--    SET_SuperRound( 0x4000, args[0] );           \
-+    SET_SuperRound( 0x4000, args[0], 1 );        \
-     CUR.GS.round_state = TT_Round_Super;         \
-     CUR.func_round = (TT_Round_Func)Round_Super;
-
-
- #define DO_S45ROUND                                 \
--    SET_SuperRound( 0x2D41, args[0] );              \
-+    SET_SuperRound( 0x2D41, args[0], 1 );           \
-     CUR.GS.round_state = TT_Round_Super_45;         \
-     CUR.func_round = (TT_Round_Func)Round_Super_45;
-
-@@ -3228,11 +3261,11 @@
-
-
- #define DO_ODD                                                  \
--    args[0] = ( ( CUR_Func_round( args[0], 0 ) & 127 ) == 64 );
-+    args[0] = ( ( CUR_Func_round( args[0], 0, 1 ) & 127 ) == 64 );
-
-
- #define DO_EVEN                                                \
--    args[0] = ( ( CUR_Func_round( args[0], 0 ) & 127 ) == 0 );
-+    args[0] = ( ( CUR_Func_round( args[0], 0, 1 ) & 127 ) == 0 );
-
-
- #define DO_AND                        \
-@@ -3281,7 +3314,31 @@
- #define DO_CEILING                    \
-     args[0] = FT_PIX_CEIL( args[0] );
-
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+#define DO_RS                           \
-+   {                                    \
-+     FT_ULong  I = (FT_ULong)args[0];   \
-+                                        \
-+                                        \
-+     if ( BOUNDSL( I, CUR.storeSize ) ) \
-+     {                                  \
-+       if ( CUR.pedantic_hinting )      \
-+       {                                \
-+         ARRAY_BOUND_ERROR;             \
-+       }                                \
-+       else                             \
-+         args[0] = 0;                   \
-+     }                                  \
-+     else                               \
-+       /* Subpixel Hinting - Avoid Typeman Dstroke and Istroke \
-+        * and Vacuform Rounds */                               \
-+       if ( CUR.enhanced                                       \
-+            && ( I == 24 || I == 22 || I == 8 )                \
-+            && !( CUR.sph_tweak_flags & SPH_TWEAK_DO_RS ) )    \
-+         args[0] = 0;                   \
-+       else args[0] = CUR.storage[I];   \
-+   }
-+#else
- #define DO_RS                           \
-    {                                    \
-      FT_ULong  I = (FT_ULong)args[0];   \
-@@ -3299,6 +3356,7 @@
-      else                               \
-        args[0] = CUR.storage[I];        \
-    }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-
- #define DO_WS                           \
-@@ -3378,12 +3436,12 @@
- #define DO_ROUND                                                   \
-     args[0] = CUR_Func_round(                                      \
-                 args[0],                                           \
--                CUR.tt_metrics.compensations[CUR.opcode - 0x68] );
-+                CUR.tt_metrics.compensations[CUR.opcode - 0x68], 1 );
-
-
- #define DO_NROUND                                                            \
-     args[0] = ROUND_None( args[0],                                           \
--                          CUR.tt_metrics.compensations[CUR.opcode - 0x6C] );
-+                          CUR.tt_metrics.compensations[CUR.opcode - 0x6C], 1 );
-
-
- #define DO_MAX               \
-@@ -4554,7 +4612,21 @@
-     FT_ULong       n;
-     TT_DefRecord*  rec;
-     TT_DefRecord*  limit;
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    int opcode_pattern[4][12]= {
-+          /* VacuFormRound function */
-+          {0x45,0x23,0x46,0x60,0x20},
-+          /* inline delta function 1 */
-+          {0x4B,0x53,0x23,0x4B,0x51,0x5A,0x58,0x38,0x1B,0x21,0x21,0x59},
-+          /* inline delta function 2 */
-+          {0x4B,0x54,0x58,0x38,0x1B,0x5A,0x21,0x21,0x59},
-+          /* diagonal stroke function */
-+          {0x20,0x20,0x40,0x60,0x47,0x40,0x23,0x42},
-+          };
-+    int opcode_patterns = 4;
-+    int i;
-+    int opcode_pointer[4] = {0,0,0,0} ;
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-     /* some font programs are broken enough to redefine functions! */
-     /* We will then parse the current table.                       */
-@@ -4592,6 +4664,7 @@
-     rec->opc    = (FT_UInt16)n;
-     rec->start  = CUR.IP + 1;
-     rec->active = TRUE;
-+    rec->inline = FALSE;
-
-     if ( n > CUR.maxFunc )
-       CUR.maxFunc = (FT_UInt16)n;
-@@ -4601,20 +4674,63 @@
-
-     while ( SKIP_Code() == SUCCESS )
-     {
-+      /*printf ("%d ", CUR.opcode);*/
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      for ( i = 0; i < opcode_patterns; i++ ){
-+        if ( CUR.opcode == opcode_pattern[i][opcode_pointer[i]] )
-+        {
-+          /*printf ("function %d, opcode ptrn: %d  op# %d: %d FOUND -------------\n ", n, i, opcode_pointer[i], CUR.opcode);*/
-+          opcode_pointer[i] += 1;
-+
-+          if (i == 0 && opcode_pointer[0] == 5){
-+              /*inline_delta_funcs[CUR.num_delta_funcs] = n;
-+              CUR.num_delta_funcs++;*/
-+                /*printf ("Vacuform Round FUNCTION %d detected \n ", n);*/
-+                if (CUR.enhanced) /*rec->active = FALSE;*/
-+            opcode_pointer[i] = 0;
-+          }
-+          if (i == 1 && opcode_pointer[1] == 12){
-+              /*rec->active = FALSE;*/
-+              /*CUR.inline_delta_funcs[CUR.num_delta_funcs] = n;
-+              CUR.num_delta_funcs++;*/
-+             rec->inline = TRUE;
-+                /*printf ("inline delta FUNCTION1 %d detected \n ", n, CUR.num_delta_funcs);*/
-+            opcode_pointer[i] = 0;
-+          }
-+          if (i == 2 && opcode_pointer[1] == 9){
-+             /* CUR.inline_delta_funcs[CUR.num_delta_funcs] = n;
-+              CUR.num_delta_funcs++;*/
-+             rec->inline = TRUE;
-+                /*printf ("inline delta2 FUNCTION2 %d detected \n ", n, CUR.num_delta_funcs);*/
-+            opcode_pointer[i] = 0;
-+          }
-+          if (i == 4 && opcode_pointer[1] == 8){
-+             /* CUR.inline_delta_funcs[CUR.num_delta_funcs] = n;
-+              CUR.num_delta_funcs++;*/
-+             /*rec->inline = TRUE;*/
-+                /*printf ("diagonal stroke function %d detected \n ", n, CUR.num_delta_funcs);*/
-+            opcode_pointer[i] = 0;
-+          }
-+        }
-+        else {
-+          opcode_pointer[i]=0;
-+        }
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-       switch ( CUR.opcode )
-       {
--      case 0x89:    /* IDEF */
--      case 0x2C:    /* FDEF */
--        CUR.error = TT_Err_Nested_DEFS;
--        return;
-+        case 0x89:    /* IDEF */
-+        case 0x2C:    /* FDEF */
-+          CUR.error = TT_Err_Nested_DEFS;
-+          return;
-
--      case 0x2D:   /* ENDF */
--        return;
-+        case 0x2D:   /* ENDF */
-+          return;
-       }
-     }
-   }
-
--
-   /*************************************************************************/
-   /*                                                                       */
-   /* ENDF[]:       END Function definition                                 */
-@@ -4643,6 +4759,13 @@
-
-     CUR.step_ins = FALSE;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    /* CUR.enhanced may be turned off prior to function calls.  This
-+     * ensures it is turned back on.
-+     */
-+    CUR.enhanced = ( CUR.subpixel_hinting || CUR.grayscale_hinting );
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-+
-     if ( pRec->Cur_Count > 0 )
-     {
-       CUR.callTop++;
-@@ -4675,8 +4798,9 @@
-     FT_ULong       F;
-     TT_CallRec*    pCrec;
-     TT_DefRecord*  def;
--
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    FT_Bool       oldF;
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-     /* first of all, check the index */
-
-     F = args[0];
-@@ -4713,6 +4837,17 @@
-     if ( !def->active )
-       goto Fail;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    /* This is test code used to detect inline delta functions */
-+    oldF = def->inline;
-+    if (CUR.enhanced)
-+    {
-+      if ( def->inline ) { CUR.infunc = TRUE; }
-+    }
-+
-+     /* if ( F == 35 || F == 34 ){  CUR.enhanced = 0; printf ("ENTERING %d ", F); }*/
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-+
-     /* check the call stack */
-     if ( CUR.callTop >= CUR.callSize )
-     {
-@@ -4733,6 +4868,12 @@
-                         def->start );
-
-     CUR.step_ins = FALSE;
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    {
-+      CUR.infunc = oldF; /*printf ("Leaving %d ", F);*/
-+    }
-+    /*if ( F == 35 || F == 34 ){  CUR.enhanced = 1; printf ("Leaving %d ", F); }*/
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-     return;
-
-   Fail:
-@@ -4752,7 +4893,9 @@
-     FT_ULong       F;
-     TT_CallRec*    pCrec;
-     TT_DefRecord*  def;
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    FT_Bool       oldF;
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-
-     /* first of all, check the index */
-     F = args[1];
-@@ -4788,7 +4931,16 @@
-     /* check that the function is active */
-     if ( !def->active )
-       goto Fail;
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    oldF=def->inline;
-+    if (CUR.enhanced)
-+    {
-+      if ( def->inline )
-+      {
-+        CUR.infunc = TRUE;
-+      }
-+    }
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-     /* check stack */
-     if ( CUR.callTop >= CUR.callSize )
-     {
-@@ -4811,6 +4963,11 @@
-
-       CUR.step_ins = FALSE;
-     }
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    {
-+      CUR.infunc = oldF;
-+    }
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-     return;
-
-   Fail:
-@@ -5154,6 +5311,10 @@
-       }
-     }
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    /* Disable Type 2 Vacuform Rounds - e.g. Arial Narrow */
-+    if ( CUR.enhanced && FT_ABS(D) == 64) D += 1;
-+#endif  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-     args[0] = D;
-   }
-
-@@ -5634,13 +5795,21 @@
-     }
- #endif
-
--    if ( CUR.GS.freeVector.x != 0 )
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( !CUR.enhanced
-+      || ( CUR.enhanced
-+        && ( CUR.sph_tweak_flags & SPH_TWEAK_ALLOW_MOVEZP2_FREEV ) ))
-     {
--      CUR.zp2.cur[point].x += dx;
--      if ( touch )
--        CUR.zp2.tags[point] |= FT_CURVE_TAG_TOUCH_X;
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+      if ( CUR.GS.freeVector.x != 0 )
-+      {
-+        CUR.zp2.cur[point].x += dx;
-+        if ( touch )
-+          CUR.zp2.tags[point] |= FT_CURVE_TAG_TOUCH_X;
-+      }
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-     }
--
-+#endif
-     if ( CUR.GS.freeVector.y != 0 )
-     {
-       CUR.zp2.cur[point].y += dy;
-@@ -5649,7 +5818,6 @@
-     }
-   }
-
--
-   /*************************************************************************/
-   /*                                                                       */
-   /* SHP[a]:       SHift Point by the last point                           */
-@@ -5819,7 +5987,7 @@
-   {
-     FT_F26Dot6  dx, dy;
-     FT_UShort   point;
--
-+    FT_Int      B1, B2;
-
-     if ( CUR.top < CUR.GS.loop + 1 )
-     {
-@@ -5863,11 +6031,64 @@
-         }
-       }
-       else
--        MOVE_Zp2_Point( point, dx, dy, TRUE );
-+      {
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+        /* The conditionals here still to not do a perfect job and need work.
-+         *
-+         * If not using enhanced rendering, allow ZP2 move.
-+         *
-+         * If using enhanced rendering, allow ZP2 point move if:
-+         * - The glyph is composite
-+         * - The glyph is specifically set to allow SHPIX moves
-+         * - The move is in the Y direction on a previously touched point
-+         *
-+         * It seems that what qualifies as a previously touched point varies
-+         * somewhat from font to font.  Some render better when either X or Y
-+         * must be touched ( SPH_TWEAK_SHPIX_CLASS_A ) and some render better
-+         * when both must be touched.
-+         */
-+
-+        if ( CUR.enhanced )
-+        {
-+          B1 = CUR.zp2.cur[point].y;
-+          if ( CUR.is_composite
-+            || ( CUR.sph_tweak_flags & SPH_TWEAK_DO_SHPIX )
-+            || ( /*CUR.infunc && !(CUR.sph_tweak_flags
-+                 & SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES) &&*/ /*CUR.infunc &&*/
-+                 CUR.GS.freeVector.y != 0
-+              && CUR.iup_called == 0
-+              && CUR.iupy_called == 0
-+              && (
-+                   (  (CUR.sph_tweak_flags & SPH_TWEAK_SHPIX_CLASS_A )
-+                      && (( CUR.pts.tags[point] & FT_CURVE_TAG_TOUCH_X ) != 0
-+                       || ( CUR.pts.tags[point] & FT_CURVE_TAG_TOUCH_Y ) != 0 ))
-+                || ( !(CUR.sph_tweak_flags & SPH_TWEAK_SHPIX_CLASS_A )
-+                      && (( CUR.pts.tags[point] & FT_CURVE_TAG_TOUCH_X ) != 0
-+                      &&  ( CUR.pts.tags[point] & FT_CURVE_TAG_TOUCH_Y ) != 0 ))
-+                 )
-+            /*|| !CUR.infunc*/ ) )
-+           MOVE_Zp2_Point( point, dx, dy, TRUE );
-+
-+          B2 = CUR.zp2.cur[point].y;
-+
-+          /* Reverse moves that move the point off a pixel boundary */
-+          if ((CUR.sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES)
-+               && B1 % 64 == 0
-+               && B2 % 64 != 0 )
-+          {
-+            /*printf ("Reversing ZP2 move ");*/
-+            MOVE_Zp2_Point( point, -dx, -dy, TRUE );
-+          }
-+        }
-+        else
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+          MOVE_Zp2_Point( point, dx, dy, TRUE );
-+
-+      }
-
-       CUR.GS.loop--;
-     }
--
-+    /*printf("SHPIX:%d ", CUR.infunc);*/
-     CUR.GS.loop = 1;
-     CUR.new_top = CUR.args;
-   }
-@@ -5884,7 +6105,17 @@
-   {
-     FT_UShort   point;
-     FT_F26Dot6  distance;
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    FT_Int      resolution = 1;
-
-+    if ( CUR.enhanced )
-+    {
-+      if ( CUR.GS.freeVector.x != 0 )
-+        resolution = Grids_Per_Pixel_X;
-+      else if ( CUR.GS.freeVector.y != 0 )
-+        resolution = Grids_Per_Pixel_Y;
-+    }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-     point = (FT_UShort)args[0];
-
-@@ -5908,6 +6139,15 @@
-     distance = CUR_Func_project( CUR.zp1.cur + point,
-                                  CUR.zp0.cur + CUR.GS.rp0 );
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    /* Subpixel Hinting - make MSIRP respect CVT cutin            */
-+    /* Fixes "k" issue with Arial                                 */
-+    if ( CUR.enhanced && CUR.GS.freeVector.x != 0
-+      && FT_ABS( distance - args[1])
-+         >= CUR.GS.control_value_cutin / resolution )
-+      distance = args[1];
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     CUR_Func_move( &CUR.zp1, point, args[1] - distance );
-
-     CUR.GS.rp1 = CUR.GS.rp0;
-@@ -5930,7 +6170,19 @@
-     FT_UShort   point;
-     FT_F26Dot6  cur_dist,
-                 distance;
-+    FT_Int      resolution = 1;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      if ( CUR.enhanced )
-+      {
-+        if ( CUR.GS.freeVector.x != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MDAP ))
-+          resolution = Grids_Per_Pixel_X;
-+        else if ( CUR.GS.freeVector.y != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MDAP ))
-+          resolution = Grids_Per_Pixel_Y;
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-     point = (FT_UShort)args[0];
-
-@@ -5946,8 +6198,8 @@
-     if ( ( CUR.opcode & 1 ) != 0 )
-     {
-       cur_dist = CUR_fast_project( &CUR.zp0.cur[point] );
--      distance = CUR_Func_round( cur_dist,
--                                 CUR.tt_metrics.compensations[0] ) - cur_dist;
-+      distance =  CUR_Func_round( cur_dist,
-+                                 CUR.tt_metrics.compensations[0], resolution ) - cur_dist;
-     }
-     else
-       distance = 0;
-@@ -5972,7 +6224,19 @@
-     FT_UShort   point;
-     FT_F26Dot6  distance,
-                 org_dist;
-+    FT_Int      resolution = 1;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      if ( CUR.enhanced )
-+      {
-+        if ( CUR.GS.freeVector.x != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MIAP ))
-+          resolution = Grids_Per_Pixel_X;
-+        else if ( CUR.GS.freeVector.y != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MIAP ))
-+          resolution = Grids_Per_Pixel_Y;
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-     cvtEntry = (FT_ULong)args[1];
-     point    = (FT_UShort)args[0];
-@@ -6020,10 +6284,13 @@
-
-     if ( ( CUR.opcode & 1 ) != 0 )   /* rounding and control cutin flag */
-     {
--      if ( FT_ABS( distance - org_dist ) > CUR.GS.control_value_cutin )
--        distance = org_dist;
--
--      distance = CUR_Func_round( distance, CUR.tt_metrics.compensations[0] );
-+      {
-+        if ( FT_ABS( distance - org_dist )
-+           > CUR.GS.control_value_cutin / resolution )
-+          distance = org_dist;
-+        distance = CUR_Func_round( distance,
-+                                   CUR.tt_metrics.compensations[0], resolution );
-+      }
-     }
-
-     CUR_Func_move( &CUR.zp0, point, distance - org_dist );
-@@ -6044,6 +6311,24 @@
-   {
-     FT_UShort   point;
-     FT_F26Dot6  org_dist, distance;
-+    FT_Int      minimum_distance_factor = 64;
-+    FT_Int      resolution = 1;
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      if ( CUR.enhanced )
-+      {
-+        if ( CUR.GS.freeVector.x != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MDRP ))
-+        {
-+          resolution = Grids_Per_Pixel_X;
-+          minimum_distance_factor = 64 - resolution / 3;
-+        }
-+        else if ( CUR.GS.freeVector.y != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MDRP ))
-+          resolution = Grids_Per_Pixel_Y;
-+
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-
-     point = (FT_UShort)args[0];
-@@ -6107,13 +6392,15 @@
-     /* round flag */
-
-     if ( ( CUR.opcode & 4 ) != 0 )
-+    {
-       distance = CUR_Func_round(
-                    org_dist,
--                   CUR.tt_metrics.compensations[CUR.opcode & 3] );
-+                   CUR.tt_metrics.compensations[CUR.opcode & 3], resolution );
-+    }
-     else
-       distance = ROUND_None(
-                    org_dist,
--                   CUR.tt_metrics.compensations[CUR.opcode & 3] );
-+                   CUR.tt_metrics.compensations[CUR.opcode & 3], resolution );
-
-     /* minimum distance flag */
-
-@@ -6121,13 +6408,17 @@
-     {
-       if ( org_dist >= 0 )
-       {
--        if ( distance < CUR.GS.minimum_distance )
--          distance = CUR.GS.minimum_distance;
-+        if ( distance < FT_MulDiv(minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64) )
-+          distance = FT_MulDiv(minimum_distance_factor,
-+          CUR.GS.minimum_distance, 64);
-       }
-       else
-       {
--        if ( distance > -CUR.GS.minimum_distance )
--          distance = -CUR.GS.minimum_distance;
-+        if ( distance > -FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 ) )
-+          distance = -FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 );
-       }
-     }
-
-@@ -6163,10 +6454,30 @@
-                 cur_dist,
-                 org_dist;
-
-+    FT_Int      minimum_distance_factor = 64;
-+    FT_Int      B1, B2, resolution = 1;
-
-     point    = (FT_UShort)args[0];
-     cvtEntry = (FT_ULong)( args[1] + 1 );
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+      if ( CUR.enhanced )
-+      {
-+        if ( CUR.GS.freeVector.x != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MIRP ))
-+        {
-+          resolution = Grids_Per_Pixel_X;
-+          /* High value emboldens glyphs at lower ppems ( < 14 ) */
-+          /* Courier looks better with 52 */
-+          /* MS Cleartype Rasterizer supposedly uses 32 */
-+          minimum_distance_factor = 64 - resolution / 3;
-+        }
-+        else if ( CUR.GS.freeVector.y != 0
-+          && !( CUR.sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND_MIRP ))
-+          resolution = Grids_Per_Pixel_Y;
-+      }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     /* XXX: UNDOCUMENTED! cvt[-1] = 0 always */
-
-     if ( BOUNDS( point,      CUR.zp1.n_points ) ||
-@@ -6230,36 +6541,55 @@
-       /*      refer to the same zone.                                  */
-
-       if ( CUR.GS.gep0 == CUR.GS.gep1 )
--        if ( FT_ABS( cvt_dist - org_dist ) >= CUR.GS.control_value_cutin )
-+        if ( FT_ABS( cvt_dist - org_dist ) >= CUR.GS.control_value_cutin / resolution )
-           cvt_dist = org_dist;
-
-       distance = CUR_Func_round(
-                    cvt_dist,
--                   CUR.tt_metrics.compensations[CUR.opcode & 3] );
-+                   CUR.tt_metrics.compensations[CUR.opcode & 3], resolution );
-     }
-     else
-       distance = ROUND_None(
-                    cvt_dist,
--                   CUR.tt_metrics.compensations[CUR.opcode & 3] );
-+                   CUR.tt_metrics.compensations[CUR.opcode & 3], resolution  );
-
-     /* minimum distance test */
--
-     if ( ( CUR.opcode & 8 ) != 0 )
-     {
-       if ( org_dist >= 0 )
-       {
--        if ( distance < CUR.GS.minimum_distance )
--          distance = CUR.GS.minimum_distance;
-+        if ( distance < FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 ) )
-+          distance = FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 );
-       }
-       else
-       {
--        if ( distance > -CUR.GS.minimum_distance )
--          distance = -CUR.GS.minimum_distance;
-+        if ( distance > -FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 ) )
-+          distance = -FT_MulDiv( minimum_distance_factor,
-+             CUR.GS.minimum_distance, 64 );
-       }
-     }
-
-+    B1 = CUR.zp1.cur[point].y;
-+
-     CUR_Func_move( &CUR.zp1, point, distance - cur_dist );
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( CUR.enhanced && CUR.sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES)
-+    {
-+      B2 = CUR.zp1.cur[point].y;
-+
-+      if ( ( CUR.GS.freeVector.x != 0 && B1 % 64 == 0 && B2 % 64 != 0 )
-+        || ( CUR.GS.freeVector.y != 0 && B2 % 64 != 0 ) )
-+      {
-+        /* reverse the MIRP move.  Ideally this could be implemented better */
-+        CUR_Func_move( &CUR.zp1, point, -(distance - cur_dist) );
-+      }
-+    }
-+#endif /*TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-+
-     CUR.GS.rp1 = CUR.GS.rp0;
-
-     if ( ( CUR.opcode & 16 ) != 0 )
-@@ -6751,6 +7081,14 @@
-     contour = 0;
-     point   = 0;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( CUR.enhanced )
-+    {
-+      CUR.iup_called = 1;
-+      if ( CUR.sph_tweak_flags & SPH_TWEAK_SKIP_IUP ) return;
-+    }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     do
-     {
-       end_point   = CUR.pts.contours[contour] - CUR.pts.first_point;
-@@ -6820,7 +7158,19 @@
-     FT_UShort  A;
-     FT_ULong   C;
-     FT_Long    B;
--
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    FT_Byte    orig_round_state;
-+    FT_Int     resolution = 1;
-+    FT_UShort  B1, B2;
-+
-+    if (CUR.enhanced )
-+    {
-+      if ( CUR.GS.freeVector.x != 0 )
-+        resolution = Grids_Per_Pixel_X;
-+      else if ( CUR.GS.freeVector.y != 0 )
-+        resolution = Grids_Per_Pixel_Y;
-+    }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
- #ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
-     /* Delta hinting is covered by US Patent 5159668. */
-@@ -6889,8 +7239,81 @@
-           if ( B >= 0 )
-             B++;
-           B = B * 64 / ( 1L << CUR.GS.delta_shift );
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS
-+          /* Undocumented hack that will round the point prior to or instead
-+           * of the delta move.  Fixes glitches in various fonts due to bad
-+           * y-hinting routines.
-+           */
-+          if ( CUR.enhanced && CUR.GS.freeVector.y != 0 )
-+          {
-+            orig_round_state= CUR.GS.round_state;
-+
-+            if ( CUR.sph_tweak_flags & SPH_TWEAK_DELTAP_RDTG  )
-+            {
-+              COMPUTE_Round( TT_Round_Down_To_Grid );
-+              B = CUR_Func_round( B, CUR.tt_metrics.compensations[0], 1 );
-+            }
-+
-+            else if ( CUR.sph_tweak_flags & SPH_TWEAK_DELTAP_RUTG )
-+            {
-+              COMPUTE_Round( TT_Round_Up_To_Grid );
-+              B = CUR_Func_round( B, CUR.tt_metrics.compensations[0], 1  );
-+            }
-+
-+            else if ( CUR.sph_tweak_flags & SPH_TWEAK_DELTAP_RTG  )
-+            {
-+              COMPUTE_Round( TT_Round_To_Grid );
-+              B = CUR_Func_round( B, CUR.tt_metrics.compensations[0], 1  );
-+            }
-+
-+            COMPUTE_Round( orig_round_state );
-+          }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS */
-+
-+          /* Allow delta move if:
-+           * - Not using enhanced rendering
-+           * - Glyph is specifically set to allow it
-+           * - Glyph is composite
-+           */
-+          if ( !CUR.enhanced
-+            || CUR.sph_tweak_flags & SPH_TWEAK_ALWAYS_DO_DELTAP
-+            || CUR.is_composite )
-+            CUR_Func_move( &CUR.zp0, A, B );
-
-+          else if ( !( CUR.sph_tweak_flags & SPH_TWEAK_ALWAYS_SKIP_DELTAP ) )
-+          {
-+            /* Save the y value of the point now. Compare after move */
-+            B1 = CUR.zp0.cur[A].y;
-+
-+            /* Allow delta move if using enhanced rendering, IUP has not
-+             * been called, and point is touched on X or Y.
-+             *
-+             * Working code, but needs more features.
-+             */
-+            if ( CUR.enhanced && CUR.GS.freeVector.y != 0
-+                 && CUR.iup_called == 0 && CUR.iupy_called == 0
-+                 && (  ( CUR.pts.tags[A] & FT_CURVE_TAG_TOUCH_X ) != 0
-+                    || ( CUR.pts.tags[A] & FT_CURVE_TAG_TOUCH_Y ) != 0 ) )
-+              /* Should resolution always be 1 for this move ??? */
-+              CUR_Func_move( &CUR.zp0, A, B );
-+
-+            B2 = CUR.zp0.cur[A].y;
-+
-+            /* Reverse this move if it results in a move off a pixel
-+             * boundary.
-+             */
-+            if ( ( CUR.sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES )
-+              && B1 % 64 == 0
-+              && B2 % 64 != 0 )
-+            {
-+              CUR_Func_move( &CUR.zp0, A, -B );
-+            }
-+
-+          }
-+#else
-           CUR_Func_move( &CUR.zp0, A, B );
-+#endif /* *TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-         }
-       }
-       else
-@@ -7015,22 +7438,100 @@
-
-     K = 0;
-
--    /* We return MS rasterizer version 1.7 for the font scaler. */
--    if ( ( args[0] & 1 ) != 0 )
--      K = 35;
--
--    /* Has the glyph been rotated? */
-+    /********************************/
-+    /* RASTERIZER VERSION           */
-+    /* Selector Bit:  0             */
-+    /* Return Bit(s): 0-7           */
-+    /*                              */
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( ( args[0] & 1 ) != 0
-+      && CUR.enhanced
-+      && !( CUR.sph_tweak_flags & SPH_TWEAK_RASTERIZER_35 ) ){
-+      K = CUR.rasterizer_version; /*printf (" SETTING AS 37 \n" );*/ }
-+    else
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+    if ( ( args[0] & 1 ) != 0 ){
-+      K = 35; /*printf (" SETTING AS 35 \n" );*/
-+    }
-+    /********************************/
-+    /* GLYPH ROTATED                */
-+    /* Selector Bit:  1             */
-+    /* Return Bit(s): 8             */
-+    /*                              */
-     if ( ( args[0] & 2 ) != 0 && CUR.tt_metrics.rotated )
--      K |= 0x80;
-+      K |= 1 << 8;
-
--    /* Has the glyph been stretched? */
-+    /********************************/
-+    /* GLYPH STRETCHED              */
-+    /* Selector Bit:  2             */
-+    /* Return Bit(s): 9             */
-+    /*                              */
-     if ( ( args[0] & 4 ) != 0 && CUR.tt_metrics.stretched )
--      K |= 1 << 8;
-+      /*K |= 1 << 8;  Original value appears to be incorrect?? */
-+      K |= 1 << 9;
-
--    /* Are we hinting for grayscale? */
-+    /********************************/
-+    /* HINTING FOR GRAYSCALE        */
-+    /* Selector Bit:  5             */
-+    /* Return Bit(s): 12            */
-+    /*                              */
-     if ( ( args[0] & 32 ) != 0 && CUR.grayscale )
-       K |= 1 << 12;
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    if ( CUR.enhanced && !( CUR.sph_tweak_flags & SPH_TWEAK_RASTERIZER_35 ) )
-+    {
-+      /********************************/
-+      /* HINTING FOR GRAYSCALE        */
-+      /* Selector Bit:  5             */
-+      /* Return Bit(s): 12            */
-+      /*                              */
-+      if ( ( args[0] & 32 ) != 0 && CUR.grayscale_hinting )
-+        K |= 1 << 12;
-+
-+      /********************************/
-+      /* HINTING FOR SUBPIXEL         */
-+      /* Selector Bit:  6             */
-+      /* Return Bit(s): 13            */
-+      /*                              */
-+      if ( ( args[0] & 64 ) != 0 && CUR.subpixel_hinting )
-+      {
-+        K |= 1 << 13;
-+
-+        /* The below are irrelevant if subpixel_hinting is not set */
-+
-+        /********************************/
-+        /* COMPATIBLE WIDTHS ENABLED    */
-+        /* Selector Bit:  7             */
-+        /* Return Bit(s): 14            */
-+        /*                              */
-+        /* Functionality still needs to be added */
-+        if ( ( args[0] & 128 ) != 0 && CUR.compatible_widths )
-+        {
-+          K |= 1 << 14;
-+        }
-+
-+        /********************************/
-+        /* SYMMETRICAL SMOOTHING        */
-+        /* Selector Bit:  8             */
-+        /* Return Bit(s): 15            */
-+        /*                              */
-+        /* Functionality still needs to be added */
-+        if ( ( args[0] & 256 ) != 0 && CUR.symmetrical_smoothing )
-+          K |= 1 << 15;
-+
-+        /********************************/
-+        /* HINTING FOR BGR?             */
-+        /* Selector Bit:  9             */
-+        /* Return Bit(s): 16            */
-+        /*                              */
-+        /* Functionality still needs to be added */
-+        if ( ( args[0] & 512 ) != 0 && CUR.bgr )
-+          K |= 1 << 16;
-+      }
-+    }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     args[0] = K;
-   }
-
-@@ -7405,6 +7906,14 @@
-     cur = *exc;
- #endif
-
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    /* Ensure some variables are set for this run */
-+    CUR.iup_called = FALSE;
-+    CUR.iupy_called = FALSE;
-+    CUR.infunc = FALSE;
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-     /* set CVT functions */
-     CUR.tt_metrics.ratio = 0;
-     if ( CUR.metrics.x_ppem != CUR.metrics.y_ppem )
-@@ -7683,8 +8192,16 @@
-
-
-         case 0x30:  /* IUP */
-+          Ins_IUP( EXEC_ARG_ args );
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+          CUR.iup_called = TRUE;
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+          break;
-         case 0x31:  /* IUP */
-           Ins_IUP( EXEC_ARG_ args );
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+          CUR.iupy_called = TRUE;
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING*/
-           break;
-
-         case 0x32:  /* SHP */
-diff -Nur freetype-2.4.3.orig/src/truetype/ttinterp.h freetype-2.4.3.new/src/truetype/ttinterp.h
---- freetype-2.4.3.orig/src/truetype/ttinterp.h 2010-08-05 16:56:05.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/ttinterp.h  2010-10-23 14:00:05.553373908 -0500
-@@ -68,7 +68,8 @@
-   /* Rounding function */
-   typedef FT_F26Dot6
-   (*TT_Round_Func)( EXEC_OP_ FT_F26Dot6  distance,
--                             FT_F26Dot6  compensation );
-+                             FT_F26Dot6  compensation,
-+                             FT_Int      resolution );
-
-   /* Point displacement along the freedom vector routine */
-   typedef void
-@@ -106,6 +107,24 @@
-   } TT_CallRec, *TT_CallStack;
-
-
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* This structure defines a rule used to tweak subpixel hinting for      */
-+  /* various fonts.  "", 0, "", NULL value indicates to match any value.   */
-+  /*                                                                       */
-+
-+  typedef struct  SPH_TweakRule_
-+  {
-+    const char      family[32];
-+    const int       ppem;
-+    const char      style[32];
-+    const char      glyph;
-+  } SPH_TweakRule;
-+
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The main structure for the interpreter which collects all necessary   */
-@@ -215,7 +234,32 @@
-     TT_Set_CVT_Func    func_write_cvt; /* write a cvt entry (in pixels) */
-     TT_Set_CVT_Func    func_move_cvt;  /* incr a cvt entry (in pixels)  */
-
--    FT_Bool            grayscale;      /* are we hinting for grayscale? */
-+    FT_Bool            grayscale;         /* are we hinting for grayscale?  */
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+    TT_Round_Func      func_round_sphn;   /* subpixel rounding fuction      */
-+
-+    FT_Bool            grayscale_hinting;  /* are we hinting for subpixel?   */
-+    FT_Bool            subpixel_hinting;   /* are we hinting for subpixel?   */
-+    FT_Bool            enhanced;         /* are we using enhanced rendering? */
-+                                /* ( grayscale_hinting || subpixel_hinting ) */
-+    FT_Bool            native_hinting;    /* do native hinting when true */
-+    /* the following 3 are unimplemented but here for future reference */
-+
-+    FT_Bool            compatible_widths; /* are we using compatible widths?*/
-+    FT_Bool            symmetrical_smoothing; /* symmetrical_smoothing?     */
-+    FT_Bool            bgr;               /* are we using bgr, not rgb?     */
-+    FT_Int             rasterizer_version;/* return ms rasterizer version   */
-+
-+    FT_Bool            iup_called;        /* IUP[x] been called for glyph?   */
-+    FT_Bool            iupy_called;       /* IUP[y] been called for glyph?   */
-+    FT_Bool            infunc;            /* inside an inline delta func?    */
-+
-+    FT_ULong           sph_tweak_flags;   /* flags to control hint tweaks   */
-+
-+    FT_Int             num_delta_funcs;
-+    FT_ULong           inline_delta_funcs[5];
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-
-   } TT_ExecContextRec;
-
-diff -Nur freetype-2.4.3.orig/src/truetype/ttobjs.h freetype-2.4.3.new/src/truetype/ttobjs.h
---- freetype-2.4.3.orig/src/truetype/ttobjs.h 2009-07-03 08:28:24.000000000 -0500
-+++ freetype-2.4.3.new/src/truetype/ttobjs.h  2010-10-22 19:25:46.075900111 -0500
-@@ -177,6 +177,7 @@
-     FT_Long  start;      /* where does it start?               */
-     FT_UInt  opc;        /* function #, or instruction code    */
-     FT_Bool  active;     /* is it active?                      */
-+    FT_Bool  inline;     /* function that defines inline delta */
-
-   } TT_DefRecord, *TT_DefArray;
-
-diff -Nur freetype-2.4.3.orig/src/truetype/ttsubpixel.c freetype-2.4.3.new/src/truetype/ttsubpixel.c
---- freetype-2.4.3.orig/src/truetype/ttsubpixel.c 1969-12-31 18:00:00.000000000 -0600
-+++ freetype-2.4.3.new/src/truetype/ttsubpixel.c  2010-11-14 09:25:59.206993605 -0600
-@@ -0,0 +1,171 @@
-+/***************************************************************************/
-+/*                                                                         */
-+/*  ttsubpixel.c                                                           */
-+/*                                                                         */
-+/*    TrueType Subpixel Hinting.                                           */
-+/*                                                                         */
-+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
-+/*            2010 by                                                      */
-+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-+/*                                                                         */
-+/*  This file is part of the FreeType project, and may only be used,       */
-+/*  modified, and distributed under the terms of the FreeType project      */
-+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-+/*  this file you indicate that you have read the license and              */
-+/*  understand and accept it fully.                                        */
-+/*                                                                         */
-+/***************************************************************************/
-+
-+#include <ft2build.h>
-+#include FT_INTERNAL_DEBUG_H
-+#include FT_INTERNAL_CALC_H
-+#include FT_INTERNAL_STREAM_H
-+#include FT_INTERNAL_SFNT_H
-+#include FT_TRUETYPE_TAGS_H
-+#include FT_OUTLINE_H
-+
-+#include "ttsubpixel.h"
-+
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-+  /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log  */
-+  /* messages during execution.                                            */
-+  /*                                                                       */
-+#undef  FT_COMPONENT
-+#define FT_COMPONENT  trace_ttgload
-+
-+
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS
-+  static FT_Bool
-+  sph_test_tweak ( TT_Face       face,
-+                 FT_String*    family,
-+                 int           ppem,
-+                 FT_String*    style,
-+                 FT_UInt       glyph_index,
-+                 SPH_TweakRule* rule,
-+                 int           num_rules )
-+  {
-+    FT_UInt  i;
-+
-+    /* rule checks may be able to be optimized further */
-+    for ( i = 0; i < num_rules; i++ )
-+    {
-+      if ( family && ( strcmp( rule[i].family, "" ) == 0
-+        || strcmp ( rule[i].family, family ) == 0 ) )
-+         if ( rule[i].ppem == 0
-+           || (rule[i].ppem == ppem) )
-+            if ( ( style && strcmp ( rule[i].style, "" ) == 0 )
-+              || strcmp ( rule[i].style, style ) == 0 )
-+               if ( rule[i].glyph == 0
-+                 || FT_Get_Char_Index( (FT_Face)face, rule[i].glyph )
-+                                         == glyph_index )
-+      {
-+        /* printf ("%s,%d,%s,%c ", family, ppem, style, rule[i].glyph); */
-+        return TRUE;
-+      }
-+    }
-+    return FALSE;
-+  }
-+
-+  static void
-+  sph_set_tweaks( TT_Loader  loader,
-+                  FT_UInt    glyph_index )
-+  {
-+    TT_Face  face = (TT_Face)loader->face;
-+    FT_String* family = face->root.family_name;
-+    int ppem = loader->size->metrics.x_ppem;
-+    FT_String* style = face->root.style_name;
-+
-+    /* loader->exec->sph_tweak_flags = 0x0000; */
-+
-+    /*printf ("%s,%d,%s,%c ", family, ppem, style, glyph_index); */
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        NORMAL_ROUND_MIRP_Rules, NORMAL_ROUND_MIRP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_NORMAL_ROUND_MIRP;
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        NORMAL_ROUND_MDRP_Rules, NORMAL_ROUND_MDRP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_NORMAL_ROUND_MDRP;
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        NORMAL_ROUND_MDAP_Rules, NORMAL_ROUND_MDAP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_NORMAL_ROUND_MDAP;
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        NORMAL_ROUND_MIAP_Rules, NORMAL_ROUND_MIAP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_NORMAL_ROUND_MIAP;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        SKIP_IUP_Rules, SKIP_IUP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_SKIP_IUP;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALWAYS_SKIP_DELTAP_Rules, ALWAYS_SKIP_DELTAP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_ALWAYS_SKIP_DELTAP;
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALWAYS_DO_DELTAP_Rules, ALWAYS_DO_DELTAP_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_ALWAYS_DO_DELTAP;
-+   else if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        DELTAP_RTG_Rules, DELTAP_RTG_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_DELTAP_RTG;
-+   else if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        DELTAP_RUTG_Rules, DELTAP_RUTG_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_DELTAP_RUTG;
-+   else if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        DELTAP_RDTG_Rules, DELTAP_RDTG_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_DELTAP_RDTG;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_DMOVEX_FREEV_Rules, ALLOW_DMOVEX_FREEV_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_ALLOW_DMOVEX_FREEV;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_DMOVE_FREEV_Rules, ALLOW_DMOVE_FREEV_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_ALLOW_DMOVE_FREEV;
-+
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_DMOVEX_FREEV_Rules_Exceptions, ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE ) )
-+     loader->exec->sph_tweak_flags &= ~SPH_TWEAK_ALLOW_DMOVEX_FREEV;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_DMOVE_FREEV_Rules_Exceptions, ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE ) )
-+     loader->exec->sph_tweak_flags &= ~SPH_TWEAK_ALLOW_DMOVE_FREEV;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        RASTERIZER_35_Rules, RASTERIZER_35_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_RASTERIZER_35;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_MOVEZP2_FREEV_Rules, ALLOW_MOVEZP2_FREEV_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_ALLOW_MOVEZP2_FREEV;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        ALLOW_MOVEZP2_FREEV_Rules_Exceptions, ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE ) )
-+     loader->exec->sph_tweak_flags &= ~SPH_TWEAK_ALLOW_MOVEZP2_FREEV;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        DO_RS_Rules, DO_RS_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_DO_RS;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        DO_SHPIX_Rules, DO_SHPIX_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_DO_SHPIX;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        SKIP_NONPIXEL_INLINE_MOVES_Rules, SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        SHPIX_CLASS_A_Rules, SHPIX_CLASS_A_RULES_SIZE ) )
-+     loader->exec->sph_tweak_flags |= SPH_TWEAK_SHPIX_CLASS_A;
-+
-+   if ( sph_test_tweak( face, family, ppem, style, glyph_index,
-+        SHPIX_CLASS_A_Rules_Exceptions, SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE ) )
-+     loader->exec->sph_tweak_flags &= ~SPH_TWEAK_SHPIX_CLASS_A;
-+
-+  }
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS */
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-diff -Nur freetype-2.4.3.orig/src/truetype/ttsubpixel.h freetype-2.4.3.new/src/truetype/ttsubpixel.h
---- freetype-2.4.3.orig/src/truetype/ttsubpixel.h 1969-12-31 18:00:00.000000000 -0600
-+++ freetype-2.4.3.new/src/truetype/ttsubpixel.h  2010-11-14 19:16:58.095874324 -0600
-@@ -0,0 +1,819 @@
-+/***************************************************************************/
-+/*                                                                         */
-+/*  ttsubpixel.h                                                           */
-+/*                                                                         */
-+/*    TrueType Subpixel Hinting.                                           */
-+/*                                                                         */
-+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,   */
-+/*            2010 by                                                      */
-+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-+/*                                                                         */
-+/*  This file is part of the FreeType project, and may only be used,       */
-+/*  modified, and distributed under the terms of the FreeType project      */
-+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-+/*  this file you indicate that you have read the license and              */
-+/*  understand and accept it fully.                                        */
-+/*                                                                         */
-+/***************************************************************************/
-+
-+#ifndef __TTSUBPIXEL_H__
-+#define __TTSUBPIXEL_H__
-+
-+#include <ft2build.h>
-+#include "ttobjs.h"
-+
-+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* Tweak flags that are set for each glyph                               */
-+  /*                                                                       */
-+  /*                                                                       */
-+#define SPH_TWEAK_NORMAL_ROUND_MIRP           0x00001
-+#define SPH_TWEAK_NORMAL_ROUND_MDRP           0x00002
-+#define SPH_TWEAK_DELTAP_RDTG                 0x00004
-+#define SPH_TWEAK_DELTAP_RTG                  0x00008
-+#define SPH_TWEAK_DELTAP_RUTG                 0x00010
-+#define SPH_TWEAK_ALLOW_DMOVEX_FREEV          0x00020
-+#define SPH_TWEAK_ALLOW_DMOVE_FREEV           0x00040
-+#define SPH_TWEAK_ALLOW_MOVEZP2_FREEV         0x00080
-+#define SPH_TWEAK_ALWAYS_SKIP_DELTAP          0x00100
-+#define SPH_TWEAK_SKIP_IUP                    0x00200
-+#define SPH_TWEAK_NORMAL_ROUND_MIAP           0x00400
-+#define SPH_TWEAK_NORMAL_ROUND_MDAP           0x00800
-+#define SPH_TWEAK_DO_RS                       0x01000
-+#define SPH_TWEAK_DO_SHPIX                    0x02000
-+#define SPH_TWEAK_ALWAYS_DO_DELTAP            0x04000
-+#define SPH_TWEAK_SKIP_NONPIXEL_INLINE_MOVES  0x08000
-+#define SPH_TWEAK_SHPIX_CLASS_A               0x10000
-+#define SPH_TWEAK_RASTERIZER_35               0x20000
-+
-+
-+  static FT_Bool
-+  sph_test_tweak ( TT_Face       face,
-+                 FT_String*    family,
-+                 int           ppem,
-+                 FT_String*    style,
-+                 FT_UInt       glyph_index,
-+                 SPH_TweakRule* rule,
-+                 int           num_rules );
-+  static void
-+  sph_set_tweaks( TT_Loader  loader,
-+                  FT_UInt    glyph_index );
-+
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* These are groups of rules that affect how the TT Interpreter does     */
-+  /* hinting.                                                              */
-+  /*                                                                       */
-+  /* "" string or 0 int/char indicates to apply to all.                    */
-+  /* "-" used as dummy placeholders, but any non-matching string works     */
-+  /*                                                                       */
-+  /* Remaining rules are tweaks for various fonts / glyphs                 */
-+  /* Some of this could arguably be implemented in fontconfig, however:    */
-+  /*                                                                       */
-+  /*  - Fontconfig can't set things on a glyph-by-glyph basis.             */
-+  /*  - The tweaks that happen here are very low-level, from an average    */
-+  /*      user's point of view and are best implemented in the hinter      */
-+  /*                                                                       */
-+  /* Ideally, some of these should be generalized across affected fonts,   */
-+  /* and enabled by default in the code. The rule structure is designed so */
-+  /* that entirely new rules can easily be added when a new compatibility  */
-+  /* feature is discovered.                                                */
-+  /*                                                                       */
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING Rules                               */
-+  /*                                                                       */
-+  /* Simply, this attempts to duplicate the fuctionality described here    */
-+  /* and nothing more:                                                     */
-+  /*                                                                       */
-+  /* http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx  */
-+  /*                                                                       */
-+  /* This mode is enabled when                                             */
-+  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS                   */
-+  /* is undefined                                                          */
-+  /*                                                                       */
-+
-+
-+#ifndef TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS
-+
-+#if FALSE /* THIS RULESET NOT CURRENTLY BEING USED */
-+
-+#define BITMAP_WIDTHS          FALSE
-+#define SET_SUBPIXEL           FALSE
-+#define SET_GRAYSCALE          TRUE
-+#define SET_MONOCHROME         FALSE
-+#define SET_COMPATIBLE_WIDTHS  TRUE
-+#define SET_RASTERIZER_VERSION 35
-+#define Grids_Per_Pixel_X      1
-+#define Grids_Per_Pixel_Y      1
-+
-+
-+/********** MOVE RULES *************/
-+
-+/* Allow a Direct_Move_X along freedom vector when matched */
-+#define ALLOW_DMOVEX_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules
-+[ALLOW_DMOVEX_FREEV_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+/* Allow a Direct_Move along freedom vector when matched */
-+#define ALLOW_DMOVE_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules
-+[ALLOW_DMOVE_FREEV_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+/* Allow a ZP2 Move along freedom vector when matched */
-+#define ALLOW_MOVEZP2_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules
-+[ALLOW_MOVEZP2_FREEV_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+/* Don't skip RS calls */
-+#define DO_RS_RULES_SIZE  1
-+SPH_TweakRule DO_RS_Rules
-+[DO_RS_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Force requested SHPIX operations when matched  */
-+#define DO_SHPIX_RULES_SIZE  1
-+SPH_TweakRule DO_SHPIX_Rules
-+[DO_SHPIX_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE  1
-+SPH_TweakRule SKIP_NONPIXEL_INLINE_MOVES_Rules
-+[SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MIRP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MIRP_Rules
-+[NORMAL_ROUND_MIRP_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MIAP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MIAP_Rules
-+[NORMAL_ROUND_MIAP_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDRP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MDRP_Rules
-+[NORMAL_ROUND_MDRP_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDAP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MDAP_Rules
-+[NORMAL_ROUND_MDAP_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+/* Indicates that SHPIX needs to match a touched point on x OR y */
-+#define SHPIX_CLASS_A_RULES_SIZE  1
-+SPH_TweakRule SHPIX_CLASS_A_Rules
-+[SHPIX_CLASS_A_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Mystery rules that make SHPIX work on certain fonts/glyphs. */
-+/* Indicates that SHPIX needs to match a touched point on x AND y */
-+/* This is dirty and needs to be generalized and incorporated. */
-+#define SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule SHPIX_CLASS_A_Rules_Exceptions
-+[SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules_Exceptions
-+[ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules_Exceptions
-+[ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules_Exceptions
-+[ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Skip IUP instructions when matched */
-+#define SKIP_IUP_RULES_SIZE  1
-+SPH_TweakRule SKIP_IUP_Rules
-+[SKIP_IUP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Skip DELTAP instructions when matched */
-+#define ALWAYS_SKIP_DELTAP_RULES_SIZE  1
-+SPH_TweakRule ALWAYS_SKIP_DELTAP_Rules
-+[ALWAYS_SKIP_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Always do DELTAP instructions when matched */
-+#define ALWAYS_DO_DELTAP_RULES_SIZE  1
-+SPH_TweakRule ALWAYS_DO_DELTAP_Rules
-+[ALWAYS_DO_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RTG instruction in DELTAP when matched */
-+#define DELTAP_RTG_RULES_SIZE  1
-+SPH_TweakRule DELTAP_RTG_Rules
-+[DELTAP_RTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RUTG instruction in DELTAP when matched */
-+#define DELTAP_RUTG_RULES_SIZE  1
-+SPH_TweakRule DELTAP_RUTG_Rules
-+[DELTAP_RUTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RDTG instruction in DELTAP when matched */
-+#define DELTAP_RDTG_RULES_SIZE 1
-+SPH_TweakRule DELTAP_RDTG_Rules
-+[DELTAP_RDTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Return MS rasterizer 35 when matched */
-+#define RASTERIZER_35_RULES_SIZE 1
-+SPH_TweakRule RASTERIZER_35_Rules
-+[RASTERIZER_35_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+#endif
-+
-+
-+#define BITMAP_WIDTHS          FALSE
-+#define SET_SUBPIXEL           TRUE
-+#define SET_GRAYSCALE          FALSE
-+#define SET_MONOCHROME         FALSE
-+#define SET_COMPATIBLE_WIDTHS  FALSE
-+#define SET_RASTERIZER_VERSION 37
-+#define Grids_Per_Pixel_X      64
-+#define Grids_Per_Pixel_Y      1
-+
-+
-+/********** MOVE RULES *************/
-+
-+/* Allow a Direct_Move_X along freedom vector when matched */
-+#define ALLOW_DMOVEX_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules
-+[ALLOW_DMOVEX_FREEV_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Allow a Direct_Move along freedom vector when matched */
-+#define ALLOW_DMOVE_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules
-+[ALLOW_DMOVE_FREEV_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Allow a ZP2 Move along freedom vector when matched */
-+#define ALLOW_MOVEZP2_FREEV_RULES_SIZE  1
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules
-+[ALLOW_MOVEZP2_FREEV_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Don't skip RS calls */
-+#define DO_RS_RULES_SIZE  1
-+SPH_TweakRule DO_RS_Rules
-+[DO_RS_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Force requested SHPIX operations when matched  */
-+#define DO_SHPIX_RULES_SIZE  1
-+SPH_TweakRule DO_SHPIX_Rules
-+[DO_SHPIX_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE  1
-+SPH_TweakRule SKIP_NONPIXEL_INLINE_MOVES_Rules
-+[SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MIRP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MIRP_Rules
-+[NORMAL_ROUND_MIRP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MIAP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MIAP_Rules
-+[NORMAL_ROUND_MIAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDRP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MDRP_Rules
-+[NORMAL_ROUND_MDRP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDAP_RULES_SIZE  1
-+SPH_TweakRule NORMAL_ROUND_MDAP_Rules
-+[NORMAL_ROUND_MDAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Indicates that SHPIX needs to match a touched point on x OR y */
-+#define SHPIX_CLASS_A_RULES_SIZE  1
-+SPH_TweakRule SHPIX_CLASS_A_Rules
-+[SHPIX_CLASS_A_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Mystery rules that make SHPIX work on certain fonts/glyphs. */
-+/* Indicates that SHPIX needs to match a touched point on x AND y */
-+/* This is dirty and needs to be generalized and incorporated. */
-+#define SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule SHPIX_CLASS_A_Rules_Exceptions
-+[SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules_Exceptions
-+[ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules_Exceptions
-+[ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+#define ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE  1
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules_Exceptions
-+[ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Skip IUP instructions when matched */
-+#define SKIP_IUP_RULES_SIZE  1
-+SPH_TweakRule SKIP_IUP_Rules
-+[SKIP_IUP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Skip DELTAP instructions when matched */
-+#define ALWAYS_SKIP_DELTAP_RULES_SIZE  1
-+SPH_TweakRule ALWAYS_SKIP_DELTAP_Rules
-+[ALWAYS_SKIP_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Always do DELTAP instructions when matched */
-+#define ALWAYS_DO_DELTAP_RULES_SIZE  1
-+SPH_TweakRule ALWAYS_DO_DELTAP_Rules
-+[ALWAYS_DO_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RTG instruction in DELTAP when matched */
-+#define DELTAP_RTG_RULES_SIZE  1
-+SPH_TweakRule DELTAP_RTG_Rules
-+[DELTAP_RTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RUTG instruction in DELTAP when matched */
-+#define DELTAP_RUTG_RULES_SIZE  1
-+SPH_TweakRule DELTAP_RUTG_Rules
-+[DELTAP_RUTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RDTG instruction in DELTAP when matched */
-+#define DELTAP_RDTG_RULES_SIZE 1
-+SPH_TweakRule DELTAP_RDTG_Rules
-+[DELTAP_RDTG_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Return MS rasterizer 35 when matched */
-+#define RASTERIZER_35_RULES_SIZE 1
-+SPH_TweakRule RASTERIZER_35_Rules
-+[RASTERIZER_35_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+
-+  /*************************************************************************/
-+  /*                                                                       */
-+  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS Rules             */
-+  /*                                                                       */
-+  /* This set of rules is an attempt at enhancing the basic subpixel rules */
-+  /* defined above, to fix visual problems with individual fonts and       */
-+  /* glyphs.                                                               */
-+  /*                                                                       */
-+  /* This mode is enabled when                                             */
-+  /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS                   */
-+  /* is defined                                                            */
-+  /*                                                                       */
-+  /*     ****************** WORK IN PROGRESS *******************           */
-+  /*                                                                       */
-+
-+#else
-+
-+#define BITMAP_WIDTHS          FALSE
-+#define SET_SUBPIXEL           TRUE
-+#define SET_GRAYSCALE          FALSE
-+#define SET_MONOCHROME         FALSE
-+#define SET_COMPATIBLE_WIDTHS  FALSE
-+#define SET_RASTERIZER_VERSION 37
-+#define Grids_Per_Pixel_X      64
-+#define Grids_Per_Pixel_Y      1
-+
-+
-+/* Don't avoid RS Rules (as the basic subpixel hinting does) */
-+#define DO_RS_RULES_SIZE  1
-+SPH_TweakRule DO_RS_Rules[DO_RS_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+};
-+
-+
-+/******************* DELTA RULES *********************/
-+
-+/* Do requested SHPIX operations when matched.  This requires ZP2 moves */
-+/* to be enabled in order to get SHPIX moves in the X direction */
-+/* Do all "Optimized for Cleartype" fonts need to be here??.  */
-+/* the below doesn't work because the bit is not set in MS cleartype fonts */
-+/* CUR.face->header.Flags & 0x10000 */
-+
-+#define DO_SHPIX_RULES_SIZE  7
-+SPH_TweakRule DO_SHPIX_Rules[DO_SHPIX_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Verdana", 0, "Regular", 0 },
-+  { "-Verdana", 12, "Regular", 0 },
-+  { "Verdana", 13, "Regular", 0 },
-+  /* aligns to pixels nicely, but messes up some glyphs */
-+  { "-Times New Roman", 0, "Regular", 0 },
-+  { "+++Segoe UI", 0, "Regular", 0 },
-+  { "-Segoe UI", 0, "Semibold", 0 },
-+};
-+
-+/* Indicates that SHPIX needs to match a touched point on x OR y */
-+#define SHPIX_CLASS_A_RULES_SIZE  1
-+SPH_TweakRule SHPIX_CLASS_A_Rules[SHPIX_CLASS_A_RULES_SIZE] = {
-+  { "", 0, "", 0 },
-+};
-+
-+/* Mystery rules that make SHPIX work on certain fonts/glyphs. */
-+/* Indicates that SHPIX needs to match a touched point on x AND y */
-+/* This is dirty and needs to be generalized and incorporated. */
-+#define SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE  2
-+SPH_TweakRule SHPIX_CLASS_A_Rules_Exceptions
-+[SHPIX_CLASS_A_RULES_EXCEPTIONS_SIZE] = {
-+  { "---", 0, "", 0 },
-+  { "Arial", 11, "Regular", 's' },
-+};
-+
-+/* Skip moves that don't align to a pixel in various functions. */
-+/* Fixes Tahoma, trebuchet oddities and some issues with $ */
-+#define SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE  4
-+SPH_TweakRule SKIP_NONPIXEL_INLINE_MOVES_Rules
-+[SKIP_NONPIXEL_INLINE_MOVES_RULES_SIZE] = {
-+  { "", 0, "Regular", 0 },
-+  /* keeps the weight in the center of the N */
-+  { "", 0, "Regular", 'N' },
-+  { "Tahoma", 0, "Regular", 0 },
-+  { "==Trebuchet MS", 0, "Regular", 0 },
-+};
-+
-+
-+/********** MOVE RULES *************/
-+
-+/* Allow a Direct_Move_X along X freedom vector when matched */
-+#define ALLOW_DMOVEX_FREEV_RULES_SIZE  20
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules[ALLOW_DMOVEX_FREEV_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-", 0, "Regular", 0 },
-+  { "-", 0, "Italic", 0 },
-+  { "-", 0, "Regular", 0 },
-+  { "-Verdana", 12, "Regular", 0 },
-+  { "-Geneva", 0, "", 0 },
-+  { "-Courier New", 0, "Regular", 0 },
-+  { "-Courier New", 0, "", 0 },
-+  { "-Arial", 0, "Bold", 0 },
-+  { "Verdana", 13, "Regular", 0 },
-+  { "-Times New Roman", 0, "Regular", 0 },
-+  { "Arial", 13, "Regular", 0 },
-+  { "Arial", 14, "Regular", 0 },
-+  { "-Tahoma", 0, "Regular", 0 },
-+  { "+++Trebuchet MS", 0, "Regular", 0 },
-+  { "-Trebuchet MS", 0, "Bold", 0 },
-+  { "-Segoe UI", 0, "Semibold", 0 },
-+  { "-Segoe UI", 12, "Regular", 'H' },
-+  { "Arial Narrow", 0, "Regular", 0 },
-+  { "+++Andale Mono", 17, "Regular", 0 },
-+};
-+
-+/* Allow a Direct_Move along X freedom vector when matched */
-+#define ALLOW_DMOVE_FREEV_RULES_SIZE  21
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules
-+[ALLOW_DMOVE_FREEV_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-", 0, "Regular", 0 },
-+  { "-", 0, "Italic", 0 },
-+  { "-Verdana", 12, "Regular", 0 },
-+  { "Verdana", 13, "Regular", 0 },
-+  { "-Courier New", 0, "Bold", 0 },
-+  { "-Times New Roman", 0, "Regular", 0 },
-+  { "Arial", 13, "Regular", 0 },
-+  { "Arial", 14, "Regular", 0 },
-+  { "-Arial", 0, "Bold", 0 },
-+  { "-Tahoma", 0, "Regular", 0 },
-+  { "+++Trebuchet MS", 0, "Regular", 0 },
-+  { "-Trebuchet MS", 0, "Bold", 0 },
-+  { "-Geneva", 0, "", 0 },
-+  { "-------", 0, "Regular", 0 },
-+  { "-Segoe UI", 0, "Semibold", 0 },
-+  { "+++Segoe UI", 12, "Regular", 'H' },
-+  { "-----", 0, "Regular", 0 },
-+  { "Arial Narrow", 0, "Regular", 0 },
-+  { "+++Andale Mono", 17, "Regular", 0 },
-+  { "-Courier New", 0, "", 0 },
-+};
-+
-+
-+#define ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE  9
-+SPH_TweakRule ALLOW_DMOVEX_FREEV_Rules_Exceptions
-+  [ALLOW_DMOVEX_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Times New Roman", 0, "Regular", 'a' },
-+  { "-Times New Roman", 0, "Regular", 'q' },
-+  { "-Times New Roman", 0, "Regular", 'P' },
-+  { "-Times New Roman", 0, "Regular", 'R' },
-+  { "-Times New Roman", 0, "Regular", 'B' },
-+  { "Arial", 0, "Regular", '4' },
-+  { "Arial", 0, "Regular", 's' },
-+  { "Arial", 0, "Regular", '^' },
-+};
-+
-+#define ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE  9
-+SPH_TweakRule ALLOW_DMOVE_FREEV_Rules_Exceptions
-+[ALLOW_DMOVE_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Times New Roman", 0, "Regular", 'a' },
-+  { "-Times New Roman", 0, "Regular", 'q' },
-+  { "-Times New Roman", 0, "Regular", 'P' },
-+  { "-Times New Roman", 0, "Regular", 'R' },
-+  { "-Times New Roman", 0, "Regular", 'B' },
-+  { "Arial", 0, "Regular", '4' },
-+  { "Arial", 0, "Regular", 's' },
-+  { "Arial", 0, "Regular", '^' },
-+};
-+
-+
-+/* Allow a ZP2 Move along freedom vector when matched */
-+/* This is called from SHP, SHPIX, SHC, SHZ           */
-+#define ALLOW_MOVEZP2_FREEV_RULES_SIZE  14
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules[ALLOW_MOVEZP2_FREEV_RULES_SIZE] = {
-+  { "-", 0, "Regular", 0 },
-+  { "-Verdana", 12, "Regular", 0 },
-+  { "Verdana", 13, "Regular", 0 },
-+  { "-Times New Roman", 0, "Regular", 0 },
-+  { "-Courier New", 0, "Bold", 0 },
-+  { "-Tahoma", 0, "Regular", 0 },
-+  { "-Courier New", 0, "", 0 },
-+  { "Arial", 13, "Regular", 0 },
-+  { "Arial", 14, "Regular", 0 },
-+  { "-Arial", 0, "Bold", 0 },
-+  { "+++Trebuchet MS", 0, "Regular", 0 },
-+  { "-Trebuchet MS", 0, "Bold", 0 },
-+  { "-Verdana", 13, "Regular", 0 },
-+  /* this needs a bit of work though */
-+  { "-Microsoft Sans Serif", 0, "Regular", 0 },
-+};
-+
-+/* Return MS rasterizer 35 when matched */
-+#define RASTERIZER_35_RULES_SIZE 1
-+SPH_TweakRule RASTERIZER_35_Rules
-+[RASTERIZER_35_RULES_SIZE] = {
-+  { "Times New Roman", 0, "Regular", 'i' },
-+};
-+
-+/************** DIRTY, DIRTY HACKS!!!!!!!! ***************/
-+
-+#define ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE  11
-+SPH_TweakRule ALLOW_MOVEZP2_FREEV_Rules_Exceptions
-+[ALLOW_MOVEZP2_FREEV_RULES_EXCEPTIONS_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "Times New Roman", 0, "Regular", 'a' },
-+  { "Times New Roman", 0, "Regular", 'q' },
-+  { "Verdana", 13, "Regular", 'N' },
-+  { "Verdana", 13, "Regular", 'f' },
-+  { "Verdana", 13, "Regular", 'v' },
-+  { "-------", 13, "Regular", 'k' },
-+  { "Verdana", 13, "Regular", 'w' },
-+  { "Verdana", 13, "Regular", 'x' },
-+  { "Verdana", 13, "Regular", 'y' },
-+  { "Verdana", 13, "Regular", 'z' },
-+};
-+
-+/*********** ROUNDING ***************/
-+/* These only have an effect on fonts that are allowed to move X (above) */
-+/* It appears all MS cleartype fonts may be OK using normal rounds */
-+#define NORMAL_ROUND_MIRP_RULES_SIZE  16
-+SPH_TweakRule NORMAL_ROUND_MIRP_Rules[NORMAL_ROUND_MIRP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Tahoma", 9, "Regular", 0 },
-+  { "-Courier New", 0, "Regular", 'W' },
-+  { "-Courier New", 0, "Regular", 'K' },
-+  { "-Courier New", 0, "Regular", 'k' },
-+  { "-Courier New", 0, "Regular", 'V' },
-+  { "-Courier New", 0, "Regular", 'O' },
-+  { "-Courier New", 0, "Regular", 'X' },
-+  { "-Courier New", 0, "Regular", 'Y' },
-+  { "-Courier New", 0, "Regular", 'A' },
-+  { "-Courier New", 0, "Regular", 'v' },
-+  { "-Courier New", 0, "Regular", 'z' },
-+  { "-Courier New", 0, "Regular", 'x' },
-+  { "-Courier New", 0, "Regular", 'y' },
-+  { "Calibri", 0, "Italic", 0 },
-+  { "Calibri", 0, "Bold Italic", 0 },
-+};
-+
-+#define NORMAL_ROUND_MIAP_RULES_SIZE  16
-+SPH_TweakRule NORMAL_ROUND_MIAP_Rules[NORMAL_ROUND_MIAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Tahoma", 9, "Regular", 0 },
-+  { "-Courier New", 0, "Regular", 'W' },
-+  { "-Courier New", 0, "Regular", 'K' },
-+  { "-Courier New", 0, "Regular", 'k' },
-+  { "-Courier New", 0, "Regular", 'V' },
-+  { "-Courier New", 0, "Regular", 'O' },
-+  { "-Courier New", 0, "Regular", 'X' },
-+  { "-Courier New", 0, "Regular", 'Y' },
-+  { "-Courier New", 0, "Regular", 'A' },
-+  { "-Courier New", 0, "Regular", 'v' },
-+  { "-Courier New", 0, "Regular", 'z' },
-+  { "-Courier New", 0, "Regular", 'x' },
-+  { "-Courier New", 0, "Regular", 'y' },
-+  { "Calibri", 0, "Italic", 0 },
-+  { "Calibri", 0, "Bold Italic", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDRP_RULES_SIZE  16
-+SPH_TweakRule NORMAL_ROUND_MDRP_Rules[NORMAL_ROUND_MDRP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Tahoma", 9, "Regular", 0 },
-+  { "-Courier New", 0, "Regular", 'W' },
-+  { "-Courier New", 0, "Regular", 'K' },
-+  { "-Courier New", 0, "Regular", 'k' },
-+  { "-Courier New", 0, "Regular", 'V' },
-+  { "-Courier New", 0, "Regular", 'O' },
-+  { "-Courier New", 0, "Regular", 'X' },
-+  { "-Courier New", 0, "Regular", 'Y' },
-+  { "-Courier New", 0, "Regular", 'A' },
-+  { "-Courier New", 0, "Regular", 'v' },
-+  { "-Courier New", 0, "Regular", 'z' },
-+  { "-Courier New", 0, "Regular", 'x' },
-+  { "-Courier New", 0, "Regular", 'y' },
-+  { "Calibri", 0, "Italic", 0 },
-+  { "Calibri", 0, "Bold Italic", 0 },
-+};
-+
-+#define NORMAL_ROUND_MDAP_RULES_SIZE  16
-+SPH_TweakRule NORMAL_ROUND_MDAP_Rules[NORMAL_ROUND_MDAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "-Tahoma", 9, "Regular", 0 },
-+  { "-Courier New", 0, "Regular", 'W' },
-+  { "-Courier New", 0, "Regular", 'K' },
-+  { "-Courier New", 0, "Regular", 'k' },
-+  { "-Courier New", 0, "Regular", 'V' },
-+  { "-Courier New", 0, "Regular", 'O' },
-+  { "-Courier New", 0, "Regular", 'X' },
-+  { "-Courier New", 0, "Regular", 'Y' },
-+  { "-Courier New", 0, "Regular", 'A' },
-+  { "-Courier New", 0, "Regular", 'v' },
-+  { "-Courier New", 0, "Regular", 'z' },
-+  { "-Courier New", 0, "Regular", 'x' },
-+  { "-Courier New", 0, "Regular", 'y' },
-+  { "Calibri", 0, "Italic", 0 },
-+  { "Calibri", 0, "Bold Italic", 0 },
-+};
-+
-+
-+/* Skip IUP instructions when matched */
-+#define SKIP_IUP_RULES_SIZE  6
-+SPH_TweakRule SKIP_IUP_Rules[SKIP_IUP_RULES_SIZE] = {
-+  { "Arial", 13, "Regular", 'a' },
-+  { "-", 0, "Regular", '2' },
-+  { "-", 0, "", 0 },
-+  { "-", 0, "Regular", 'a' },
-+  { "-", 0, "Regular", 'V' },
-+  { "-", 0, "Light", 0 },
-+};
-+
-+/* Skip DELTAP instructions when matched */
-+#define ALWAYS_SKIP_DELTAP_RULES_SIZE  19
-+SPH_TweakRule ALWAYS_SKIP_DELTAP_Rules[ALWAYS_SKIP_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "--Courier New", 0, "Regular", 'V' },
-+  { "Verdana", 10, "Regular", 0 },
-+  { "-Trebuchet MS", 0, "Regular", 'W' },
-+  { "-Trebuchet MS", 0, "Regular", 'w' },
-+  { "-Verdana", 0, "Italic", 'v' },
-+  { "-Verdana", 0, "Italic", 'w' },
-+  { "-Verdana", 0, "Italic", 'x' },
-+  { "-Verdana", 0, "Italic", 'y' },
-+  { "-Verdana", 0, "Italic", 'z' },
-+  { "-Verdana", 0, "Regular", 'v' },
-+  { "-Verdana", 10, "Regular", 'w' },
-+  { "-Verdana", 0, "Regular", 'y' },
-+  { "-Verdana", 0, "Regular", 'z' },
-+  { "-Arial Bold", 0, "Bold", 's' },
-+  { "Trebuchet MS", 14, "Regular", 'e' },
-+  { "Trebuchet MS", 0, "Italic", 0 },
-+  { "-Arial", 0, "Italic", 0 },
-+  { "-", 0, "Italic", 0 },
-+};
-+
-+/* Always do DELTAP instructions when matched */
-+#define ALWAYS_DO_DELTAP_RULES_SIZE  3
-+SPH_TweakRule ALWAYS_DO_DELTAP_Rules[ALWAYS_DO_DELTAP_RULES_SIZE] = {
-+  { "-", 0, "", 0 },
-+  { "DejaVu Sans", 14, "Regular", 'k' },
-+  { "DejaVu Sans", 14, "Regular", 'K' },
-+};
-+
-+/* Do an extra RTG instruction in DELTAP when matched */
-+#define DELTAP_RTG_RULES_SIZE  4
-+SPH_TweakRule DELTAP_RTG_Rules[DELTAP_RTG_RULES_SIZE] = {
-+  { "-Arial Unicode MS", 0, "Regular", 0 },
-+  { "-Microsoft Sans Serif", 0, "Regular", '0' },
-+  { "--Verdana", 0, "", 0 },
-+  { "-Trebuchet MS", 14, "Regular", 'e' },
-+};
-+
-+/* Do an extra RUTG instruction in DELTAP when matched */
-+#define DELTAP_RUTG_RULES_SIZE  2
-+SPH_TweakRule DELTAP_RUTG_Rules[DELTAP_RUTG_RULES_SIZE] = {
-+  { "-", 14, "Regular", 'e' },
-+  { "-", 0, "", 0 },
-+};
-+
-+/* Do an extra RDTG instruction in DELTAP when matched */
-+#define DELTAP_RDTG_RULES_SIZE 28
-+SPH_TweakRule DELTAP_RDTG_Rules[DELTAP_RDTG_RULES_SIZE] = {
-+  { "Calibri", 0, "Italic", 0 },
-+  { "Comic Sans MS", 0, "Regular", 0 },
-+  { "Lucida Grande", 0, "Regular", 'e' },
-+  { "Lucida Grande", 12, "Bold", 0 },
-+  { "Microsoft Sans Serif", 0, "Regular", '7' },
-+  { "Microsoft Sans Serif", 0, "Regular", 'O' },
-+  { "Microsoft Sans Serif", 0, "Regular", 'Q' },
-+  { "Microsoft Sans Serif", 0, "Regular", 'X' },
-+  { "Microsoft Sans Serif", 0, "Regular", 'e' },
-+  { "Microsoft Sans Serif", 0, "Regular", 'o' },
-+  { "-", 0, "", 0 },
-+  { "-", 0, "Regular", 'O' },
-+  { "-", 0, "Regular", 'U' },
-+  { "-", 0, "Regular", 'e' },
-+  { "-", 0, "Regular", 'g' },
-+  { "Tahoma", 0, "Bold", '0' },
-+  { "Tahoma", 16, "Bold", 'C' },
-+  { "Tahoma", 16, "Bold Italic", 'C' },
-+  { "Trebuchet MS", 0, "", '0' },
-+  { "-", 9, "", 'w' },
-+  { "Verdana", 0, "", '0' },
-+  { "Verdana", 0, "Bold Italic", '7' },
-+  { "Verdana", 0, "Bold Italic", 'v' },
-+  { "Verdana", 0, "Bold Italic", 'w' },
-+  { "Verdana", 0, "Bold", 0 },
-+  { "Verdana", 0, "Italic", 'o' },
-+  { "Verdana", 0, "Regular", 'x' },
-+  { "Trebuchet MS", 14, "Regular", 'e' },
-+};
-+
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS */
-+#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+
-+#endif /* __TTSUBPIXEL_H__ */
diff --git a/unmaintained/freetype-infinality/freetype-enable-subpixel-hinting-infinality-20100909-1.patch b/unmaintained/freetype-infinality/freetype-enable-subpixel-hinting-infinality-20100909-1.patch
deleted file mode 100644
index 08416afed5..0000000000
--- a/unmaintained/freetype-infinality/freetype-enable-subpixel-hinting-infinality-20100909-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- freetype-2.4.2.subpixel-patched/include/freetype/config/ftoption.h	2010-09-09 18:08:11.375855632 -0500
-+++ freetype-2.4.2.subpixel-enabled/include/freetype/config/ftoption.h	2010-09-09 18:09:48.491864607 -0500
-@@ -93,7 +93,7 @@
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- 
- 
-   /*************************************************************************/
-@@ -510,7 +510,7 @@
-   /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
-   /*   defined.                                                            */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
- 
- 
-   /*************************************************************************/
-@@ -527,7 +527,7 @@
-   /*   This option requires TT_CONFIG_OPTION_SUBPIXEL_HINTING to be        */
-   /*   defined.                                                            */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING_ADDITIONAL_TWEAKS
- 
- 
-   /*************************************************************************/
diff --git a/unmaintained/freetype-infinality/freetype-entire-infinality-patchset-20101114-1.patch b/unmaintained/freetype-infinality/freetype-entire-infinality-patchset-20101114-1.patch
deleted file mode 100644
index aae5faddee..0000000000
--- a/unmaintained/freetype-infinality/freetype-entire-infinality-patchset-20101114-1.patch
+++ /dev/null
@@ -1,1602 +0,0 @@
-freetype-entire-infinality-patchset  (excludes the TT subpixel patches)
--------------------------------------------------------------------
-
-This patch contains all the patches I used to distribute separately.
-It made more sense to lump these all together into a single file
-now that there are runtime options.  It's also easier for me to maintain. ;)
-
-I recommend that if you are using this patch that you use 
-
-  /etc/fonts/local.conf
-
-that I provide at:   http://www.infinality.net/files/local.conf
-You will also need:  http://www.infinality.net/files/infinality-settings
-
-The second one will need to be included in your profile with something like:
-
-  . ~/path/to/the/file/infinality-settings
-
-It should be adjusted to your personal tastes as an end-user.
-
-
-DISCLAIMERS:
-
-This patch will almost certainly result in a performance hit when
-freetype is rendering the glyphs.  The good news is that fontconfig
-caches the glyphs so it's only the first time they are displayed that there
-could be a performance issue.
-
-I expect that if you compile freetype with this patch along with my
-TT subpixel hinting patch, you will have a complete build that works the
-way I expect it to.  However, I have not tested all compile configurations
-for errors.  I intend to at some point.  This patch may make your system crash,
-have memory leaks, not compile, or render fonts in a way that you don't like.
-Either way, when you use this patch, you should recognize that it
-is ALPHA / BETA quality.  That said, I intend to run these patches on my
-personal system, so they had better be pretty stable!
-
-
-Changelog
-
-2010-11-14
-  - All patches can now be enabled at runtime with ENVIRONMENT_VARIABLES.
-    See the file  infinality-settings  (and below) for how to enable these.
-    Effects that used to work now **REQUIRE** these in order to be turned on
-    at runtime.  This lets end users have full control over what they want
-    without requiring different compiles.
-    
-  - Added option to auto-embolden thin/light fonts.
-  
-  - Further refinement of the stem calculations for enhanced autohint.
-  
-  - Adjustable FIR filter at runtime.
-
-  - Stem alignment ability to align glyph bitmaps to pixel boundaries.
-
-  - Adjustable gamma correction prior to the FIR filter for LCD rendering.
-    This can be used to make small ppem text more readable, or for whatever
-    else you want to use it for.
-
-  - A height tweak on the enhanced autohint that makes Arial, Segoe, Times
-    and others render more similarly to Windows.
-
-  - Separated out the option to maintain the original width of glyphs
-    when doing fake emboldening.
-
-
-
-##################################################################
-# The environment variables below should be copied to a file in
-# /etc/profile.d/ for system-wide effects and/or included in
-# ~/.bashrc or ~/.bash_profile for per-user effects:
-#
-#   . ~/path/to/the/file/infinality-settings
-#
-# Of course, the per-user settings will override the system-wide
-# settings.
-
-
-
-##################################################################
-# INFINALITY_FT_FILTER_PARAMS
-#
-# This is a modified version of the patch here:
-# http://levelsofdetail.kendeeter.com/2008/12/dynamic_fir_filter_patch.html
-#
-# Allows you to adjust the FIR filter at runtime instead of at
-# compile time.  The idea is to have values add up to one, and be
-# symmetrical around the middle value.  Here are some samples
-# of various filter parameters:
-#
-# Strong Extra Smooth  "0.15 0.2 0.3 0.2 0.15"  (extra smooth, natural weight)
-# Extra Smooth      "0.20 0.20 0.30 0.20 0.20"  (extra smooth, extra weight)
-# Smooth            "0.15 0.20 0.32 0.20 0.15"  (smooth, natural weight)
-# Stronger Gibson   "0.11 0.22 0.38 0.22 0.11"  (smooth, extra weight)
-# Gibson            "0.11 0.22 0.33 0.22 0.11"  (smooth, natural weight)
-# Freetype Light    "0.00 0.33 0.34 0.33 0.00"  (sharp, natural weight)
-# Freetype Default  "0.06 0.25 0.44 0.25 0.06"  (sharp, extra weight)           *default
-# Extra Sharp       "0.00 0.35 0.35 0.35 0.00"  (extra sharp, extra weight)
-#
-# Default:     [Freetype's default]
-# Recommended: "0.11 0.22 0.38 0.22 0.11"
-#
-# Example 1:  export INFINALITY_FT_FILTER_PARAMS="0.11 0.22 0.38 0.22 0.11"
-#
-
-export INFINALITY_FT_FILTER_PARAMS="0.11 0.22 0.38 0.22 0.11"
-
-
-
-
-##################################################################
-# INFINALITY_FT_STEM_ALIGNMENT_TYPE
-#
-# This performs analysis on each glyph and determines the best
-# subpixel orientation for the glyph.  The glyph is not scaled in
-# any way, just moved left or right by a subpixel amount.  This
-# results in subtley cleaner looking fonts, at the expense of
-# proper distances between glyphs.  This is only active for sizes
-# 10 px or greater and does not apply to bold or italic fonts.
-#
-# Possible values:
-# full             - Allows a glyph to be moved to the LEFT or RIGHT by 1 subpixel
-#                    Best alignment, Worst positioning
-# medium,medium1   - Only allows a glyph to be moved to the LEFT by 1 subpixel
-#                    Good alignment, Good positioning
-# medium2          - Only allows a glyph to be moved to the RIGHT by 1 subpixel
-#                    Good alignment, Good positioning
-# slight,slight1   - A stricter version of medium
-#                    Minor alignment, Best positioning
-# slight2          - A stricter version of medium2
-#                    Minor alignment, Best positioning
-# infinality       - medium1 when stem < 5 subpixels, full when >= 5 subpixels
-# none             - Don't do any alignment
-#
-# Default:     none
-# Recommended: medium
-
-export INFINALITY_FT_STEM_ALIGNMENT_TYPE=medium
-
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT
-#
-# Cause the height of horizontal stems to snap to integer pixels
-# when using light auto-hinting.  (This happens automatically
-# when using full auto-hinting)
-#
-# This produces an effect similar to the way Windows renders fonts
-# without requiring the font to contain bytecode instructions.
-#
-# Possible values:
-# true             - enable stem snapping
-# false            - do not enable stem snapping
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_EMBOLDEN_LIGHT
-#
-# Embolden particularly light or thin fonts, like DejaVu Sans Light,
-# Inconsolata, Freemono, Courier New, etc. up until stem width is
-# 1 pixel wide.  This makes these fonts easier to read at lower
-# ppems.  Only applies when the autohinter is being used.
-#
-# Possible values:
-# true             - enable emboldening of light fonts
-# false            - do not enable emboldening of light fonts
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTOFIT_EMBOLDEN_LIGHT=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_PSEUDO_GAMMA
-#
-# This does a weighted gamma correction at the LCD filter phase
-# prior to the LCD filter.
-#
-# The first value indicates a px value, the second indicates a
-# "gamma" value.  All sizes < the px value will be corrected
-# on a weighted scale based on the second value.
-#
-# Values .1 < 1.0 will darken the glyph
-# Values > 1.0 will lighten the glyph
-#
-# Example 1:  Darken glyphs that are less than 10 px. With some fonts
-#             even 5 or 6px is readable!
-# export INFINALITY_FT_PSEUDO_GAMMA="10 .6"
-#
-# Example 2:  Lighten all glyphs (below 100px)
-# export INFINALITY_FT_PSEUDO_GAMMA="100 1.5"
-#
-# Default:     [No gamma correction]
-# Recommended: "9 .7"
-
-export INFINALITY_FT_PSEUDO_GAMMA="9 .7"
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_ADJUST_HEIGHTS
-#
-# This will slightly stretch some glyphs vertically between 9px
-# and 14px (inclusive).  Some people may find this more
-# aesthetically pleasing.  This only applies to fonts that are
-# using autohint.
-#
-# Possible values:
-# true             - enable height adjustment
-# false            - do not enable height adjustment
-#
-# Default:     false
-
-export INFINALITY_FT_AUTOFIT_ADJUST_HEIGHTS=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_ENHANCED_EMBOLDEN
-#
-# When doing artificial emboldening, only embolden in the X
-# direction, skipping the Y direction. Most people will find this
-# more aesthetically pleasing than the default behavior.
-#
-# Possible values:
-# true             - enable enhanced emboldening
-# false            - no not enable enhanced emboldening
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_ENHANCED_EMBOLDEN=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_EMBOLDEN_MAINTAIN_WIDTH
-#
-# When doing artificial emboldening, don't change the glyph width.
-#
-# Possible values:
-# true             - maintain width
-# false            - do not maintain width
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_EMBOLDEN_MAINTAIN_WIDTH=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTO_AUTOHINT
-#
-# Automatically use autohint when rendering a font that contains
-# no truetype instructions, regardless of what the calling
-# program asks for.  The truetype hinter will not do a good job
-# on these.
-#
-# Possible values:
-# true             - automatically use autohint
-# false            - do not automatically use autohint
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTO_AUTOHINT=true
-
-
-
-
-
-
-INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT details
----------------------------------------------
-
-This patch is intended to make freetype's autohinter round down widths of
-horizontal stems to whole pixel values.  This dramatically reduces the
-graininess of the rendering at small sizes, at the expense of being true to the
-glyph.
-
-Put simply, it makes freetype's autohinter render fonts similarly
-to well-hinted TrueType fonts, even on fonts that contain no instructions.
-So, as far as I can tell, this makes it 100% patent-free.
-
-The most dramatic results are on sans-serif fonts like Lucida Grande,
-Arial, Helvetica Neue, Inconsolata, Droid Sans, Trebuchet MS, etc.
-
-
-It is recommended to use this with antialiasing on, and fonts set to
-slight hinting:
-
-  <match target="font" >
-    <edit mode="assign" name="rgba" >
-      <const>rgb</const>
-    </edit>
-    <edit mode="assign" name="hinting" >
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="autohint" >
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="antialias" >
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="hintstyle" >
-      <const>hintslight</const>
-    </edit>
-    <edit name="lcdfilter" mode="assign">
-      <const>lcddefault</const>
-    </edit>
-  </match>
-
-
-
-
-diff -Nur freetype-2.4.3.orig/configure freetype-2.4.3.new/configure
---- freetype-2.4.3.orig/configure 2010-10-03 13:05:26.000000000 -0500
-+++ freetype-2.4.3.new/configure  2010-11-14 18:17:36.593491866 -0600
-@@ -13,6 +13,8 @@
- # Call the `configure' script located in `builds/unix'.
- #
-
-+export LDFLAGS="$LDFLAGS -lm"
-+
- rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
-
- if test "x$GNUMAKE" = x; then
-diff -Nur freetype-2.4.3.orig/include/freetype/internal/ftobjs.h freetype-2.4.3.new/include/freetype/internal/ftobjs.h
---- freetype-2.4.3.orig/include/freetype/internal/ftobjs.h  2010-07-18 11:07:31.000000000 -0500
-+++ freetype-2.4.3.new/include/freetype/internal/ftobjs.h 2010-11-07 11:18:19.681501081 -0600
-@@ -762,6 +770,10 @@
-                                             FT_Library      library );
-
-
-+  typedef void  (*FT_Bitmap_LcdStemAlignFunc)( FT_Bitmap*      bitmap,
-+                                               FT_Render_Mode  render_mode,
-+                                               FT_GlyphSlot       slot );
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* <Struct>                                                              */
-@@ -862,6 +874,7 @@
-     FT_Int                   lcd_extra;        /* number of extra pixels */
-     FT_Byte                  lcd_weights[7];   /* filter weights, if any */
-     FT_Bitmap_LcdFilterFunc  lcd_filter_func;  /* filtering callback     */
-+    FT_Bitmap_LcdStemAlignFunc  lcd_stem_align_func;
- #endif
-
- #ifdef FT_CONFIG_OPTION_PIC
-diff -Nur freetype-2.4.3.orig/src/autofit/aflatin.c freetype-2.4.3.new/src/autofit/aflatin.c
---- freetype-2.4.3.orig/src/autofit/aflatin.c 2010-09-11 01:23:02.000000000 -0500
-+++ freetype-2.4.3.new/src/autofit/aflatin.c  2010-11-14 18:55:57.678647844 -0600
-@@ -21,6 +21,7 @@
-
- #include "aflatin.h"
- #include "aferrors.h"
-+#include "strings.h"
-
-
- #ifdef AF_USE_WARPER
-@@ -495,6 +496,29 @@
-     AF_LatinAxis  axis;
-     FT_UInt       nn;
-
-+    int checked_adjust_heights_env = 0;
-+    FT_Bool adjust_heights = FALSE;
-+
-+    if ( checked_adjust_heights_env == 0 )
-+    {
-+      char *adjust_heights_env = getenv( "INFINALITY_FT_AUTOFIT_ADJUST_HEIGHTS" );
-+      if ( adjust_heights_env != NULL )
-+      {
-+        if ( strcasecmp(adjust_heights_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(adjust_heights_env, "true") == 0)
-+            adjust_heights = TRUE;
-+          else if ( strcasecmp(adjust_heights_env, "1") == 0)
-+            adjust_heights = TRUE;
-+          else if ( strcasecmp(adjust_heights_env, "on") == 0)
-+            adjust_heights = TRUE;
-+          else if ( strcasecmp(adjust_heights_env, "yes") == 0)
-+            adjust_heights = TRUE;
-+        }
-+      }
-+      checked_adjust_heights_env = 1;
-+    }
-+
-
-     if ( dim == AF_DIMENSION_HORZ )
-     {
-@@ -522,21 +546,46 @@
-     {
-       AF_LatinAxis  Axis = &metrics->axis[AF_DIMENSION_VERT];
-       AF_LatinBlue  blue = NULL;
--
-+      int threshold = 40;
-
-       for ( nn = 0; nn < Axis->blue_count; nn++ )
-       {
--        if ( Axis->blues[nn].flags & AF_LATIN_BLUE_ADJUSTMENT )
-+        if ( Axis->blues[nn].flags & AF_LATIN_BLUE_ADJUSTMENT
-+          || ( adjust_heights && Axis->blues[nn].flags & AF_LATIN_BLUE_TOP )
-+        )
-         {
-           blue = &Axis->blues[nn];
-           break;
-         }
-       }
-
-+      if ( adjust_heights
-+        && metrics->root.scaler.face->size->metrics.x_ppem < 15
-+        && metrics->root.scaler.face->size->metrics.x_ppem > 8 )
-+        threshold = 52;
-+
-+      /* NEED TO FIND A WAY TO ADJUST CAPS AND LOWER SEPARATELY */
-+      /* The below does not work */
-+      /*  if (Axis->blues[nn].flags & AF_LATIN_BLUE_SMALL_TOP )
-+        {
-+          if (metrics->root.scaler.face->size->metrics.x_ppem < 15)
-+            threshold = 22;
-+          else threshold = 40;
-+          break;
-+        }
-+        if ( Axis->blues[nn].flags & AF_LATIN_BLUE_CAPITAL_TOP )
-+        {
-+          if (metrics->root.scaler.face->size->metrics.x_ppem < 15)
-+            threshold = 40;
-+          else threshold = 40;
-+          break;
-+        }
-+      */
-+
-       if ( blue )
-       {
-         FT_Pos  scaled = FT_MulFix( blue->shoot.org, scaler->y_scale );
--        FT_Pos  fitted = ( scaled + 40 ) & ~63;
-+        FT_Pos  fitted = ( scaled + threshold ) & ~63;
-
-
-         if ( scaled != fitted )
-@@ -1340,7 +1389,8 @@
-               if ( dist < 0 )
-                 dist = -dist;
-
--              dist = FT_MulFix( dist, scale );
-+              /* round down to pixels */
-+              dist = FT_MulFix( dist, scale ) & ~63;
-               if ( dist < best_dist )
-               {
-                 best_dist = dist;
-@@ -1500,9 +1550,33 @@
-     FT_Int           vertical = ( dim == AF_DIMENSION_VERT );
-
-
--    if ( !AF_LATIN_HINTS_DO_STEM_ADJUST( hints ) ||
--          axis->extra_light                      )
--      return width;
-+    int checked_stem_snap_env = 0;
-+    FT_Bool stem_snap_light = FALSE;
-+
-+    if ( checked_stem_snap_env == 0 )
-+    {
-+      char *stem_snap_env = getenv( "INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT" );
-+      if ( stem_snap_env != NULL )
-+      {
-+        if ( strcasecmp(stem_snap_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(stem_snap_env, "true") == 0)
-+            stem_snap_light = TRUE;
-+          else if ( strcasecmp(stem_snap_env, "1") == 0)
-+            stem_snap_light = TRUE;
-+          else if ( strcasecmp(stem_snap_env, "on") == 0)
-+            stem_snap_light = TRUE;
-+          else if ( strcasecmp(stem_snap_env, "yes") == 0)
-+            stem_snap_light = TRUE;
-+        }
-+      }
-+      checked_stem_snap_env = 1;
-+    }
-+
-+    if ( !stem_snap_light )
-+      if ( !AF_LATIN_HINTS_DO_STEM_ADJUST( hints ) ||
-+            axis->extra_light                      )
-+        return width;
-
-     if ( dist < 0 )
-     {
-@@ -1510,8 +1584,67 @@
-       sign = 1;
-     }
-
--    if ( (  vertical && !AF_LATIN_HINTS_DO_VERT_SNAP( hints ) ) ||
--         ( !vertical && !AF_LATIN_HINTS_DO_HORZ_SNAP( hints ) ) )
-+    if ( stem_snap_light
-+      && (
-+           ( vertical && !AF_LATIN_HINTS_DO_VERT_SNAP( hints ) )
-+      ||   ( !vertical && !AF_LATIN_HINTS_DO_HORZ_SNAP( hints ) ) ) )
-+    {
-+      dist = af_latin_snap_width( axis->widths, axis->width_count, dist );
-+
-+      if ( metrics->root.scaler.face->size->metrics.x_ppem > 9
-+        && axis->width_count > 0
-+        && abs ( axis->widths[0].cur - dist ) < 32
-+        && axis->widths[0].cur > 52 )
-+      {
-+        if ( strstr(metrics->root.scaler.face->style_name, "Regular")
-+          || strstr(metrics->root.scaler.face->style_name, "Book")
-+          || strstr(metrics->root.scaler.face->style_name, "Medium")
-+          || strcmp(metrics->root.scaler.face->style_name, "Italic") == 0
-+          || strcmp(metrics->root.scaler.face->style_name, "Oblique") == 0 )
-+        {
-+          /* regular weight */
-+          if ( axis->widths[0].cur < 64 ) dist = 64 ;
-+          else if (axis->widths[0].cur  < 88) dist = 64;
-+          else if (axis->widths[0].cur  < 160) dist = 128;
-+          else if (axis->widths[0].cur  < 240) dist = 190;
-+          else dist = ( dist ) & ~63;
-+        }
-+        else
-+        {
-+          /* bold gets a different threshold */
-+          if ( axis->widths[0].cur < 64 ) dist = 64 ;
-+          else if (axis->widths[0].cur  < 108) dist = 64;
-+          else if (axis->widths[0].cur  < 160) dist = 128;
-+          else if (axis->widths[0].cur  < 222) dist = 190;
-+          else if (axis->widths[0].cur  < 288) dist = 254;
-+          else dist = ( dist + 16 ) & ~63;
-+        }
-+
-+        /* fix any unusually low values */
-+        if (dist < ( axis->widths[0].cur & ~63 ) )
-+          dist = (axis->widths[0].cur & ~63);
-+
-+        /* fix any unusually high values */
-+        if (dist > ( ( axis->widths[0].cur + 64 ) & ~63 ) )
-+          dist = ( ( axis->widths[0].cur + 64 ) & ~63 );
-+
-+        if (dist < 64 ) dist = 64 ;
-+
-+      }
-+      if (dist < 52)
-+      {
-+        if (metrics->root.scaler.face->size->metrics.x_ppem < 9 )
-+        {
-+          /*dist = 64 - (64 - dist) / 2 ;*/
-+          if (dist < 31) dist = 31;
-+        }
-+        else
-+          dist = 52;
-+      }
-+
-+    }
-+    else if ( !stem_snap_light && (( vertical && !AF_LATIN_HINTS_DO_VERT_SNAP( hints ) ) ||
-+         ( !vertical && !AF_LATIN_HINTS_DO_HORZ_SNAP( hints ) ) ) )
-     {
-       /* smooth hinting process: very lightly quantize the stem width */
-
-@@ -1569,7 +1702,7 @@
-           dist = ( dist + 32 ) & ~63;
-       }
-     }
--    else
-+    else if (!stem_snap_light)
-     {
-       /* strong hinting process: snap the stem width to integer pixels */
-       FT_Pos  org_dist = dist;
-@@ -1577,6 +1710,8 @@
-
-       dist = af_latin_snap_width( axis->widths, axis->width_count, dist );
-
-+      if ( stem_snap_light ) goto Done_Width;
-+
-       if ( vertical )
-       {
-         /* in the case of vertical hinting, always round */
-@@ -2100,7 +2235,30 @@
-   {
-     FT_Error  error;
-     int       dim;
-+    int       e_strength = 0;
-+
-+    int checked_embolden_light_env = 0;
-+    FT_Bool embolden_light = FALSE;
-
-+    if ( checked_embolden_light_env == 0 )
-+    {
-+      char *embolden_light_env = getenv( "INFINALITY_FT_AUTOFIT_EMBOLDEN_LIGHT" );
-+      if ( embolden_light_env != NULL )
-+      {
-+        if ( strcasecmp(embolden_light_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(embolden_light_env, "true") == 0)
-+            embolden_light = TRUE;
-+          else if ( strcasecmp(embolden_light_env, "1") == 0)
-+            embolden_light = TRUE;
-+          else if ( strcasecmp(embolden_light_env, "on") == 0)
-+            embolden_light = TRUE;
-+          else if ( strcasecmp(embolden_light_env, "yes") == 0)
-+            embolden_light = TRUE;
-+        }
-+      }
-+      checked_embolden_light_env = 1;
-+    }
-
-     error = af_glyph_hints_reload( hints, outline );
-     if ( error )
-@@ -2146,8 +2304,15 @@
-       }
- #endif
-
--      if ( ( dim == AF_DIMENSION_HORZ && AF_HINTS_DO_HORIZONTAL( hints ) ) ||
--           ( dim == AF_DIMENSION_VERT && AF_HINTS_DO_VERTICAL( hints ) )   )
-+      if ( ( dim == AF_DIMENSION_HORZ && AF_HINTS_DO_HORIZONTAL( hints ) ) )
-+      {
-+        af_latin_hint_edges( hints, (AF_Dimension)dim );
-+        af_glyph_hints_align_edge_points( hints, (AF_Dimension)dim );
-+        af_glyph_hints_align_strong_points( hints, (AF_Dimension)dim );
-+        af_glyph_hints_align_weak_points( hints, (AF_Dimension)dim );
-+      }
-+
-+      if ( ( dim == AF_DIMENSION_VERT && AF_HINTS_DO_VERTICAL( hints ) )   )
-       {
-         af_latin_hint_edges( hints, (AF_Dimension)dim );
-         af_glyph_hints_align_edge_points( hints, (AF_Dimension)dim );
-@@ -2157,6 +2322,34 @@
-     }
-     af_glyph_hints_save( hints, outline );
-
-+    /* if the font is particularly thin, embolden it, up to 1 px */
-+    if ( embolden_light
-+      && metrics->axis->widths[0].cur <= 80
-+      && !( dim == AF_DIMENSION_VERT )
-+      && !AF_LATIN_HINTS_DO_HORZ_SNAP( hints ) )
-+    {
-+      if ( metrics->axis->widths[0].cur
-+        / metrics->root.scaler.face->size->metrics.x_ppem < 5 )
-+      {
-+        /* weakest at width 80, stronger at lower widths */
-+        e_strength = 40 * ( 80 - metrics->axis->widths[0].cur)/80 ;
-+        /* Don't do low ppems as much */
-+        if ( metrics->root.scaler.face->size->metrics.x_ppem < 9 )
-+          e_strength -=
-+            ( 9 - metrics->root.scaler.face->size->metrics.x_ppem ) * 10;
-+      }
-+
-+      /* Embolden small fonts on a sliding scale. Better readability. */
-+      if ( e_strength > 0
-+        && ( strstr(metrics->root.scaler.face->style_name, "Regular")
-+              || strstr(metrics->root.scaler.face->style_name, "Book")
-+              || strstr(metrics->root.scaler.face->style_name, "Light")
-+              || strstr(metrics->root.scaler.face->style_name, "Medium")
-+              || strcmp(metrics->root.scaler.face->style_name, "Italic") == 0
-+              || strcmp(metrics->root.scaler.face->style_name, "Oblique") == 0 ) )
-+        FT_Outline_Embolden(outline,e_strength);
-+    }
-+
-   Exit:
-     return error;
-   }
-diff -Nur freetype-2.4.3.orig/src/autofit/afloader.c freetype-2.4.3.new/src/autofit/afloader.c
---- freetype-2.4.3.orig/src/autofit/afloader.c  2009-07-03 08:28:24.000000000 -0500
-+++ freetype-2.4.3.new/src/autofit/afloader.c 2010-10-22 22:22:04.073099288 -0500
-@@ -180,8 +180,8 @@
-         AF_Edge       edge2 = edge1 +
-                               axis->num_edges - 1; /* rightmost edge */
-
--
--        if ( axis->num_edges > 1 && AF_HINTS_DO_ADVANCE( hints ) )
-+/* dont hint metrics - temporary until different hinting can be done */
-+        if ( FALSE && axis->num_edges > 1 && AF_HINTS_DO_ADVANCE( hints ) )
-         {
-           old_rsb = loader->pp2.x - edge2->opos;
-           old_lsb = edge1->opos;
-@@ -214,7 +214,8 @@
-           slot->lsb_delta = loader->pp1.x - pp1x_uh;
-           slot->rsb_delta = loader->pp2.x - pp2x_uh;
-         }
--        else
-+/* dont hint metrics - temporary until different hinting can be done */
-+        else if (FALSE)
-         {
-           FT_Pos  pp1x = loader->pp1.x;
-           FT_Pos  pp2x = loader->pp2.x;
-diff -Nur freetype-2.4.3.orig/src/base/ftlcdfil.c freetype-2.4.3.new/src/base/ftlcdfil.c
---- freetype-2.4.3.orig/src/base/ftlcdfil.c 2010-04-01 03:18:57.000000000 -0500
-+++ freetype-2.4.3.new/src/base/ftlcdfil.c  2010-11-14 18:33:58.300770778 -0600
-@@ -21,9 +21,659 @@
- #include FT_IMAGE_H
- #include FT_INTERNAL_OBJECTS_H
-
-+#include <math.h>
-+#include <string.h>
-+#include <strings.h>
-
- #ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-+/*
-+int sinc( int val ) {
-+  if (val == 0.0)
-+  return(1.0);
-+  return 256.0 * (sin(3.14*(double) (val/256.0))/(3.14*(double) (val/256.0)));
-+}
-+
-+int sigmoidal( int val ) {
-+   int val2;
-+   val2 = 256.0 /(1.0+exp(-(10.0*(val/256.0-.5))));
-+   return window(val2);
-+}
-+
-+int window ( int val )
-+{
-+  if (val < 0 ) return 0;
-+  if (val > 255) return 255;
-+  else return val;
-+}
-+*/
-+int gamma2 ( int val, float value ) {
-+   return 256 * (1.0 - pow((1.0 - (float)val/ 256.0) , 1.0/value));
-+}
-+/*
-+int gamma3 ( int val, float value ) {
-+  1- (x-1)^10
-+}
-+*/
-+/*
-+int gamma ( int val ) {
-+   return 256 * (1.0 - pow((1.0 - (float)val/ 256.0) , 1.5));
-+}
-+
-+int brick (int val) {
-+   if (val > 50) return val;
-+   else return 0;
-+}
-+
-+int brick2 (int val) {
-+   if (val > 100) return val;
-+   if (val > 50) return 100;
-+   else return 0;
-+}
-+
-+int none (int val) {
-+   return val;
-+}
-+
-+float pixmoid (int val1, int val2, int val3, int testval)
-+{
-+  int avg;
-+  int result;
-+
-+  avg = (val1 + val2 + val3)/3;
-+
-+  if ( avg < 128 )
-+  {
-+    if (testval > 128) result = avg;
-+    else result = testval;
-+  }
-+  else
-+  {
-+    if (testval < 128) result = avg;
-+    else result = testval;
-+  }
-+
-+  return none(result);
-+}
-+
-+float pixmoid2 (int val1, int val2, int val3, int testval)
-+{
-+  int avg;
-+  int result;
-+
-+  avg = (val1 + val2 + val3)/3;
-+
-+  if ( avg > 160 ) return 255;
-+  else if  ( avg < 100 ) return 0;
-+  else return testval;
-+
-+  return none(result);
-+
-+}
-+*/
-+/*
-+bool Resample(FT_Byte*  line, int newWidth, int newHeight)
-+{
-+
-+  unsigned char* newData = new unsigned char [newWidth * newHeight * 3];
-+
-+  double scaleWidth =  (double)newWidth / (double)_width;
-+  double scaleHeight = (double)newHeight / (double)_height;
-+
-+  for(int cy = 0; cy < newHeight; cy++)
-+  {
-+      for(int cx = 0; cx < newWidth; cx++)
-+      {
-+          int pixel = (cy * (newWidth *3)) + (cx*3);
-+          int nearestMatch =  (((int)(cy / scaleHeight)
-+          * (_width *3)) + ((int)(cx / scaleWidth) *3) );
-+
-+          newData[pixel    ] =  _data[nearestMatch    ];
-+          newData[pixel + 1] =  _data[nearestMatch + 1];
-+          newData[pixel + 2] =  _data[nearestMatch + 2];
-+      }
-+  }
-+
-+  delete[] _data;
-+  _data = newData;
-+  _width = newWidth;
-+  _height = newHeight;
-+
-+  return true;
-+}*/
-+
-+
-+  /* Stem alignment for bitmaps;  A hack with very nice results */
-+  /* Ideally this could be implemented on the outline, prior to
-+   * rasterization */
-+  static void
-+  _lcd_stem_align ( FT_Bitmap*      bitmap,
-+                    FT_Render_Mode  mode,
-+                      FT_GlyphSlot   slot )
-+  {
-+    /*FT_Byte*  weights = library->lcd_weights;*/
-+    FT_UInt   width   = (FT_UInt)bitmap->width;
-+    FT_UInt   height  = (FT_UInt)bitmap->rows;
-+
-+    FT_UInt   h;
-+
-+    FT_UInt alignment_type = 0;
-+    FT_UInt checked_alignment_type = 0;
-+    float pseudo_gamma_value = 1;
-+    float pseudo_gamma_lt = 0;
-+    FT_UInt checked_pseudo_gamma_value = 0;
-+
-+    if ( checked_alignment_type == 0)
-+    {
-+      char *alignment_type_env = getenv( "INFINALITY_FT_STEM_ALIGNMENT_TYPE" );
-+      if ( alignment_type_env != NULL )
-+      {
-+        /*sscanf ( alignment_type_env, "%d", &alignment_type );*/
-+        if      (strcasecmp(alignment_type_env, "full") == 0) alignment_type = 1;
-+        else if (strcasecmp(alignment_type_env, "medium") == 0) alignment_type = 2;
-+        else if (strcasecmp(alignment_type_env, "medium1") == 0) alignment_type = 2;
-+        else if (strcasecmp(alignment_type_env, "slight") == 0) alignment_type = 3;
-+        else if (strcasecmp(alignment_type_env, "slight1") == 0) alignment_type = 3;
-+        else if (strcasecmp(alignment_type_env, "medium2") == 0) alignment_type = 4;
-+        else if (strcasecmp(alignment_type_env, "slight2") == 0) alignment_type = 5;
-+        else if (strcasecmp(alignment_type_env, "infinality") == 0) alignment_type = 6;
-+        else if (strcasecmp(alignment_type_env, "infinality1") == 0) alignment_type = 6;
-+        else alignment_type = 0;
-+
-+        if ( /*strstr(slot.metrics->root.scaler.face->style_name, "Regular")
-+          || strstr(slot.metrics->root.scaler.face->style_name, "Book")
-+          || strstr(slot.metrics->root.scaler.face->style_name, "Medium")
-+          ||*/ strcasestr(slot->face->style_name, "Italic")
-+          || strcasestr(slot->face->style_name, "Oblique") )
-+          alignment_type = 0;
-+        if ( strcasestr(slot->face->style_name, "Bold") )
-+          alignment_type = 0;
-+      }
-+      checked_alignment_type = 1;
-+    }
-+
-+    if ( checked_pseudo_gamma_value == 0 )
-+    {
-+      char *pseudo_gamma_value_env = getenv( "INFINALITY_FT_PSEUDO_GAMMA" );
-+      if ( pseudo_gamma_value_env != NULL )
-+      {
-+        float f1, f2;
-+
-+        if ( strcasecmp(pseudo_gamma_value_env, "default" ) != 0)
-+        {
-+          sscanf ( pseudo_gamma_value_env, "%f %f", &f1, &f2 );
-+          pseudo_gamma_lt = f1;
-+          pseudo_gamma_value = f2;
-+        }
-+        if ( pseudo_gamma_value < .1 ) pseudo_gamma_value = 1;
-+        if ( pseudo_gamma_lt < 0 ) pseudo_gamma_lt = 1;
-+      }
-+      checked_pseudo_gamma_value = 1;
-+    }
-+
-+    /*printf("%s,%s ", slot->face->family_name, slot->face->style_name);*/
-+    /*printf("%d ", slot->face->size->metrics.x_ppem);*/
-+
-+    /* set gamma value to 1 if out of range */
-+    if ( slot->face->size->metrics.x_ppem >= pseudo_gamma_lt )
-+    {
-+      pseudo_gamma_value = 1;
-+    }
-+
-+    /* don't do alignment for < 10 */
-+    if ( slot->face->size->metrics.x_ppem < 10 )
-+    {
-+      alignment_type = 0;
-+    }
-+
-+    if ( mode == FT_RENDER_MODE_LCD )
-+    {
-+      if (width >= 4 && alignment_type != 0 )
-+      {
-+        FT_Byte*  line = bitmap->buffer;
-+        FT_Byte*  lineabove = bitmap->buffer;
-+        FT_Byte*  linebelow = bitmap->buffer;
-+
-+        FT_UInt vsums[width], vtotals[width], offsetruns[width / 2][width/2];
-+        FT_UInt offsetrank[width/2], offsetchosen, stemwidths[width], stemwidthsmax;
-+        FT_UInt stemwidth, vstems = 0;
-+
-+        FT_UInt shift = 0;
-+        FT_UInt  xx;
-+
-+        FT_ULong rtotal = 0, vweight = 0, wtotal = 0;
-+        FT_UInt lreached = 0, rreached = 0, rr = 0, ll = 0, testwidth;
-+        FT_UInt lwidth = 0, loffset = 0, offset = 0, htotal = 0, windowstart;
-+        FT_UInt windowelement;
-+
-+        line = bitmap->buffer;
-+        rreached = 0; lreached = width, ll = width;
-+
-+        lwidth = 0;
-+        loffset = 0;
-+
-+
-+        /* initialize variables - can this be done inline??? */
-+        for ( testwidth = 3; testwidth < 4; testwidth += 1 )
-+        {
-+          for ( offset = 0; offset < 3; offset +=1 )
-+          {
-+            offsetruns[offset][testwidth] = 0;
-+            offsetrank[offset] = 0;
-+          }
-+        }
-+        for ( xx = 0; xx < width; xx += 1 )
-+        {
-+          stemwidths[xx] = 0;
-+        }
-+
-+
-+        for ( h = (FT_UInt)bitmap->rows; h > 0; h--, line += bitmap->pitch )
-+        {
-+
-+          if (rr > rreached) rreached = rr;
-+          if (ll < lreached) lreached = ll;
-+
-+          rr = width;
-+          ll = 0;
-+          rtotal = 0;
-+          htotal = 0;
-+
-+          /*stemwidthsmax = 0;*/
-+          stemwidth = 0;
-+
-+
-+          /* Calculate various sums and stem widths of glyph */
-+          for ( xx = 0; xx < width; xx += 1 )
-+          {
-+            if (line[xx] >= 128)
-+            {
-+              stemwidth += 1;
-+              /*if (stemwidth > stemwidthsmax) stemwidthsmax = stemwidth;*/ /* necessary ? */
-+            }
-+            else
-+            {
-+              if (xx > 0 && line[xx - 1] >= 128) stemwidths[stemwidth] += 1;
-+              stemwidth = 0;
-+            }
-+
-+            if (h == (FT_UInt)bitmap->rows) vsums[xx] = 0;
-+            if ( h == (FT_UInt)bitmap->rows ) vtotals[xx] = 0;
-+
-+            if (line[xx] == 0) vsums[xx] -= 255;
-+            else vsums[xx] += line[xx];
-+            if (vsums[xx] < 0) vsums[xx] = 0;
-+
-+            if (ll == 0 && line[xx] != 0) ll = (xx);
-+
-+            if (line[xx] != 0) rr = (xx);
-+
-+            if (xx < width / 2) vweight -= line[xx];
-+            else vweight += line[xx];
-+
-+            htotal += line [xx];
-+            vtotals[xx] += line[xx];
-+          }
-+
-+          if ( h < (FT_UInt)bitmap->rows ) lineabove = line - bitmap->pitch;
-+          if ( h > 1 ) linebelow = line + bitmap->pitch;
-+
-+
-+          /* Determine the offset at which the most weight of the glyph exists */
-+          /* This is currently hard-coded at 3, but the code is here to adjust */
-+          for ( testwidth = 3; testwidth < 4; testwidth += 1 )
-+          {
-+            /* test the widths at each of these offsets */
-+            for ( offset = 0; offset < 3; offset +=1 )
-+            {
-+              /* test window of size testwidth, starting at offset */
-+              rtotal = 0;
-+              for ( windowstart = offset; windowstart < width;
-+                  windowstart += testwidth )
-+              {
-+                /* calculate total for this window */
-+                wtotal = 0;
-+                for ( windowelement = windowstart;
-+                    windowelement < windowstart + testwidth; windowelement += 1 )
-+                  if ( windowelement < width)
-+                  {
-+                    wtotal += line[windowelement];
-+
-+                    /* Assign extra value to this subpixel under certain conditions */
-+                    if ( line[windowelement] == 255 )
-+                    {
-+                      /* favor if full pixels above and below */
-+                      if ( h < (FT_UInt)bitmap->rows
-+                        && lineabove[windowelement] == 255 )
-+                        wtotal += 10;
-+                      if ( h > 1 && linebelow[windowelement] == 255 )
-+                        wtotal += 10;
-+
-+                      /* favor if full pixels next to them */
-+                      if ( windowelement > 0 && line[windowelement-1] == 255 )
-+                      {
-+                        wtotal += 10;
-+                        if ( windowelement > 1 &&  line[windowelement-2] == 255 )
-+                        {
-+                          wtotal += 10;
-+                          if ( windowelement > 2 && line[windowelement-3] == 255 )
-+                            wtotal += 10;
-+                        }
-+                      }
-+                      if ( windowelement < width - 1 && line[windowelement+1] == 255 )
-+                      {
-+                        wtotal += 10;
-+                        if ( windowelement < width - 2 && line[windowelement+2] == 255 )
-+                        {
-+                          wtotal += 10;
-+                          if ( windowelement < width - 3 && line[windowelement+3] == 255 )
-+                            wtotal += 10;
-+                        }
-+                      }
-+                    }
-+                  }
-+                /* divide window total by number of subpixel samples */
-+                /* add to total for this run */
-+                rtotal += (wtotal * wtotal) / testwidth;
-+              }
-+              /* dont count horizontal stems */
-+              /*if (rtotal < ( 255 * testwidth ) * (255 * testwidth) * (width / testwidth) / (testwidth * 2)  )*/
-+              if ( rtotal < ( 255 * 255 * width / 2 ) )
-+                offsetruns[offset][testwidth] += rtotal;
-+            }
-+
-+            /* determine the best offset for this width and increment its counter */
-+            offsetchosen = 0;
-+            for ( offset = 0; offset < 2; offset +=1 )
-+            {
-+              if ( offsetruns[offset][testwidth] < offsetruns[offset + 1][testwidth] ){
-+                offsetrank[offset + 1] += 1;
-+                offsetchosen = offset;
-+              }
-+            }
-+            if (offsetchosen == 0) offsetrank[0] += 1;
-+          }
-+        }
-+
-+        /* Use the best offset */
-+        loffset = 0;
-+        for ( offset = 0; offset < 2; offset +=1 )
-+        {
-+          if ( offsetrank[offset] < offsetrank[offset + 1] ){
-+            loffset = offset + 1;
-+          }
-+        }
-+
-+        /* Use the best width */
-+        lwidth = 0;
-+        stemwidthsmax = 0;
-+
-+        for ( xx = 0; xx < width - 1; xx +=1 )
-+        {
-+          if ( stemwidthsmax < stemwidths[xx + 1] ){
-+            lwidth = xx + 1;
-+            stemwidthsmax = stemwidths[xx + 1];
-+          }
-+        }
-+
-+        /* currently unused */
-+        rreached = width - rreached;
-+
-+        /* Set the number of vertical stem components */
-+        for ( xx = 0; xx < width; xx += 1 )
-+        {
-+          if ( height > 0 && vsums[xx] / height > 110 )
-+            vstems++;
-+        }
-+
-+
-+        /******************** CALCULATE GLYPH ALIGNMENT *********************/
-+        /*printf(" %d,%d,%d,%d,%d,%d,%d\n", width, height, lreached,
-+        rreached, lwidth,vstems,alignment_type );*/
-+
-+        shift = 0;
-+
-+        /* infinality1 alignment - combination of below */
-+        if ( alignment_type == 6 )
-+        {
-+          if ( lwidth < 5 ) alignment_type = 2;
-+          else alignment_type = 1;
-+        }
-+
-+        /* strong alignment - shift glyph left or right one subpixel */
-+        if ( alignment_type == 1 /*&& vstems > 0*/ )
-+        {
-+          if ( lwidth < 5)
-+          {
-+          /* lower widths should use this */
-+            if (loffset % 3 == 0) shift = -1;
-+            if (loffset % 3 == 1) shift = 1;
-+            if (loffset % 3 == 2) shift = 0;
-+          }
-+          else if ( lwidth < 6 )
-+          {
-+          /* medium widths should use this */
-+            if (loffset % 3 == 0) shift = 1;
-+            if (loffset % 3 == 1) shift = 0;
-+            if (loffset % 3 == 2) shift = -1;
-+          }
-+          else if ( lwidth < 20 )
-+          {
-+          /* higher widths should use this */
-+            if (loffset % 3 == 0) shift = 1;
-+            if (loffset % 3 == 1) shift = -1;
-+            if (loffset % 3 == 2) shift = 0;
-+          }
-+        }
-+
-+        /* medium alignment - shift glyph ONLY LEFT one subpixel
-+        * - a compromise to prevent spacing issues */
-+        else if ( alignment_type == 2 /*&& vstems > 0*/ ){
-+
-+          if ( lwidth < 5 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 1 && offsetrank[0] > offsetrank[2] ) loffset = 0;
-+
-+            if ( loffset % 3 == 0 ) shift = -1;
-+            /*if (loffset % 3 == 1 ) shift = 1;*/
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+          else if (lwidth < 6 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 0 && offsetrank[2] > offsetrank[1] ) loffset = 2;
-+            /*if (loffset % 3 == 0 ) shift = 1;*/
-+            if ( loffset % 3 == 1 ) shift = 0;
-+            if ( loffset % 3 == 2 ) shift = -1;
-+          }
-+          else if ( lwidth < 20 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 0 && offsetrank[1] > offsetrank[2] ) loffset = 1;
-+            /*if (loffset % 3 == 0 ) shift = 1;*/
-+            if ( loffset % 3 == 1 ) shift = -1;
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+        }
-+
-+        /* medium alignment 2 - shift glyph ONLY RIGHT one subpixel
-+        * - a compromise to prevent spacing issues */
-+        else if ( alignment_type == 4 ){
-+          if ( lwidth < 5 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 0 && offsetrank[1] > offsetrank[2] ) loffset = 1;
-+
-+            /*if ( loffset % 3 == 0 ) shift = -1;*/
-+            if ( loffset % 3 == 1 ) shift = 1;
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+          else if ( lwidth < 6 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 2 && offsetrank[0] > offsetrank[1] ) loffset = 0;
-+            if ( loffset % 3 == 0 ) shift = 1;
-+            if ( loffset % 3 == 1 ) shift = 0;
-+            /*if ( loffset % 3 == 2 ) shift = -1;*/
-+          }
-+          else if ( lwidth < 20 )
-+          {
-+            /* medium alignment - use next highest value instead */
-+            if ( loffset == 1 && offsetrank[0] > offsetrank[2] ) loffset = 0;
-+            if ( loffset % 3 == 0 ) shift = 1;
-+            /*if (loffset % 3 == 1 ) shift = -1;*/
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+        }
-+
-+        /* light alignment - shift glyph ONLY LEFT one subpixel
-+        * - a compromise to prevent spacing issues */
-+        else if ( alignment_type == 3 ){
-+          if ( lwidth < 5 )
-+          {
-+            if ( loffset % 3 == 0 ) shift = -1;
-+            /*if ( loffset % 3 == 1 ) shift = 1;*/
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+          else if ( lwidth < 6 )
-+          {
-+            /*if ( loffset % 3 == 0 ) shift = 1;*/
-+            if ( loffset % 3 == 1 ) shift = 0;
-+            if ( loffset % 3 == 2 ) shift = -1;
-+          }
-+          else if ( lwidth < 20 )
-+          {
-+            /*if ( loffset % 3 == 0 ) shift = 1;*/
-+            if ( loffset % 3 == 1 ) shift = -1;
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+        }
-+
-+        /* light alignment 2 - shift glyph ONLY RIGHT one subpixel
-+        * - a compromise to prevent spacing issues */
-+        else if ( alignment_type == 5 ){
-+          if ( lwidth < 5 )
-+          {
-+            /*if ( loffset % 3 == 0 ) shift = -1;*/
-+            if ( loffset % 3 == 1 ) shift = 1;
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+          else if ( lwidth < 6 )
-+          {
-+            if ( loffset % 3 == 0 ) shift = 1;
-+            if ( loffset % 3 == 1 ) shift = 0;
-+            /*if ( loffset % 3 == 2 ) shift = -1;*/
-+          }
-+          else if ( lwidth < 20 )
-+          {
-+            if ( loffset % 3 == 0 ) shift = 1;
-+            /*if ( loffset % 3 == 1 ) shift = -1;*/
-+            if ( loffset % 3 == 2 ) shift = 0;
-+          }
-+        }
-+
-+        /******************** ALIGN GLYPHS *********************/
-+        if (shift == -1)
-+        {
-+          line = bitmap->buffer;
-+          for ( height = (FT_UInt)bitmap->rows; height > 0; height--,
-+            line += bitmap->pitch )
-+          {
-+            FT_UInt  xx;
-+
-+            for ( xx = 0; xx < width - 1; xx += 1 )
-+            {
-+              line[xx] = line[xx+1];
-+            }
-+            line[width - 1] = 1;
-+          }
-+        }
-+
-+        else if (shift == -2)
-+        {
-+          line = bitmap->buffer;
-+          for ( height = (FT_UInt)bitmap->rows; height > 0; height--,
-+            line += bitmap->pitch )
-+          {
-+            FT_UInt  xx;
-+
-+            for ( xx = 0; xx < width - 2; xx += 1 )
-+            {
-+              line[xx] = line[xx+2];
-+            }
-+            line[width - 2] = 1;
-+            line[width - 1] = 1;
-+          }
-+        }
-+        else if (shift == 1)
-+        {
-+          line = bitmap->buffer;
-+          for ( height = (FT_UInt)bitmap->rows; height > 0; height--,
-+            line += bitmap->pitch )
-+          {
-+            FT_UInt  xx;
-+
-+            for ( xx = width - 1; xx > 0; xx -= 1 )
-+            {
-+              line[xx] = line[xx-1];
-+            }
-+            line[0] = 1;
-+          }
-+        }
-+        else if (shift == 2)
-+        {
-+          line = bitmap->buffer;
-+          for ( height = (FT_UInt)bitmap->rows; height > 0; height--,
-+            line += bitmap->pitch )
-+          {
-+            FT_UInt  xx;
-+
-+            for ( xx = width; xx > 1; xx -= 1 )
-+            {
-+              line[xx] = line[xx-2];
-+            }
-+            line[0] = 1;
-+            line[1] = 1;
-+          }
-+        }
-+      }
-+
-+      if ( pseudo_gamma_value != 1 )
-+      {
-+        FT_Byte*  line = bitmap->buffer;
-+        float ppem = (float)slot->face->size->metrics.x_ppem;
-+
-+        if (ppem >= 5 )
-+        for (height = (FT_UInt)bitmap->rows; height > 0; height--, line += bitmap->pitch )
-+        {
-+          FT_UInt  xx;
-+
-+          for ( xx = 0; xx < width; xx += 1 )
-+          {
-+            /*normal*/
-+            /*line[xx] = gamma2 ( line[xx], pseudo_gamma_value );*/
-+
-+            /* sloped */
-+            /*line[xx] = gamma2 ( line[xx], pseudo_gamma_value - 5
-+            * (1-pseudo_gamma_value)/(pseudo_gamma_lt -5)
-+            + ((1-pseudo_gamma_value)/(pseudo_gamma_lt -5)) * ppem );*/
-+
-+            /* 1/3-sloped */
-+            line[xx] = gamma2 ( line[xx], pseudo_gamma_value - 5
-+            * ((1-pseudo_gamma_value)/(3*(pseudo_gamma_lt -5)))
-+            * + ((1-pseudo_gamma_value)/(3*(pseudo_gamma_lt -5))) * ppem );
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+
-+
-+
-+
-+
- /* define USE_LEGACY to implement the legacy filter */
- #define  USE_LEGACY
-
-@@ -287,9 +1017,31 @@
-                             { 0x00, 0x55, 0x56, 0x55, 0x00 };
-     /* the values here sum up to a value larger than 256, */
-     /* providing a cheap gamma correction                 */
--    static const FT_Byte  default_filter[5] =
-+    static FT_Byte  default_filter[5] =
-                             { 0x10, 0x40, 0x70, 0x40, 0x10 };
-
-+    int checked_filter_params_env = 0;
-+
-+    if ( checked_filter_params_env == 0 )
-+    {
-+      char *filter_params = getenv( "INFINALITY_FT_FILTER_PARAMS" );
-+      if ( filter_params != NULL )
-+      {
-+        float f1, f2, f3, f4, f5;
-+
-+        if ( strcasecmp(filter_params, "default" ) != 0)
-+        {
-+          sscanf ( filter_params, "%f %f %f %f %f", &f1, &f2, &f3, &f4, &f5 );
-+
-+          default_filter[0] = (FT_Byte) (f1 * 255.0f + 0.5f);
-+          default_filter[1] = (FT_Byte) (f2 * 255.0f + 0.5f);
-+          default_filter[2] = (FT_Byte) (f3 * 255.0f + 0.5f);
-+          default_filter[3] = (FT_Byte) (f4 * 255.0f + 0.5f);
-+          default_filter[4] = (FT_Byte) (f5 * 255.0f + 0.5f);
-+        }
-+      }
-+      checked_filter_params_env = 1;
-+    }
-
-     if ( !library )
-       return FT_Err_Invalid_Argument;
-@@ -304,17 +1056,20 @@
-     case FT_LCD_FILTER_DEFAULT:
- #if defined( FT_FORCE_LEGACY_LCD_FILTER )
-
-+      library->lcd_stem_align_func = _lcd_stem_align;
-       library->lcd_filter_func = _ft_lcd_filter_legacy;
-       library->lcd_extra       = 0;
-
- #elif defined( FT_FORCE_LIGHT_LCD_FILTER )
-
-+      library->lcd_stem_align_func = _lcd_stem_align;
-       ft_memcpy( library->lcd_weights, light_filter, 5 );
-       library->lcd_filter_func = _ft_lcd_filter_fir;
-       library->lcd_extra       = 2;
-
- #else
-
-+      library->lcd_stem_align_func = _lcd_stem_align;
-       ft_memcpy( library->lcd_weights, default_filter, 5 );
-       library->lcd_filter_func = _ft_lcd_filter_fir;
-       library->lcd_extra       = 2;
-@@ -325,6 +1080,7 @@
-
-     case FT_LCD_FILTER_LIGHT:
-       ft_memcpy( library->lcd_weights, light_filter, 5 );
-+      library->lcd_stem_align_func = _lcd_stem_align;
-       library->lcd_filter_func = _ft_lcd_filter_fir;
-       library->lcd_extra       = 2;
-       break;
-@@ -332,6 +1088,7 @@
- #ifdef USE_LEGACY
-
-     case FT_LCD_FILTER_LEGACY:
-+      library->lcd_stem_align_func = _lcd_stem_align;
-       library->lcd_filter_func = _ft_lcd_filter_legacy;
-       library->lcd_extra       = 0;
-       break;
-diff -Nur freetype-2.4.3.orig/src/base/ftobjs.c freetype-2.4.3.new/src/base/ftobjs.c
---- freetype-2.4.3.orig/src/base/ftobjs.c 2010-08-06 13:02:15.000000000 -0500
-+++ freetype-2.4.3.new/src/base/ftobjs.c  2010-11-14 15:43:02.906303324 -0600
-@@ -562,6 +562,45 @@
-     FT_Bool       autohint = FALSE;
-     FT_Module     hinter;
-
-+    TT_Face face2=(TT_Face)face;
-+    int checked_auto_autohint_env;
-+    FT_Bool auto_autohint = FALSE;
-+
-+    if ( !checked_auto_autohint_env )
-+    {
-+      char *auto_autohint_env = getenv( "INFINALITY_FT_AUTO_AUTOHINT" );
-+      if ( auto_autohint_env != NULL )
-+      {
-+        if ( strcasecmp(auto_autohint_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(auto_autohint_env, "true") == 0) auto_autohint = TRUE;
-+          else if ( strcasecmp(auto_autohint_env, "1") == 0) auto_autohint = TRUE;
-+          else if ( strcasecmp(auto_autohint_env, "on") == 0) auto_autohint = TRUE;
-+          else if ( strcasecmp(auto_autohint_env, "yes") == 0) auto_autohint = TRUE;
-+        }
-+      }
-+      checked_auto_autohint_env = 1;
-+    }
-+/*printf("%d,%d ", load_flags, FT_LOAD_TARGET_NORMAL);
-+10000001000101000
-+0#define FT_LOAD_DEFAULT                      0x0
-+0#define FT_LOAD_NO_SCALE                     0x1
-+0#define FT_LOAD_NO_HINTING                   0x2
-+1#define FT_LOAD_RENDER                       0x4
-+0#define FT_LOAD_NO_BITMAP                    0x8
-+1#define FT_LOAD_VERTICAL_LAYOUT              0x10
-+0#define FT_LOAD_FORCE_AUTOHINT               0x20
-+0#define FT_LOAD_CROP_BITMAP                  0x40
-+0#define FT_LOAD_PEDANTIC                     0x80
-+1#define FT_LOAD_ADVANCE_ONLY                 0x100
-+0#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  0x200
-+0#define FT_LOAD_NO_RECURSE                   0x400
-+0#define FT_LOAD_IGNORE_TRANSFORM             0x800
-+0#define FT_LOAD_MONOCHROME                   0x1000
-+0#define FT_LOAD_LINEAR_DESIGN                0x2000
-+0#define FT_LOAD_SBITS_ONLY                   0x4000
-+1#define FT_LOAD_NO_AUTOHINT                  0x8000U
-+*/
-
-     if ( !face || !face->size || !face->glyph )
-       return FT_Err_Invalid_Face_Handle;
-@@ -627,8 +666,11 @@
-
-
-         if ( mode == FT_RENDER_MODE_LIGHT             ||
--             face->internal->ignore_unpatented_hinter )
-+             face->internal->ignore_unpatented_hinter ||
-+             ( auto_autohint && face2->max_profile.maxSizeOfInstructions  == 0 ) )
-+        {
-           autohint = TRUE;
-+        }
-       }
-     }
-
-diff -Nur freetype-2.4.3.orig/src/base/ftoutln.c freetype-2.4.3.new/src/base/ftoutln.c
---- freetype-2.4.3.orig/src/base/ftoutln.c  2010-06-27 08:03:58.000000000 -0500
-+++ freetype-2.4.3.new/src/base/ftoutln.c 2010-11-14 09:06:38.779916717 -0600
-@@ -888,6 +888,28 @@
-     FT_Int      c, n, first;
-     FT_Int      orientation;
-
-+    int checked_enhanced_embolden_env = 0;
-+    FT_Bool enhanced_embolden = FALSE;
-+
-+    if ( checked_enhanced_embolden_env == 0 )
-+    {
-+      char *enhanced_embolden_env = getenv( "INFINALITY_FT_ENHANCED_EMBOLDEN" );
-+      if ( enhanced_embolden_env != NULL )
-+      {
-+        if ( strcasecmp(enhanced_embolden_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(enhanced_embolden_env, "true") == 0)
-+            enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "1") == 0)
-+            enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "on") == 0)
-+            enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "yes") == 0)
-+            enhanced_embolden = TRUE;
-+        }
-+      }
-+      checked_enhanced_embolden_env = 1;
-+    }
-
-     if ( !outline )
-       return FT_Err_Invalid_Argument;
-@@ -957,7 +979,8 @@
-         }
-
-         outline->points[n].x = v_cur.x + strength + in.x;
--        outline->points[n].y = v_cur.y + strength + in.y;
-+        if ( !enhanced_embolden )
-+          outline->points[n].y = v_cur.y + strength + in.y;
-
-         v_prev = v_cur;
-         v_cur  = v_next;
-diff -Nur freetype-2.4.3.orig/src/base/ftsynth.c freetype-2.4.3.new/src/base/ftsynth.c
---- freetype-2.4.3.orig/src/base/ftsynth.c  2010-09-11 01:28:32.000000000 -0500
-+++ freetype-2.4.3.new/src/base/ftsynth.c 2010-11-14 09:19:16.860168106 -0600
-@@ -88,9 +88,28 @@
-     FT_Error    error;
-     FT_Pos      xstr, ystr;
-
-+    int checked_enhanced_embolden_env = 0;
-+    FT_Bool enhanced_embolden = FALSE;
-+
-+    if ( checked_enhanced_embolden_env == 0 )
-+    {
-+      char *enhanced_embolden_env = getenv( "INFINALITY_FT_EMBOLDEN_MAINTAIN_WIDTH" );
-+      if ( enhanced_embolden_env != NULL )
-+      {
-+        if ( strcasecmp(enhanced_embolden_env, "default" ) != 0 )
-+        {
-+          if ( strcasecmp(enhanced_embolden_env, "true") == 0) enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "1") == 0) enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "on") == 0) enhanced_embolden = TRUE;
-+          else if ( strcasecmp(enhanced_embolden_env, "yes") == 0) enhanced_embolden = TRUE;
-+        }
-+      }
-+      checked_enhanced_embolden_env = 1;
-+    }
-+
-
-     if ( slot->format != FT_GLYPH_FORMAT_OUTLINE &&
--         slot->format != FT_GLYPH_FORMAT_BITMAP  )
-+         slot->format != FT_GLYPH_FORMAT_BITMAP )
-       return;
-
-     /* some reasonable strength */
-@@ -108,7 +127,7 @@
-       xstr = xstr * 2;
-       ystr = xstr;
-     }
--    else /* slot->format == FT_GLYPH_FORMAT_BITMAP */
-+    else if ( slot->format == FT_GLYPH_FORMAT_BITMAP )
-     {
-       /* round to full pixels */
-       xstr &= ~63;
-@@ -146,7 +165,8 @@
-     slot->metrics.width        += xstr;
-     slot->metrics.height       += ystr;
-     slot->metrics.horiBearingY += ystr;
--    slot->metrics.horiAdvance  += xstr;
-+    /* Don't add any horiAdvance - Personal preference */
-+    if ( !enhanced_embolden ) slot->metrics.horiAdvance  += xstr;
-     slot->metrics.vertBearingX -= xstr / 2;
-     slot->metrics.vertBearingY += ystr;
-     slot->metrics.vertAdvance  += ystr;
-diff -Nur freetype-2.4.3.orig/src/smooth/ftsmooth.c freetype-2.4.3.new/src/smooth/ftsmooth.c
---- freetype-2.4.3.orig/src/smooth/ftsmooth.c 2010-08-09 19:47:47.000000000 -0500
-+++ freetype-2.4.3.new/src/smooth/ftsmooth.c  2010-11-07 11:17:08.693652341 -0600
-@@ -283,6 +283,9 @@
-           vec->y /= 3;
-     }
-
-+    if ( slot->library->lcd_stem_align_func )
-+      slot->library->lcd_stem_align_func ( bitmap, mode, slot );
-+
-     if ( slot->library->lcd_filter_func )
-       slot->library->lcd_filter_func( bitmap, mode, slot->library );
diff --git a/unmaintained/freetype-infinality/freetype2-infinality-protect_null_pointer-goddesse.patch b/unmaintained/freetype-infinality/freetype2-infinality-protect_null_pointer-goddesse.patch
deleted file mode 100644
index 43143e69e1..0000000000
--- a/unmaintained/freetype-infinality/freetype2-infinality-protect_null_pointer-goddesse.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Contributed by goddesse
-https://bbs.archlinux.org/viewtopic.php?pid=864901#p864901
-
-diff -Naur freetype-2.4.4/src/base/ftlcdfil.c freetype-2.4.4.new/src/base/ftlcdfil.c
---- freetype-2.4.4/src/base/ftlcdfil.c    2010-12-12 12:05:21.606671258 -0600
-+++ freetype-2.4.4.new/src/base/ftlcdfil.c    2010-12-12 12:08:17.726671242 -0600
-@@ -180,14 +180,17 @@
-         else if (strcasecmp(alignment_type_env, "infinality1") == 0) alignment_type = 6;
-         else alignment_type = 0;
- 
--        if ( /*strstr(slot.metrics->root.scaler.face->style_name, "Regular")
--          || strstr(slot.metrics->root.scaler.face->style_name, "Book")
--          || strstr(slot.metrics->root.scaler.face->style_name, "Medium")
--          ||*/ strcasestr(slot->face->style_name, "Italic")
--          || strcasestr(slot->face->style_name, "Oblique") )
--          alignment_type = 0;
--        if ( strcasestr(slot->face->style_name, "Bold") )
--          alignment_type = 0;
-+        if ( slot->face != NULL && slot->face->style_name != NULL )
-+        {
-+          if ( /*strstr(slot.metrics->root.scaler.face->style_name, "Regular")
-+            || strstr(slot.metrics->root.scaler.face->style_name, "Book")
-+            || strstr(slot.metrics->root.scaler.face->style_name, "Medium")
-+            ||*/ strcasestr(slot->face->style_name, "Italic")
-+            || strcasestr(slot->face->style_name, "Oblique") )
-+            alignment_type = 0;
-+          if ( strcasestr(slot->face->style_name, "Bold") )
-+            alignment_type = 0;
-+        }
-       }
-       checked_alignment_type = 1;
-     }
-@@ -214,16 +217,19 @@
-     /*printf("%s,%s ", slot->face->family_name, slot->face->style_name);*/
-     /*printf("%d ", slot->face->size->metrics.x_ppem);*/
- 
--    /* set gamma value to 1 if out of range */
--    if ( slot->face->size->metrics.x_ppem >= pseudo_gamma_lt )
-+    if ( slot->face && slot->face->size )
-     {
--      pseudo_gamma_value = 1;
--    }
-+        /* set gamma value to 1 if out of range */
-+        if ( slot->face->size->metrics.x_ppem >= pseudo_gamma_lt )
-+        {
-+          pseudo_gamma_value = 1;
-+        }
- 
--    /* don't do alignment for < 10 */
--    if ( slot->face->size->metrics.x_ppem < 10 )
--    {
--      alignment_type = 0;
-+        /* don't do alignment for < 10 */
-+        if ( slot->face->size->metrics.x_ppem < 10 )
-+        {
-+          alignment_type = 0;
-+        }
-     }
- 
-     if ( mode == FT_RENDER_MODE_LCD )
-@@ -642,7 +648,9 @@
-       if ( pseudo_gamma_value != 1 )
-       {
-         FT_Byte*  line = bitmap->buffer;
--        float ppem = (float)slot->face->size->metrics.x_ppem;
-+        float ppem = 0;
-+        if ( slot->face && slot->face->size )
-+            ppem = (float)slot->face->size->metrics.x_ppem;
- 
-         if (ppem >= 5 )
-         for (height = (FT_UInt)bitmap->rows; height > 0; height--, line += bitmap->pitch )
diff --git a/unmaintained/freetype-infinality/infinality-settings b/unmaintained/freetype-infinality/infinality-settings
deleted file mode 100644
index f6fca1aac5..0000000000
--- a/unmaintained/freetype-infinality/infinality-settings
+++ /dev/null
@@ -1,230 +0,0 @@
-##################################################################
-# INFINALITY ENVIRONMENT VARIABLES FOR EXTRA RUN-TIME OPTIONS
-##################################################################
-#
-# These environment variables require that their respective patches
-# from http://www.infinality.net have been applied to the Freetype
-# installation you are using.  They will do abolutely
-# nothing otherwise!
-#
-
-# This file should be copied to /etc/profile.d/ for system-wide
-# effects and/or included in ~/.bashrc or ~/.bash_profile for per-user
-# effects:
-# 
-#   . ~/path/to/this/file/infinality-settings
-#
-# Of course, the per-user settings will override the system-wide
-# settings.  Default values indicated below will be used when the
-# environment variables below are not defined.
-
-
-
-##################################################################
-# INFINALITY_FT_FILTER_PARAMS
-#
-# This is a modified version of the patch here:
-# http://levelsofdetail.kendeeter.com/2008/12/dynamic_fir_filter_patch.html
-#
-# Allows you to adjust the FIR filter at runtime instead of at
-# compile time.  The idea is to have values add up to one, and be
-# symmetrical around the middle value.  Here are some samples
-# of various filter parameters:
-#
-# Strong Extra Smooth  "15e-2 20e-2 30e-2 20e-2 15e-2"  (extra smooth, natural weight)
-# Extra Smooth      "20e-2 20e-2 30e-2 20e-2 20e-2"  (extra smooth, extra weight)
-# Smooth            "15e-2 20e-2 32e-2 20e-2 15e-2"  (smooth, natural weight)
-# Stronger Gibson   "11e-2 22e-2 38e-2 22e-2 11e-2"  (smooth, extra weight)
-# Gibson            "11e-2 22e-2 33e-2 22e-2 11e-2"  (smooth, natural weight)
-# Freetype Light    "00e-2 33e-2 34e-2 33e-2 00e-2"  (sharp, natural weight)
-# Freetype Default  "06e-2 25e-2 44e-2 25e-2 06e-2"  (sharp, extra weight)           *default
-# Extra Sharp       "00e-2 35e-2 35e-2 35e-2 00e-2"  (extra sharp, extra weight)
-#
-# Default:     [Freetype's default]
-# Recommended: "11e-2 22e-2 38e-2 22e-2 11e-2"
-#
-# Example 1:  export INFINALITY_FT_FILTER_PARAMS="11e-2 22e-2 38e-2 22e-2 11e-2"
-#
-
-export INFINALITY_FT_FILTER_PARAMS="11e-2 22e-2 38e-2 22e-2 11e-2"
-
-
-
-
-##################################################################
-# INFINALITY_FT_STEM_ALIGNMENT_TYPE
-#
-# This performs analysis on each glyph and determines the best
-# subpixel orientation for the glyph.  The glyph is not scaled in
-# any way, just moved left or right by a subpixel amount.  This
-# results in subtley cleaner looking fonts, at the expense of
-# proper distances between glyphs.  This is only active for sizes
-# 10 px or greater and does not apply to bold or italic fonts.
-# 
-# Possible values:
-# full             - Allows a glyph to be moved to the LEFT or RIGHT by 1 subpixel
-#                    Best alignment, Worst positioning
-# medium,medium1   - Only allows a glyph to be moved to the LEFT by 1 subpixel
-#                    Good alignment, Good positioning
-# medium2          - Only allows a glyph to be moved to the RIGHT by 1 subpixel
-#                    Good alignment, Good positioning
-# slight,slight1   - A stricter version of medium
-#                    Minor alignment, Best positioning
-# slight2          - A stricter version of medium2
-#                    Minor alignment, Best positioning
-# infinality       - medium1 when stem < 5 subpixels, full when >= 5 subpixels
-# none             - Don't do any alignment
-#
-# Default:     none
-# Recommended: medium
-
-export INFINALITY_FT_STEM_ALIGNMENT_TYPE=medium
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT
-#
-# Cause the height of horizontal stems to snap to integer pixels
-# when using light auto-hinting.  (This happens automatically
-# when using full auto-hinting)
-#
-# This produces an effect similar to the way Windows renders fonts
-# without requiring the font to contain bytecode instructions.
-#
-# Possible values:
-# true             - enable stem snapping
-# false            - do not enable stem snapping
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTOFIT_STEM_SNAP_LIGHT=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_EMBOLDEN_LIGHT
-#
-# Embolden particularly light or thin fonts, like DejaVu Sans Light,
-# Inconsolata, Freemono, Courier New, etc. up until stem width is
-# 1 pixel wide.  This makes these fonts easier to read at lower
-# ppems.  Only applies when the autohinter is being used.
-#
-# Possible values:
-# true             - enable emboldening of light fonts
-# false            - do not enable emboldening of light fonts
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTOFIT_EMBOLDEN_LIGHT=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_PSEUDO_GAMMA
-#
-# This does a weighted gamma correction at the LCD filter phase
-# prior to the LCD filter.
-#
-# The first value indicates a px value, the second indicates a
-# "gamma" value.  All sizes < the px value will be corrected
-# on a weighted scale based on the second value.
-#
-# Values .1 < 1.0 will darken the glyph
-# Values > 1.0 will lighten the glyph
-#
-# Example 1:  Darken glyphs that are less than 10 px. With some fonts
-#             even 5 or 6px is readable!
-# export INFINALITY_FT_PSEUDO_GAMMA="10 6e-1"
-#
-# Example 2:  Lighten all glyphs (below 100px)
-# export INFINALITY_FT_PSEUDO_GAMMA="100 15e-1"
-#
-# Default:     [No gamma correction]
-# Recommended: "9 5e-1"
-
-export INFINALITY_FT_PSEUDO_GAMMA="9 7e-1"
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTOFIT_ADJUST_HEIGHTS
-#
-# This will slightly stretch some glyphs vertically between 9px
-# and 14px (inclusive).  Some people may find this more
-# aesthetically pleasing.  This only applies to fonts that are
-# using autohint.  
-#
-# Possible values:
-# true             - enable height adjustment
-# false            - do not enable height adjustment
-#
-# Default:     false
-
-export INFINALITY_FT_AUTOFIT_ADJUST_HEIGHTS=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_ENHANCED_EMBOLDEN
-#
-# When doing artificial emboldening, only embolden in the X
-# direction, skipping the Y direction. Most people will find this
-# more aesthetically pleasing than the default behavior.
-#
-# Possible values:
-# true             - enable enhanced emboldening
-# false            - no not enable enhanced emboldening
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_ENHANCED_EMBOLDEN=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_EMBOLDEN_MAINTAIN_WIDTH
-#
-# When doing artificial emboldening, don't change the glyph width.
-#
-# Possible values:
-# true             - maintain width
-# false            - do not maintain width
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_EMBOLDEN_MAINTAIN_WIDTH=true
-
-
-
-
-##################################################################
-# INFINALITY_FT_AUTO_AUTOHINT
-#
-# Automatically use autohint when rendering a font that contains
-# no truetype instructions, regardless of what the calling
-# program asks for.  The truetype hinter will not do a good job
-# on these.
-#
-# Possible values:
-# true             - automatically use autohint
-# false            - do not automatically use autohint
-#
-# Default:     false
-# Recommended: true
-
-export INFINALITY_FT_AUTO_AUTOHINT=true
-
-
-
-
diff --git a/unmaintained/gnome-base/APKBUILD b/unmaintained/gnome-base/APKBUILD
deleted file mode 100644
index a89fb86c79..0000000000
--- a/unmaintained/gnome-base/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-base
-pkgver=2.32.0
-pkgrel=1
-pkgdesc="GNOME metapackage (base)"
-url="http://www.gnome.org/"
-arch="noarch"
-license="GPL"
-depends="metacity
-         nautilus
-
-         gnome-session
-         gnome-themes
-         gnome-screensaver
-         gnome-power-manager
-         gnome-settings-daemon
-         gnome-control-center
-         gnome-desktop
-
-         gnome-system-monitor
-         gnome-panel
-         gnome-terminal"
-depends_dev=
-makedepends=
-install=""
-subpackages=
-source=""
-
-build() {
-	mkdir -p "$pkgdir"
-}
-
-md5sums=""
diff --git a/unmaintained/gnome-control-center/APKBUILD b/unmaintained/gnome-control-center/APKBUILD
deleted file mode 100644
index c56c8cf57e..0000000000
--- a/unmaintained/gnome-control-center/APKBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-control-center
-pkgver=2.32.1
-pkgrel=6
-pkgdesc="GNOME configuration applets"
-url="http://www.gnome.org"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libunique-dev
-
-	     gnome-menus-dev
-	     gnome-settings-daemon-dev
-	     metacity-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev
-
-	     libgnomekbd-dev
-	     libxklavier-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev desktop-file-utils"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages="$pkgname-lang"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-	link-gmodule.patch"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-scrollkeeper \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-
-	rm -rf ${pkgdir}/usr/share/mime
-}
-
-md5sums="b4e8ab5c7556ae07addbfcfb4fa2f761  gnome-control-center-2.32.1.tar.bz2
-ccbfe3d954cc7d0bb91ef081a51793ea  link-gmodule.patch"
diff --git a/unmaintained/gnome-control-center/gnome-control-center.post-install b/unmaintained/gnome-control-center/gnome-control-center.post-install
deleted file mode 100644
index 98f2aac0e9..0000000000
--- a/unmaintained/gnome-control-center/gnome-control-center.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in control-center.schemas fontilus.schemas gnome-control-center.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-control-center/gnome-control-center.post-upgrade b/unmaintained/gnome-control-center/gnome-control-center.post-upgrade
deleted file mode 100644
index 98f2aac0e9..0000000000
--- a/unmaintained/gnome-control-center/gnome-control-center.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in control-center.schemas fontilus.schemas gnome-control-center.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-control-center/gnome-control-center.pre-deinstall b/unmaintained/gnome-control-center/gnome-control-center.pre-deinstall
deleted file mode 100644
index 9b03979ce7..0000000000
--- a/unmaintained/gnome-control-center/gnome-control-center.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in control-center.schemas fontilus.schemas gnome-control-center.schemas; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-control-center/link-gmodule.patch b/unmaintained/gnome-control-center/link-gmodule.patch
deleted file mode 100644
index 9bf14ec961..0000000000
--- a/unmaintained/gnome-control-center/link-gmodule.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/capplets/appearance/Makefile.in b/capplets/appearance/Makefile.in
-index 4b8df30..9c62c4f 100644
---- a/capplets/appearance/Makefile.in
-+++ b/capplets/appearance/Makefile.in
-@@ -386,7 +386,7 @@ gnome_appearance_properties_LDADD = \
- 	$(top_builddir)/capplets/common/libcommon.la \
- 	$(GNOMECC_CAPPLETS_LIBS) \
- 	$(FONT_CAPPLET_LIBS) \
--	$(METACITY_LIBS)
-+	$(METACITY_LIBS) -lgmodule-2.0
- 
- gnome_appearance_properties_LDFLAGS = -export-dynamic
- gtkbuilderdir = $(pkgdatadir)/ui
-diff --git a/capplets/common/Makefile.in b/capplets/common/Makefile.in
-index 00e594a..5f1849a 100644
---- a/capplets/common/Makefile.in
-+++ b/capplets/common/Makefile.in
-@@ -365,7 +365,7 @@ gnome_theme_test_SOURCES = \
- 
- gnome_theme_test_LDADD = \
- 	libcommon.la							\
--	$(GNOMECC_CAPPLETS_LIBS)
-+	$(GNOMECC_CAPPLETS_LIBS) -lgmodule-2.0
- 
- all: all-am
- 
diff --git a/unmaintained/gnome-panel/APKBUILD b/unmaintained/gnome-panel/APKBUILD
deleted file mode 100644
index d39c3bb961..0000000000
--- a/unmaintained/gnome-panel/APKBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-panel
-pkgver=2.32.1
-pkgrel=12
-pkgdesc="GNOME Panel"
-url="http://projects.gnome.org/gnome-panel"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     gnome-menus-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libgweather-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-lang"
-replaces_dev="$pkgname"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-	as-needed.patch
-	libm-underlinking.patch
-	link-gmodule.patch
-	"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-scrollkeeper \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="a228035e1f7026abf296b797f1f7d2f9  gnome-panel-2.32.1.tar.bz2
-42a7f2693e5f99ce3440bd53ebccbae0  as-needed.patch
-292372a7f264bb63ca9eb3c69a664ee1  libm-underlinking.patch
-399b61956a678c60e0f0d28eeca63aba  link-gmodule.patch"
diff --git a/unmaintained/gnome-panel/as-needed.patch b/unmaintained/gnome-panel/as-needed.patch
deleted file mode 100644
index 87e95e0104..0000000000
--- a/unmaintained/gnome-panel/as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./applets/notification_area/Makefile.in.orig
-+++ ./applets/notification_area/Makefile.in
-@@ -403,17 +403,17 @@
- 
- NOTIFICATION_AREA_SOURCES = main.c
- NOTIFICATION_AREA_LDADD = \
-+	libtray.la					\
- 	../../libpanel-applet/libpanel-applet-3.la	\
- 	$(X_LIBS)					\
- 	$(NOTIFICATION_AREA_LIBS)			\
--	$(LIBPANEL_APPLET_LIBS)				\
--	libtray.la
-+	$(LIBPANEL_APPLET_LIBS)
- 
- testtray_SOURCES = testtray.c
- testtray_LDADD = \
-+	libtray.la 			\
- 	$(X_LIBS)			\
--	$(NOTIFICATION_AREA_LIBS)	\
--	libtray.la
-+	$(NOTIFICATION_AREA_LIBS)
- 
- @NOTIFICATION_AREA_INPROCESS_FALSE@APPLET_IN_PROCESS = false
- @NOTIFICATION_AREA_INPROCESS_TRUE@APPLET_IN_PROCESS = true
diff --git a/unmaintained/gnome-panel/gnome-panel.post-install b/unmaintained/gnome-panel/gnome-panel.post-install
deleted file mode 100644
index 06060f9059..0000000000
--- a/unmaintained/gnome-panel/gnome-panel.post-install
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-for i in \
-	clock.schemas \
-	fish.schemas \
-	panel-compatibility.schemas \
-	panel-general.schemas \
-	panel-global.schemas \
-	panel-object.schemas \
-	panel-toplevel.schemas \
-	window-list.schemas \
-	workspace-switcher.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
-
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-echo "Installing GConf2 default entries to ${GCONF_CONFIG_SOURCE}"
-/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load /etc/gconf/schemas/panel-default-setup.entries >/dev/null
diff --git a/unmaintained/gnome-panel/gnome-panel.post-upgrade b/unmaintained/gnome-panel/gnome-panel.post-upgrade
deleted file mode 100644
index 06060f9059..0000000000
--- a/unmaintained/gnome-panel/gnome-panel.post-upgrade
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-for i in \
-	clock.schemas \
-	fish.schemas \
-	panel-compatibility.schemas \
-	panel-general.schemas \
-	panel-global.schemas \
-	panel-object.schemas \
-	panel-toplevel.schemas \
-	window-list.schemas \
-	workspace-switcher.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
-
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-echo "Installing GConf2 default entries to ${GCONF_CONFIG_SOURCE}"
-/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load /etc/gconf/schemas/panel-default-setup.entries >/dev/null
diff --git a/unmaintained/gnome-panel/gnome-panel.pre-deinstall b/unmaintained/gnome-panel/gnome-panel.pre-deinstall
deleted file mode 100644
index 96aa7274d4..0000000000
--- a/unmaintained/gnome-panel/gnome-panel.pre-deinstall
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-for i in \
-	clock.schemas \
-	fish.schemas \
-	panel-compatibility.schemas \
-	panel-general.schemas \
-	panel-global.schemas \
-	panel-object.schemas \
-	panel-toplevel.schemas \
-	window-list.schemas \
-	workspace-switcher.schemas \
-; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done
-
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-echo "Uninstalling GConf2 default entries from ${GCONF_CONFIG_SOURCE}"
-/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload /etc/gconf/schemas/panel-default-setup.entries >/dev/null
diff --git a/unmaintained/gnome-panel/libm-underlinking.patch b/unmaintained/gnome-panel/libm-underlinking.patch
deleted file mode 100644
index 9d56f0648a..0000000000
--- a/unmaintained/gnome-panel/libm-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./gnome-panel/Makefile.in.orig
-+++ ./gnome-panel/Makefile.in
-@@ -582,7 +582,7 @@
- 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la			\
- 	$(PANEL_LIBS)									\
- 	$(XRANDR_LIBS)									\
--	$(X_LIBS)
-+	$(X_LIBS) -lm
- 
- gnome_panel_LDFLAGS = -export-dynamic
- gnome_desktop_item_edit_SOURCES = \
diff --git a/unmaintained/gnome-panel/link-gmodule.patch b/unmaintained/gnome-panel/link-gmodule.patch
deleted file mode 100644
index a92791fa49..0000000000
--- a/unmaintained/gnome-panel/link-gmodule.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gnome-panel/Makefile.in b/gnome-panel/Makefile.in
-index d2b72bb..27e624c 100644
---- a/gnome-panel/Makefile.in
-+++ b/gnome-panel/Makefile.in
-@@ -582,7 +582,7 @@ gnome_panel_LDADD = \
- 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la			\
- 	$(PANEL_LIBS)									\
- 	$(XRANDR_LIBS)									\
--	$(X_LIBS) -lm
-+	$(X_LIBS) -lm -lgmodule-2.0
- 
- gnome_panel_LDFLAGS = -export-dynamic
- gnome_desktop_item_edit_SOURCES = \
-@@ -612,7 +612,7 @@ panel_test_applets_CPPFLAGS = \
- panel_test_applets_LDADD = \
- 	$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private-mini.la	\
- 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la				\
--	$(PANEL_LIBS)
-+	$(PANEL_LIBS) -lgmodule-2.0
- 
- panel_test_applets_LDFLAGS = -export-dynamic
- panel_enum_headers = \
diff --git a/unmaintained/gnome-screensaver/APKBUILD b/unmaintained/gnome-screensaver/APKBUILD
deleted file mode 100644
index eeeab1d6ff..0000000000
--- a/unmaintained/gnome-screensaver/APKBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-screensaver
-pkgver=2.30.2
-pkgrel=3
-pkgdesc="GNOME screensaver collection"
-url="http://www.gnome.org"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     libwnck-dev
-	     libnotify-dev
-	     libunique-dev
-
-	     gnome-desktop-dev
-	     gnome-menus-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev
-	     libxrender-dev
-	     libxrandr-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages="$pkgname-lang"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-	gnome-screensaver-2.30.2-libnotify-0.7.patch"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-applets \
-		--disable-scrollkeeper \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="0fbe6e610e6847ac1e69d49b1e1f0582  gnome-screensaver-2.30.2.tar.bz2
-e517e9d432e97f89b706655dae21ed71  gnome-screensaver-2.30.2-libnotify-0.7.patch"
diff --git a/unmaintained/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch b/unmaintained/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
deleted file mode 100644
index 6eeb168190..0000000000
--- a/unmaintained/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c gnome-screensaver-2.30.2/src/gs-lock-plug.c
---- gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c	2010-09-28 13:36:51.000000000 -0700
-+++ gnome-screensaver-2.30.2/src/gs-lock-plug.c	2011-03-07 00:54:44.086669840 -0800
-@@ -47,6 +47,10 @@
- #include <libnotify/notify.h>
- #endif
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "gs-lock-plug.h"
- 
- #include "gs-debug.h"
-@@ -1090,7 +1094,11 @@
-         strftime (summary, 128, "%X", tmp);
- 
-         notify_init ("gnome-screensaver-dialog");
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+        note = notify_notification_new (summary, escaped_text, NULL);
-+#else
-         note = notify_notification_new (summary, escaped_text, NULL, NULL);
-+#endif
-         notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
-         notify_notification_show (note, NULL);
-         g_object_unref (note);
diff --git a/unmaintained/gnome-screensaver/gnome-screensaver.post-install b/unmaintained/gnome-screensaver/gnome-screensaver.post-install
deleted file mode 100644
index 49ca99c158..0000000000
--- a/unmaintained/gnome-screensaver/gnome-screensaver.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-screensaver.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-screensaver/gnome-screensaver.post-upgrade b/unmaintained/gnome-screensaver/gnome-screensaver.post-upgrade
deleted file mode 100644
index 49ca99c158..0000000000
--- a/unmaintained/gnome-screensaver/gnome-screensaver.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-screensaver.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-screensaver/gnome-screensaver.pre-deinstall b/unmaintained/gnome-screensaver/gnome-screensaver.pre-deinstall
deleted file mode 100644
index 1aebff8243..0000000000
--- a/unmaintained/gnome-screensaver/gnome-screensaver.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-screensaver.schemas; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-session/APKBUILD b/unmaintained/gnome-session/APKBUILD
deleted file mode 100644
index 519f91fd43..0000000000
--- a/unmaintained/gnome-session/APKBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-session
-pkgver=2.32.1
-pkgrel=1
-pkgdesc="GNOME session manager"
-url="http://www.gnome.org/"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libxcomposite-dev
-	     upower-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-compositor \
-		--disable-scrollkeeper \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="222bad6b446cb19a6b9028ea24538002  gnome-session-2.32.1.tar.bz2"
diff --git a/unmaintained/gnome-session/gnome-session.post-install b/unmaintained/gnome-session/gnome-session.post-install
deleted file mode 100644
index b64d264717..0000000000
--- a/unmaintained/gnome-session/gnome-session.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-session.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-session/gnome-session.post-upgrade b/unmaintained/gnome-session/gnome-session.post-upgrade
deleted file mode 100644
index b64d264717..0000000000
--- a/unmaintained/gnome-session/gnome-session.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-session.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-session/gnome-session.pre-deinstall b/unmaintained/gnome-session/gnome-session.pre-deinstall
deleted file mode 100644
index 59f0672e52..0000000000
--- a/unmaintained/gnome-session/gnome-session.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-session.schemas; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-settings-daemon/APKBUILD b/unmaintained/gnome-settings-daemon/APKBUILD
deleted file mode 100644
index 3fe6946eb3..0000000000
--- a/unmaintained/gnome-settings-daemon/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-settings-daemon
-pkgver=2.32.1
-pkgrel=5
-pkgdesc="GNOME settings daemon"
-url="http://www.gnome.org"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libunique-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev
-
-	     libgnomekbd-dev
-	     libxklavier-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-lang"
-replaces_dev="$pkgname"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-scrollkeeper \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="6420706542e8fb959acba7e2a69ee35f  gnome-settings-daemon-2.32.1.tar.bz2"
diff --git a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-install b/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-install
deleted file mode 100644
index 0a7432db11..0000000000
--- a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps_gnome_settings_daemon_housekeeping.schemas \
-	apps_gnome_settings_daemon_keybindings.schemas \
-	apps_gnome_settings_daemon_xrandr.schemas \
-	desktop_gnome_font_rendering.schemas \
-	desktop_gnome_keybindings.schemas \
-	desktop_gnome_peripherals_smartcard.schemas \
-	desktop_gnome_peripherals_touchpad.schemas \
-	gnome-settings-daemon.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-upgrade b/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-upgrade
deleted file mode 100644
index 0a7432db11..0000000000
--- a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.post-upgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps_gnome_settings_daemon_housekeeping.schemas \
-	apps_gnome_settings_daemon_keybindings.schemas \
-	apps_gnome_settings_daemon_xrandr.schemas \
-	desktop_gnome_font_rendering.schemas \
-	desktop_gnome_keybindings.schemas \
-	desktop_gnome_peripherals_smartcard.schemas \
-	desktop_gnome_peripherals_touchpad.schemas \
-	gnome-settings-daemon.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.pre-deinstall b/unmaintained/gnome-settings-daemon/gnome-settings-daemon.pre-deinstall
deleted file mode 100644
index 19cf86965f..0000000000
--- a/unmaintained/gnome-settings-daemon/gnome-settings-daemon.pre-deinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps_gnome_settings_daemon_housekeeping.schemas \
-	apps_gnome_settings_daemon_keybindings.schemas \
-	apps_gnome_settings_daemon_xrandr.schemas \
-	desktop_gnome_font_rendering.schemas \
-	desktop_gnome_keybindings.schemas \
-	desktop_gnome_peripherals_smartcard.schemas \
-	desktop_gnome_peripherals_touchpad.schemas \
-	gnome-settings-daemon.schemas \
-; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/jabberd14/APKBUILD b/unmaintained/jabberd14/APKBUILD
deleted file mode 100644
index a9b7f7f505..0000000000
--- a/unmaintained/jabberd14/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com> 
-pkgname=jabberd14
-pkgver=1.6.1.1
-pkgrel=2
-pkgdesc="Jabber server or XMPP"
-url="http://jabberd.org/"
-license="GPL"
-depends=
-makedepends="automake pkgconfig gnutls-dev libidn-dev libtool
-	popt-dev pth-dev expat-dev libgcrypt-dev"
-install=
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://download.jabberd.org/jabberd14/$pkgname-$pkgver.tar.gz
-	jabberd14.initd"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	export CXX=${CXX_UC:-g++-uc}
-	
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make -j1 || return 1
-	make -j1 DESTDIR="$pkgdir" install
-	
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-
-}
-
-md5sums="597c7ee14518ba22b1cee883b4737d87  jabberd14-1.6.1.1.tar.gz
-aa6ec7b00e05aedcc1db49da0029242b  jabberd14.initd"
diff --git a/unmaintained/jabberd14/jabberd14.initd b/unmaintained/jabberd14/jabberd14.initd
deleted file mode 100644
index 6c1b7126fc..0000000000
--- a/unmaintained/jabberd14/jabberd14.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1.init,v 1.1 2008/06/18 12:24:56 nelchael Exp $
-
-depend() {
-	need net
-	after firewall
-	provide jabber-server
-
-}
-
-start() {
-
-	ebegin "Starting Jabber Server"
-	start-stop-daemon --start \
-		-c jabber:jabber \
-		-x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
-	eend $?
-
-}
-
-stop() {
-
-	ebegin "Stopping Jabber Server"
-	start-stop-daemon --stop -x /usr/bin/jabberd
-	eend $?
-
-}
diff --git a/unmaintained/kdeadmin/APKBUILD b/unmaintained/kdeadmin/APKBUILD
deleted file mode 100644
index 7f2d4db966..0000000000
--- a/unmaintained/kdeadmin/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=kdeadmin
-pkgver=4.6.3
-pkgrel=0
-pkgdesc="kde administrative tools"
-url="http://www.kde.org/"
-arch="all"
-license="GPL"
-depends=
-depends_dev="kdebase-workspace-dev kdepimlibs-dev"
-makedepends="$depends_dev cmake automoc4"
-install=""
-subpackages="$pkgname-doc"
-source="http://kde.mirrors.tds.net/pub/kde/stable/$pkgver/src/kdeadmin-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/kdeadmin-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mkdir -p "$_builddir"/build
-}
-
-build() {
-	cd "$_builddir"/build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON "$_builddir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="8ac0a89337a58ddec49be0ca7a4a7534  kdeadmin-4.6.3.tar.bz2"
diff --git a/unmaintained/kdelibs/APKBUILD b/unmaintained/kdelibs/APKBUILD
deleted file mode 100644
index 90352204bd..0000000000
--- a/unmaintained/kdelibs/APKBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Contributor: k0r10n <k0r10n.dev@gmail.com>
-# Maintainer:
-pkgname=kdelibs
-pkgver=4.13.3
-pkgrel=4
-pkgdesc="KDE base libraries"
-url="http://www.kde.org/"
-arch="all"
-license="GPL"
-depends=
-depends_dev="phonon-dev polkit-qt-dev acl-dev attica-dev 
-	     libdbusmenu-qt-dev pcre-dev strigi-dev 
-	     docbook-xml docbook-xsl shared-mime-info
-	     giflib-dev jpeg-dev grantlee-dev qca-dev
-	     udev-dev xz-dev jasper-dev enchant-dev 
-	     libxslt-dev openssl-dev bison flex-dev 
-	     openexr-dev krb5-dev avahi-dev libxss-dev
-	     scrnsaverproto"
-makedepends="$depends_dev cmake automoc4 paxmark"
-install=""
-options="suid"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://kde.mirrors.tds.net/pub/kde/stable/$pkgver/src/kdelibs-$pkgver.tar.xz
-	fix-cmake-FindLibintl-4.13.3.patch
-	fix-headers-kdelibs.patch"
-
-_builddir="$srcdir"/kdelibs-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mkdir -p "$_builddir"/build
-}
-
-build() {
-	cd "$_builddir"/build
-	#
-	# We have enchant, so we don't need
-	# ASPELL and HSPEELL (for Hebrew spell checking)
-	# Also soprano and Shared Desktop Ontologies 
-	# are disabled in this build, because we
-	# don't have nepomuk
-	#
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	      -DCMAKE_BUILD_TYPE=Release \
-	      -DKDE4_BUILD_TESTS:BOOL=OFF \
-	      -DCMAKE_SKIP_RPATH:BOOL=ON \
-	      -DWITH_SOLID_UDISKS2:BOOL=ON \
-	      -DWITH_FAM:BOOL=OFF \
-	      -DWITH_ASPELL:BOOL=OFF \
-	      -DWITH_HSPELL:BOOL=OFF \
-	      -DWITH_Soprano:BOOL=OFF \
-	      -DWITH_SharedDesktopOntologies:BOOL=OFF \
-	      -DWITH_HUpnp:BOOL=OFF \
-	      -DKDE_DISTRIBUTION_TEXT="Alpine Linux" \
-	      -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-	      -DKDE_DEFAULT_HOME=.kde4 \
-	      -DSYSCONF_INSTALL_DIR=/etc \
-	      -Wno-dev \
-	      "$_builddir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || return 1
-	paxmark -mpes "$pkgdir"/usr/bin/kdeinit4 || return 1
-}
-
-dev() {
-	default_dev
-	mv "$subpkgdir"/usr/bin/kde4-config "$pkgdir"/usr/bin/kde4-config
-}
-
-md5sums="f58d9277127aad95b3032e2546f3006d  kdelibs-4.13.3.tar.xz
-36ba28baf498d17f2145680dbc6fcf49  fix-cmake-FindLibintl-4.13.3.patch
-5ca4cb4c347099c5cc1523981556fb7f  fix-headers-kdelibs.patch"
-sha256sums="d291b4bc159a3f686ad93ff3dfbe90a0a7e33600357e8390c84154ec050efc82  kdelibs-4.13.3.tar.xz
-e880d71f7fdb7cb4cba4f534d4290ab6c0f0dfd956a96eeda3813b73af52a2ad  fix-cmake-FindLibintl-4.13.3.patch
-1ae5f298acaf25231b4c1e21bf481f711fd654701b9d7bca37734f510a06ce12  fix-headers-kdelibs.patch"
-sha512sums="9bc6f154cbf1b6e8b46ee255ce099d9ba9e530dd478d4a1bf2d24f8f9a063221da3a938f9520ad9149c6b82c4135dc72ab652c410bd82ad4b7100e16fff7a661  kdelibs-4.13.3.tar.xz
-7491f758d02318ba4fec6465b4076944d65b7f84f23a5982a7dccce02dcc920e0e9354e80b605bc9a2c112901eb040765d0d594f3056f0e86a50a827b285c76b  fix-cmake-FindLibintl-4.13.3.patch
-a266f3a97cfa3bddfdcbea52df8192a801878981946942044cf76b547b160327163a9cca7f0a2cbfdeb3a4387b6dfc23b6fe58612812fc5f671262329718af71  fix-headers-kdelibs.patch"
diff --git a/unmaintained/kdelibs/fix-cmake-FindLibintl-4.13.3.patch b/unmaintained/kdelibs/fix-cmake-FindLibintl-4.13.3.patch
deleted file mode 100644
index f4475aec34..0000000000
--- a/unmaintained/kdelibs/fix-cmake-FindLibintl-4.13.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.13.3/cmake/modules/FindLibintl.cmake.orig
-+++ kdelibs-4.13.3/cmake/modules/FindLibintl.cmake
-@@ -29,7 +29,7 @@
-   check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)
- 
-   if (LIBINTL_LIBC_HAS_DGETTEXT)
--    set(LIBINTL_LIBRARIES)
-+    set(LIBINTL_LIBRARIES "intl")
-     set(LIBINTL_LIB_FOUND TRUE)
-   else (LIBINTL_LIBC_HAS_DGETTEXT)
-     find_library(LIBINTL_LIBRARIES NAMES intl libintl )
diff --git a/unmaintained/kdelibs/fix-headers-kdelibs.patch b/unmaintained/kdelibs/fix-headers-kdelibs.patch
deleted file mode 100644
index 11ea5ff837..0000000000
--- a/unmaintained/kdelibs/fix-headers-kdelibs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/solid/solid/backends/udisks2/udisksblock.h
-+++ b/solid/solid/backends/udisks2/udisksblock.h
-@@ -21,6 +21,7 @@
- #ifndef UDISKS2BLOCK_H
- #define UDISKS2BLOCK_H
- 
-+#include <sys/stat.h>
- #include <solid/ifaces/block.h>
- #include "udisksdeviceinterface.h"
-
---- a/kdecore/io/kdirwatch_p.h
-+++ b/kdecore/io/kdirwatch_p.h
-@@ -65,6 +65,7 @@
- 
- #include <sys/time.h>
- #include <sys/param.h> // ino_t
-+#include <sys/stat.h>
- #include <ctime>
diff --git a/unmaintained/kdepimlibs/APKBUILD b/unmaintained/kdepimlibs/APKBUILD
deleted file mode 100644
index af22ddf164..0000000000
--- a/unmaintained/kdepimlibs/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=kdepimlibs
-pkgver=4.13.3
-pkgrel=2
-pkgdesc="kde personal information management libraries"
-url="https://projects.kde.org/projects/kde/kdepimlibs"
-arch="all"
-license="LGPL"
-depends=
-depends_dev="kdelibs-dev libical-dev cyrus-sasl-dev
-	     openldap-dev gpgme-dev
-	     akonadi-dev qjson-dev"
-makedepends="$depends_dev cmake automoc4"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-
-_builddir="$srcdir"/${pkgname}-${pkgver}
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mkdir -p "$_builddir"/build
-}
-
-build() {
-	cd "$_builddir"/build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	      -DCMAKE_SKIP_RPATH=ON \
-	      -DCMAKE_BUILD_TYPE=Release \
-	      -Wno-dev "$_builddir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="f312139c3871f4666f626ea8feb26974  kdepimlibs-4.13.3.tar.xz"
-sha256sums="5ed6907c3bfd4e74de185145385405a2b55bcf5f41ffcb2b56dbda41cc857adb  kdepimlibs-4.13.3.tar.xz"
-sha512sums="e1a6b96efaef11806b6fc7a7c636af47231c556fc03d605d7008fab610532bd5483dab49e85abf056d803d585a9d709e6467682637096b1c6669cb27fe9f13e4  kdepimlibs-4.13.3.tar.xz"
diff --git a/unmaintained/liblockfile/APKBUILD b/unmaintained/liblockfile/APKBUILD
deleted file mode 100644
index 8d89af8478..0000000000
--- a/unmaintained/liblockfile/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=liblockfile
-pkgver=1.08
-pkgrel=0
-pkgdesc="Implements functions designed to lock the standard mailboxes"
-url="http://www.debian.org"
-license="GPL"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-doc"
-source="ftp://ftp.debian.org/debian/pool/main/libl/$pkgname/"$pkgname"_"$pkgver".orig.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-	install -m2755 -D "$srcdir"/"$pkgname-$pkgver"/dotlockfile "$pkgdir"/usr/bin/dotlockfile
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/lockfile.h "$pkgdir"/usr/include/lockfile.h
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/maillock.h "$pkgdir"/usr/include/maillock.h
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/liblockfile.a   "$pkgdir"/usr/lib/liblockfile.a
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/dotlockfile.1  "$pkgdir"-doc/usr/man/man1/dotlockfile.1
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/lockfile_create.3  "$pkgdir"-doc/usr/man/man3/lockfile_create.3
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/maillock.3  "$pkgdir"-doc/usr/man/man3/maillock.3
-}
-
-md5sums="c24e2dfb4a2aab0263fe5ac1564d305e  liblockfile_1.08.orig.tar.gz"
diff --git a/unmaintained/libprojectm/APKBUILD b/unmaintained/libprojectm/APKBUILD
deleted file mode 100644
index 3bb14afdd7..0000000000
--- a/unmaintained/libprojectm/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=libprojectm
-pkgver=2.0.1
-pkgrel=4
-pkgdesc="milkdrop-like music visualizer using opengl"
-url="http://projectm.sourceforge.net/"
-arch="all"
-license="LGPL"
-depends=
-depends_dev="mesa-dev ftgl-dev glew-dev"
-makedepends="cmake $depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://downloads.sourceforge.net/projectm/projectM-${pkgver}-Source.tar.gz
-	projectm-isnan.patch"
-
-_srcdir="$srcdir/projectM-${pkgver}-Source"
-_builddir="$srcdir/build"
-prepare() {
-	local i
-	mkdir -p "$_builddir"
-	cd "$_srcdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	cmake -DCMAKE_INSTALL_PREFIX=/usr "$_srcdir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="f8bf795878cdbbef54784cf2390b4c89  projectM-2.0.1-Source.tar.gz
-0090aaeb6f4df4600ffadfc7b7c0e732  projectm-isnan.patch"
diff --git a/unmaintained/libprojectm/projectm-isnan.patch b/unmaintained/libprojectm/projectm-isnan.patch
deleted file mode 100644
index d8738e709c..0000000000
--- a/unmaintained/libprojectm/projectm-isnan.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- projectM-2.0.1-Source/Common.hpp
-+++ projectM-2.0.1-Source.mod/Common.hpp
-@@ -30,6 +30,7 @@
- #include <typeinfo>
- #include <cstdarg>
- #include <cassert>
-+#include <math.h>
- #ifdef _MSC_sVER
- #define strcasecmp(s, t) _strcmpi(s, t)
- #endif
-@@ -55,7 +56,7 @@
- 
- #ifdef LINUX
- #include <cstdlib>
--#define projectM_isnan isnan
-+#define projectM_isnan __isnan
- 
- #endif
- 
-
diff --git a/unmaintained/lua-ev/APKBUILD b/unmaintained/lua-ev/APKBUILD
deleted file mode 100644
index a9a46d060e..0000000000
--- a/unmaintained/lua-ev/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-ev
-pkgver=1.3
-pkgrel=0
-pkgdesc="Lua bindings to libev"
-url="https://github.com/brimworks/lua-ev"
-arch="all"
-license="MIT"
-depends=
-makedepends="lua-dev cmake libev-dev wget"
-install=
-subpackages="$pkgname-doc"
-source="https://github.com/downloads/brimworks/lua-ev/lua-ev-v$pkgver.tar.gz"
-
-_builddir="$srcdir"/lua-ev-v$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DINSTALL_CMOD=/usr/lib/lua/5.1/ \
-		. || return 1
-	make || return 1
-	install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="4b3703d82711407be6ca5ef793b0cf57  lua-ev-v1.3.tar.gz"
diff --git a/unmaintained/lua-lmd5/APKBUILD b/unmaintained/lua-lmd5/APKBUILD
deleted file mode 100644
index f3ffdbf5c6..0000000000
--- a/unmaintained/lua-lmd5/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-lmd5
-pkgver=5.1.2011.03.24
-pkgrel=0
-pkgdesc="A message digest library for Lua based on OpenSSL"
-url="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmd5"
-arch="all"
-license="Public Domain"
-depends="lua"
-makedepends="lua-dev openssl-dev"
-install=
-subpackages="$pkgname-sha"
-
-# seems like they just update the upstream source package. Version is found in
-# luuid.c
-# For date and checksum see:
-# http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/release.txt
-
-source="http://dev.alpinelinux.org/archive/lmd5/lmd5-$pkgver.tar.gz"
-#source="http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmd5.tar.gz"
-
-
-_builddir="$srcdir"/md5
-
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	make digests LUABIN=/usr/bin || return 1
-}
-
-package() {
-	cd "$_builddir"
-	local cmod=$(pkg-config --variable INSTALL_CMOD lua)
-	mkdir -p "$pkgdir"/$cmod
-	cp -a *.so "$pkgdir"/$cmod/
-}
-
-sha() {
-	local cmod=$(pkg-config --variable INSTALL_CMOD lua)
-	mkdir -p "$subpkgdir"/$cmod
-	mv "$pkgdir"/$cmod/sha*.so "$subpkgdir"/$cmod/
-}
-
-md5sums="bc336a560b7b6513982c17eec9692bd6  lmd5-5.1.2011.03.24.tar.gz"
diff --git a/unmaintained/mailutils/APKBUILD b/unmaintained/mailutils/APKBUILD
deleted file mode 100644
index 220214f114..0000000000
--- a/unmaintained/mailutils/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=mailutils
-pkgver=2.0
-pkgrel=0
-pkgdesc="A useful collection of mail servers, clients, and filters."
-url="http://www.gnu.org/software/mailutils/mailutils.html"
-license="GPL"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://ftp.gnu.org/gnu/mailutils/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-	make DESTDIR="$pkgdir" install
-
-	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="299ae73c1c0143de94d7486bf7f479a4  mailutils-2.0.tar.bz2"
diff --git a/unmaintained/mailx-support/APKBUILD b/unmaintained/mailx-support/APKBUILD
deleted file mode 100644
index 503f203067..0000000000
--- a/unmaintained/mailx-support/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=mailx-support
-pkgver=20060102
-pkgrel=0
-pkgdesc="Provides lockspool utility"
-url="http://www.openbsd.org"
-license="BSD"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-doc"
-source="http://gentoo.osuosl.org/distfiles/$pkgname-$pkgver.tar.bz2
-	mailx-support-ldflags.patch"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in ../*.patch; do
-		msg "Appling $i..."
-		patch -p1 < $i || return 1
-	done
-
-	make || return 1
-	install -m755 -D "$srcdir"/"$pkgname-$pkgver"/lockspool "$pkgdir"/usr/libexec/lockspool
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/lockspool.1 "$pkgdir"-doc/usr/share/man/man1/lockspool.1
-}
-
-md5sums="3f671fe4368a5b536e8384980a9a5c80  mailx-support-20060102.tar.bz2
-32a98aee973db8860f1f53a9297b8dd9  mailx-support-ldflags.patch"
diff --git a/unmaintained/mailx-support/mailx-support-ldflags.patch b/unmaintained/mailx-support/mailx-support-ldflags.patch
deleted file mode 100644
index 97c5b60047..0000000000
--- a/unmaintained/mailx-support/mailx-support-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mailx-support-20060102.orig/Makefile
-+++ mailx-support-20060102/Makefile
-@@ -17,10 +17,10 @@ clean:
- 	${RM} -f ${PRODUCTS} *.o
- 
- mail.local: mail.local.o locking.o open_with_exlock.o
--	${CC} ${CFLAGS} -o $@ $^
-+	${CC} ${LDFLAGS} ${CFLAGS} -o $@ $^
- 
- lockspool: lockspool.o locking.o open_with_exlock.o
--	${CC} ${CFLAGS} -o $@ $^
-+	${CC} ${LDFLAGS} ${BINDNOW_FLAGS} ${CFLAGS} -o $@ $^
- 
- .c.o:
- 	${CC} ${CFLAGS} -c -o $@ $^
diff --git a/unmaintained/moodbar/APKBUILD b/unmaintained/moodbar/APKBUILD
deleted file mode 100644
index 3db1eb9000..0000000000
--- a/unmaintained/moodbar/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=moodbar
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="Analysis tool for building .mood files"
-url="http://amarok.kde.org/wiki/Moodbar"
-arch="all"
-license="GPL2+"
-depends=""
-makedepends="gstreamer-dev gst-plugins-base-dev fftw-dev"
-install=""
-subpackages=""
-source="http://pwsp.net/~qbob/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	# apply patches here
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="28c8eb65e83b30f71b84be4fab949360  moodbar-0.1.2.tar.gz"
diff --git a/unmaintained/muffin/APKBUILD b/unmaintained/muffin/APKBUILD
deleted file mode 100644
index c1330141cc..0000000000
--- a/unmaintained/muffin/APKBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=muffin
-pkgver=2.0.5
-pkgrel=1
-pkgdesc="Cinnamon window manager based on Mutter"
-url="https://github.com/linuxmint/muffin"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="glib-dev dconf-dev libcanberra-dev gobject-introspection-dev gtk+3.0-dev
-	cinnamon-desktop-dev clutter-dev startup-notification-dev"
-makedepends="$depends_dev autoconf automake libtool gnome-common intltool gnome-doc-utils
-	zenity"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-
-_builddir="$srcdir/muffin-$pkgver"
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-schemas-compile \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="80e47a1393389f79b968d3cc7180c997  muffin-2.0.5.tar.gz"
-sha256sums="81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee  muffin-2.0.5.tar.gz"
-sha512sums="5d19c58b2ff53fec906bfe99f7431f673316cd9adb77d2ee1f8d27b65f071b94004ce81f439e458713e7476663300bb437674fbde28b0492ca888de040d04cd8  muffin-2.0.5.tar.gz"
diff --git a/unmaintained/muffin/muffin.post-deinstall b/unmaintained/muffin/muffin.post-deinstall
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/muffin/muffin.post-deinstall
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/muffin/muffin.post-install b/unmaintained/muffin/muffin.post-install
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/muffin/muffin.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/muffin/muffin.post-upgrade b/unmaintained/muffin/muffin.post-upgrade
deleted file mode 100644
index 772791e6f3..0000000000
--- a/unmaintained/muffin/muffin.post-upgrade
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Compiling glib schemas"
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
diff --git a/unmaintained/oxygen-gtk/APKBUILD b/unmaintained/oxygen-gtk/APKBUILD
deleted file mode 100644
index 9e32f06beb..0000000000
--- a/unmaintained/oxygen-gtk/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=oxygen-gtk
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="gtk+ oxygen port"
-url="http://www.kde.org/"
-arch="all"
-license="LGPL"
-depends=
-depends_dev="gtk+-dev"
-makedepends="$depends_dev cmake"
-install=""
-subpackages=
-source="http://kde.mirrors.tds.net/pub/kde/stable/oxygen-gtk/$pkgver/src/oxygen-gtk-$pkgver.tar.bz2
-	isnan.patch"
-
-_builddir="$srcdir"/oxygen-gtk-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mkdir "$_builddir"/build
-}
-
-build() {
-	cd "$_builddir"/build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON "$_builddir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="bacbe2be37db8e8fb3e60a3e13be7fb8  oxygen-gtk-1.1.0.tar.bz2
-7425615ff80fd7afb0b90e6bed613f62  isnan.patch"
diff --git a/unmaintained/oxygen-gtk/isnan.patch b/unmaintained/oxygen-gtk/isnan.patch
deleted file mode 100644
index 5e2d27477d..0000000000
--- a/unmaintained/oxygen-gtk/isnan.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- oxygen-gtk-1.0.5.orig/src/oxygencolorutils.cpp
-+++ oxygen-gtk-1.0.5/src/oxygencolorutils.cpp
-@@ -460,7 +460,7 @@
-     {
-         if( amount <= 0.0 ) return base;
-         if( amount >= 1.0 ) return color;
--        if( isnan( amount ) ) return base;
-+        if( __isnan( amount ) ) return base;
- 
-         double ri = contrastRatio( base, color );
-         double rg = 1.0 + ( ( ri + 1.0 ) * amount * amount * amount );
-@@ -487,7 +487,7 @@
-     {
-         if( bias <= 0.0 ) return c1;
-         if( bias >= 1.0 ) return c2;
--        if( isnan( bias ) ) return c1;
-+        if( __isnan( bias ) ) return c1;
- 
-         double r = mixdouble( c1.red(),   c2.red(),   bias );
-         double g = mixdouble( c1.green(), c2.green(), bias );
diff --git a/unmaintained/par2cmdline/APKBUILD b/unmaintained/par2cmdline/APKBUILD
deleted file mode 100644
index d0c41caef5..0000000000
--- a/unmaintained/par2cmdline/APKBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: <kalonji@gmail.com>
-# Maintainer: <kalonji@gmail.com>
-pkgname=par2cmdline
-pkgver=0.4
-pkgrel=1
-pkgdesc="Providing a tool to apply the data-recovery capability concepts of RAID-like systems to the posting & recovery of multi-part archives on Usenet."
-url="http://sourceforge.net/projects/parchive/"
-arch="all"
-license="GPL"
-depends=
-makedepends=
-install=
-source="http://downloads.sourceforge.net/sourceforge/parchive/${pkgname}-${pkgver}.tar.gz
-par2cmdline-0.4-autoconf.patch
-par2cmdline-0.4-letype.patch
-par2cmdline-0.4-cosmetic.patch
-par2cmdline-0.4-offset.patch
-par2cmdline-0.4-gcc4.patch
-par2cmdline-0.4-wildcard-fix.patch
-par2cmdline-0.4-hardlinks.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	for i in "$srcdir"/*.patch; do
-		msg "Applying ${i}"
-		patch -N -i $i || return 1
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="1551b63e57e3c232254dc62073b723a9  par2cmdline-0.4.tar.gz
-8a0fad41e3c3165e3c788d2693797557  par2cmdline-0.4-autoconf.patch
-1f7adb9308d4e972a5630eb56a42f8d5  par2cmdline-0.4-letype.patch
-986d44b0cdba449459f9cfd93322144f  par2cmdline-0.4-cosmetic.patch
-cd54801b5107f03982c2b01ead21f02a  par2cmdline-0.4-offset.patch
-d52515669d3bc43f19c545fd6405dacc  par2cmdline-0.4-gcc4.patch
-c823d25f8862531e6e435ce0c76f8384  par2cmdline-0.4-wildcard-fix.patch
-8683d237bc11e9d5581d14b4697d1f8b  par2cmdline-0.4-hardlinks.patch"
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-autoconf.patch b/unmaintained/par2cmdline/par2cmdline-0.4-autoconf.patch
deleted file mode 100644
index a0f2fbb551..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-autoconf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../orig/par2cmdline-0.4/par2cmdline.h	2004-04-15 15:30:02.000000000 +0200
-+++ ./par2cmdline.h	2007-03-24 13:25:43.000000000 +0100
-@@ -132,6 +132,10 @@
- typedef unsigned long long u64;
- #endif
- 
-+// FIXME: this is not done right w/ autoconf
-+#include <sys/ioctl.h>
-+#include <sys/mount.h>
-+
- #if HAVE_SYS_STAT_H
- #  include <sys/stat.h>
- #endif
-@@ -179,6 +183,8 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
-+#include <sys/mount.h>
- #include <dirent.h>
- #include <assert.h>
- 
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-cosmetic.patch b/unmaintained/par2cmdline/par2cmdline-0.4-cosmetic.patch
deleted file mode 100644
index 0d5df21610..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-cosmetic.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- verificationhashtable.h	2003-06-03 13:48:52.000000000 +0200
-+++ verificationhashtable.h.new	2010-02-10 20:48:50.425580166 +0100
-@@ -66,11 +66,11 @@ public:
-   // Comparison operators for searching
-   bool operator <(const VerificationHashEntry &r) const 
-   {
--    return crc < r.crc || crc == r.crc && hash < r.hash;
-+    return crc < r.crc || ( crc == r.crc && hash < r.hash );
-   }
-   bool operator >(const VerificationHashEntry &r) const 
-   {
--    return crc > r.crc || crc == r.crc && hash > r.hash;
-+    return crc > r.crc || ( crc == r.crc && hash > r.hash );
-   }
-   bool operator ==(const VerificationHashEntry &r) const 
-   {
-@@ -183,11 +183,11 @@ inline const VerificationHashEntry* Veri
- 
-   while (entry)
-   {
--    if (entry->crc < crc || entry->crc == crc && entry->hash < hash)
-+    if (entry->crc < crc || ( entry->crc == crc && entry->hash < hash ) )
-     {
-       entry = entry->right;
-     }
--    else if (entry->crc > crc || entry->crc == crc && entry->hash > hash)
-+    else if (entry->crc > crc || ( entry->crc == crc && entry->hash > hash ) )
-     {
-       entry = entry->left;
-     }
-@@ -402,14 +402,14 @@ inline const VerificationHashEntry* Veri
-     // have already been matched, or ones that are the wrong length
-     while (currententry && (currententry->SourceFile() != sourcefile || 
-                             currententry->IsSet() ||
--                            checksummer.ShortBlock() && checksummer.BlockLength() != currententry->GetDataBlock()->GetLength()
-+                            ( checksummer.ShortBlock() && checksummer.BlockLength() != currententry->GetDataBlock()->GetLength() )
-                            )
-           )
-     {
-       // If we found an unused entry (which was presumably for the wrong 
-       // source file) remember it (providing it is the correct length).
--      if (0 == nextentry && !(currententry->IsSet() || 
--                              checksummer.ShortBlock() && checksummer.BlockLength() != currententry->GetDataBlock()->GetLength()
-+      if ( ( ( 0 == nextentry && !(currententry->IsSet() ) ) || 
-+                              ( checksummer.ShortBlock() && checksummer.BlockLength() != currententry->GetDataBlock()->GetLength() )
-                              )
-          )
-       {
-@@ -425,8 +425,8 @@ inline const VerificationHashEntry* Veri
-   }
- 
-   // Check for an unused entry which is the correct length
--  while (nextentry && (nextentry->IsSet() ||
--                       checksummer.ShortBlock() && checksummer.BlockLength() != nextentry->GetDataBlock()->GetLength()
-+  while ( ( ( nextentry && (nextentry->IsSet() ) ) ||
-+                       ( checksummer.ShortBlock() && checksummer.BlockLength() != nextentry->GetDataBlock()->GetLength() )
-                       )
-         )
-   {
---- par1repairer.cpp	2004-04-15 15:40:48.000000000 +0200
-+++ par1repairer.cpp.new	2010-02-10 21:04:43.288702325 +0100
-@@ -324,7 +324,7 @@ bool Par1Repairer::LoadRecoveryFile(stri
-           ||
-           (fileheader.datasize && (fileheader.dataoffset < sizeof(fileheader) || fileheader.dataoffset + fileheader.datasize > filesize))
-           ||
--          (fileheader.datasize && (fileheader.filelistoffset <= fileheader.dataoffset && fileheader.dataoffset < fileheader.filelistoffset+fileheader.filelistsize || fileheader.dataoffset <= fileheader.filelistoffset && fileheader.filelistoffset < fileheader.dataoffset + fileheader.datasize)))
-+          (fileheader.datasize && ( ( fileheader.filelistoffset <= fileheader.dataoffset && fileheader.dataoffset < fileheader.filelistoffset+fileheader.filelistsize ) || ( fileheader.dataoffset <= fileheader.filelistoffset && fileheader.filelistoffset < fileheader.dataoffset + fileheader.datasize ) )))
-         break;
- 
-       // Check the size of the file list
-@@ -518,9 +518,9 @@ bool Par1Repairer::LoadOtherRecoveryFile
-       // Check the the file extension is the correct form
-       if ((tail[0] == 'P' || tail[0] == 'p') &&
-           (
--            (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r')
-+            ( (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r') )
-             ||
--            isdigit(tail[1]) && isdigit(tail[2])
-+            ( isdigit(tail[1]) && isdigit(tail[2]) )
-           ))
-       {
-         LoadRecoveryFile(filename);
-@@ -549,9 +549,9 @@ bool Par1Repairer::LoadExtraRecoveryFile
-       // Check the the file extension is the correct form
-       if ((tail[0] == 'P' || tail[0] == 'p') &&
-           (
--            (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r')
-+            ( (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r') )
-             ||
--            isdigit(tail[1]) && isdigit(tail[2])
-+            ( isdigit(tail[1]) && isdigit(tail[2]) )
-           ))
-       {
-         LoadRecoveryFile(filename);
-@@ -652,9 +652,9 @@ bool Par1Repairer::VerifyExtraFiles(cons
-       // Check the the file extension is the correct form
-       if ((tail[0] == 'P' || tail[0] == 'p') &&
-           (
--            (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r')
-+            ( (tail[1] == 'A' || tail[1] == 'a') && (tail[2] == 'R' || tail[2] == 'r') )
-             ||
--            isdigit(tail[1]) && isdigit(tail[2])
-+            ( isdigit(tail[1]) && isdigit(tail[2]) )
-           ))
-       {
-         skip = true;
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-gcc4.patch b/unmaintained/par2cmdline/par2cmdline-0.4-gcc4.patch
deleted file mode 100644
index c6da26789e..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-gcc4.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix compilation with gcc-4.
-
-Patch by Dirk-Jan Heijs.
-
-http://bugs.gentoo.org/102391
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904
-
---- par2cmdline-0.4/reedsolomon.cpp
-+++ par2cmdline-0.4/reedsolomon.cpp
-@@ -51,7 +51,7 @@
-   }
- }
- 
--bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
-+template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
- {
-   inputcount = (u32)present.size();
- 
-@@ -80,7 +80,7 @@
-   return true;
- }
- 
--bool ReedSolomon<Galois8>::SetInput(u32 count)
-+template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
- {
-   inputcount = count;
- 
-@@ -101,7 +101,7 @@
-   return true;
- }
- 
--bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
-+template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
- {
-   // Look up the appropriate element in the RS matrix
-   Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
-@@ -189,7 +189,7 @@
- 
- // Set which of the source files are present and which are missing
- // and compute the base values to use for the vandermonde matrix.
--bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
-+template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
- {
-   inputcount = (u32)present.size();
- 
-@@ -233,7 +233,7 @@
- 
- // Record that the specified number of source files are all present
- // and compute the base values to use for the vandermonde matrix.
--bool ReedSolomon<Galois16>::SetInput(u32 count)
-+template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
- {
-   inputcount = count;
- 
-@@ -267,7 +267,7 @@
-   return true;
- }
- 
--bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
-+template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
- {
-   // Look up the appropriate element in the RS matrix
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-hardlinks.patch b/unmaintained/par2cmdline/par2cmdline-0.4-hardlinks.patch
deleted file mode 100644
index 0d815f0948..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-hardlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in	2004-04-12 18:44:18.000000000 +0200
-+++ Makefile.in.new	2010-02-10 21:08:17.799145528 +0100
-@@ -716,9 +716,9 @@ uninstall-am: uninstall-binPROGRAMS unin
- 
- 
- install-exec-hook :
--	ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT)
--	ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT)
--	ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT)
-+	ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT)
-+	ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT)
-+	ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT)
- 
- uninstall-hook :
- 	rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT)
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-letype.patch b/unmaintained/par2cmdline/par2cmdline-0.4-letype.patch
deleted file mode 100644
index e0c8d6c57b..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-letype.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -ur par2cmdline-0.4-orig/letype.h par2cmdline-0.4/letype.h
---- par2cmdline-0.4-orig/letype.h	2003-05-26 20:01:17.000000000 +0200
-+++ par2cmdline-0.4/letype.h	2006-05-09 10:47:29.000000000 +0200
-@@ -28,44 +28,15 @@
- 
- #else
- 
--class leu16
-+struct leu16
- {
--public:
--  leu16(void);
--
--  leu16(const leu16 &other);
--  leu16& operator=(const leu16 &other);
--
--  leu16(const u16 &other);
-   leu16& operator=(const u16 &other);
- 
-   operator u16(void) const;
- 
--protected:
-   u16 value;
- };
- 
--inline leu16::leu16(void)
--{
--}
--
--inline leu16::leu16(const leu16 &other)
--: value(other.value)
--{
--}
--
--inline leu16& leu16::operator =(const leu16 &other)
--{
--  value = other.value;
--  return *this;
--}
--
--inline leu16::leu16(const u16 &other)
--{
--  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
--  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
--}
--
- inline leu16& leu16::operator=(const u16 &other)
- {
-   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-@@ -81,46 +52,15 @@
- }
- 
- 
--class leu32
-+struct leu32
- {
--public:
--  leu32(void);
--
--  leu32(const leu32 &other);
--  leu32& operator=(const leu32 &other);
--
--  leu32(const u32 &other);
-   leu32& operator=(const u32 &other);
- 
-   operator u32(void) const;
- 
--protected:
-   u32 value;
- };
- 
--inline leu32::leu32(void)
--{
--}
--
--inline leu32::leu32(const leu32 &other)
--: value(other.value)
--{
--}
--
--inline leu32& leu32::operator =(const leu32 &other)
--{
--  value = other.value;
--  return *this;
--}
--
--inline leu32::leu32(const u32 &other)
--{
--  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
--  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
--  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
--  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
--}
--
- inline leu32& leu32::operator=(const u32 &other)
- {
-   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-@@ -140,50 +80,15 @@
- }
- 
- 
--class leu64
-+struct leu64
- {
--public:
--  leu64(void);
--
--  leu64(const leu64 &other);
--  leu64& operator=(const leu64 &other);
--
--  leu64(const u64 &other);
-   leu64& operator=(const u64 &other);
- 
-   operator u64(void) const;
- 
--protected:
-   u64 value;
- };
- 
--inline leu64::leu64(void)
--{
--}
--
--inline leu64::leu64(const leu64 &other)
--: value(other.value)
--{
--}
--
--inline leu64& leu64::operator =(const leu64 &other)
--{
--  value = other.value;
--  return *this;
--}
--
--inline leu64::leu64(const u64 &other)
--{
--  ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
--  ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
--  ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
--  ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
--  ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff);
--  ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff);
--  ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff);
--  ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff);
--}
--
- inline leu64& leu64::operator=(const u64 &other)
- {
-   ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
-diff -ur par2cmdline-0.4-orig/md5.h par2cmdline-0.4/md5.h
---- par2cmdline-0.4-orig/md5.h	2003-08-02 01:41:04.000000000 +0200
-+++ par2cmdline-0.4/md5.h	2006-05-09 10:47:29.000000000 +0200
-@@ -20,6 +20,13 @@
- #ifndef __MD5_H__
- #define __MD5_H__
- 
-+#ifdef WIN32
-+#pragma pack(push, 1)
-+#define PACKED
-+#else
-+#define PACKED __attribute__ ((packed))
-+#endif
-+
- // This file defines the MD5Hash and MD5Context objects which are used
- // to compute and manipulate the MD5 Hash values for a block of data.
- 
-@@ -35,12 +42,11 @@
- 
- // MD5 Hash value
- 
--class MD5Hash
--{
--public:
--  // Constructor does not initialise the value
--  MD5Hash(void) {};
-+struct MD5Hash;
-+ostream& operator<<(ostream &s, const MD5Hash &hash);
- 
-+struct MD5Hash
-+{
-   // Comparison operators
-   bool operator==(const MD5Hash &other) const;
-   bool operator!=(const MD5Hash &other) const;
-@@ -54,13 +60,8 @@
-   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
-   string print(void) const;
- 
--  // Copy and assignment
--  MD5Hash(const MD5Hash &other);
--  MD5Hash& operator=(const MD5Hash &other);
--
--public:
-   u8 hash[16]; // 16 byte MD5 Hash value
--};
-+} PACKED;
- 
- // Intermediate computation state
- 
-@@ -144,16 +145,9 @@
-   return !other.operator<(*this);
- }
- 
--inline MD5Hash::MD5Hash(const MD5Hash &other)
--{
--  memcpy(&hash, &other.hash, sizeof(hash));
--}
--
--inline MD5Hash& MD5Hash::operator=(const MD5Hash &other)
--{
--  memcpy(&hash, &other.hash, sizeof(hash));
--
--  return *this;
--}
-+#ifdef WIN32
-+#pragma pack(pop)
-+#endif
-+#undef PACKED
- 
- #endif // __MD5_H__
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-offset.patch b/unmaintained/par2cmdline/par2cmdline-0.4-offset.patch
deleted file mode 100644
index 6539280668..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-offset.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- par2cmdline-0.4.orig/par2creatorsourcefile.cpp	2004-04-15 14:45:23.000000000 +0100
-+++ par2cmdline-0.4/par2creatorsourcefile.cpp	2005-09-29 02:27:43.000000000 +0100
-@@ -213,11 +213,12 @@
-         }
-       }
- 
-+      offset += want;
-+
-       if (noiselevel > CommandLine::nlQuiet)
-       {
-         // Display progress
-         u32 oldfraction = (u32)(1000 * offset / filesize);
--        offset += want;
-         u32 newfraction = (u32)(1000 * offset / filesize);
-         if (oldfraction != newfraction)
-         {
diff --git a/unmaintained/par2cmdline/par2cmdline-0.4-wildcard-fix.patch b/unmaintained/par2cmdline/par2cmdline-0.4-wildcard-fix.patch
deleted file mode 100644
index d5f43c7963..0000000000
--- a/unmaintained/par2cmdline/par2cmdline-0.4-wildcard-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- commandline.cpp.orig	2006-04-06 21:41:27.000000000 -0700
-+++ commandline.cpp	2006-04-07 00:12:29.000000000 -0700
-@@ -550,6 +550,20 @@
-         }
-         else
-         {
-+          //start of shell expanded * patch. -- Michael Evans
-+          //The shell might expaned * so, if we have our name and we're creating, then filter for files...
-+          if ((parfilename.length() != 0) && (operation == opCreate))
-+          {
-+            struct stat st;
-+            if (!(stat(argv[0], &st) == 0 && S_ISREG(st.st_mode)))
-+            {
-+              cerr << "Skipping non-regular file: " << argv[0] << endl;
-+              argc--;
-+              argv++;
-+              options = false;
-+              continue;
-+            }
-+          }//end of shell expanded * patch. -- Michael Evans
-           filenames = new list<string>;
-           filenames->push_back(argv[0]);
-         }
diff --git a/unmaintained/partclone/APKBUILD b/unmaintained/partclone/APKBUILD
deleted file mode 100644
index ec56ba81df..0000000000
--- a/unmaintained/partclone/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: Leonardo Arena <rnarld@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=partclone
-pkgver=0.2.38
-pkgrel=1
-pkgdesc="Partition cloning tool"
-url="http://partclone.org/"
-arch="all"
-license="GPL2+"
-depends=
-makedepends="e2fsprogs-dev ncurses-dev ntfsprogs-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/partclone/stable/$pkgver/partclone_$pkgver.tar.gz
-	memtrace.patch"
-
-# TODO:
-# libreiserfs: http://reiserfs.linux.kiev.ua
-#
-_builddir="$srcdir"/partclone-$pkgver
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-#  --enable-all            enable all supported file system
-#  --enable-extfs          enable ext2/3/4 file system
-#  --enable-xfs            enable XFS file system
-#  --enable-reiserfs       enable REISERFS 3.6/3.6 file system
-#  --enable-reiser4        enable Reiser4 file system
-#  --enable-hfsp           enable HFS plus file system
-#  --enable-fat            enable FAT file system
-#  --enable-ntfs           enable NTFS file system
-#  --enable-ufs            enable UFS(1/2) file system
-#  --enable-vmfs           enable vmfs file system
-#  --enable-jfs            enable jfs file system
-#  --enable-btrfs          enable btrfs file system
-##		--enable-xfs \
-	ac_cv_lib_rt_aio_init=yes ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-extfs \
-		--enable-fat \
-		--enable-ntfs \
-		--enable-ncursesw \
-		--disable-nls \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="8577ac06ad54a829435f272eecedfa14  partclone_0.2.38.tar.gz
-83dfb01e5d68795266726826a49a2de8  memtrace.patch"
diff --git a/unmaintained/partclone/memtrace.patch b/unmaintained/partclone/memtrace.patch
deleted file mode 100644
index 9c8ba9af1b..0000000000
--- a/unmaintained/partclone/memtrace.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/main.c b/src/main.c
-index 2fb6b58..8f079f2 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -20,7 +20,9 @@
- #include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_MEMTRACE
- #include <mcheck.h>
-+#endif
- #include <stdint.h>
- #include <stdarg.h>
- #include <string.h>
diff --git a/unmaintained/proxychains/APKBUILD b/unmaintained/proxychains/APKBUILD
deleted file mode 100644
index 92f2ef2539..0000000000
--- a/unmaintained/proxychains/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=proxychains
-pkgver=3.1
-pkgrel=0
-pkgdesc="Provides proxy support to any application"
-url="http://proxychains.sourceforge.net"
-arch="all"
-license="GPL2+"
-depends="bind-tools"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--disable-static \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="4629c156001ab70aa7e98960eb513148  proxychains-3.1.tar.gz"
-sha256sums="9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a  proxychains-3.1.tar.gz"
-sha512sums="7ec7be851d956070fe28bdd3bd7c1a7dc442c054e6487868672ba27490c9b0b6aaa061504c9e1933feccb40ca1996123d202df449eac4251d9582a0ba73c7061  proxychains-3.1.tar.gz"
diff --git a/unmaintained/pwbunny/APKBUILD b/unmaintained/pwbunny/APKBUILD
deleted file mode 100644
index 4acbf8f269..0000000000
--- a/unmaintained/pwbunny/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=pwbunny
-pkgver=1.1
-pkgrel=0
-pkgdesc="A password manager that stores and retrieves passwords in an encrypted file"
-url="http://code.arp242.net/pwbunny"
-arch="noarch"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="python-dev py-setuptools"
-install=""
-subpackages=""
-source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$_builddir"
-	python setup.py build || return 1
-}
-
-package() {
-	cd "$_builddir"
-	python setup.py install --root="$pkgdir" || return 1
-}
-
-md5sums="07d1145eef28670cd634cf4231bd7508  pwbunny-1.1.tar.gz"
diff --git a/unmaintained/py-apache-libcloud/APKBUILD b/unmaintained/py-apache-libcloud/APKBUILD
deleted file mode 100644
index 954a196c18..0000000000
--- a/unmaintained/py-apache-libcloud/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:
-pkgname=py-apache-libcloud
-_pkgname=apache-libcloud
-pkgver=0.13.0
-pkgrel=0
-pkgdesc="A Python library that abstracts away differences among multiple cloud provider APIs"
-url="https://libcloud.apache.org"
-arch="noarch"
-license="ASL 2.0"
-depends=""
-depends_dev=""
-makedepends="python-dev py-setuptools"
-install=""
-subpackages=""
-source="http://www.apache.org/dist/libcloud/$_pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$_pkgname-$pkgver
-build() {
-	cd "$_builddir"
-	python setup.py build || return 1
-}
-
-package() {
-	cd "$_builddir"
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
-}
-
-md5sums="b493c24fecc4e9ad86322d021cb3fbfd  apache-libcloud-0.13.0.tar.bz2"
-sha256sums="e26ee90d81ed996112bfe744a0d3f33a07bcf98dd41ec01f129e1682de1ddac5  apache-libcloud-0.13.0.tar.bz2"
-sha512sums="b82176cfb54cb6a83e2096e92ef2bbc2e094df36fdd7d107b43ce46382629537b1fdab4fca6f8f451df8566052553bfaa1301e0256a19f12dae2c709f84429a4  apache-libcloud-0.13.0.tar.bz2"
diff --git a/unmaintained/shadowircd/APKBUILD b/unmaintained/shadowircd/APKBUILD
deleted file mode 100644
index a513e7b8bf..0000000000
--- a/unmaintained/shadowircd/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Sam Dodrill <shadow.h511@gmail.com>
-# Maintainer: Sam Dodrill <shadow.h511@gmail.com>
-pkgname=shadowircd
-pkgver=6.3.3
-pkgrel=1
-pkgdesc="Scalable IRC daemon with many useful features"
-url="http://www.github.com/shadowircd/shadowircd"
-arch="all"
-license="GPL2"
-pkgusers="ircd"
-depends=""
-depends_dev="bison flex openssl-dev zlib-dev libtool"
-makedepends="$depends_dev"
-install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/shadowircd/shadowircd/archive/shadowircd-6.3.3.tar.gz
-	$pkgname.initd
-	$pkgname.confd"
-_builddir="$srcdir"/$pkgname-$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-			*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc/shadowircd \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib \
-		--disable-assert \
-		--enable-ssl \
-		--enable-ipv6 \
-		--with-rundir=/var/run \
-		|| return 1
-	 make
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-        install -m755 -D "$srcdir"/$pkgname.initd \
-              "$pkgdir"/etc/init.d/shadowircd || return 1
-        install -m644 -D "$srcdir"/$pkgname.confd \
-              "$pkgdir"/etc/conf.d/shadowircd || return 1
-        chown ircd "$pkgdir"/var/run/shadowircd
-        chown ircd "$pkgdir"/var/log/shadowircd
-        chown ircd "$pkgdir"/var/shadowircd
-	sed -i -e "s/\"modules\"/\"\/usr\/lib\/shadowircd\/modules\"/g" $pkgdir/etc/$pkgname/example.conf
-	sed -i -e "s/\"modules\/autoload\"/\"\/usr\/lib\/shadowircd\/modules\/autoload\"/g" "$pkgdir"/etc/$pkgname/example.conf
-	sed -i -e "s/usr\/local\/ircd\/modules/usr\/lib\/shadowircd\/modules/g" "$pkgdir"/etc/$pkgname/reference.conf
-}
-
-md5sums="fff418e27b8979285a13b93ec7d6dbd1  shadowircd-6.3.3.tar.gz
-9c5473325cf654433ea8844d3e4e4882  shadowircd.initd
-585358efa2a9fa1cb15317d4442e1774  shadowircd.confd"
-sha256sums="a3b6189a473e837d4248b8f18b1e8454ab111c8eafeb46eda477095771636f24  shadowircd-6.3.3.tar.gz
-e969f81f76d32104edd6db7b5a47b6eaef09f595d6940c5a3821a7d2b29c6fd7  shadowircd.initd
-0564d57624848d943cb0986d7115d596c98c24b5034b2c81ce489abe4ebd3912  shadowircd.confd"
-sha512sums="f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4  shadowircd-6.3.3.tar.gz
-5a3592d3be89af13cdc4e30dd1595e13e70fbb369ab3921d8ca7e8089618ad3be98edf9adb69510f889d8e9bd8f7dd515d7cdd8c4de591d7e36d67d33787abec  shadowircd.initd
-40e1d2a7a01b97721893dd6ea2bc1857c4bb74b257362ad8bcde9087fe44d1514cbea12a8ab53feb41499f73807de3fa8de9f89a5eb5cb2d558507e952db5a58  shadowircd.confd"
diff --git a/unmaintained/shadowircd/shadowircd.confd b/unmaintained/shadowircd/shadowircd.confd
deleted file mode 100644
index 810fde20fe..0000000000
--- a/unmaintained/shadowircd/shadowircd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-SHADOWIRCD_USER="ircd"
-SHADOWIRCD_PID="/var/run/shadowircd/ircd.pid"
-SHADOWIRCD_CONF="/etc/shadowircd/ircd.conf"
diff --git a/unmaintained/shadowircd/shadowircd.initd b/unmaintained/shadowircd/shadowircd.initd
deleted file mode 100644
index c9abc7fd83..0000000000
--- a/unmaintained/shadowircd/shadowircd.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/files/charybdis-ircd.initd,v 1.2 2008/01/08 21:17:02 jokey Exp $
-
-depend() {
- 	use net
- 	provide ircd
-}
-	
-start() {
- 	ebegin "Starting shadowircd"
- 	start-stop-daemon --start --quiet -u ${SHADOWIRCD_USER} --exec /usr/bin/ircd -- -configfile ${SHADOWIRCD_CONF}>/dev/null
- 	eend $?
-}
- 	
-stop() {
- 	ebegin "Stopping shadowircd"
- 	start-stop-daemon --stop --quiet --pidfile ${SHADOWIRCD_PID}
- 	eend $?
-}
-
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
deleted file mode 100644
index 4120e456a6..0000000000
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -D -S -h /var/run/shadowircd -s /bin/false -g ircd ircd 2>/dev/null
-
-exit 0
diff --git a/unmaintained/snowstorm/APKBUILD b/unmaintained/snowstorm/APKBUILD
deleted file mode 100644
index 563db80edd..0000000000
--- a/unmaintained/snowstorm/APKBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=snowstorm
-pkgver=2.5.2
-pkgrel=4
-pkgdesc="snowstorm viewer for secondlife (and compatible servers)"
-url="http://wiki.secondlife.com/wiki/Project_Snowstorm"
-arch=""
-license="GPL"
-depends=
-depends_dev="mesa-dev sdl-dev openal-soft-dev apr-dev 
-	apr-util-dev libvorbis-dev 
-	libogg-dev freealut-dev db-dev boost-dev c-ares-dev
-	xmlrpc-epi-dev libpng-dev tut-dev openjpeg-dev gtk+-dev
-	qt-dev dbus-glib-dev gstreamer-dev gst-plugins-base-dev
-	jsoncpp-dev boost-coroutine pth-dev"
-makedepends="$depends_dev cmake"
-install=""
-subpackages=""
-source="http://67.202.104.180/~nenolod/secondlife-${pkgver}-sourcebundle.tar.gz
-	indra-no-breakpad.patch"
-
-_builddir="${srcdir}/build"
-_srcdir="${srcdir}/viewer-release/indra"
-prepare() {
-	local i
-	mkdir "$_builddir"
-
-	cd "$_srcdir/.."
-
-	msg "Copying indra to indra.orig for easy patching"
-	cp -R indra indra.orig
-
-	cd "$_srcdir"
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	msg "Preparing llqtwebkit"
-	cd "$_builddir/../llqtwebkit"
-
-	qmake CONFIG-=debug
-	make
-
-	msg "Building indra"
-	cd "$_builddir"
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DPACKAGE:BOOL=FALSE \
-		-DLLQTWEBKIT_INCLUDE_DIR:STRING=${srcdir}/llqtwebkit \
-		-DLLQTWEBKIT_LIBRARY:STRING=${srcdir}/llqtwebkit \
-		-DCMAKE_BUILD_TYPE:STRING=RELWITHDEBINFO \
-		-DOPENAL:BOOL=TRUE \
-		-DFMOD:BOOL=FALSE \
-		-DUNATTENDED:BOOL=TRUE \
-		-DSTANDALONE:BOOL=TRUE \
-		-DLL_TESTS:BOOL=FALSE \
-		-DNDOF:BOOL=FALSE \
-		-DVIEWER:BOOL=TRUE "$_srcdir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="e16f67d04813953e5eadc1beafc435dd  secondlife-2.5.2-sourcebundle.tar.gz
-c75027c0a6f7c52e0ae2b8008ca99f9e  indra-no-breakpad.patch"
diff --git a/unmaintained/snowstorm/indra-no-breakpad.patch b/unmaintained/snowstorm/indra-no-breakpad.patch
deleted file mode 100644
index 28670b1469..0000000000
--- a/unmaintained/snowstorm/indra-no-breakpad.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- indra.orig/cmake/GoogleBreakpad.cmake
-+++ indra/cmake/GoogleBreakpad.cmake
-@@ -2,7 +2,7 @@
- include(Prebuilt)
- 
- if (STANDALONE)
--  set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON)
-+  set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED OFF)
-   include(FindGoogleBreakpad)
- else (STANDALONE)
-   use_prebuilt_binary(google_breakpad)
---- indra.orig/llcommon/llapp.cpp
-+++ indra/llcommon/llapp.cpp
-@@ -46,7 +46,9 @@
- #include "llstring.h"
- #include "lleventtimer.h"
- 
-+#if 0
- #include "google_breakpad/exception_handler.h"
-+#endif
- 
- //
- // Signal handling
-@@ -143,8 +145,6 @@
- 	// Set the application to this instance.
- 	sApplication = this;
- 	
--	mExceptionHandler = 0;
--	
- 	// initialize the buffer to write the minidump filename to
- 	// (this is used to avoid allocating memory in the crash handler)
- 	memset(minidump_path, 0, MAX_MINDUMP_PATH_LENGTH);
-@@ -177,8 +177,6 @@
- 		mThreadErrorp = NULL;
- 	}
- 	
--	if(mExceptionHandler != 0) delete mExceptionHandler;
--
- 	LLCommon::cleanupClass();
- }
- 
-@@ -284,75 +282,7 @@
- 
- void LLApp::setupErrorHandling()
- {
--	// Error handling is done by starting up an error handling thread, which just sleeps and
--	// occasionally checks to see if the app is in an error state, and sees if it needs to be run.
--
--#if LL_WINDOWS
--	// This sets a callback to handle w32 signals to the console window.
--	// The viewer shouldn't be affected, sicne its a windowed app.
--	SetConsoleCtrlHandler( (PHANDLER_ROUTINE) ConsoleCtrlHandler, TRUE);
--
--	// Install the Google Breakpad crash handler for Windows
--	if(mExceptionHandler == 0)
--	{
--		llwarns << "adding breakpad exception handler" << llendl;
--		mExceptionHandler = new google_breakpad::ExceptionHandler(
--			L"C:\\Temp\\", 0, windows_post_minidump_callback, 0, google_breakpad::ExceptionHandler::HANDLER_ALL);
--	}
--
--#else
--	//
--	// Start up signal handling.
--	//
--	// There are two different classes of signals.  Synchronous signals are delivered to a specific
--	// thread, asynchronous signals can be delivered to any thread (in theory)
--	//
--	setup_signals();
--	
--	// Add google breakpad exception handler configured for Darwin/Linux.
--	bool installHandler = true;
--#ifdef LL_DARWIN
--	// For the special case of Darwin, we do not want to install the handler if
--	// the process is being debugged as the app will exit with value ABRT (6) if
--	// we do.  Unfortunately, the code below which performs that test relies on
--	// the structure kinfo_proc which has been tagged by apple as an unstable
--	// API.  We disable this test for shipping versions to avoid conflicts with
--	// future releases of Darwin.  This test is really only needed for developers
--	// starting the app from a debugger anyway.
--	#ifndef LL_RELEASE_FOR_DOWNLOAD
--    int mib[4];
--	mib[0] = CTL_KERN;
--	mib[1] = KERN_PROC;
--	mib[2] = KERN_PROC_PID;
--	mib[3] = getpid();
--	
--	struct kinfo_proc info;
--	memset(&info, 0, sizeof(info));
--	
--	size_t size = sizeof(info);
--	int result = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0);
--	if((result == 0) || (errno == ENOMEM))
--	{
--		// P_TRACED flag is set, so this process is being debugged; do not install
--		// the handler
--		if(info.kp_proc.p_flag & P_TRACED) installHandler = false;
--	}
--	else
--	{
--		// Failed to discover if the process is being debugged; default to
--		// installing the handler.
--		installHandler = true;
--	}
--	#endif
--#endif
--	if(installHandler && (mExceptionHandler == 0))
--	{
--		std::string dumpPath = "/tmp/";
--		mExceptionHandler = new google_breakpad::ExceptionHandler(dumpPath, 0, &unix_post_minidump_callback, 0, true);
--	}
--#endif
--
--	startErrorThread();
-+	sDisableCrashlogger = TRUE;
- }
- 
- void LLApp::startErrorThread()
-@@ -403,20 +333,10 @@
- 
- void LLApp::setMiniDumpDir(const std::string &path)
- {
--	if(mExceptionHandler == 0) return;
--#ifdef LL_WINDOWS
--	wchar_t buffer[MAX_MINDUMP_PATH_LENGTH];
--	mbstowcs(buffer, path.c_str(), MAX_MINDUMP_PATH_LENGTH);
--	mExceptionHandler->set_dump_path(std::wstring(buffer));
--#else
--	mExceptionHandler->set_dump_path(path);
--#endif
- }
- 
- void LLApp::writeMiniDump()
- {
--	if(mExceptionHandler == 0) return;
--	mExceptionHandler->WriteMinidump();
- }
- 
- // static
-@@ -473,13 +393,6 @@
- 
- void LLApp::disableCrashlogger()
- {
--	// Disable Breakpad exception handler.
--	if (mExceptionHandler != 0)
--	{
--		delete mExceptionHandler;
--		mExceptionHandler = 0;
--	}
--
- 	sDisableCrashlogger = TRUE;
- }
- 
---- indra.orig/llcommon/llapp.h
-+++ indra/llcommon/llapp.h
-@@ -60,9 +60,11 @@
- };
- #endif
- 
-+#if 0
- namespace google_breakpad {
- 	class ExceptionHandler; // See exception_handler.h
- }
-+#endif
- 
- class LL_COMMON_API LLApp : public LLOptionInterface
- {
-@@ -330,9 +332,9 @@
- private:
- 	// the static application instance if it was created.
- 	static LLApp* sApplication;
--	
-+#if 0	
- 	google_breakpad::ExceptionHandler * mExceptionHandler;
--
-+#endif
- 
- #if !LL_WINDOWS
- 	friend void default_unix_signal_handler(int signum, siginfo_t *info, void *);
diff --git a/unmaintained/taglib-extras/APKBUILD b/unmaintained/taglib-extras/APKBUILD
deleted file mode 100644
index 3aecb4f93f..0000000000
--- a/unmaintained/taglib-extras/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=taglib-extras
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="extra modules for taglib"
-url="http://amarok.kde.org/"
-arch="all"
-license="GPL"
-depends=
-depends_dev="qt-dev taglib-dev"
-makedepends="$depends_dev cmake"
-install=""
-subpackages="$pkgname-dev"
-source="http://www.kollide.net/~jefferai/taglib-extras-$pkgver.tar.gz"
-
-_builddir="$srcdir"/taglib-extras-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mkdir "$_builddir"/build
-}
-
-build() {
-	cd "$_builddir"/build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON "$_builddir" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="e973ca609b18e2c03c147ff9fd9e6eb8  taglib-extras-1.0.1.tar.gz"
diff --git a/unmaintained/thunderbird/0002-Use-C99-math-isfinite.patch b/unmaintained/thunderbird/0002-Use-C99-math-isfinite.patch
deleted file mode 100644
index 3d85a69288..0000000000
--- a/unmaintained/thunderbird/0002-Use-C99-math-isfinite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:30:51 +0000
-Subject: [PATCH 2/4] Use C99 math isfinite
-
----
- js/src/ctypes/CTypes.cpp |    2 +-
- xpcom/ds/nsMathUtils.h   |    6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
-index 5c0f886..a3b1ae6 100644
---- a/js/src/ctypes/CTypes.cpp
-+++ b/js/src/ctypes/CTypes.cpp
-@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) {
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
-diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h
-index 21ffbec..2e80476 100644
---- a/xpcom/ds/nsMathUtils.h
-+++ b/xpcom/ds/nsMathUtils.h
-@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
-+#else
-+    return isfinite(d);
-+#endif
- #endif
- }
- 
--- 
-1.7.7.4
-
diff --git a/unmaintained/thunderbird/0004-xulrunner-malloc_usable_size.patch b/unmaintained/thunderbird/0004-xulrunner-malloc_usable_size.patch
deleted file mode 100644
index aae416c7da..0000000000
--- a/unmaintained/thunderbird/0004-xulrunner-malloc_usable_size.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a2a15c826a5e1743ba71288543b9e144603fba26 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:40:53 +0000
-Subject: [PATCH 4/4] xulrunner: malloc_usable_size
-
----
- memory/mozalloc/mozalloc.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/memory/mozalloc/mozalloc.cpp b/memory/mozalloc/mozalloc.cpp
-index 58e5192..500c651 100644
---- a/memory/mozalloc/mozalloc.cpp
-+++ b/memory/mozalloc/mozalloc.cpp
-@@ -267,7 +267,7 @@ moz_malloc_usable_size(void *ptr)
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
- #elif defined(MOZ_MEMORY)
--    return malloc_usable_size(ptr);
-+    return 0;
- #elif defined(XP_WIN)
-     return _msize(ptr);
- #else
--- 
-1.7.7.4
-
diff --git a/unmaintained/thunderbird/APKBUILD b/unmaintained/thunderbird/APKBUILD
deleted file mode 100644
index ae94b46dba..0000000000
--- a/unmaintained/thunderbird/APKBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=thunderbird
-pkgver=8.0
-_pkgver=$pkgver
-_xulver=8.0
-pkgrel=0
-pkgdesc="Mozilla Thunderbird mail/newsgroup client"
-url="http://www.mozilla.org/projects/thunderbird/"
-arch="all"
-license="MPLv1.1 or GPLv2+ or LGPLv2+"
-depends="xulrunner>=${_xulver} zip"
-makedepends="
-	alsa-lib-dev
-	cairo-dev
-	curl-dev
-	dbus-glib-dev
-	gtk+2.0-dev
-	hicolor-icon-theme
-	hunspell-dev
-	libevent-dev
-	libidl-dev
-	libnotify-dev
-	libvpx-dev
-	libx11-dev
-	libxext-dev
-	libxt-dev
-	mesa-dev
-	nspr-dev
-	nss-dev
-	python
-	sqlite-dev
-	startup-notification-dev
-	wireless-tools-dev
-	xulrunner-dev>=${_xulver}
-	yasm
-	"
-install=""
-subpackages=""
-source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2
-	mozconfig
-	thunderbird.desktop
-	xpt.py.patch
-	jemalloc-libs.patch
-	"
-#	mozalloc_usable_size.patch
-#	finite.patch
-
-_builddir="${srcdir}/comm-release"
-_mozappdir=/usr/lib/thunderbird-$pkgver
-
-prepare() {
-	local i
-
-	cd "$_builddir"
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
-	cp "${srcdir}/mozconfig" .mozconfig || return 1
-	echo "ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)" >> .mozconfig
-}
-
-build() {
-	cd "$_builddir"
-
-	# mozilla's buildsystem is on drugs
-	export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
-	export CXXFLAGS="$CFLAGS -std=gnu++0x"
-
-#	export LDFLAGS="-Wl,-rpath,${_mozappdir}"
-	make -j1 -f client.mk build \
-		STRIP="/bin/true" \
-		MOZ_MAKE_FLAGS="$MAKEOPTS" || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1
-
-	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-		install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-		"$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
-	done
-
-	install -Dm644 "$srcdir"/$pkgname.desktop \
-		"$pkgdir"/usr/share/applications/$pkgname.desktop || return 1
-
-	# xulrunner stub launcher has changed to using a symlink overlay...
-	# go figure
-	ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/$_mozappdir/xulrunner
-}
-
-md5sums="332f60036aebdce7dec6ee2b1af4941d  thunderbird-8.0.source.tar.bz2
-ca98c2bf1017b33e19dae22fdcef2e73  mozconfig
-af3e5b344d2edf1c7d61bb0a5a96de9a  thunderbird.desktop
-c872ba4217937bbbb6d2ab469a3bf95a  xpt.py.patch
-7f4d92ea8800a34b3c23569c7993f092  jemalloc-libs.patch"
diff --git a/unmaintained/thunderbird/finite.patch b/unmaintained/thunderbird/finite.patch
deleted file mode 100644
index 63927ab82a..0000000000
--- a/unmaintained/thunderbird/finite.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./mozilla/js/src/ctypes/CTypes.cpp.orig
-+++ ./mozilla/js/src/ctypes/CTypes.cpp
-@@ -467,7 +467,7 @@
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
---- ./mozilla/xpcom/ds/nsMathUtils.h
-+++ ./mozilla/xpcom/ds/nsMathUtils.h
-@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
-+#else
-+    return isfinite(d);
-+#endif
- #endif
- }
- 
diff --git a/unmaintained/thunderbird/jemalloc-libs.patch b/unmaintained/thunderbird/jemalloc-libs.patch
deleted file mode 100644
index e7968986b6..0000000000
--- a/unmaintained/thunderbird/jemalloc-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mail/app/Makefile.in.orig
-+++ ./mail/app/Makefile.in
-@@ -172,8 +172,6 @@
- RCFLAGS += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\"
- endif
- 
--LIBS += $(JEMALLOC_LIBS)
--
- include $(topsrcdir)/config/rules.mk
- 
- ifdef MOZILLA_OFFICIAL
diff --git a/unmaintained/thunderbird/mozalloc_usable_size.patch b/unmaintained/thunderbird/mozalloc_usable_size.patch
deleted file mode 100644
index 9b6740dcee..0000000000
--- a/unmaintained/thunderbird/mozalloc_usable_size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mozilla/memory/mozalloc/mozalloc.cpp.orig
-+++ ./mozilla/memory/mozalloc/mozalloc.cpp
-@@ -266,7 +266,7 @@
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY)
-+#elif defined(MOZ_MEMORY) && !defined(__UCLIBC__)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
diff --git a/unmaintained/thunderbird/mozconfig b/unmaintained/thunderbird/mozconfig
deleted file mode 100644
index 85ed8a6484..0000000000
--- a/unmaintained/thunderbird/mozconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/unmaintained/thunderbird/thunderbird.desktop b/unmaintained/thunderbird/thunderbird.desktop
deleted file mode 100644
index a626e52bad..0000000000
--- a/unmaintained/thunderbird/thunderbird.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/unmaintained/thunderbird/xpt.py.patch b/unmaintained/thunderbird/xpt.py.patch
deleted file mode 100644
index 1718e8707f..0000000000
--- a/unmaintained/thunderbird/xpt.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./config/config.mk.orig
-+++ ./config/config.mk
-@@ -368,7 +368,7 @@
- else
- XPIDL_COMPILE 	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
- endif
--XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
-+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
- 
- INCLUDES = \
-   $(LOCAL_INCLUDES) \
diff --git a/unmaintained/tir/APKBUILD b/unmaintained/tir/APKBUILD
deleted file mode 100644
index 6d7e5ce794..0000000000
--- a/unmaintained/tir/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer:
-pkgname=tir
-pkgver=0.9.3
-_pkgsubver=3
-pkgrel=0
-pkgdesc="Tir web framework"
-url=http://tir.mongrel2.org/
-arch=noarch
-license=BSD
-depends="lua lua-json4 lua-md5 lua-posix lua-signal lua-sqlite3 lua-telescope lua-tnetstrings lua-zmq"
-source=${url}downloads/$pkgname-$pkgver-$_pkgsubver.tar.gz
-
-_builddir=$srcdir/$pkgname-$pkgver-$_pkgsubver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	:
-}
-
-package() {
-	cd "$_builddir"
-	local bindir=$pkgdir/usr/sbin
-	local luadir=$pkgdir/usr/share/lua/5.1
-	install -d "$bindir"
-	install -d "$luadir"
-	install bin/tir "$bindir"
-	cp -r tir "$luadir"
-}
-
-md5sums="cd21b247adee9a39e3081d8a974b6146  tir-0.9.3-3.tar.gz"
diff --git a/unmaintained/ucsniff/APKBUILD b/unmaintained/ucsniff/APKBUILD
deleted file mode 100644
index 5ce323ba7f..0000000000
--- a/unmaintained/ucsniff/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Mika Havela <mika.havela@gmail.com>
-pkgname=ucsniff
-pkgver=1.0.0
-pkgrel=0
-pkgdesc="VoIP Security Assessment tool"
-url="http://ucsniff.sourceforge.net"
-license="GPLv3"
-depends="libpcap libnet zlib alsa-lib libltdl"
-makedepends="libpcap-dev libnet-dev zlib-dev"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--disable-gtk \
-		--disable-nls \
-		--without-iconv || return 1
-
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="64f12c353744dcf6c8710b4704cadfbe  ucsniff-1.0.0.tar.gz"
diff --git a/unmaintained/wanpipe-grsec/APKBUILD b/unmaintained/wanpipe-grsec/APKBUILD
deleted file mode 100644
index 12801e9430..0000000000
--- a/unmaintained/wanpipe-grsec/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_flavor=${FLAVOR:-grsec}
-_realname=wanpipe
-_name=$_realname-$_flavor
-
-_kpkg=linux-$_flavor
-_kver=3.9.6
-_kpkgrel=0
-
-# source the kernel version
-if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
-	. ../../main/linux-$_flavor/APKBUILD
-	pkgname=$_name
-	[ "$_kver" != "$pkgver" ] && die "$_name: Please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "$_name: Please update _kpkgrel to $pkgrel"
-fi
-
-_kernelver=$_kver-r$_kpkgrel
-_abi_release=${_kver}-${_kpkgrel}-${_flavor}
-
-pkgname=$_name
-pkgver=$_kver
-_realver=7.0.0
-_mypkgrel=0
-pkgrel=$(($_kpkgrel + $_mypkgrel))
-pkgdesc="Sangoma Wanpipe drivers for $_flavor kernel"
-url="http://wiki.sangoma.com/wanpipe-linux-drivers"
-arch=""
-license="GPL"
-depends="linux-${_flavor}=${_kernelver}"
-makedepends="linux-${_flavor}-dev=${_kernelver} bison libtool flex bash
-	dahdi-linux-dev autoconf"
-install=
-install_if="linux-$_flavor=$_kernelver $_realname"
-subpackages=
-source="ftp://ftp.sangoma.com/linux/current_wanpipe/wanpipe-$_realver.tgz"
-
-# override kernel's prepare()
-prepare() {
-	cd "$srcdir/$_realname-$_realver"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$srcdir/$_realname-$_realver"
-	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
-
-	make CC="${CC:-gcc}" \
-		KVER=$_abi_release \
-		DAHDI_DIR=/usr/src/dahdi-headers-$_abi_release \
-		all_kmod_dahdi || return 1
-}
-
-package() {
-	cd "$srcdir/$_realname-$_realver"
-	make CC="${CC:-gcc}" \
-		KVER=$_abi_release \
-		DAHDI_DIR=/usr/src/dahdi-headers-$_abi_release \
-		DESTDIR="$pkgdir" \
-		install_kmod || return 1
-}
-
-md5sums="0602bf8a632312019e092f7de23caa9a  wanpipe-7.0.0.tgz"
-sha256sums="39e6b820168af511b3714d80aeede9bb62002ad6e03653ecf47904e4cc247118  wanpipe-7.0.0.tgz"
-sha512sums="70996740de89f7369d16f5a55e825e36e29b227bef8f1a21962f7b8fdd7f5922ff125e3d0e9f4b6472acdf68567a8b469c85693b3a68f3b788ce15a68fb2a875  wanpipe-7.0.0.tgz"
diff --git a/unmaintained/wanpipe-grsec/constify.patch b/unmaintained/wanpipe-grsec/constify.patch
deleted file mode 100644
index dfd78eca7d..0000000000
--- a/unmaintained/wanpipe-grsec/constify.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/patches/kdrivers/include/if_wanpipe_common.h b/patches/kdrivers/include/if_wanpipe_common.h
-index e7f4fca..1bf0c1b 100644
---- a/patches/kdrivers/include/if_wanpipe_common.h
-+++ b/patches/kdrivers/include/if_wanpipe_common.h
-@@ -49,7 +49,7 @@ typedef struct {
- #if defined (__LINUX__)
-        int     (*change_mtu)(netdevice_t *dev, int new_mtu);
- #endif
--} wanpipe_common_iface_t;
-+} __no_const wanpipe_common_iface_t;
- 
- typedef struct wanpipe_common {
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-diff --git a/patches/kdrivers/include/sdla_front_end.h b/patches/kdrivers/include/sdla_front_end.h
-index 11d7f3c..61bb8a2 100644
---- a/patches/kdrivers/include/sdla_front_end.h
-+++ b/patches/kdrivers/include/sdla_front_end.h
-@@ -630,7 +630,7 @@ typedef struct {
- 	/* Enable/Disable Clock recovery from the line */
- 	int		(*clock_ctrl)(sdla_fe_t*, u_int8_t /* WANOPT_NO/WANOPT_YES */);
- 	u_int32_t 	(*read_tx_alarm)(sdla_fe_t *fe, int);
--} sdla_fe_iface_t;
-+} __no_const sdla_fe_iface_t;
- 
- /* 
- ** Sangoma Front-End interface structure (new version)
-diff --git a/patches/kdrivers/include/sdladrv.h b/patches/kdrivers/include/sdladrv.h
-index 4398f4c..5e34811 100644
---- a/patches/kdrivers/include/sdladrv.h
-+++ b/patches/kdrivers/include/sdladrv.h
-@@ -743,7 +743,7 @@ typedef struct sdlahw_iface
- 	int		(*usb_flush_err_stats)(void *phw);
- 	void		(*reset_fe)(void*);            
- 
--} sdlahw_iface_t;
-+} __no_const sdlahw_iface_t;
- 
- typedef struct sdla_hw_type_cnt
- {
-@@ -772,7 +772,7 @@ typedef struct sdla_hw_type_cnt
- typedef struct sdladrv_callback_ {
- 	int (*add_device)(void);
- 	int (*delete_device)(char*);
--} sdladrv_callback_t;
-+} __no_const sdladrv_callback_t;
- 
- #if defined(SDLADRV_HW_IFACE)
- typedef struct sdladrv_hw_probe_iface {
-diff --git a/patches/kdrivers/include/wanpipe_cdev_iface.h b/patches/kdrivers/include/wanpipe_cdev_iface.h
-index bccf2e2..486572e 100644
---- a/patches/kdrivers/include/wanpipe_cdev_iface.h
-+++ b/patches/kdrivers/include/wanpipe_cdev_iface.h
-@@ -32,7 +32,7 @@ typedef struct wanpipe_cdev_ops
- 	/* handle transmission time out */
- 	int (*tx_timeout)(void* dev_ptr);
- 
--}wanpipe_cdev_ops_t;
-+} __no_const wanpipe_cdev_ops_t;
- 
- 
- 
-diff --git a/patches/kdrivers/include/wanpipe_defines.h b/patches/kdrivers/include/wanpipe_defines.h
-index 9c62b8d..5269262 100644
---- a/patches/kdrivers/include/wanpipe_defines.h
-+++ b/patches/kdrivers/include/wanpipe_defines.h
-@@ -895,7 +895,7 @@ typedef struct wan_rtp_pkt {
- 
- #if defined(HAVE_NET_DEVICE_OPS) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
- 
--#define WAN_DECLARE_NETDEV_OPS(_ops_name) static struct net_device_ops _ops_name = {0};
-+#define WAN_DECLARE_NETDEV_OPS(_ops_name) static net_device_ops_no_const _ops_name = {0};
- 
- #define WAN_NETDEV_OPS_BIND(dev,_ops_name)  dev->netdev_ops = &_ops_name
- 
-diff --git a/patches/kdrivers/include/wanpipe_wanrouter.h b/patches/kdrivers/include/wanpipe_wanrouter.h
-index 7b2a919..4a05fa5 100644
---- a/patches/kdrivers/include/wanpipe_wanrouter.h
-+++ b/patches/kdrivers/include/wanpipe_wanrouter.h
-@@ -362,7 +362,7 @@ typedef struct wan_device
- 		void	(*ringdetect) (void* card_id, wan_event_t*);	
- 		void	(*linkstatus) (void* card_id, wan_event_t*);
- 		void	(*polarityreverse) (void* card_id, wan_event_t*);
--	} event_callback;
-+	} __no_const event_callback;
- 	
- 	unsigned char 		ignore_front_end_status;
- 	unsigned char		line_idle;
-diff --git a/patches/kdrivers/src/net/sdladrv.c b/patches/kdrivers/src/net/sdladrv.c
-index 22d4b4f..d5b9fbb 100644
---- a/patches/kdrivers/src/net/sdladrv.c
-+++ b/patches/kdrivers/src/net/sdladrv.c
-@@ -343,12 +343,12 @@ static unsigned	sdla_test_memregion (sdlahw_t* hw, unsigned len);
- static unsigned short sdla_checksum (unsigned char* buf, unsigned len);
- static int sdla_init_pci_slot(sdlahw_t *);
- 
--static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
-+static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
- static int sdla_card_unregister (sdlahw_card_t*);
--static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
-+static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
- static int sdla_card_info(sdlahw_card_t*);
- 
--sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, char*);
-+sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char*);
- static sdlahw_cpu_t* sdla_hwcpu_register(sdlahw_card_t*, int, int, void*);
- static int sdla_hwcpu_unregister(sdlahw_cpu_t*);
- static int sdla_hwcpu_info(sdlahw_cpu_t*);
-@@ -4339,7 +4339,7 @@ static int sdla_card_info(sdlahw_card_t *hwcard)
- }
- 
- static sdlahw_card_t*
--sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
-+sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
- {
- 	sdlahw_card_t	*new_hwcard, *last_hwcard;
- 
-@@ -4408,7 +4408,7 @@ sdla_card_unregister(sdlahw_card_t* hwcard)
- }
- 
- static sdlahw_card_t*
--sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
-+sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
- {
- 	sdlahw_card_t*	tmp;
- 	
-@@ -4547,7 +4547,7 @@ static int sdla_hwcpu_unregister(sdlahw_cpu_t *hwcpu)
- }
- 
- sdlahw_cpu_t*
--sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, char *bus_id)
-+sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, const char *bus_id)
- {
- 	sdlahw_cpu_t*	tmp;
- 	
diff --git a/unmaintained/wifidog/APKBUILD b/unmaintained/wifidog/APKBUILD
deleted file mode 100644
index caa4872051..0000000000
--- a/unmaintained/wifidog/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
-pkgname=wifidog
-pkgver=20090925
-pkgrel=2
-pkgdesc="Wifi Captive Portal"
-url="http://dev.wifidog.org/"
-arch="all"
-license="GPL2"
-depends=
-makedepends=
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	wifidog.initd"
-
-_httplib=/usr/lib
-
-_builddir="$srcdir/$pkgname-$pkgver"
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc/wifidog || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir/" install || return 1
-	mkdir -p "$pkgdir"/etc/wifidog || return
-	cp "$_builddir"/wifidog.conf "$pkgdir"/etc/wifidog/wifidog.conf
-	cp "$_builddir"/wifidog-msg.html "$pkgdir"/etc/wifidog/wifidog-msg.html
-	rm -rf "$pkgdir"/usr/include || return 1	
-	rm "$pkgdir"/$_httplib/*.a || return 1	
-        install -Dm755 "$srcdir"/wifidog.initd "$pkgdir"/etc/init.d/wifidog \
-		|| return 1
-
-}
-
-md5sums="e3ecacba67a91b6ea3c1072ba6c5a0b4  wifidog-20090925.tar.gz
-410267a956ee1b12669353771fe3cafa  wifidog.initd"
diff --git a/unmaintained/wifidog/wifidog.initd b/unmaintained/wifidog/wifidog.initd
deleted file mode 100755
index c5e3b37f08..0000000000
--- a/unmaintained/wifidog/wifidog.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 2012 Nathan Angelacos for Alpine Linux
-# Distributed under the terms of the GNU General Public License v2
-
-SVCDIR=${SVCDIR:-/etc/wifidog}
-SVC=${SVCNAME#*.}
-if [ -n "${SVC}" ] && [ ${SVCNAME} != "wifidog" ]; then
-	SVCPID="/var/run/wifidog.${SVC}.pid"
-else
-	SVCPID="/var/run/wifidog.pid"
-fi
-SVCCONF="${SVCDIR}/${SVC}.conf"
-
-depend() {
-	need  net
-	use   dns
-}
-
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	start-stop-daemon --start --exec /usr/bin/wifidog -b -m --pidfile "${SVCPID}" \
-		-- -f -s -c ${SVCCONF} ${CONF} 2&>1 >/dev/null
-	if ! [ -d /proc/`cat ${SVCPID}` ]; then
-		rm -f "${SVCPID}"
-		eend 1 
-		return 1
-	fi
-	eend 0
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec /usr/sbin/wifidog --pidfile "${SVCPID}"
-	eend $?
-}
-
diff --git a/unmaintained/wxformbuilder/APKBUILD b/unmaintained/wxformbuilder/APKBUILD
deleted file mode 100644
index cc486c477b..0000000000
--- a/unmaintained/wxformbuilder/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=wxformbuilder
-pkgver=3.1.70
-pkgrel=0
-pkgdesc="RAD tool for wxWidgets GUI design"
-url="http://sourceforge.net/apps/wordpress/wxformbuilder"
-arch="all"
-license="GPLv2"
-depends=""
-depends_dev=""
-makedepends="$depends_dev wxgtk-dev"
-install=""
-subpackages=""
-source="http://downloads.sourceforge.net/project/wxformbuilder/wxformbuilder/$pkgver/wxFormBuilder_v${pkgver}-src.tar.bz2
-	libdl.patch"
-
-_builddir="$srcdir"/wxformbuilder
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e 's/\r//' create_build_files.sh \
-		install/linux/wxfb_export.sh
-}
-
-build() {
-	cd "$_builddir"
-	./create_build_files.sh || return 1
-	make CONFIG=Release || return 1
-}
-
-package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/usr
-	install/linux/wxfb_export.sh "$pkgdir"/usr || return 1
-}
-
-md5sums="1c2d53a344333bd2389f9f07a5321d5e  wxFormBuilder_v3.1.70-src.tar.bz2
-304bb4f7dd668fd42abc7d9ae986610a  libdl.patch"
diff --git a/unmaintained/wxformbuilder/icon_48x48_wxformbuilder.png b/unmaintained/wxformbuilder/icon_48x48_wxformbuilder.png
deleted file mode 100644
index db33a0adef..0000000000
--- a/unmaintained/wxformbuilder/icon_48x48_wxformbuilder.png
+++ /dev/null
diff --git a/unmaintained/wxformbuilder/libdl.patch b/unmaintained/wxformbuilder/libdl.patch
deleted file mode 100644
index 41aa10e383..0000000000
--- a/unmaintained/wxformbuilder/libdl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/premake.lua.orig
-+++ ./src/premake.lua
-@@ -58,7 +58,7 @@
- 	package.libpaths = { "../output/lib/wxformbuilder", "../sdk/lib" }

- end

- -- Set the libraries it links to.

--package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface" }

-+package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface", "dl" }

- 

- -- Add libraries and build options for stack trace in MinGW

- if ( windows and ( (string.find( target or "", ".*-gcc" )) or (target == "gnu") ) ) then

diff --git a/unmaintained/wzdftpd-svn/APKBUILD b/unmaintained/wzdftpd-svn/APKBUILD
deleted file mode 100644
index b9b4626564..0000000000
--- a/unmaintained/wzdftpd-svn/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is an example APKBUILD file. Use this as a start to creating your own,
-# and remove these comments.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Contributor: Your Name <youremail@domain.com>
-pkgname=wzdftpd-svn
-pkgver=2040
-pkgrel=2
-pkgdesc="A portable, modular, small, and efficient FTP server"
-url="http://www.wzdftpd.net"
-license='GPL'
-depends=
-makedepends="cmake mysql-dev sqlite-dev tcl-dev openssl-dev flex"
-source="http://alpine.nethq.org/clandmeter/src/wzdftpd-svn2040.tar.gz
-wzdftpd-svn.initd"
-subpackages="$pkgname-doc"
-
-build() {
-        mkdir "$srcdir/${pkgname}"
-        mv "$srcdir/wzdftpd-src" "$srcdir/${pkgname}/"
-        cd "$srcdir/${pkgname}/"
-        cmake \
-        -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-        -D WITH_DUPECHECK:BOOL=ON \
-        -D WITH_SFV:BOOL=ON \
-        -D BUILD_TESTING:BOOL=OFF \
-        -D WITH_Zeroconf:BOOL=ON \
-        -D TCL_LIBRARY:FILEPATH=/usr/lib/libtcl8.5.so \
-        -D WITH_PAM:BOOL=OFF \
-        -D WITH_PerlDev:BOOL=OFF \
-        -D CONF_INSTALL_PATH:PATH=/etc/wzdftpd \
-        ./wzdftpd-src || return 1
-        make || return 1
-        make DESTDIR="$pkgdir/" install
-        mv $pkgdir/usr/var $pkgdir/
-        sed -i -e 's|usr/var|var|' \
-        -e 's|usr/etc|etc|' \
-        -e 's|usr//etc|etc|' \
-	-e 's|#pid_file|pid_file|' \
-        $pkgdir/etc/wzdftpd/wzd.cfg.sample
-	install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/wzdftpd
-}
-
-md5sums="4bdb2fcaa4ca316261e9f77380818769  wzdftpd-svn2040.tar.gz
-ae2b7497cc7729bfaf346ba0d3b607d2  wzdftpd-svn.initd"
diff --git a/unmaintained/wzdftpd-svn/wzdftpd-svn.initd b/unmaintained/wzdftpd-svn/wzdftpd-svn.initd
deleted file mode 100644
index 25f4da6f47..0000000000
--- a/unmaintained/wzdftpd-svn/wzdftpd-svn.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	after firewall
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/wzdftpd/wzd.cfg ] ; then
-		eerror "No /etc/wzdftpd/wzd.cnf file exists!"
-		return 1
-	fi
-	if [ ! -d /var/run/wzdftpd ] ; then
-		install -dD -o ftp -g ftp /var/run/wzdftpd
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting wzdftpd"
-	/usr/sbin/wzdftpd >/dev/null 2>&1 &
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping wzdftpd"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/wzdftpd/wzdftpd.pid --retry 20
-	eend $?
-}
-
diff --git a/unmaintained/xf86-video-virtualbox/APKBUILD b/unmaintained/xf86-video-virtualbox/APKBUILD
deleted file mode 100644
index a87c439903..0000000000
--- a/unmaintained/xf86-video-virtualbox/APKBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-virtualbox
-pkgdesc="Xorg Virtual box video driver"
-pkgver=4.3.8
-_ver=${pkgver/_rc/_RC}
-pkgrel=0
-arch="all"
-url='http://virtualbox.org'
-license="GPL custom"
-makedepends="
-	dev86 iasl kbuild>=0.1.9998_pre20120806-r1 yasm zlib-dev sed
-	libxinerama-dev libxrandr-dev libxmu-dev libxdmcp-dev libxau-dev
-	libxext-dev libxfixes-dev libiconv-dev libx11-dev xorg-server-dev
-	mesa-dev"
-source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2
-	uclibc-gnu_linux.patch
-	futimens.patch
-	xf86-video-virtualbox-4-makeself-check.patch
-	musl-no-glibc.patch
-	LocalConfig.kmk
-	"
-#	uclibc-spawn.patch
-
-_builddir="$srcdir/VirtualBox-${_ver}"
-
-prepare() {
-	cd "$_builddir"
-	local i
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
-	# the kmk_sed they ship and use is linked to glibc...
-	sed -i -e 's:KBUILD_SED=.*:KBUILD_SED="busybox sed":' configure
-	rm -r kBuild/bin tools
-	cp "$srcdir"/LocalConfig.kmk .
-}
-
-build() {
-	cd "$_builddir"
-	cp "$srcdir/LocalConfig.kmk" .
-	./configure --disable-docs \
-		--nofatal \
-		--disable-java \
-		--disable-pulse \
-		--disable-opengl \
-		--disable-kmods \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--build-headless \
-		|| return 1
-	. ./env.sh
-	for i in Runtime Additions/common/VBoxGuestLib \
-			Additions/x11/x11stubs Additions/x11/vboxvideo; do
-		cd "$_builddir"/src/VBox/$i
-		kmk TOOL_YASM_AS=yasm || return 1
-	done
-}
-
-package() {
-	cd "$_builddir"/out/linux.*/release/bin/additions
-	install -Dm755 vboxvideo_drv_112.so \
-		"$pkgdir"/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
-}
-
-md5sums="422ab09b7eb9c0564b55a6a0a6e6678f  VirtualBox-4.3.8.tar.bz2
-072ee2114b3771e7bdbff5211f342755  uclibc-gnu_linux.patch
-10f65154d3ff17d88fad5ed384e20276  futimens.patch
-44efb3c4be214daa453a317d527f1f30  xf86-video-virtualbox-4-makeself-check.patch
-a66c27f91349d9c9ae8304905b855fd6  musl-no-glibc.patch
-eedb57172f97829c2ad53fdb970a1c68  LocalConfig.kmk"
-sha256sums="ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641  VirtualBox-4.3.8.tar.bz2
-1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae  uclibc-gnu_linux.patch
-deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb  futimens.patch
-31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966  xf86-video-virtualbox-4-makeself-check.patch
-3f1c59fbd4e9fb2a6d2777c9f5979735fe77cd564293bde1edb3017255e5b164  musl-no-glibc.patch
-5ec9b53a113af1c37edf320be8a2f5f688b4afce7c5a065d785bea8c95645d8b  LocalConfig.kmk"
-sha512sums="0bc00254733befee6ba864b9c88e0ddedb5949fff884313b72bbedeaefb572fd129a8d16b179612acef9b53fc3d2203ac775656d6c941d94a77bb944fdd66903  VirtualBox-4.3.8.tar.bz2
-d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb  uclibc-gnu_linux.patch
-1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638  futimens.patch
-7f60a857213b1b045247f5a041ebed60099f0f634b7d843bd85062eb4cf8504e8d5907b43df852dc49465248e2cbe3d998acefeb676113ca9a38e72da6d926a7  xf86-video-virtualbox-4-makeself-check.patch
-d79032d0a7a098e5e63c9a11cce278322cc2ecd75a996dc11096a738d43cecc84abb5de25b32b4409164d08a77541bcc00a53e7e62624880756c7e8fb238b447  musl-no-glibc.patch
-a126ef0182caca3fcbe5d12947cd63a6a729280127f5ead874b5ae0d1fe5f3aadd538b639bfd0d738f95048c25027761f47374e91b585b78e1d5a65ec98a5c23  LocalConfig.kmk"
diff --git a/unmaintained/xf86-video-virtualbox/LocalConfig.kmk b/unmaintained/xf86-video-virtualbox/LocalConfig.kmk
deleted file mode 100644
index ce47ec7854..0000000000
--- a/unmaintained/xf86-video-virtualbox/LocalConfig.kmk
+++ /dev/null
@@ -1,14 +0,0 @@
-VBOX_WITH_TESTCASES     :=
-VBOX_WITH_TESTSUITE     :=
-VBOX_GCC_WERR		:=
-
-KBUILD_MSG_STYLE        := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING        := 2
-VBOX_WITH_ORIGIN           :=
-VBOX_ONLY_ADDITIONS        := 1
-
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
-TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
-
diff --git a/unmaintained/xf86-video-virtualbox/futimens.patch b/unmaintained/xf86-video-virtualbox/futimens.patch
deleted file mode 100644
index f85e1ae6e2..0000000000
--- a/unmaintained/xf86-video-virtualbox/futimens.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/VBox/Runtime/r3/posix/fileio2-posix.cpp.orig
-+++ ./src/VBox/Runtime/r3/posix/fileio2-posix.cpp
-@@ -165,7 +165,12 @@
- 
-     /* XXX this falls back to utimes("/proc/self/fd/...",...) for older kernels/glibcs and this
-      * will not work for hardened builds where this directory is owned by root.root and mode 0500 */
--    if (futimes(RTFileToNative(hFile), aTimevals))
-+    struct timespec aTimespecs[2] = {
-+    	{ aTimevals[0].tv_sec, aTimevals[0].tv_usec * 1000 },
-+    	{ aTimevals[1].tv_sec, aTimevals[1].tv_usec * 1000 },
-+    };
-+
-+    if (futimens(RTFileToNative(hFile), aTimespecs))
-     {
-         int rc = RTErrConvertFromErrno(errno);
-         Log(("RTFileSetTimes(%RTfile,%p,%p,,): returns %Rrc\n", hFile, pAccessTime, pModificationTime, rc));
diff --git a/unmaintained/xf86-video-virtualbox/musl-fix-headers.patch b/unmaintained/xf86-video-virtualbox/musl-fix-headers.patch
deleted file mode 100644
index 8eaa63c1f8..0000000000
--- a/unmaintained/xf86-video-virtualbox/musl-fix-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/VBox/Runtime/r3/linux/sysfs.cpp.orig
-+++ ./src/VBox/Runtime/r3/linux/sysfs.cpp
-@@ -40,7 +40,6 @@
- 
- #include <unistd.h>
- #include <stdio.h>
--#include <sys/sysctl.h>
- #include <sys/stat.h>
- #include <sys/fcntl.h>
- #include <errno.h>
diff --git a/unmaintained/xf86-video-virtualbox/musl-no-glibc.patch b/unmaintained/xf86-video-virtualbox/musl-no-glibc.patch
deleted file mode 100644
index 65372f5d9d..0000000000
--- a/unmaintained/xf86-video-virtualbox/musl-no-glibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp.orig
-+++ ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp
-@@ -32,6 +32,8 @@
- # define _GNU_SOURCE
- #endif
- #include <features.h>
-+
-+#if defined(__GLIBC__)
- #if __GLIBC_PREREQ(2,4)
- 
- #include <sched.h>
-@@ -87,6 +89,11 @@
- 
-     return VINF_SUCCESS;
- }
-+
-+#else
-+# include "../../generic/RTThreadGetAffinity-stub-generic.cpp"
-+# include "../../generic/RTThreadSetAffinity-stub-generic.cpp"
-+#endif
- 
- #else
- # include "../../generic/RTThreadGetAffinity-stub-generic.cpp"
diff --git a/unmaintained/xf86-video-virtualbox/musl-sched_yield.patch b/unmaintained/xf86-video-virtualbox/musl-sched_yield.patch
deleted file mode 100644
index 08ca79cb9b..0000000000
--- a/unmaintained/xf86-video-virtualbox/musl-sched_yield.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./src/VBox/Runtime/r3/posix/thread2-posix.cpp.orig
-+++ ./src/VBox/Runtime/r3/posix/thread2-posix.cpp
-@@ -66,7 +66,7 @@
- #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
-         sched_yield();
- #else
--        if (!pthread_yield())
-+        if (!sched_yield())
- #endif
-         {
-             LogFlow(("RTThreadSleep: returning %Rrc (cMillies=%d)\n", VINF_SUCCESS, cMillies));
-@@ -105,7 +105,7 @@
- #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
-         sched_yield();
- #else
--        if (!pthread_yield())
-+        if (!sched_yield())
- #endif
-             return VINF_SUCCESS;
-     }
-@@ -131,10 +131,8 @@
- #endif
- #ifdef RT_OS_DARWIN
-     pthread_yield_np();
--#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
--    sched_yield();
- #else
--    pthread_yield();
-+    sched_yield();
- #endif
- #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-     u64TS = ASMReadTSC() - u64TS;
diff --git a/unmaintained/xf86-video-virtualbox/uclibc-gnu_linux.patch b/unmaintained/xf86-video-virtualbox/uclibc-gnu_linux.patch
deleted file mode 100644
index b227d55b1d..0000000000
--- a/unmaintained/xf86-video-virtualbox/uclibc-gnu_linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/libs/kStuff/kStuff/include/k/kDefs.h.orig
-+++ ./src/libs/kStuff/kStuff/include/k/kDefs.h
-@@ -82,7 +82,7 @@
- #  define K_OS      K_OS_DRAGONFLY
- # elif defined(__FreeBSD__) /*??*/
- #  define K_OS      K_OS_FREEBSD
--# elif defined(__gnu_linux__)
-+# elif defined(__linux__)
- #  define K_OS      K_OS_LINUX
- # elif defined(__NetBSD__) /*??*/
- #  define K_OS      K_OS_NETBSD
diff --git a/unmaintained/xf86-video-virtualbox/uclibc-spawn.patch b/unmaintained/xf86-video-virtualbox/uclibc-spawn.patch
deleted file mode 100644
index 98b4e8ad6e..0000000000
--- a/unmaintained/xf86-video-virtualbox/uclibc-spawn.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig
-+++ ./src/VBox/Runtime/r3/posix/process-creation-posix.cpp
-@@ -48,6 +48,9 @@
-  * whether it is started detached or not. */
- # define HAVE_POSIX_SPAWN 1
- #endif
-+#if defined(__UCLIBC__)
-+#undef HAVE_POSIX_SPAWN
-+#endif
- #ifdef HAVE_POSIX_SPAWN
- # include <spawn.h>
- #endif
-@@ -103,11 +106,9 @@
-     if (spwd)
-         pw->pw_passwd = spwd->sp_pwdp;
- 
--    /* be reentrant */
--    struct crypt_data *data = (struct crypt_data*)RTMemTmpAllocZ(sizeof(*data));
--    char *pszEncPasswd = crypt_r(pszPasswd, pw->pw_passwd, data);
-+    /* NOT reentrant */
-+    char *pszEncPasswd = crypt(pszPasswd, pw->pw_passwd);
-     int fCorrect = !strcmp(pszEncPasswd, pw->pw_passwd);
--    RTMemTmpFree(data);
-     if (!fCorrect)
-         return VERR_PERMISSION_DENIED;
- 
diff --git a/unmaintained/xf86-video-virtualbox/virtualbox-4-makeself-check.patch b/unmaintained/xf86-video-virtualbox/virtualbox-4-makeself-check.patch
deleted file mode 100644
index e1fcb8c2f4..0000000000
--- a/unmaintained/xf86-video-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/unmaintained/xf86-video-virtualbox/xf86-video-virtualbox-4-makeself-check.patch b/unmaintained/xf86-video-virtualbox/xf86-video-virtualbox-4-makeself-check.patch
deleted file mode 100644
index e1fcb8c2f4..0000000000
--- a/unmaintained/xf86-video-virtualbox/xf86-video-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/unmaintained/xf86-video-virtualbox/xf86-video-virtualbox-link-lazy.patch b/unmaintained/xf86-video-virtualbox/xf86-video-virtualbox-link-lazy.patch
deleted file mode 100644
index 5bb605419c..0000000000
--- a/unmaintained/xf86-video-virtualbox/xf86-video-virtualbox-link-lazy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2012-02-26	Magnus Granberg <zorry@gentoo.org>
-
-	#394757
-	* Config.kmk	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
---- ./Config.kmk	2011-12-19 13:58:30.000000000 +0100
-+++ ./Config.kmk	2012-02-26 12:40:07.497810044 +0100
-@@ -4429,7 +4429,7 @@ else # the gcc guys
-  TEMPLATE_VBOXGUESTR3EXE_TOOL    := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
-  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
-  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
- TEMPLATE_VBOXGUESTR3EXE_DEFS     := $(filter-out $(ARCH_BITS_DEFS), $(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 IN_RT_R3 $(VBOX_GC_ARCH_BITS_DEFS)
diff --git a/unmaintained/yaws/APKBUILD b/unmaintained/yaws/APKBUILD
deleted file mode 100644
index 8e92ba33f6..0000000000
--- a/unmaintained/yaws/APKBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# Contributor: Vitaliy Tokarev <vitaliy.tokarev@gmail.com>
-# Maintainer:
-pkgname=yaws
-pkgver=1.97
-pkgrel=0
-pkgdesc="Yet Another Web Server, pure Erlang HTTP server/framework"
-url="http://yaws.hyber.org/"
-arch="all"
-license="BSD"
-depends="erlang linux-pam"
-depends_dev="linux-pam-dev erlang-dev"
-makedepends="$depends_dev perl"
-options="!emptydirs"
-install=""
-subpackages="$pkgname-doc $pkgname-web"
-source="http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz
-	yaws.initd
-	yaws.conf.alpine"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	export ERLCFLAGS="-W"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-
-	# XXX: from arch linux
-	install -d "$pkgdir/usr/lib/erlang/lib"
-	ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" \
-		|| return 1
-
-	# init.d
-	install -Dm755 "$srcdir/yaws.initd" "$pkgdir/etc/init.d/yaws" \
-		|| return 1
-
-	# License
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" \
-		|| return 1
-
-	# update config
-	# * basically change log dir to /var/log/yaws
-	# * on of <server localhost> definitions commented, because conflict
-	install -Dm644 "$srcdir"/yaws.conf.alpine "$pkgdir/etc/yaws/yaws.conf" \
-		|| return 1
-
-	install -d "$pkgdir"/var/log/yaws
-}
-
-web() {
-	arch="noarch"
-	depends="yaws"
-	pkgdesc="Yet Another Web Server, pure Erlang HTTP server/framework (examples)"
-
-	mkdir -p "$subpkgdir"/var
-	mv "$pkgdir"/var/yaws "$subpkgdir"/var/
-
-	# cleanup unnecessary Makefiles
-	find "$subpkgdir"/var/yaws/www -type f -name 'Makefile' \
-		-exec rm -f {} \;
-}
-
-md5sums="7a835c3b80b1158b54695591ed2d0864  yaws-1.97.tar.gz
-3a1445696bd25ae71631d13457980693  yaws.initd
-2b71d01e0837aff6798e602c74ae6a2c  yaws.conf.alpine"
-sha256sums="a792478564866393f3e901bf4ec33272c22d7c01a8c5493b33856729d25b026e  yaws-1.97.tar.gz
-313ce8cacd25e8eed5717dfd9e79d1683a4038a64cffff6e93aacfd2fb11c261  yaws.initd
-ebff598ac47a0185a81ca5fb45b1c843b184390d85c630686aa2579b6d51e3af  yaws.conf.alpine"
-sha512sums="b91fa598ea91a190e341dda35f7bc0ee468454fd5eb6bf7cbae722c59816e6b6da81a08aea5f2f6fa49fafaeccd42c85025ed21be9f208c4e2b73b624586db12  yaws-1.97.tar.gz
-07ff290eb98be729445d797361503d01dfba29f050639632d251202267aa485655fd04798f4de8d66a83bb0a798280116f8b06d5b9e8810d3cb2d20c1c1bd1d6  yaws.initd
-7f4bf1a099337cf53a2492cc2e295108adcb9ab26b27089303429542c5097ed357623f6d448c5b0b9c9e4d0e8517350ab9d8bf1b6d51a529c45b264f810c688d  yaws.conf.alpine"
diff --git a/unmaintained/yaws/yaws-1.96-etc.patch b/unmaintained/yaws/yaws-1.96-etc.patch
deleted file mode 100644
index a48801be27..0000000000
--- a/unmaintained/yaws/yaws-1.96-etc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# don't create /usr/etc dir when --sysconfdir=/etc passed to configure
-
---- yaws-1.96/scripts/Install
-+++ yaws-1.96/scripts/Install.new
-@@ -18,7 +18,7 @@
- v=${vardir}
- 
- install -d ${destdir}${prefix}/bin
--install -d ${destdir}${prefix}/etc
-+install -d ${destdir}${etcdir}
- install -d ${destdir}${vardir}/log/yaws
- 
- cat yaws.template | \
diff --git a/unmaintained/yaws/yaws.conf.alpine b/unmaintained/yaws/yaws.conf.alpine
deleted file mode 100644
index c3a6d2832c..0000000000
--- a/unmaintained/yaws/yaws.conf.alpine
+++ /dev/null
@@ -1,150 +0,0 @@
-
-# conf for yaws
-
-# First we have a set of globals that apply to all virtual servers
-
-# This is the directory where all logfiles for
-# all virtual servers will be written.
-logdir = /var/log/yaws
-
-# These are the paths to directories where additional
-# beam code can be placed. The daemon will add these
-# directories to its search path.
-ebin_dir = /usr/lib/yaws/examples/ebin
-ebin_dir = /var/yaws/ebin
-
-# This is a directory where application specific .hrl
-# files can be placed. Application-specific .yaws code can
-# then include these .hrl files.
-include_dir = /usr/lib/yaws/examples/include
-
-# Set this to an integer value to control
-# max number of connections from clients into the server.
-max_connections = nolimit
-
-# Normally, yaws does not restrict the number of times a connection is
-# kept alive using keepalive. Setting this parameter to an integer X
-# will ensure that connections are closed once they have been used X times.
-# This can be a useful to guard against long running connections
-# collecting too much garbage in the Erlang VM.
-keepalive_maxuses = nolimit
-
-# Override the garbage collection option parameters for processes
-# that handle new connections. Useful for systems expecting long-lived
-# connections that handle a lot of data. The default value is Erlang's
-# default. Valid options are {fullsweep_after, X} and/or {min_heap_size, Y} where
-# X and Y are integers. See Erlang's erlang:spawn_opt/4 function for more
-# details. The value type is a quoted string containing an Erlang proplist or
-# the atom undefined.
-process_options = "[]"
-
-# Set the size of the cached acceptor process pool. The value must be an
-# integer greater than or equal to 0. The default pool size is 8. Setting
-# the pool size to 0 effectively disables the pool.
-#acceptor_pool_size = 8
-
-# This is a debug variable, possible values are http | traffic | false
-# It is also possible to set the trace (possibly to the tty) while
-# invoking yaws from the shell as in
-# yaws -i -T -x (see man yaws).
-trace = false
-
-# Enable this if we want to use the old OTP ssl implementation
-# OTP R13B03 is known to work with this flag set to false (default).
-use_old_ssl = false
-
-# It is possible to have yaws start additional application-specific code at
-# startup. Set runmod to the name of the module you want yaws to start. It
-# assumes the module has an exported function start/0. To have multiple
-# runmods just add more "runmod = xyz" lines.
-#
-# runmod = mymodule
-
-# By default yaws will copy the erlang error_log and
-# append it to a wrap log called report.log (in the logdir).
-# This feature can be turned off. This would typically
-# be the case when yaws runs within another larger app.
-copy_error_log = true
-
-# Logs are wrap logs
-log_wrap_size = 1000000
-
-# Possibly resolve all hostnames in logfiles so webalizer
-# can produce the nice geography piechart
-log_resolve_hostname = false
-
-# Fail completely or not if yaws fails to bind a listen socket.
-fail_on_bind_err = true
-
-# If HTTP auth is used, it is possible to have a specific
-# auth log. As of release 1.90 the global auth_log is
-# deprecated and ignored. Now, this variable must be set in
-# server part
-#auth_log = true
-
-# When we're running multiple yaws systems on the same
-# host, we need to give each yaws system an individual
-# name. Yaws will write a number of runtime files under
-# ${HOME}/.yaws/yaws/${id}
-# The default value is "default"
-# If we're not planning to run multiple webservers on the
-# same host it's much better to leave this value unset since
-# then all the ctl function (--stop et.el) work without having
-# to supply the id.
-#
-# id = myname
-
-# Earlier versions of Yaws picked the first virtual host
-# in a list of hosts with the same IP/PORT when the Host:
-# header doesn't match any name on any Host.
-# This is often nice in testing environments but not
-# acceptable in real-world hosting scenarios;
-# think http://porn.bigcompany.com
-pick_first_virthost_on_nomatch = true
-
-# If the HTTP client session is to be kept alive, wait this many
-# milliseconds for a new request before timing out the connection. Note
-# that infinity is a valid value but it's not recommended.
-keepalive_timeout = 30000
-
-# Now, a set of virtual servers.
-# The examples below first show two virthosted servers on the same IP (0.0.0.0)
-# in this case, but an explicit IP can be given as well.
-
-#<server localhost>
-#        port = 80
-#        listen = 0.0.0.0
-#        docroot = /var/yaws/www
-#        auth_log = true
-#        appmods = <cgi-bin, yaws_appmod_cgi>
-#</server>
-
-<server localhost>
-        port = 80
-        listen = 0.0.0.0
-        docroot = /tmp
-        dir_listings = true
-        auth_log = true
-        statistics = true
-        <auth>
-                realm = foobar
-                dir = /
-                user = foo:bar
-                user = baz:bar
-        </auth>
-</server>
-
-# Now an SSL server
-
-<server localhost>
-        port = 443
-        docroot = /tmp
-        listen = 0.0.0.0
-        dir_listings = true
-        auth_log = true
-        <ssl>
-                keyfile = /etc/yaws/yaws-key.pem
-                certfile = /etc/yaws/yaws-cert.pem
-                depth = 0
-        </ssl>
-</server>
diff --git a/unmaintained/yaws/yaws.initd b/unmaintained/yaws/yaws.initd
deleted file mode 100755
index 5867acf5a8..0000000000
--- a/unmaintained/yaws/yaws.initd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/runscript
-#
-# Startup script for the Yaws Web Server (for Alpine Linux)
-#
-# config: /etc/conf.d/yaws
-#
-# description: yaws - Erlang enabled http server
-#
-# use: rc-update add yaws default
-#
-
-yaws=/usr/bin/yaws
-
-# By default we run with the default id
-# idopts="--id myserverid"
-
-conf="--conf /etc/yaws/yaws.conf"
-
-extra_started_commands="restart reload"
-extra_commands="query"
-
-depend() {
-       need net
-}
-
-
-start() {
-       ebegin "Starting yaws "
-       ${yaws} --daemon --heart ${conf}
-       eend $?
-}
-
-
-stop() {
-       ebegin "Stopping yaws "
-       ${yaws} --stop ${idopts}
-       eend $? "Failed to stop yaws"
-}
-
-
-reload() {
-       ebegin "Reloading yaws "
-       ${yaws} --hup ${idopts}
-       eend $? "Failed to reload yaws"
-}
-
-query() {
-       ebegin "Querying yaws "
-       ${yaws} --status ${idopts}
-       eend $?
-}
-