merged x11 repository into main

ref #255

382 files changed, 0 insertions, 8862 deletions

diff --git a/x11/a52dec/APKBUILD b/x11/a52dec/APKBUILD
deleted file mode 100644
index 8d3b868d2..000000000
--- a/x11/a52dec/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=a52dec
-pkgver=0.7.4
-pkgrel=0
-pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
-url="http://liba52.sourceforge.net/"
-license="GPL2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="autoconf automake libtool"
-source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
-	$pkgname-$pkgver-build.patch"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir"/a52dec-0.7.4-build.patch || return 1
-	./bootstrap || return 1
-	./configure --prefix=/usr \
-		--enable-shared \
-		|| return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/ || return 1
-}
-md5sums="caa9f5bc44232dc8aeea773fea56be80  a52dec-0.7.4.tar.gz
-fa16f224a7dceb7613824380abef0052  a52dec-0.7.4-build.patch"
diff --git a/x11/a52dec/a52dec-0.7.4-build.patch b/x11/a52dec/a52dec-0.7.4-build.patch
deleted file mode 100644
index f3a29f303..000000000
--- a/x11/a52dec/a52dec-0.7.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
---- a52dec-0.7.4.orig/liba52/Makefile.am	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/Makefile.am	2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
- 
- lib_LTLIBRARIES = liba52.la
- 
-diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
---- a52dec-0.7.4.orig/liba52/configure.incl	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/configure.incl	2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,6 @@
- AC_SUBST([LIBA52_LIBS])
- 
- dnl avoid -fPIC when possible
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
- 
- AC_ARG_ENABLE([double],
-     [  --enable-double         use double-precision samples])
-diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
---- a52dec-0.7.4.orig/src/Makefile.am	2002-06-22 18:51:57.000000000 -0700
-+++ a52dec-0.7.4/src/Makefile.am	2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @A52DEC_CFLAGS@
- 
- bin_PROGRAMS = a52dec extract_a52
- a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/x11/abiword/APKBUILD b/x11/abiword/APKBUILD
deleted file mode 100644
index 198620e23..000000000
--- a/x11/abiword/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=abiword
-pkgver=2.8.1
-pkgrel=0
-pkgdesc="A fully-featured word processor"
-url="http://www.abisource.com"
-license="GPL"
-makedepends="pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev
-	popt-dev jpeg-dev librsvg-dev bzip2-dev"
-subpackages="$pkgname-dev"
-source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-md5sums="284fe25289c160c3797b527a8aacad12  abiword-2.8.1.tar.gz"
diff --git a/x11/aterm/APKBUILD b/x11/aterm/APKBUILD
deleted file mode 100644
index e414f4a45..000000000
--- a/x11/aterm/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=aterm
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="An xterm replacement with transparency support"
-url="http://aterm.sourceforge.net/"
-license="GPL"
-makedepends="libxext-dev libsm-dev libxt-dev"
-subpackages="$pkgname-doc"
-depends=
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	uclibc.patch"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../uclibc.patch || return 1
-	./configure --prefix=/usr \
-		--enable-transparency=yes \
-		--enable-background-image \
-		--enable-fading \
-		--enable-menubar \
-		--enable-graphics
-	make || return 1
-	make prefix="$pkgdir"/usr install
-}
-md5sums="c2eede028e1011e0ec7035cf319c9b5a  aterm-1.0.1.tar.bz2
-cd942d2639bd32fb9cbf06c94dcd536f  uclibc.patch"
diff --git a/x11/aterm/uclibc.patch b/x11/aterm/uclibc.patch
deleted file mode 100644
index 1c1428345..000000000
--- a/x11/aterm/uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- aterm-1.0.1/src/command.c.orig	2009-06-12 18:04:43.000000000 +0000
-+++ aterm-1.0.1/src/command.c	2009-06-12 18:10:23.000000000 +0000
-@@ -91,7 +91,12 @@
- 
- #if defined (__svr4__) || defined (__lnx21__)
- # include <sys/resource.h>	/* for struct rlimit */
--# include <sys/stropts.h>	/* for I_PUSH */
-+# if defined (__UCLIBC__)
-+#  define __SID ('S' << 8)
-+#  define I_PUSH (__SID | 2)
-+# else
-+#  include <sys/stropts.h>	/* for I_PUSH */
-+# endif
- # define _NEW_TTY_CTRL		/* to get proper defines in <termios.h> */
- #endif
- 
diff --git a/x11/atk/APKBUILD b/x11/atk/APKBUILD
deleted file mode 100644
index 2cd80710c..000000000
--- a/x11/atk/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=atk
-pkgver=1.28.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-url="http://www.gtk.org/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="glib-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="010a85478adc053c016a0a5c9bb52004  atk-1.28.0.tar.bz2"
diff --git a/x11/bdftopcf/APKBUILD b/x11/bdftopcf/APKBUILD
deleted file mode 100644
index 49abcee74..000000000
--- a/x11/bdftopcf/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=bdftopcf
-pkgver=1.0.2
-pkgrel=0
-pkgdesc="X.Org font utility"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libxfont-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://xorg.freedesktop.org//releases/individual/app/bdftopcf-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-mapdir=/usr/share/fonts/util || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="148f20d28caaa69bbe7dcca7c2674fb6  bdftopcf-1.0.2.tar.bz2"
diff --git a/x11/bigreqsproto/APKBUILD b/x11/bigreqsproto/APKBUILD
deleted file mode 100644
index 4960d2dd3..000000000
--- a/x11/bigreqsproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=bigreqsproto
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="X11 Big Requests extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2"
diff --git a/x11/cairo/APKBUILD b/x11/cairo/APKBUILD
deleted file mode 100644
index 4e2183a0e..000000000
--- a/x11/cairo/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cairo
-pkgver=1.8.8
-pkgrel=0
-pkgdesc="Cairo vector graphics library"
-url="http://cairographics.org/"
-license="LGPL MPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev
-	xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev
-	libiconv-dev"
-depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev
-	xcb-util-dev"
-source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd ""$srcdir"/$pkgname-$pkgver"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-xcb \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR=""$pkgdir"" install || return 1
-}
-md5sums="d3e1a1035ae563812d4dd44a74fb0dd0  cairo-1.8.8.tar.gz"
diff --git a/x11/claws-mail/APKBUILD b/x11/claws-mail/APKBUILD
deleted file mode 100644
index 5d133d744..000000000
--- a/x11/claws-mail/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=claws-mail
-pkgver=3.7.4
-pkgrel=0
-pkgdesc="A GTK+ based e-mail client."
-url="http://www.claws-mail.org"
-license="GPL3"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="gtk+-dev openssl-dev startup-notification-dev enchant-dev
-	libsm-dev gnutls-dev curl-dev dbus-glib-dev libetpan-dev openldap-dev"
-depends=
-#	gpgme-dev libetpan-dev 
-#pilot-link>=0.12.3-5
-install= #claws-mail.install
-source="http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgname-$pkgver.tar.bz2
-	libc-version.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	patch -p1 -i ../libc-version.patch || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--disable-static \
-		--enable-enchant \
-		--enable-gnutls \
-		--enable-ldap \
-		--disable-dillo-viewer-plugin \
-		--enable-crash-dialog \
-		--enable-pgpmime-plugin \
-		--enable-spamassassin-plugin \
-		--enable-bogofilter-plugin \
-		--disable-jpilot
-	make || return 1
-	cd tools
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	find tools -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i; do
-		install -D -m755 ${i} "$pkgdir"/usr/lib/claws-mail/tools/${i}
-	done
-}
-md5sums="aa6c8b9177bc2bc506470821ee2afbb2  claws-mail-3.7.4.tar.bz2
-f3416743b5d8ff97b5a3cc2f7efc2dc1  libc-version.patch"
diff --git a/x11/claws-mail/libc-version.patch b/x11/claws-mail/libc-version.patch
deleted file mode 100644
index c55c007ba..000000000
--- a/x11/claws-mail/libc-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/crash.c.orig	2009-09-05 22:12:33.000000000 +0000
-+++ b/src/crash.c	2009-09-05 22:14:34.000000000 +0000
-@@ -42,7 +42,7 @@
- #	include <sys/utsname.h>
- #endif
- 
--#if defined(__GNU_LIBRARY__)
-+#if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__)
- #	include <gnu/libc-version.h>
- #endif
- 
-@@ -446,7 +446,9 @@
-  */
- static const gchar *get_lib_version(void)
- {
--#if defined(__GNU_LIBRARY__)
-+#if defined(__UCLIBC__)
-+	return g_strdup_printf("uClibc");
-+#elif defined(__GNU_LIBRARY__)
- 	return g_strdup_printf("GNU libc %s", gnu_get_libc_version());
- #else
- 	return g_strdup(_("Unknown"));
diff --git a/x11/compositeproto/APKBUILD b/x11/compositeproto/APKBUILD
deleted file mode 100644
index 9efafaa84..000000000
--- a/x11/compositeproto/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=compositeproto
-pkgver=0.4.1
-pkgrel=0
-pkgdesc="X11 Composite extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="fixesproto"
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums="3692f3f8b2ea10dff3d2cede8dc65e79  compositeproto-0.4.1.tar.bz2"
diff --git a/x11/cups/APKBUILD b/x11/cups/APKBUILD
deleted file mode 100644
index 26fd2ad2f..000000000
--- a/x11/cups/APKBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cups
-pkgver=1.4.2
-pkgrel=1
-pkgdesc="The CUPS Printing System"
-url="http://www.cups.org/"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client"
-makedepends="openssl-dev libpaper-dev dbus-dev"
-depends="cups-client poppler-utils"
-install=
-pkggroups="lp lpadmin"
-pkgusers="lp"
-source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
-	$pkgname.logrotate
-	cupsd.initd
-	"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--without-php \
-		--disable-pam \
-		--disable-ldap \
-		--libdir=/usr/lib \
-		--enable-raw-printing \
-		--enable-dbus \
-		--with-dbusdir=/etc/dbus-1 \
-		--enable-libpaper \
-		--enable-ssl=yes \
-		--enable-gnutls \
-		--enable-pdftops \
-		--with-pdftops=pdftops \
-		--with-optim="$CFLAGS"
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make BUILDROOT="$pkgdir" install
-	rm -rf "$pkgdir"/etc/init.d "$pkgdir"/etc/rc*
-
-	install -D -m644 ../cups.logrotate "$pkgdir"/etc/logrotate.d/cups
-	install -D -m755 ../cupsd.initd "$pkgdir"/etc/init.d/cupsd
-
-	sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "$pkgdir"/usr/share/applications/cups.desktop
-	find "$pkgdir"/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-}
-
-_mv() {
-	for i in "$@"; do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/${i%/*}/ || return 1
-	done
-}
-
-libcups() {
-	pkgdesc="CUPS libraries"
-	_mv usr/lib/*.so*
-	install -d "$pkgdir"/etc/cups
-}
-
-client() {
-	pkgdesc="CUPS client"
-	_mv usr/bin \
-		usr/share/cups/charsets \
-		usr/share/cups/charmaps \
-		usr/sbin/accept \
-		usr/sbin/cupsaddsmb \
-		usr/sbin/cupsctl \
-		usr/sbin/cupsdisable \
-		usr/sbin/cupsenable \
-		usr/sbin/lpadmin \
-		usr/sbin/lpc \
-		usr/sbin/lpinfo \
-		usr/sbin/lpmove \
-		usr/sbin/reject
-	touch "$subpkgdir"/usr/share/cups/charmaps/us-ascii.txt
-}
-
-md5sums="d95e2d588e3d36e563027a963b117b1b  cups-1.4.2-source.tar.bz2
-f861b18f4446c43918c8643dcbbd7f6d  cups.logrotate
-1154ed66fdcfa0523f929a369079f43c  cupsd.initd"
diff --git a/x11/cups/cups.logrotate b/x11/cups/cups.logrotate
deleted file mode 100644
index 9c49bbdaf..000000000
--- a/x11/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/x11/cups/cupsd.initd b/x11/cups/cupsd.initd
deleted file mode 100644
index f59e27b4c..000000000
--- a/x11/cups/cupsd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use net
-	need dbus
-	before nfs
-	after logger
-}
-
-start() {
-	ebegin "Starting cupsd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cupsd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
-	eend $?
-}
diff --git a/x11/damageproto/APKBUILD b/x11/damageproto/APKBUILD
deleted file mode 100644
index 787b9d3fc..000000000
--- a/x11/damageproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=damageproto
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="X11 Damage extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2"
diff --git a/x11/dbus-glib/APKBUILD b/x11/dbus-glib/APKBUILD
deleted file mode 100644
index 46c85f201..000000000
--- a/x11/dbus-glib/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dbus-glib
-pkgver=0.82
-pkgrel=0
-pkgdesc="GLib bindings for DBUS"
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="dbus glib libiconv expat gettext"
-makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev g++ expat-dev"
-source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-depends_dev="glib-dev dbus-dev"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--enable-bash-completion=no || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="aa2a4517de0e9144be3bce2cf8cdd924  dbus-glib-0.82.tar.gz"
diff --git a/x11/dbus/APKBUILD b/x11/dbus/APKBUILD
deleted file mode 100644
index 054db2787..000000000
--- a/x11/dbus/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dbus
-pkgver=1.2.16
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-license="GPL custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="expat-dev libx11-dev pkgconfig util-linux-ng-dev"
-depends_dev="util-linux-ng-dev"
-install="$pkgname.pre-install"
-source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-	$pkgname.initd
-	"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-xml=expat \
-		--with-dbus-user=messagebus \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--disable-verbose-mode \
-		--disable-static \
-		--enable-inotify \
-		--disable-dnotify \
-		--disable-tests \
-		--disable-asserts \
-		--with-x || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
-}
-md5sums="c7a47b851ebe02f6726b65b78d1b730b  dbus-1.2.16.tar.gz
-58356b4db650a89312a670c02804c540  dbus.initd"
diff --git a/x11/dbus/dbus.initd b/x11/dbus/dbus.initd
deleted file mode 100644
index e96ea05cd..000000000
--- a/x11/dbus/dbus.initd
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.4 2007/04/04 13:35:25 cardoe Exp $
-
-opts="reload"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting D-BUS system messagebus"
-
-	/usr/bin/dbus-uuidgen --ensure
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
-
-	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
-	eend $?
-}
-
-stop() {
-	local retval
-
-	ebegin "Stopping D-BUS system messagebus"
-
-	start-stop-daemon --stop --pidfile /var/run/dbus.pid
-	retval=$?
-
-	eend ${retval}
-
-	[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
-
-	return ${retval}
-}
-
-reload() {
-	local retval
-
-	ebegin "Reloading D-BUS messagebus config"
-	
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	retval=$?
-	eend ${retval}
-	return ${retval}
-}
diff --git a/x11/dbus/dbus.pre-install b/x11/dbus/dbus.pre-install
deleted file mode 100644
index 515161db6..000000000
--- a/x11/dbus/dbus.pre-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-adduser -H -h /dev/null -s /bin/false -D messagebus 2>/dev/null
-exit 0
diff --git a/x11/desktop-file-utils/APKBUILD b/x11/desktop-file-utils/APKBUILD
deleted file mode 100644
index b4b373fe1..000000000
--- a/x11/desktop-file-utils/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=desktop-file-utils
-pkgver=0.15
-pkgrel=1
-pkgdesc="Command line utilities for working with desktop entries"
-url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
-license="GPL"
-depends=
-makedepends="glib-dev libiconv-dev gettext-dev pkgconfig"
-triggers="$pkgname.trigger:/usr/share/applications"
-source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/desktop-file-utils-$pkgver
-
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="2fe8ebe222fc33cd4a959415495b7eed  desktop-file-utils-0.15.tar.gz"
diff --git a/x11/desktop-file-utils/desktop-file-utils.trigger b/x11/desktop-file-utils/desktop-file-utils.trigger
deleted file mode 100644
index 0400e9a2b..000000000
--- a/x11/desktop-file-utils/desktop-file-utils.trigger
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
diff --git a/x11/dhcpcd-dbus/APKBUILD b/x11/dhcpcd-dbus/APKBUILD
deleted file mode 100644
index ed4415aff..000000000
--- a/x11/dhcpcd-dbus/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dhcpcd-dbus
-pkgver=0.4.2
-pkgrel=0
-pkgdesc="DBUS binding to dhcpcd"
-url="http://roy.marples.name/projects/dhcpcd-dbus"
-license="BSD"
-depends=""
-makedepends="dbus-dev pkgconfig"
-install=
-subpackages=
-source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
-		install
-}
-
-md5sums="c42ee474f21fd813abf5d04f56110a79  dhcpcd-dbus-0.4.2.tar.bz2"
diff --git a/x11/dhcpcd-ui/APKBUILD b/x11/dhcpcd-ui/APKBUILD
deleted file mode 100644
index 2732f1c73..000000000
--- a/x11/dhcpcd-ui/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dhcpcd-ui
-pkgver=0.4.3
-pkgrel=0
-pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
-url="http://roy.marples.name/projects/dhcpcd-dbus"
-license="BSD-2"
-depends="dhcpcd-dbus"
-makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig"
-install=
-subpackages=
-source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make PREFIX=/usr
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
-		install
-}
-
-md5sums="2a01fa94c79699807131c488b47d9dc8  dhcpcd-ui-0.4.3.tar.bz2"
diff --git a/x11/dri2proto/APKBUILD b/x11/dri2proto/APKBUILD
deleted file mode 100644
index 77f866e5f..000000000
--- a/x11/dri2proto/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dri2proto
-pkgver=2.1
-pkgrel=0
-pkgdesc="X11 DRI protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2"
diff --git a/x11/enchant/APKBUILD b/x11/enchant/APKBUILD
deleted file mode 100644
index 8133127b4..000000000
--- a/x11/enchant/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=enchant
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="A wrapper library for generic spell checking"
-url="http://www.abisource.com/enchant/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-depends_dev="glib-dev"
-makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev"
-source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7dfaed14e142b4a0004b770c9568ed02  enchant-1.5.0.tar.gz"
diff --git a/x11/encodings/APKBUILD b/x11/encodings/APKBUILD
deleted file mode 100644
index 7b9cca22c..000000000
--- a/x11/encodings/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=encodings
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org font encoding files"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig mkfontscale"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/encodings-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/encodings-$pkgver
-	./configure --prefix=/usr \
-		--with-encodingsdir=/usr/share/fonts/encodings
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/encodings-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="29637480e7ce12546668631067c19ced  encodings-1.0.3.tar.bz2"
diff --git a/x11/epdfview/APKBUILD b/x11/epdfview/APKBUILD
deleted file mode 100644
index fdd6e4186..000000000
--- a/x11/epdfview/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=epdfview
-pkgver=0.1.7
-pkgrel=1
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
-license="GPL"
-#depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="poppler-gtk-dev"
-source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
-	$pkgname.desktop.patch
-	fix-scrolling.patch"
-
-build ()
-{
-	cd ""$srcdir"/$pkgname-$pkgver"
-	patch -Np0 -i ../epdfview.desktop.patch || return 1
-	patch -Np0 -i ../fix-scrolling.patch || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" install || return 1
-	for i in 24 32 48; do
-		install -d "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps \
-			|| return 1
-	done
-	install -m644 data/icon_epdfview-24.png \
-		"$pkgdir"/usr/share/icons/hicolor/24x24/apps/epdfview.png
-	install -m644 data/icon_epdfview-32.png \
-		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/epdfview.png
-	install -m644 data/icon_epdfview-48.png \
-		"$pkgdir"/usr/share/icons/hicolor/48x48/apps/epdfview.png
-}
-
-md5sums="1919bb19c16ef0a97d48b0a8303d3c7b  epdfview-0.1.7.tar.bz2
-fbf22bbabdbb7544db615ac5775d57e2  epdfview.desktop.patch
-7a1574e0a8d0bcde316050629fb7bedd  fix-scrolling.patch"
diff --git a/x11/epdfview/epdfview.desktop.patch b/x11/epdfview/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/x11/epdfview/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
diff --git a/x11/epdfview/fix-scrolling.patch b/x11/epdfview/fix-scrolling.patch
deleted file mode 100644
index 828bf1258..000000000
--- a/x11/epdfview/fix-scrolling.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./src/gtk/MainView.cxx.old	2009-02-28 22:00:55.000000000 +0100
-+++ ./src/gtk/MainView.cxx	2009-03-20 03:12:10.000000000 +0100
-@@ -77,7 +77,7 @@
- static void main_window_zoom_out_cb (GtkWidget *, gpointer);
- static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
- static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
--static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
-+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
- 
- #if defined (HAVE_CUPS)
- static void main_window_print_cb (GtkWidget *, gpointer);
-@@ -1479,18 +1479,19 @@
-     pter->setPageMode (mode);
- }
- 
--void 
-+gboolean
- main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
- {
-     g_assert ( NULL != data && "The data parameter is NULL.");
- 
-     MainPter *pter = (MainPter *)data;
-     // Only zoom when the CTRL-Button is down...
--    if ( !(event->state & GDK_CONTROL_MASK) ) return;
-+    if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
-     if ( event->direction == GDK_SCROLL_UP ) {
-         pter->zoomInActivated ();
-     } else if ( event->direction == GDK_SCROLL_DOWN ) {
-         pter->zoomOutActivated ();
-     }
-+    return TRUE;
- }
- 
diff --git a/x11/epris/APKBUILD b/x11/epris/APKBUILD
deleted file mode 100644
index eb1aaf0b8..000000000
--- a/x11/epris/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=epris
-pkgver=0.2
-pkgrel=0
-pkgdesc="Small audio player using GStreamer and DBus"
-url="http://code.google.com/p/epris/"
-license="LGPL"
-depends=""
-makedepends="gstreamer-dev dbus-glib-dev"
-install=
-subpackages=
-source="http://epris.googlecode.com/files/epris-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="94ec5123207d34834eaa345435964f99  epris-0.2.tar.gz"
diff --git a/x11/exo/APKBUILD b/x11/exo/APKBUILD
deleted file mode 100644
index 6b7d6ef96..000000000
--- a/x11/exo/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# TODO: hal
-pkgname=exo
-pkgver=0.3.106
-pkgrel=0
-pkgdesc="Extensions to Xfce by os-cillation"
-url="http://www.os-cillation.com/article.php?sid=40"
-license="GPL-2 LGPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="hicolor-icon-theme"
-makedepends="intltool libxfce4util-dev perl perl-uri gtk+-dev gettext-dev
-	libiconv-dev libnotify-dev"
-install=
-source="http://archive.xfce.org/src/xfce/$pkgname/0.3/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="gtk+-dev libxfce4util-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-python \
-		--enable-notifications \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="927905f89252fa397e50d7a4fbf3c9a7  exo-0.3.106.tar.bz2"
diff --git a/x11/feh/APKBUILD b/x11/feh/APKBUILD
deleted file mode 100644
index a609b8d99..000000000
--- a/x11/feh/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=feh
-pkgver=1.3.4
-pkgrel=0
-pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
-url="http://www.linuxbrit.co.uk/feh/"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="libxt-dev libpng-dev giblib-dev imlib2-dev jpeg-dev"
-source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums="3d35ba3d2f0693b019800787f1103891  feh-1.3.4.tar.gz"
diff --git a/x11/ffmpeg/APKBUILD b/x11/ffmpeg/APKBUILD
deleted file mode 100644
index fcad6fe1b..000000000
--- a/x11/ffmpeg/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ffmpeg
-pkgver=0.5
-pkgrel=0
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-url="http://ffmpeg.mplayerhq.hu/"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="lame-dev libvorbis-dev faad2-dev faac-dev xvidcore-dev zlib-dev
-	imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl"
-depends=""
-source="http://$pkgname.mplayerhq.hu/releases/$pkgname-$pkgver.tar.bz2
-	pic.patch"
-
-build ()
-{
-	cd "$srcdir/$pkgname-$pkgver" || return 1
-	patch -p1 < ../pic.patch || return 1
-
-	./configure --prefix=/usr \
-		--enable-gpl \
-		--enable-libmp3lame \
-		--enable-libvorbis \
-		--enable-libfaac \
-		--enable-libfaad \
-		--enable-libxvid \
-		--enable-libx264 \
-		--enable-libtheora \
-		--enable-postproc \
-		--enable-shared \
-		--enable-pthreads \
-		--enable-x11grab \
-		--disable-mmx \
-		--disable-mmx2 \
-		--disable-stripping \
-		--enable-swscale || return 1
-	make || return 1
-	make tools/qt-faststart || return 1
-	make doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1 || return 1
-	make DESTDIR="$pkgdir" install install-man || return 1
-	install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1
-#	strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1
-}
-md5sums="be8503f15c3b81ba00eb8379ca8dcf33  ffmpeg-0.5.tar.bz2
-3c5d446db8d512a3bca5f5a860bbcc04  pic.patch"
diff --git a/x11/ffmpeg/pic.patch b/x11/ffmpeg/pic.patch
deleted file mode 100644
index 9651f31ef..000000000
--- a/x11/ffmpeg/pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libswscale/rgb2rgb.c	2009-07-10 14:27:39.000000000 +0000
-+++ b/libswscale/rgb2rgb.c	2009-07-10 14:53:45.000000000 +0000
-@@ -149,7 +149,7 @@
- #define RENAME(a) a ## _C
- #include "rgb2rgb_template.c"
- 
--#if ARCH_X86 && CONFIG_GPL
-+#if ARCH_X86 && CONFIG_GPL && !defined(PIC)
- 
- //MMX versions
- #undef RENAME
diff --git a/x11/fixesproto/APKBUILD b/x11/fixesproto/APKBUILD
deleted file mode 100644
index 888f97ed0..000000000
--- a/x11/fixesproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fixesproto
-pkgver=4.1.1
-pkgrel=1
-pkgdesc="X11 Fixes extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="xextproto"
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2"
diff --git a/x11/fluxbox/APKBUILD b/x11/fluxbox/APKBUILD
deleted file mode 100644
index 4229d1bba..000000000
--- a/x11/fluxbox/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fluxbox
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A lightweight and highly-configurable window manager"
-url="http://www.fluxbox.org"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libxinerama-dev libxpm-dev libxrandr imlib2-dev
-	libxrender-dev libxrandr-dev libxinerama-dev"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-kde \
-		--disable-gnome \
-		--enable-imlib2 \
-		--disable-nls || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="fa9fa8fe9a44f86522de5754f8b285ca  fluxbox-1.1.1.tar.bz2"
diff --git a/x11/font-adobe-100dpi/APKBUILD b/x11/font-adobe-100dpi/APKBUILD
deleted file mode 100644
index c56dc913f..000000000
--- a/x11/font-adobe-100dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-adobe-100dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org adobe 100dpi font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="443acfe70e26716282f9068730fe92c4  font-adobe-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-adobe-75dpi/APKBUILD b/x11/font-adobe-75dpi/APKBUILD
deleted file mode 100644
index aaa7e3cc4..000000000
--- a/x11/font-adobe-75dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-adobe-75dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org adobe 75dpi font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="813b5d3723c84388a938ab6732e1329c  font-adobe-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-adobe-utopia-100dpi/APKBUILD b/x11/font-adobe-utopia-100dpi/APKBUILD
deleted file mode 100644
index 54bfa807b..000000000
--- a/x11/font-adobe-utopia-100dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-adobe-utopia-100dpi
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="X.org adobe 100dpi font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="5d28a30efef966f8dbbaff9a6619f01a  font-adobe-utopia-100dpi-1.0.1.tar.bz2"
diff --git a/x11/font-adobe-utopia-75dpi/APKBUILD b/x11/font-adobe-utopia-75dpi/APKBUILD
deleted file mode 100644
index 9ef0813a7..000000000
--- a/x11/font-adobe-utopia-75dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-adobe-utopia-75dpi
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="X.org adobe 75dpi font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="dd912284e4750023f9682812532fa033  font-adobe-utopia-75dpi-1.0.1.tar.bz2"
diff --git a/x11/font-adobe-utopia-type1/APKBUILD b/x11/font-adobe-utopia-type1/APKBUILD
deleted file mode 100644
index 81303c535..000000000
--- a/x11/font-adobe-utopia-type1/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-adobe-utopia-type1
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="X.org adobe utopia-type1 fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/utopia-type1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="aa7ff4bd20b961afda9c15d103b972a5  font-adobe-utopia-type1-1.0.1.tar.bz2"
diff --git a/x11/font-alias/APKBUILD b/x11/font-alias/APKBUILD
deleted file mode 100644
index 4e4448276..000000000
--- a/x11/font-alias/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-alias
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="X.org font alias files"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-top-fontdir=/usr/share/fonts
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="c4776b6f0f2ecdb7670b6fe64b5d2a2d  font-alias-1.0.1.tar.bz2"
diff --git a/x11/font-arabic-misc/APKBUILD b/x11/font-arabic-misc/APKBUILD
deleted file mode 100644
index 53b3ac8c6..000000000
--- a/x11/font-arabic-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-arabic-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="81595016e2ff859716fc256ebb136ba6  font-arabic-misc-1.0.0.tar.bz2"
diff --git a/x11/font-bh-100dpi/APKBUILD b/x11/font-bh-100dpi/APKBUILD
deleted file mode 100644
index 37f4cd1f3..000000000
--- a/x11/font-bh-100dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-100dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="e5592de74a5c04e3a2608800dd079197  font-bh-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-75dpi/APKBUILD b/x11/font-bh-75dpi/APKBUILD
deleted file mode 100644
index dd22ad8c7..000000000
--- a/x11/font-bh-75dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-75dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="6e51cd02f4ce32e1393e34ab17a9b211  font-bh-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD b/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
deleted file mode 100644
index b1bb4fc2b..000000000
--- a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-lucidatypewriter-100dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="c44d3f730564da465993e9292a33c235  font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD b/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
deleted file mode 100644
index cd5ee83e4..000000000
--- a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-lucidatypewriter-75dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="fdd9be5b9db94ef363a33e39b7977e2b  font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-ttf/APKBUILD b/x11/font-bh-ttf/APKBUILD
deleted file mode 100644
index 31cd28b6a..000000000
--- a/x11/font-bh-ttf/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-ttf
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org bh TTF fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/TTF
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="ad43cf739b3d46ba1e7dc778a0608a52  font-bh-ttf-1.0.0.tar.bz2"
diff --git a/x11/font-bh-type1/APKBUILD b/x11/font-bh-type1/APKBUILD
deleted file mode 100644
index 43b556633..000000000
--- a/x11/font-bh-type1/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-type1
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org bh Type1 fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="46588b22678e440741d6220bc3945cbf  font-bh-type1-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-100dpi/APKBUILD b/x11/font-bitstream-100dpi/APKBUILD
deleted file mode 100644
index c27cd0476..000000000
--- a/x11/font-bitstream-100dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bitstream-100dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bitstream bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="173352ddec3d26e2b91df1edcf1ae85b  font-bitstream-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-75dpi/APKBUILD b/x11/font-bitstream-75dpi/APKBUILD
deleted file mode 100644
index 8fcc05b2e..000000000
--- a/x11/font-bitstream-75dpi/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bitstream-75dpi
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.Org Bitstream bitmap fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="beb476657d50d07d17eef7c325a5ed08  font-bitstream-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-speedo/APKBUILD b/x11/font-bitstream-speedo/APKBUILD
deleted file mode 100644
index 0dbbab1ba..000000000
--- a/x11/font-bitstream-speedo/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bitstream-speedo
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org bitstream Speedo fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Speedo
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="1399dc18aeb9571b0951d9570ea1059d  font-bitstream-speedo-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-type1/APKBUILD b/x11/font-bitstream-type1/APKBUILD
deleted file mode 100644
index 12f38f041..000000000
--- a/x11/font-bitstream-type1/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bitstream-type1
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org bitstream Type1 fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="6610475e2e231242f8f2122a709c3695  font-bitstream-type1-1.0.0.tar.bz2"
diff --git a/x11/font-cronyx-cyrillic/APKBUILD b/x11/font-cronyx-cyrillic/APKBUILD
deleted file mode 100644
index e4b155815..000000000
--- a/x11/font-cronyx-cyrillic/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-cronyx-cyrillic
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org cronyx cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="22b451e7230b8c003cfc496ee2d360cc  font-cronyx-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-cursor-misc/APKBUILD b/x11/font-cursor-misc/APKBUILD
deleted file mode 100644
index 3b3ca078d..000000000
--- a/x11/font-cursor-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-cursor-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="305fa22cdfefb8f80babd711051a534b  font-cursor-misc-1.0.0.tar.bz2"
diff --git a/x11/font-daewoo-misc/APKBUILD b/x11/font-daewoo-misc/APKBUILD
deleted file mode 100644
index 9f8719f4c..000000000
--- a/x11/font-daewoo-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-daewoo-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="61f9eab48c619af5494d3e384d8d7d79  font-daewoo-misc-1.0.0.tar.bz2"
diff --git a/x11/font-dec-misc/APKBUILD b/x11/font-dec-misc/APKBUILD
deleted file mode 100644
index c8d7b07c8..000000000
--- a/x11/font-dec-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-dec-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="284e554db1c64fb7580a06df01444a2b  font-dec-misc-1.0.0.tar.bz2"
diff --git a/x11/font-ibm-type1/APKBUILD b/x11/font-ibm-type1/APKBUILD
deleted file mode 100644
index 34a9e2644..000000000
--- a/x11/font-ibm-type1/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-ibm-type1
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org ibm Type1 fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="8e8733051371e2b51123376b49f5d3ea  font-ibm-type1-1.0.0.tar.bz2"
diff --git a/x11/font-isas-misc/APKBUILD b/x11/font-isas-misc/APKBUILD
deleted file mode 100644
index 2a3fcd3f9..000000000
--- a/x11/font-isas-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-isas-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="ec709a96b64b497a5cb5658c93bd38dc  font-isas-misc-1.0.0.tar.bz2"
diff --git a/x11/font-jis-misc/APKBUILD b/x11/font-jis-misc/APKBUILD
deleted file mode 100644
index 70071bfcc..000000000
--- a/x11/font-jis-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-jis-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="61febb49a71065723a1fba17cbf23c67  font-jis-misc-1.0.0.tar.bz2"
diff --git a/x11/font-micro-misc/APKBUILD b/x11/font-micro-misc/APKBUILD
deleted file mode 100644
index d2ca0977b..000000000
--- a/x11/font-micro-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-micro-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="8c8bffd7540f05caa0dbb4e6e1d6c58e  font-micro-misc-1.0.0.tar.bz2"
diff --git a/x11/font-misc-cyrillic/APKBUILD b/x11/font-misc-cyrillic/APKBUILD
deleted file mode 100644
index d49c2cf94..000000000
--- a/x11/font-misc-cyrillic/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-misc-cyrillic
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org misc cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="3596907d7a2a99c81d8de99bc4552b6a  font-misc-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-misc-ethiopic/APKBUILD b/x11/font-misc-ethiopic/APKBUILD
deleted file mode 100644
index cf2a54984..000000000
--- a/x11/font-misc-ethiopic/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-misc-ethiopic
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org misc ethiopic fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/ethiopic
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="0b271fc617087d77560bdca20c0cdbb0  font-misc-ethiopic-1.0.0.tar.bz2"
diff --git a/x11/font-misc-meltho/APKBUILD b/x11/font-misc-meltho/APKBUILD
deleted file mode 100644
index 1ba95b9bb..000000000
--- a/x11/font-misc-meltho/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-misc-meltho
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org misc meltho fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/meltho
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="ccb212a7badf7aefdc9f9a92af428d32  font-misc-meltho-1.0.0.tar.bz2"
diff --git a/x11/font-misc-misc/APKBUILD b/x11/font-misc-misc/APKBUILD
deleted file mode 100644
index 63038836c..000000000
--- a/x11/font-misc-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-misc-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="2a57f6188c41d4bc1b88ca3d08ad011d  font-misc-misc-1.0.0.tar.bz2"
diff --git a/x11/font-mutt-misc/APKBUILD b/x11/font-mutt-misc/APKBUILD
deleted file mode 100644
index 63c63f49e..000000000
--- a/x11/font-mutt-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-mutt-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="648b409b7eb78ad1cd5f6d7fac3eef88  font-mutt-misc-1.0.0.tar.bz2"
diff --git a/x11/font-schumacher-misc/APKBUILD b/x11/font-schumacher-misc/APKBUILD
deleted file mode 100644
index 5693c5168..000000000
--- a/x11/font-schumacher-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-schumacher-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="f1c6063d2fadc57e696a0aab69afd6e0  font-schumacher-misc-1.0.0.tar.bz2"
diff --git a/x11/font-screen-cyrillic/APKBUILD b/x11/font-screen-cyrillic/APKBUILD
deleted file mode 100644
index 5f2b143af..000000000
--- a/x11/font-screen-cyrillic/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-screen-cyrillic
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="X.org screen cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="c8d5aef01c906c7aaea329702a8b1b63  font-screen-cyrillic-1.0.1.tar.bz2"
diff --git a/x11/font-sony-misc/APKBUILD b/x11/font-sony-misc/APKBUILD
deleted file mode 100644
index cc346436a..000000000
--- a/x11/font-sony-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-sony-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="0dfddd1a946e4497f009094c0ae1bdd5  font-sony-misc-1.0.0.tar.bz2"
diff --git a/x11/font-sun-misc/APKBUILD b/x11/font-sun-misc/APKBUILD
deleted file mode 100644
index 9f50fc326..000000000
--- a/x11/font-sun-misc/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-sun-misc
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="e17d43a7c6c0d862cfba0908ff132ffa  font-sun-misc-1.0.0.tar.bz2"
diff --git a/x11/font-util/APKBUILD b/x11/font-util/APKBUILD
deleted file mode 100644
index d7bbb361d..000000000
--- a/x11/font-util/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-util
-pkgver=1.1.1
-pkgrel=0
-pkgdesc="X.org font utilities"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="perl"
-makedepends="pkgconfig"
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-md5sums="5c735ae6916b65186f3c876d76c27ce3  font-util-1.1.1.tar.bz2"
diff --git a/x11/font-winitzki-cyrillic/APKBUILD b/x11/font-winitzki-cyrillic/APKBUILD
deleted file mode 100644
index fe1a60d0b..000000000
--- a/x11/font-winitzki-cyrillic/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-winitzki-cyrillic
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="X.org winitzki cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="b99b02aff36a88ca3379715423c60303  font-winitzki-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-xfree86-type1/APKBUILD b/x11/font-xfree86-type1/APKBUILD
deleted file mode 100644
index 42b22285b..000000000
--- a/x11/font-xfree86-type1/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-xfree86-type1
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="X.org xfree86 Type1 fonts"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="pkgconfig font-util-dev bdftopcf"
-install=
-source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-md5sums="d7e965776c7f0c30b0f09742176fb77a  font-xfree86-type1-1.0.1.tar.bz2"
diff --git a/x11/fontconfig/APKBUILD b/x11/fontconfig/APKBUILD
deleted file mode 100644
index 3ae0ffd41..000000000
--- a/x11/fontconfig/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fontconfig
-pkgver=2.8.0
-pkgrel=0
-pkgdesc="The Fontconfig package is a library for configuring and customizing font access."
-url="http://fontconfig.org"
-license="GPL"
-depends=
-makedepends="pkgconfig freetype-dev expat-dev zlib-dev"
-install=
-triggers="$pkgname.trigger:/usr/share/fonts/*"
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://fontconfig.org/release/${pkgname}-${pkgver}.tar.gz"
-depends_dev="freetype-dev expat-dev"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-docs
-	make || return 1
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make -j1 DESTDIR="$pkgdir" install
-
-	install -m644 -D COPYING "$pkgdir"/usr/share/licenses/"${pkgname}"/COPYING
-}
-
-md5sums="77e15a92006ddc2adbb06f840d591c0e  fontconfig-2.8.0.tar.gz"
diff --git a/x11/fontconfig/fontconfig.trigger b/x11/fontconfig/fontconfig.trigger
deleted file mode 100644
index 35f3d37eb..000000000
--- a/x11/fontconfig/fontconfig.trigger
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-fc-cache -f > /dev/null
-
diff --git a/x11/fontsproto/APKBUILD b/x11/fontsproto/APKBUILD
deleted file mode 100644
index b8eb75bbd..000000000
--- a/x11/fontsproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fontsproto
-pkgver=2.1.0
-pkgrel=0
-pkgdesc="X11 font extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2"
diff --git a/x11/gamin/APKBUILD b/x11/gamin/APKBUILD
deleted file mode 100644
index 730271afb..000000000
--- a/x11/gamin/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gamin
-pkgver=0.1.10
-pkgrel=1
-pkgdesc="Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system."
-url="http://www.gnome.org/~veillard/gamin"
-license="GPL"
-subpackages="$pkgname-dev"
-depends=
-makedepends="pkgconfig glib-dev"
-source="http://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static \
-		--with-threads \
-		--disable-debug-api \
-		--disable-debug \
-		--disable-dnotify \
-		--libexecdir=/usr/lib/gamin
-	make || return 1
-
-	# some kinde of race in the make install which is not solved with -j
-	export MKDIRPROG="mkdir -p"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="b4ec549e57da470c04edd5ec2876a028  gamin-0.1.10.tar.gz"
diff --git a/x11/geany/APKBUILD b/x11/geany/APKBUILD
deleted file mode 100644
index cb1f4b9a4..000000000
--- a/x11/geany/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=geany
-pkgver=0.18
-pkgrel=0
-pkgdesc="A fast and lightweight IDE"
-url="http://www.geany.org"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="gtk+-dev intltool perl-xml-parser vte-dev"
-depends=
-depends_dev="gtk+-dev"
-install=
-source="http://download.$pkgname.org/$pkgname-$pkgver.tar.gz"
-
-build()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop || return 1
-	sed -i 's|Sh=|Sh=APKBUILD;|' data/filetype_extensions.conf || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="e5d4075dcb486d3cec958c2bac9ce8f4  geany-0.18.tar.gz"
diff --git a/x11/giblib/APKBUILD b/x11/giblib/APKBUILD
deleted file mode 100644
index e7242d869..000000000
--- a/x11/giblib/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=giblib
-pkgver=1.2.4
-pkgrel=1
-pkgdesc="Giblib is a library that feh uses as a wrapper to imlib2"
-url="http://linuxbrit.co.uk/giblib/"
-license="MIT"
-subpackages="$pkgname-doc $pkgname-dev"
-depends=
-makedepends="imlib2-dev libxext-dev libx11-dev freetype-dev"
-source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
-
-depends_dev="imlib2-dev freetype-dev zlib-dev libx11-dev libxext-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install || return 1
-	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="c810ef5389baf24882a1caca2954385e  giblib-1.2.4.tar.gz"
diff --git a/x11/giflib/APKBUILD b/x11/giflib/APKBUILD
deleted file mode 100644
index 4ea64b882..000000000
--- a/x11/giflib/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=giflib
-pkgver=4.1.6
-pkgrel=1
-pkgdesc="A library for reading and writing gif images"
-url="http://sourceforge.net/projects/giflib/"
-license="MIT"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="libx11-dev libsm-dev util-linux-ng-dev"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-build () { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	MAJOR=`echo $pkgver | sed 's/\([0-9]\+\)\..*/\1/'`
-	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$pkgver || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING \
-		|| return 1
-	
-	install -m755 libungif.so.$pkgver "$pkgdir"/usr/lib/ || return 1
-	ln -sf libungif.so.$pkgver "$pkgdir"/usr/lib/libungif.so.4 || return 1
-	ln -sf libungif.so.4 "$pkgdir"/usr/lib/libungif.so || return 1
-}
-md5sums="7125644155ae6ad33dbc9fc15a14735f  giflib-4.1.6.tar.bz2"
diff --git a/x11/glproto/APKBUILD b/x11/glproto/APKBUILD
deleted file mode 100644
index 7aadaa1ee..000000000
--- a/x11/glproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=glproto
-pkgver=1.4.10
-pkgrel=0
-pkgdesc="X11 OpenGL extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2"
diff --git a/x11/gnome-doc-utils/APKBUILD b/x11/gnome-doc-utils/APKBUILD
deleted file mode 100644
index 9641482c7..000000000
--- a/x11/gnome-doc-utils/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gnome-doc-utils
-pkgver=0.16.1
-pkgrel=0
-pkgdesc="Documentation utilities for Gnome"
-url="http://www.gnome.org"
-license="GPL LGPL"
-depends="python docbook-xml rarian"
-makedepends="libxslt-dev libxml2-dev perl-xml-parser rarian-dev pkgconfig
-	gettext-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.16/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd ""$srcdir"/$pkgname-$pkgver"
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var --disable-scrollkeeper || return 1
-	make || return 1
-	make DESTDIR=""$pkgdir"" install || return 1
-}
-md5sums="85d4bba44773f6162de72e81e8bd0ab0  gnome-doc-utils-0.16.1.tar.bz2"
diff --git a/x11/gst-plugins-bad/APKBUILD b/x11/gst-plugins-bad/APKBUILD
deleted file mode 100644
index 97eb64f26..000000000
--- a/x11/gst-plugins-bad/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gst-plugins-bad
-pkgver=0.10.14
-pkgrel=0
-pkgdesc="GStreamer bad plugins"
-url="http://gstreamer.freedesktop.org/"
-license="LGPL GPL"
-depends=""
-makedepends="pkgconfig gst-plugins-base-dev gstreamer-dev xvidcore-dev
-	bzip2-dev neon-dev faac-dev libexif-dev faad2-dev glib-dev liboil-dev
-	alsa-lib-dev libx11-dev sdl-dev"
-
-#'libdca>=0.0.5' 'bzip2' 'libdc1394>=2.1.0' 'exempi>=2.1.0' 'jack-audio-connection-kit>=0.116.2' 'neon>=0.28.4' 'faac>=1.28' 'libexif>=0.6.17' 'musicbrainz>=2.1.5' 'faad2>=2.7' 'libmms>=0.4' 'libcdaudio>=0.99.12' 'libmpcdec>=1.2.6' 'mjpegtools>=1.9.0' 'libdvdnav>=4.1.3' 'libmodplug>=0.8.7' 'jasper>=1.900.1' 'liblrdf>=0.4.0' 'libofa>=0.9.3')
-source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd ""$srcdir"/gst-plugins-bad-$pkgver"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-experimental \
-		--with-package-name="GStreamer Bad Plugins (Alpine Linux)" \
-		--with-package-origin="http://www.alpinelinux.org/" \
-		|| return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="6be38b04fc76cdfef3a3b02b8434efa2  gst-plugins-bad-0.10.14.tar.bz2"
diff --git a/x11/gst-plugins-base/APKBUILD b/x11/gst-plugins-base/APKBUILD
deleted file mode 100644
index a2013047d..000000000
--- a/x11/gst-plugins-base/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gst-plugins-base
-pkgver=0.10.25
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins"
-url="http://gstreamer.freedesktop.org/"
-license="GPL LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig gstreamer-dev alsa-lib-dev libvorbis-dev liboil-dev
-	perl libogg-dev gtk+-dev libtheora-dev libice-dev libsm-dev libxv-dev
-	util-linux-ng-dev expat-dev"
-# cdparanoia>=10.2 libvisual libtheora"
-source="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="gstreamer-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-experimental \
-		--with-default-audiosink=osssink \
-		--with-package-name="GStreamer Base Plugins (Alpine Linux)" \
-		--with-package-origin="http://www.alpinelinux.org/" \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="d29669dd79276c5cd94e1613c03cd9ab  gst-plugins-base-0.10.25.tar.bz2"
diff --git a/x11/gst-plugins-ffmpeg/APKBUILD b/x11/gst-plugins-ffmpeg/APKBUILD
deleted file mode 100644
index 1949f16cb..000000000
--- a/x11/gst-plugins-ffmpeg/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gst-ffmpeg
-pkgver=0.10.7
-pkgrel=0
-pkgdesc="Gstreamer FFMpeg Plugin"
-url="http://www.gstreamer.net"
-license="GPL"
-makedepends="gstreamer-dev gst-plugins-base-dev liboil-dev ffmpeg-dev"
-source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/gst-ffmpeg-$pkgver
-	sed -i \
-		-e 's,ffmpeg/avformat.h,libavformat/avformat.h,' \
-		-e 's,ffmpeg/avcodec.h,libavcodec/avcodec.h,' \
-		-e 's,ffmpeg/swscale.h,libswscale/swscale.h,' \
-		ext/ffmpeg/gst*	\
-		ext/libpostproc/gstpostproc.c \
-		|| return 1
-
-	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--with-system-ffmpeg \
-		--localstatedir=/var || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/gstreamer-0.10/*.{l,}a
-}
-
-md5sums="6be89b26592f36ef631b22a68b8e06c4  gst-ffmpeg-0.10.7.tar.bz2"
diff --git a/x11/gst-plugins-good/APKBUILD b/x11/gst-plugins-good/APKBUILD
deleted file mode 100644
index 16e8fdaaf..000000000
--- a/x11/gst-plugins-good/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gst-plugins-good
-pkgver=0.10.17
-pkgrel=0
-pkgdesc="GStreamer Multimedia Framework Good Plugins"
-url="http://gstreamer.freedesktop.org/"
-license="LGPL"
-subpackages="$pkgname-dev"
-depends=
-makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev
-	libsoup-dev flac-dev libogg-dev taglib-dev jpeg-dev"
-
-# might consider those:
-#libavc1394
-#hal
-#libiec61883
-#libshout
-#libdv
-#wavpack
-#libv4l
-#libcaca
-
-source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.bz2"
-
-depends_dev="gstreamer-dev gst-plugins-base-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-experimental \
-		--with-package-name="GStreamer Good Plugins (Alpine Linux)" \
-		--with-package-origin="http://www.alpinelinux.org/" \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="833546cd2b8bbf86b8ed083b00897918  gst-plugins-good-0.10.17.tar.bz2"
diff --git a/x11/gst-plugins-ugly/APKBUILD b/x11/gst-plugins-ugly/APKBUILD
deleted file mode 100644
index cb49433c0..000000000
--- a/x11/gst-plugins-ugly/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gst-plugins-ugly
-pkgver=0.10.13
-pkgrel=0
-pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-url="http://gstreamer.freedesktop.org/"
-license="LGPL"
-depends= #"gstreamer0.10-ugly>=0.10.11 libdvdread>=4.1.3 lame>=3.98.2 libmpeg2>=0.5.1 a52dec>=0.7.4 libid3tag>=0.15.1b libmad>=0.15.1b libsidplay>=1.36.59 libcdio>=0.81"
-makedepends="pkgconfig lame-dev libmpeg2-dev a52dec-dev libid3tag-dev
-	libmad-dev glib-dev liboil-dev gstreamer-dev gst-plugins-base-dev"
-source="http://gstreamer.freedesktop.org//src/gst-plugins-ugly/gst-plugins-ugly-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-experimental \
-		--with-package-name="GStreamer Ugly Plugins (Alpine Linux)" \
-		--with-package-origin="http://www.alpinelinux.org/" || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1619365247ef9cd7da1cd890285bf87a  gst-plugins-ugly-0.10.13.tar.bz2"
diff --git a/x11/gstreamer/APKBUILD b/x11/gstreamer/APKBUILD
deleted file mode 100644
index df825c01d..000000000
--- a/x11/gstreamer/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gstreamer
-pkgver=0.10.25
-pkgrel=0
-pkgdesc="GStreamer Multimedia Framework"
-url="http://gstreamer.freedesktop.org/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxml2-dev glib-dev bison flex gettext-dev libiconv-dev"
-source="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev"
-
-build() {
-	cd "$srcdir"/gstreamer-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-docs-build || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/gstreamer-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	cd "$pkgdir"/usr/bin
-}
-md5sums="88544e034a051baf472983791d233076  gstreamer-0.10.25.tar.bz2"
diff --git a/x11/gtk+/APKBUILD b/x11/gtk+/APKBUILD
deleted file mode 100644
index ff5b65b13..000000000
--- a/x11/gtk+/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk+
-pkgver=2.18.6
-pkgrel=0
-pkgdesc="The GTK+ Toolkit (v2)"
-url="http://www.gtk.org/"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-triggers="$pkgname.trigger:/usr/share/icons/*"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="shared-mime-info"
-makedepends="pkgconfig 
-	atk-dev
-	cairo-dev
-	cups-dev
-	expat-dev
-	gettext-dev
-	glib-dev
-	gnutls-dev
-	libice-dev
-	libiconv-dev
-	jpeg-dev
-	libx11-dev
-	libxcomposite-dev
-	libxcursor-dev
-	libxdamage-dev
-	libxext-dev
-	libxfixes-dev
-	libxrandr-dev
-	libxi-dev
-	pango-dev
-	tiff-dev
-	zlib-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2"
-
-depends_dev="atk-dev pango-dev cairo-dev glib-dev"
-build() {
-	cd "$srcdir"/gtk+-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-xinput=yes \
-		--without-libjasper \
-		--with-included-loaders=png || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/gtk+-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="3b32073cf1fad755f7c2b2db71aebe90  gtk+-2.18.6.tar.bz2"
diff --git a/x11/gtk+/gtk+.post-deinstall b/x11/gtk+/gtk+.post-deinstall
deleted file mode 100644
index e7ee2a151..000000000
--- a/x11/gtk+/gtk+.post-deinstall
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-rm -f etc/gtk-2.0/gtk.immodules
-rm -f etc/gtk-2.0/gdk-pixbuf.loaders
-
diff --git a/x11/gtk+/gtk+.post-install b/x11/gtk+/gtk+.post-install
deleted file mode 100644
index 80444cfb9..000000000
--- a/x11/gtk+/gtk+.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-
diff --git a/x11/gtk+/gtk+.post-upgrade b/x11/gtk+/gtk+.post-upgrade
deleted file mode 120000
index 127667db2..000000000
--- a/x11/gtk+/gtk+.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-gtk+.post-install
\ No newline at end of file
diff --git a/x11/gtk+/gtk+.trigger b/x11/gtk+/gtk+.trigger
deleted file mode 100644
index e9ff91c91..000000000
--- a/x11/gtk+/gtk+.trigger
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
-	gtk-update-icon-cache -q -t -f $i
-done
diff --git a/x11/gtk-doc/APKBUILD b/x11/gtk-doc/APKBUILD
deleted file mode 100644
index 9c86f49cc..000000000
--- a/x11/gtk-doc/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk-doc
-pkgver=1.13
-pkgrel=0
-pkgdesc="Documentation tool for public library API"
-url="http://www.gtk.org/gtk-doc/"
-license="GPL FDL"
-depends="docbook-xsl gnome-doc-utils perl pkgconfig"
-makedepends="rarian-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="27940d6cd5c9dcda8fc003043d8c299a  gtk-doc-1.13.tar.bz2"
diff --git a/x11/gtk-vnc/APKBUILD b/x11/gtk-vnc/APKBUILD
deleted file mode 100644
index dd94fd54b..000000000
--- a/x11/gtk-vnc/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk-vnc
-pkgver=0.3.10
-pkgrel=0
-pkgdesc="A VNC viewer widget for GTK"
-url="http://live.gnome.org/gtk-vnc"
-license="LGPL"
-subpackages="$pkgname-dev gvncviewer"
-makedepends="gnutls-dev gtk+-dev libiconv-dev gettext-dev intltool expat-dev
-	libgcrypt-dev libgpg-error-dev cyrus-sasl-dev"
-depends_dev="gtk+-dev gnutls-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.3/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--without-python \
-		--with-examples \
-		--disable-static || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-gvncviewer() {
-	pkgdesc="Demo application for gtk-vnc"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-md5sums="9aa9d830b219255c8d6753ef55802932  gtk-vnc-0.3.10.tar.bz2"
diff --git a/x11/gtk-xfce-engine/APKBUILD b/x11/gtk-xfce-engine/APKBUILD
deleted file mode 100644
index ddeb911d1..000000000
--- a/x11/gtk-xfce-engine/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk-xfce-engine
-pkgver=2.6.0
-pkgrel=0
-pkgdesc="A port of Xfce engine to GTK+-2.0"
-url="http://www.xfce.org/"
-license="GPL-2"
-depends=
-makedepends="pkgconfig gtk+-dev libiconv-dev gettext-dev expat-dev"
-source="http://www.xfce.org/archive/xfce-4.6.0/src/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="e836705d2933d0a77c6628285e10d982  gtk-xfce-engine-2.6.0.tar.bz2"
diff --git a/x11/hicolor-icon-theme/APKBUILD b/x11/hicolor-icon-theme/APKBUILD
deleted file mode 100644
index 2b27dab38..000000000
--- a/x11/hicolor-icon-theme/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=hicolor-icon-theme
-pkgver=0.10
-pkgrel=0
-pkgdesc="Freedesktop.org Hicolor icon theme"
-url="http://icon-theme.freedesktop.org/wiki/HicolorTheme"
-license="GPL2"
-depends=""
-makedepends=""
-source="http://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="3534f7b8e59785c7d5bfa923e85510a7  hicolor-icon-theme-0.10.tar.gz"
diff --git a/x11/iceauth/APKBUILD b/x11/iceauth/APKBUILD
deleted file mode 100644
index 30da7ad06..000000000
--- a/x11/iceauth/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=iceauth
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.Org ICE authority file utility"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libice-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/iceauth-$pkgver.tar.bz2"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2"
diff --git a/x11/icon-naming-utils/APKBUILD b/x11/icon-naming-utils/APKBUILD
deleted file mode 100644
index b5164dd05..000000000
--- a/x11/icon-naming-utils/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=icon-naming-utils
-pkgver=0.8.90
-pkgrel=0
-pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
-url="http://tango.freedesktop.org/"
-license="GPL"
-depends="perl-xml-simple"
-makedepends=""
-source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/icon-naming-utils \
-		--localstatedir=/var || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/pkgconfig || return 1
-	chmod +x "$pkgdir"/usr/lib/icon-naming-utils/icon-name-mapping
-}
-
-md5sums="dd8108b56130b9eedc4042df634efa66  icon-naming-utils-0.8.90.tar.bz2"
diff --git a/x11/imlib2/APKBUILD b/x11/imlib2/APKBUILD
deleted file mode 100644
index 99e48f2e3..000000000
--- a/x11/imlib2/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=imlib2
-pkgver=1.4.2
-pkgrel=1
-pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
-url="http://sourceforge.net/projects/enlightenment/"
-license="BSD"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev
-	libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev"
-source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
-	bufferoverflow.patch"
-
-build ()
-{
-	cd $srcdir/$pkgname-$pkgver
-	patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc/imlib2 \
-		--x-libraries=/usr/lib \
-		--disable-mmx \
-		--disable-amd64 \
-		|| return 1
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
-	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="9f15568e76ebda9092c571e0df261f54  imlib2-1.4.2.tar.bz2
-76def1fe0ac2ac1686ff24d29979606f  bufferoverflow.patch"
diff --git a/x11/imlib2/bufferoverflow.patch b/x11/imlib2/bufferoverflow.patch
deleted file mode 100644
index 397b43fb8..000000000
--- a/x11/imlib2/bufferoverflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/loaders/loader_xpm.c
-+++ src/modules/loaders/loader_xpm.c.new
-@@ -246,8 +246,8 @@
-                                  return 0;
-                               }
-                             ptr = im->data;
--                            end = ptr + (sizeof(DATA32) * w * h);
-                             pixels = w * h;
-+                            end = ptr + pixels;
-                          }
-                        else
-                          {
-
diff --git a/x11/inputproto/APKBUILD b/x11/inputproto/APKBUILD
deleted file mode 100644
index ef5e4198f..000000000
--- a/x11/inputproto/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=inputproto
-pkgver=2.0
-pkgrel=0
-pkgdesc="X11 Input extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2"
diff --git a/x11/intltool/APKBUILD b/x11/intltool/APKBUILD
deleted file mode 100644
index bf231ce61..000000000
--- a/x11/intltool/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=intltool
-pkgver=0.40.6
-pkgrel=2
-pkgdesc="The internationalization tool collection"
-url="http://freedesktop.org/wiki/Software/intltool"
-license="GPL"
-depends="perl perl-xml-parser gettext"
-subpackages="$pkgname-doc"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.40/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="69bc0353323112f42ad4f9cf351bc3e5  intltool-0.40.6.tar.bz2"
diff --git a/x11/iso-codes/APKBUILD b/x11/iso-codes/APKBUILD
deleted file mode 100644
index 34434037b..000000000
--- a/x11/iso-codes/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=iso-codes
-pkgver=3.10.1
-pkgrel=0
-pkgdesc="Lists of the country, language, and currency names"
-url="http://pkg-isocodes.alioth.debian.org/"
-license="LGPL"
-depends=""
-makedepends="python gettext"
-source="ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install || return 1
-}
-md5sums="1db1466d1ea63fe5fc349b7ba8b189fb  iso-codes-3.10.1.tar.bz2"
diff --git a/x11/kbproto/APKBUILD b/x11/kbproto/APKBUILD
deleted file mode 100644
index 338779988..000000000
--- a/x11/kbproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=kbproto
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="X11 XKB extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7f439166a9b2bf81471a33951883019f  kbproto-1.0.4.tar.bz2"
diff --git a/x11/libcroco/APKBUILD b/x11/libcroco/APKBUILD
deleted file mode 100644
index 47a289667..000000000
--- a/x11/libcroco/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libcroco
-pkgver=0.6.2
-pkgrel=0
-pkgdesc="GNOME CSS2 parsing and manipulation toolkit"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev"
-depends=
-makedepends="glib-dev libxml2-dev pkgconfig"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev pkgconfig"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1429c597aa4b75fc610ab3a542c99209  libcroco-0.6.2.tar.bz2"
diff --git a/x11/libdrm/APKBUILD b/x11/libdrm/APKBUILD
deleted file mode 100644
index 86ab0c37c..000000000
--- a/x11/libdrm/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libdrm
-pkgver=2.4.17
-pkgrel=0
-pkgdesc="Userspace interface to kernel DRM services"
-url="http://dri.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libpthread-stubs"
-subpackages="$pkgname-dev"
-source="http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="667d81f993f7fd8a1b1b1b830a28a748  libdrm-2.4.17.tar.bz2"
diff --git a/x11/libfontenc/APKBUILD b/x11/libfontenc/APKBUILD
deleted file mode 100644
index 7dac13ea8..000000000
--- a/x11/libfontenc/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libfontenc
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="X11 font encoding library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig xproto zlib-dev"
-subpackages="$pkgname-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--with-encodingsdir=/usr/share/fonts/encodings
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="4f0d8191819be9f2bdf9dad49a65e43b  libfontenc-1.0.5.tar.bz2"
diff --git a/x11/libglade/APKBUILD b/x11/libglade/APKBUILD
deleted file mode 100644
index b999bd4ae..000000000
--- a/x11/libglade/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libglade
-pkgver=2.6.4
-pkgrel=0
-pkgdesc="Allows you to load glade interface files in a program at runtime"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="python pkgconfig gtk+-dev libxml2-dev gettext-dev libiconv-dev
-	expat-dev"
-install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade
-	$pkgname.post-deinstall"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.6/$pkgname-$pkgver.tar.bz2
-	$pkgname-2.0.1-nowarning.patch
-	$install
-	"
-
-depends_dev="gtk+-dev libxml2-dev"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir"/libglade-2.0.1-nowarning.patch || return 1
-	./configure --sysconfdir=/etc \
-		--prefix=/usr \
-		--localstatedir=/var || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 libglade-convert "$pkgdir"/usr/bin/ || return 1
-}
-md5sums="d1776b40f4e166b5e9c107f1c8fe4139  libglade-2.6.4.tar.bz2
-4f879c0ce550004905aa0fb24f25c353  libglade-2.0.1-nowarning.patch
-9083bddf8edd4a116bec36df3866e9bf  libglade.post-install
-964867abf7ceafdce9640b08f34ce090  libglade.pre-upgrade
-9083bddf8edd4a116bec36df3866e9bf  libglade.post-upgrade
-964867abf7ceafdce9640b08f34ce090  libglade.post-deinstall"
diff --git a/x11/libglade/libglade-2.0.1-nowarning.patch b/x11/libglade/libglade-2.0.1-nowarning.patch
deleted file mode 100644
index fd071215f..000000000
--- a/x11/libglade/libglade-2.0.1-nowarning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
-+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
-@@ -639,9 +639,8 @@
- 		if (!strcmp (childinfo->properties[j].name, "label")) {
- 		    label = childinfo->properties[j].value;
- 		    break;
--		} else {
--		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
- 		}
-+		/* Ignore all other properties */
- 	    }
- 
- 	    if (label) {
-@@ -683,6 +682,7 @@
- 	    char *icon = NULL;
- 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
- 	    gboolean use_underline = FALSE;
-+	    gboolean sensitive = TRUE;
- 	    GtkWidget *iconw = NULL;
- 	    int j;
- 
-@@ -708,6 +708,8 @@
- 		    group_name = value;
- 		} else if (!strcmp (name, "new_group")) {
- 		    new_group = BOOL (value);
-+		} else if (!strcmp (name, "sensitive")) {
-+		    sensitive = BOOL (value);
- 		} else if (!strcmp (name, "visible")) {
- 		    /* ignore for now */
- 		} else if (!strcmp (name, "tooltip")) {
-@@ -785,6 +787,8 @@
- 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
- 					     TRUE);
- 	    }
-+	    
-+	    gtk_widget_set_sensitive (child, sensitive);
- 
- 	    glade_xml_set_common_params (xml, child, childinfo->child);
- 	} else {
diff --git a/x11/libglade/libglade.post-deinstall b/x11/libglade/libglade.post-deinstall
deleted file mode 100644
index 1b368de84..000000000
--- a/x11/libglade/libglade.post-deinstall
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-xmlcatalog --noout --del \
-	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
-
diff --git a/x11/libglade/libglade.post-install b/x11/libglade/libglade.post-install
deleted file mode 100644
index 2188b7563..000000000
--- a/x11/libglade/libglade.post-install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-mkdir -p etc/xml
-
-if [ ! -e etc/xml/catalog ]; then
-	xmlcatalog --noout --create etc/xml/catalog
-fi
-
-xmlcatalog --noout --add "system" \
-	"http://glade.gnome.org/glade-2.0.dtd" \
-	/usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
-
diff --git a/x11/libglade/libglade.post-upgrade b/x11/libglade/libglade.post-upgrade
deleted file mode 120000
index 25d67c626..000000000
--- a/x11/libglade/libglade.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-libglade.post-install
\ No newline at end of file
diff --git a/x11/libglade/libglade.pre-upgrade b/x11/libglade/libglade.pre-upgrade
deleted file mode 120000
index 06b72fb37..000000000
--- a/x11/libglade/libglade.pre-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-libglade.post-deinstall
\ No newline at end of file
diff --git a/x11/libgsf/APKBUILD b/x11/libgsf/APKBUILD
deleted file mode 100644
index ae307f670..000000000
--- a/x11/libgsf/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libgsf
-pkgver=1.14.16
-pkgrel=0
-pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
-url="http://www.gnome.org/"
-license="GPL LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="libxml2-dev glib-dev bzip2-dev intltool python zlib-dev"
-source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev pkgconfig"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--disable-static \
-		--without-gnome-vfs \
-		--without-bonobo || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
-}
-
-md5sums="8478d83fda0b6e57f36550c11a693ee1  libgsf-1.14.16.tar.bz2"
diff --git a/x11/libice/APKBUILD b/x11/libice/APKBUILD
deleted file mode 100644
index 4cf8058d9..000000000
--- a/x11/libice/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libice
-pkgver=1.0.6
-pkgrel=1
-pkgdesc="X11 Inter-Client Exchange library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig xproto xtrans"
-subpackages="$pkgname-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libICE-$pkgver.tar.bz2"
-
-depends_dev="xproto"
-build () {
-	cd "$srcdir"/libICE-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libICE-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="2d39bc924af24325dae589e9a849180c  libICE-1.0.6.tar.bz2"
diff --git a/x11/libmpeg2/APKBUILD b/x11/libmpeg2/APKBUILD
deleted file mode 100644
index 15704d0de..000000000
--- a/x11/libmpeg2/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libmpeg2
-pkgver=0.5.1
-pkgrel=1
-pkgdesc="libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams."
-url="http://libmpeg2.sourceforge.net/"
-license="GPL2"
-subpackages="$pkgname-dev $pkgname-doc mpeg2dec"
-depends=
-makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev"
-source="http://$pkgname.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--enable-shared \
-		--disable-static || return 1
-	make OPT_CFLAGS="${CFLAGS}" \
-		MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS="" || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-mpeg2dec() {
-	pkgdesc="a test program for libmpeg2"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/mpeg2dec "$subpkgdir"/usr/bin/
-}
-
-md5sums="0f92c7454e58379b4a5a378485bbd8ef  libmpeg2-0.5.1.tar.gz"
diff --git a/x11/libnotify/APKBUILD b/x11/libnotify/APKBUILD
deleted file mode 100644
index 2765a4dff..000000000
--- a/x11/libnotify/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libnotify
-pkgver=0.4.5
-pkgdesc="Desktop notification library"
-url="http://www.galago-project.org/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig dbus-glib-dev  gtk+-dev gettext-dev libiconv-dev
-	expat-dev"
-source="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$pkgver.tar.gz"
-
-depends_dev="gtk+-dev glib-dev dbus-dev dbus-glib-dev"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="472e2c1f808848365572a9b024d9e8f5  libnotify-0.4.5.tar.gz"
diff --git a/x11/liboil/APKBUILD b/x11/liboil/APKBUILD
deleted file mode 100644
index d388ca491..000000000
--- a/x11/liboil/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=liboil
-pkgver=0.3.16
-pkgrel=0
-pkgdesc="Library of simple functions that are optimized for various CPUs."
-url="http://liboil.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-source="http://$pkgname.freedesktop.org/download/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	unset CFLAGS
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" install || return 1
-	install -m755 -d "$pkgdir"/usr/share/licenses/liboil
-	install -m644 COPYING "$pkgdir"/usr/share/licenses/liboil/ || return 1
-}
-md5sums="febb1d9f9bc4c440fcf622dc90f8b6b7  liboil-0.3.16.tar.gz"
diff --git a/x11/libpciaccess/APKBUILD b/x11/libpciaccess/APKBUILD
deleted file mode 100644
index 1f5e63652..000000000
--- a/x11/libpciaccess/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libpciaccess
-pkgver=0.11.0
-pkgrel=0
-pkgdesc="X11 PCI access library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig"
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="686320dcec98daad0bdfb8894d4f2a2b  libpciaccess-0.11.0.tar.bz2"
diff --git a/x11/libpthread-stubs/APKBUILD b/x11/libpthread-stubs/APKBUILD
deleted file mode 100644
index 7ca630b43..000000000
--- a/x11/libpthread-stubs/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libpthread-stubs
-pkgver=0.3
-pkgrel=0
-pkgdesc="Pthread functions stubs for platforms missing them"
-url="http://cgit.freedesktop.org/xcb/pthread-stubs"
-license="X11"
-depends=
-source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	# we actually have pthread_exit, the configure script just
-	# fails to detect it
-	make CFLAGS="$CFLAGS -DHAVE_PTHREAD_EXIT=1"
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install
-}
-md5sums="e8fa31b42e13f87e8f5a7a2b731db7ee  libpthread-stubs-0.3.tar.bz2"
diff --git a/x11/librsvg/APKBUILD b/x11/librsvg/APKBUILD
deleted file mode 100644
index ba930bf6d..000000000
--- a/x11/librsvg/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=librsvg
-pkgver=2.26.0
-pkgrel=0
-pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
-url="http://librsvg.sourceforge.net/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="gtk+-dev libcroco-dev libgsf-dev bzip2-dev"
-install="librsvg.post-install librsvg.post-upgrade librsvg.post-deinstall"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.26/$pkgname-$pkgver.tar.bz2
-	$install"
-
-depends_dev="glib-dev gtk+-dev cairo-dev libcroco-dev libgsf-dev"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/$pkgname \
-		--with-croco \
-		--disable-static \
-		--disable-mozilla-plugin \
-		--with-svgz || return 1
-	make || return 1
-	make DESTDIR=""$pkgdir"" install || return 1
-	rm -rf "$pkgdir"/usr/lib/mozilla
-}
-
-md5sums="65dbd726a514fe8b797d26254b8efc1e  librsvg-2.26.0.tar.bz2
-323a187b3a9bc1c506543c03a6f533ce  librsvg.post-install
-323a187b3a9bc1c506543c03a6f533ce  librsvg.post-upgrade
-323a187b3a9bc1c506543c03a6f533ce  librsvg.post-deinstall"
diff --git a/x11/librsvg/librsvg.post-deinstall b/x11/librsvg/librsvg.post-deinstall
deleted file mode 120000
index 4729c2e26..000000000
--- a/x11/librsvg/librsvg.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-librsvg.post-install
\ No newline at end of file
diff --git a/x11/librsvg/librsvg.post-install b/x11/librsvg/librsvg.post-install
deleted file mode 100644
index de5ca6c6c..000000000
--- a/x11/librsvg/librsvg.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#We need to update the pixbuf loaders to let GTK support SVG images
-gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-
-exit 0
diff --git a/x11/librsvg/librsvg.post-upgrade b/x11/librsvg/librsvg.post-upgrade
deleted file mode 120000
index 4729c2e26..000000000
--- a/x11/librsvg/librsvg.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-librsvg.post-install
\ No newline at end of file
diff --git a/x11/libsexy/APKBUILD b/x11/libsexy/APKBUILD
deleted file mode 100644
index 64488a0ad..000000000
--- a/x11/libsexy/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libsexy
-pkgver=0.1.11
-pkgrel=0
-pkgdesc="Doing naughty things to good widgets."
-url="http://chipx86.com/wiki/Libsexy"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="gtk+-dev libxml2-dev iso-codes"
-source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/libsexy.a
-}
-
-md5sums="33c079a253270ec8bfb9508e4bb30754  libsexy-0.1.11.tar.gz"
diff --git a/x11/libsm/APKBUILD b/x11/libsm/APKBUILD
deleted file mode 100644
index 9f17e18a8..000000000
--- a/x11/libsm/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libsm
-pkgver=1.1.1
-pkgrel=0
-pkgdesc="X11 Session Management library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends="libice libuuid"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="pkgconfig libice-dev e2fsprogs-dev xproto xtrans"
-source="http://xorg.freedesktop.org/releases/individual/lib/libSM-$pkgver.tar.bz2"
-
-depends_dev="libice-dev xproto"
-
-build () {
-	cd "$srcdir"/libSM-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="6889a455496aaaa65b1fa05fc518d179  libSM-1.1.1.tar.bz2"
diff --git a/x11/libsoup/APKBUILD b/x11/libsoup/APKBUILD
deleted file mode 100644
index af9462e6b..000000000
--- a/x11/libsoup/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libsoup
-pkgver=2.28.2
-pkgrel=0
-pkgdesc="Gnome HTTP Library"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig glib-dev gnutls-dev libxml2-dev libiconv-dev gettext-dev
-	libgcrypt-dev libgpg-error-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev gnutls-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--without-gnome \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="31d7ad416005eed4b78f07ac01b6b9f0  libsoup-2.28.2.tar.bz2"
diff --git a/x11/libtheora/APKBUILD b/x11/libtheora/APKBUILD
deleted file mode 100644
index f17b0e8ac..000000000
--- a/x11/libtheora/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libtheora
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="An open video codec developed by the Xiph.org"
-url="http://www.xiph.org"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-examples"
-depends=
-makedepends="libvorbis-dev libogg-dev sdl-dev autoconf automake libtool"
-source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
-	libtheora-flags.patch"
-
-depends_dev="libogg-dev"
-build() {
-	cd "$srcdir"/libtheora-$pkgver
-	patch -p1 -i ../libtheora-flags.patch || return 1
-	aclocal -I m4 && autoconf && automake && libtoolize || return 1
-
-	./configure --prefix=/usr \
-		--enable-shared \
-		--disable-static || return 1
-
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libtheora-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
-	install -m644 LICENSE COPYING "$pkgdir"/usr/share/licenses/$pkgname/
-}
-
-examples() {
-	pkgdesc="Example applications for libtheora"
-	cd "$srcdir"/libtheora-$pkgver/examples
-	install -d "$subpkgdir"/usr/bin
-	install -m755 dump_psnr player_example dump_video encoder_example \
-		"$subpkgdir"/usr/bin/
-}
-
-md5sums="292ab65cedd5021d6b7ddd117e07cd8e  libtheora-1.1.1.tar.bz2
-7cbab1ce1f52adb98e1c241515a27aca  libtheora-flags.patch"
diff --git a/x11/libtheora/libtheora-flags.patch b/x11/libtheora/libtheora-flags.patch
deleted file mode 100644
index a47cc5771..000000000
--- a/x11/libtheora/libtheora-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac
---- libtheora-1.0beta2.orig/configure.ac	2007-10-13 00:01:38.000000000 +0300
-+++ libtheora-1.0beta2/configure.ac	2007-11-25 22:44:49.000000000 +0200
-@@ -102,8 +102,8 @@
-         case $host in 
-         *)
-                 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
--                CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
--                PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
-+                CFLAGS="-Wall -Wno-parentheses"
-+                PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
-         esac
- fi
- CFLAGS="$CFLAGS $cflags_save"
diff --git a/x11/libwnck/APKBUILD b/x11/libwnck/APKBUILD
deleted file mode 100644
index 95347a2cb..000000000
--- a/x11/libwnck/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libwnck
-pkgver=2.28.0
-pkgrel=0
-pkgdesc="Window Navigator Construction Kit"
-url="http://www.gnome.org/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig gtk+-dev  startup-notification-dev  libxres-dev intltool
-	gettext-dev libiconv-dev expat-dev libsm-dev e2fsprogs-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev gtk+-dev libx11-dev pango-dev cairo-dev 
-	startup-notification-dev libxres-dev"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a9311661aa954e7c918439b6dd578792  libwnck-2.28.0.tar.bz2"
diff --git a/x11/libx11/APKBUILD b/x11/libx11/APKBUILD
deleted file mode 100644
index 93224d6f4..000000000
--- a/x11/libx11/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libx11
-pkgver=1.3.2
-pkgrel=0
-pkgdesc="X11 client-side library"
-url="http://xorg.freedesktop.org/"
-license="custom:XFREE86"
-depends=
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libxcb-dev libxau-dev libxdmcp-dev xproto xextproto
-	xf86bigfontproto xtrans kbproto inputproto util-macros pkgconfig
-	"
-source="http://xorg.freedesktop.org/releases/individual/lib/libX11-$pkgver.tar.bz2
-	"
-
-depends_dev="xproto kbproto libxau-dev libxdmcp-dev libxcb-dev"
-
-build() {
-	cd "$srcdir"/libX11-$pkgver
-	./configure --prefix=/usr \
-		--with-xcb || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/libX11-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-md5sums="001d780829f936e34851ef7cd37b4dfd  libX11-1.3.2.tar.bz2"
diff --git a/x11/libxau/APKBUILD b/x11/libxau/APKBUILD
deleted file mode 100644
index c6b799063..000000000
--- a/x11/libxau/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxau
-pkgver=1.0.5
-pkgrel=0
-pkgdesc="X11 authorisation library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig xproto"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXau-$pkgver.tar.bz2"
-
-depends_dev="xproto"
-
-build() {
-	cd "$srcdir"/libXau-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING || return 1
-}
-md5sums="993b3185c629e4b89401fca072dcb663  libXau-1.0.5.tar.bz2"
diff --git a/x11/libxcb/APKBUILD b/x11/libxcb/APKBUILD
deleted file mode 100644
index a1b30a351..000000000
--- a/x11/libxcb/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxcb
-pkgver=1.5
-pkgrel=0
-pkgdesc="X11 client-side library"
-url="http://xcb.freedesktop.org/"
-license="custom"
-depends="xcb-proto>=1.6"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libxdmcp-dev libxau-dev libxslt libpthread-stubs pkgconfig python"
-source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2
-	"
-depends_dev="libpthread-stubs libxau-dev libxdmcp-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--enable-xinput || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="d19c0ba6ba42ebccd3d62d8bb147b551  libxcb-1.5.tar.bz2"
diff --git a/x11/libxcomposite/APKBUILD b/x11/libxcomposite/APKBUILD
deleted file mode 100644
index f2e48a911..000000000
--- a/x11/libxcomposite/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxcomposite
-pkgver=0.4.1
-pkgrel=0
-pkgdesc="X11 Composite extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxfixes-dev libxext-dev compositeproto"
-source="http://xorg.freedesktop.org//releases/individual/lib/libXcomposite-$pkgver.tar.bz2"
-
-depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev"
-build ()
-{
-	cd "$srcdir"/libXcomposite-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums="0f1367f57fdf5df17a8dd71d0fa68248  libXcomposite-0.4.1.tar.bz2"
diff --git a/x11/libxcursor/APKBUILD b/x11/libxcursor/APKBUILD
deleted file mode 100644
index bc9e33d4c..000000000
--- a/x11/libxcursor/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxcursor
-pkgver=1.1.10
-pkgrel=1
-pkgdesc="X cursor management library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxfixes-dev libx11-dev libxrender-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXcursor-$pkgver.tar.bz2"
-
-depends_dev="xproto libx11-dev libxrender-dev libxfixes-dev"
-build() {
-	cd "$srcdir"/libXcursor-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXcursor-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7dcdad1c10daea872cb3355af414b2ca  libXcursor-1.1.10.tar.bz2"
diff --git a/x11/libxdamage/APKBUILD b/x11/libxdamage/APKBUILD
deleted file mode 100644
index bf58651c0..000000000
--- a/x11/libxdamage/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxdamage
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="X11 damaged region extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libxfixes-dev damageproto xextproto"
-subpackages="$pkgname-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXdamage-$pkgver.tar.bz2"
-
-depends_dev="xproto damageproto libxfixes-dev libx11-dev fixesproto"
-build() {
-	cd "$srcdir"/libXdamage-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXdamage-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="b42780bce703ec202a33e5693991c09d  libXdamage-1.1.2.tar.bz2"
diff --git a/x11/libxdmcp/APKBUILD b/x11/libxdmcp/APKBUILD
deleted file mode 100644
index f61c9e486..000000000
--- a/x11/libxdmcp/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxdmcp
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X11 Display Manager Control Protocol library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="xproto pkgconfig"
-subpackages="$pkgname-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/libXdmcp-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc 
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d60941d471800f41a3f19b24bea855a7  libXdmcp-1.0.3.tar.bz2"
diff --git a/x11/libxext/APKBUILD b/x11/libxext/APKBUILD
deleted file mode 100644
index dbfb1b26d..000000000
--- a/x11/libxext/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxext
-pkgver=1.1.1
-pkgrel=0
-pkgdesc="X11 miscellaneous extensions library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig xproto xextproto libx11-dev libxau-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXext-$pkgver.tar.bz2"
-
-depends_dev="xextproto libx11-dev libxau-dev"
-build() {
-	cd "$srcdir"/libXext-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
-	make
-}
-
-package() {
-	cd "$srcdir"/libXext-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="c417c0e8df39a067f90a2a2e7133637d  libXext-1.1.1.tar.bz2"
diff --git a/x11/libxfce4menu/APKBUILD b/x11/libxfce4menu/APKBUILD
deleted file mode 100644
index 0023f2d93..000000000
--- a/x11/libxfce4menu/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfce4menu
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="a freedesktop.org compliant menu implementation for Xfce"
-url="http://www.xfce.org/"
-license="GPL-2"
-depends=
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libxfce4util-dev intltool pkgconfig gtk+-dev gettext-dev
-	libiconv-dev"
-source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="5dc9343885c2c6f931318b2a1cdcc9db  libxfce4menu-4.6.1.tar.bz2"
diff --git a/x11/libxfce4util/APKBUILD b/x11/libxfce4util/APKBUILD
deleted file mode 100644
index 7cfbd769d..000000000
--- a/x11/libxfce4util/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfce4util
-pkgver=4.6.1
-pkgrel=1
-pkgdesc="Basic utility non-GUI functions for Xfce"
-url="http://www.xfce.org/"
-license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig glib-dev gettext-dev libiconv-dev"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="eac51d58179cbcadc3f802450a8ec9cd  libxfce4util-4.6.1.tar.bz2"
diff --git a/x11/libxfcegui4/APKBUILD b/x11/libxfcegui4/APKBUILD
deleted file mode 100644
index 488a555b6..000000000
--- a/x11/libxfcegui4/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfcegui4
-pkgver=4.6.2
-pkgrel=0
-pkgdesc="Basic GUI functions for Xfce"
-url="http://www.xfce.org/"
-license="GPL2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig intltool glib-dev gettext-dev libiconv-dev gtk+-dev
-	xfconf-dev libsm-dev libice-dev libglade-dev e2fsprogs-dev
-	libxfce4util-dev expat-dev"
-source="http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2"
-
-depends_dev="gtk+-dev libxfce4util-dev xfconf-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="e520b93351d87194b5fcc1315acd8617  libxfcegui4-4.6.2.tar.bz2"
diff --git a/x11/libxfixes/APKBUILD b/x11/libxfixes/APKBUILD
deleted file mode 100644
index 87e81e1b0..000000000
--- a/x11/libxfixes/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfixes
-pkgver=4.0.4
-pkgrel=0
-pkgdesc="X11 miscellaneous 'fixes' extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig xproto libx11-dev fixesproto xextproto"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2"
-
-depends_dev="xproto fixesproto libx11-dev"
-build() {
-	cd "$srcdir"/libXfixes-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc --build=${CHOST} --host=${CHOST}
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7f2c40852eb337b237ad944ca5c30d49  libXfixes-4.0.4.tar.bz2"
diff --git a/x11/libxfont/APKBUILD b/x11/libxfont/APKBUILD
deleted file mode 100644
index f8a2bb250..000000000
--- a/x11/libxfont/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfont
-pkgver=1.4.1
-pkgrel=0
-pkgdesc="X11 font rasterisation library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="libfontenc freetype zlib"
-makedepends="pkgconfig libfontenc-dev freetype-dev fontsproto xproto xtrans
-	zlib-dev"
-source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.bz2"
-
-depends_dev="xproto fontsproto libfontenc-dev freetype-dev"
-
-build() {
-	cd "$srcdir"/libXfont-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="4f2bed2a2be82e90a51a24bb3a22cdf0  libXfont-1.4.1.tar.bz2"
diff --git a/x11/libxft/APKBUILD b/x11/libxft/APKBUILD
deleted file mode 100644
index 43b5a3c07..000000000
--- a/x11/libxft/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxft
-pkgver=2.1.14
-pkgrel=1
-pkgdesc="FreeType-based font drawing library for X"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig fontconfig-dev libxrender-dev freetype-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXft-$pkgver.tar.bz2"
-depends_dev="xproto libxrender-dev fontconfig-dev freetype-dev"
-
-build () {
-	cd "$srcdir"/libXft-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXft-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="254e62a233491e0e1251636536163e20  libXft-2.1.14.tar.bz2"
diff --git a/x11/libxi/APKBUILD b/x11/libxi/APKBUILD
deleted file mode 100644
index 21fd77cec..000000000
--- a/x11/libxi/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxi
-pkgver=1.3
-pkgrel=1
-pkgdesc="X11 Input extension library"
-url="http://xorg.freedesktop.org"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="
-	inputproto
-	libx11-dev
-	libxext-dev
-	pkgconfig 
-	xextproto
-	xproto
-	"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXi-$pkgver.tar.bz2"
-
-depends_dev="inputproto libx11-dev libxext-dev"
-
-build () 
-{ 
-	cd "$srcdir"/libXi-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXi-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="8df4ece9bd1efb02c28acb2b6f485e09  libXi-1.3.tar.bz2"
diff --git a/x11/libxinerama/APKBUILD b/x11/libxinerama/APKBUILD
deleted file mode 100644
index 589994d1b..000000000
--- a/x11/libxinerama/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxinerama
-pkgver=1.1
-pkgrel=1
-pkgdesc="X11 Xinerama extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libx11-dev xineramaproto"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXinerama-$pkgver.tar.bz2"
-depends_dev="xineramaproto libx11-dev libxext-dev"
-
-build() { 
-	cd "$srcdir"/libXinerama-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXinerama-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a2ac01fc0426cdbb713c5d59cf9955ed  libXinerama-1.1.tar.bz2"
diff --git a/x11/libxkbfile/APKBUILD b/x11/libxkbfile/APKBUILD
deleted file mode 100644
index 1298aed04..000000000
--- a/x11/libxkbfile/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxkbfile
-pkgver=1.0.6
-pkgrel=1
-pkgdesc="X11 keyboard file manipulation library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libx11-dev"
-subpackages="$pkgname-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="libx11-dev kbproto"
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \
-		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b01156e263eca8177e6b7f10441951c4  libxkbfile-1.0.6.tar.bz2"
diff --git a/x11/libxkbui/APKBUILD b/x11/libxkbui/APKBUILD
deleted file mode 100644
index e585174ab..000000000
--- a/x11/libxkbui/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxkbui
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="X11 keyboard UI presentation library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev"
-depends=
-makedepends="pkgconfig libxt-dev libx11-dev libsm-dev libice-dev libxkbfile-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="libx11-dev xproto libxt-dev"
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1143e456f7429e18e88f2eadb2f2b6b1  libxkbui-1.0.2.tar.bz2"
diff --git a/x11/libxklavier/APKBUILD b/x11/libxklavier/APKBUILD
deleted file mode 100644
index 522a032a7..000000000
--- a/x11/libxklavier/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxklavier
-pkgver=4.0
-pkgrel=0
-pkgdesc="High-level API for X Keyboard Extension"
-url="http://gswitchit.sourceforge.net"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="xkeyboard-config iso-codes"
-makedepends="pkgconfig libxkbfile-dev libxml2-dev glib-dev libxi-dev iso-codes
-	gettext-dev libiconv-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="libxml2-dev glib-dev gettext-dev"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1b714ba04835fb49511f9e1444a5ea4c  libxklavier-4.0.tar.bz2"
diff --git a/x11/libxmu/APKBUILD b/x11/libxmu/APKBUILD
deleted file mode 100644
index 13343d781..000000000
--- a/x11/libxmu/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxmu
-pkgver=1.0.5
-pkgrel=0
-pkgdesc="X11 miscellaneous micro-utility library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libxt-dev libx11-dev libsm-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXmu-$pkgver.tar.bz2"
-depends_dev="xproto libx11-dev libxt-dev libxext-dev"
-
-build () 
-{ 
-	cd "$srcdir"/libXmu-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 $srcdir/libXmu-$pkgver/COPYING \
-		$pkgdir/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="fc4d66be7a1a1eb474954728415e46d6  libXmu-1.0.5.tar.bz2"
diff --git a/x11/libxpm/APKBUILD b/x11/libxpm/APKBUILD
deleted file mode 100644
index d1be1b737..000000000
--- a/x11/libxpm/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxpm
-pkgver=3.5.8
-pkgrel=1
-pkgdesc="X11 pixmap library"
-url="http://xorg.freedesktop.org/"
-license="custom:BELL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxt-dev libxext-dev libx11-dev util-linux-ng-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXpm-$pkgver.tar.bz2"
-
-depends_dev="libx11-dev"
-build() {
-	cd "$srcdir"/libXpm-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXpm-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="38e58e72d476a74298a59052fde185a3  libXpm-3.5.8.tar.bz2"
diff --git a/x11/libxrandr/APKBUILD b/x11/libxrandr/APKBUILD
deleted file mode 100644
index e261af4f4..000000000
--- a/x11/libxrandr/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxrandr
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="X11 RandR extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libxrender-dev randrproto libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXrandr-$pkgver.tar.bz2"
-
-depends_dev="xproto randrproto libx11-dev libxext-dev libxrender-dev"
-
-build() {
-	cd "$srcdir"/libXrandr-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXrandr-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="68eb59c3b7524db6ffd78746ee893d1d  libXrandr-1.3.0.tar.bz2"
diff --git a/x11/libxrender/APKBUILD b/x11/libxrender/APKBUILD
deleted file mode 100644
index dc1175533..000000000
--- a/x11/libxrender/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxrender
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="X Rendering Extension client library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev"
-depends=
-makedepends="pkgconfig libx11-dev renderproto"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXrender-$pkgver.tar.bz2"
-
-depends_dev="xproto renderproto libx11-dev"
-build() { 
-	cd "$srcdir"/libXrender-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXrender-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="276dd9e85daf0680616cd9f132b354c9  libXrender-0.9.5.tar.bz2"
diff --git a/x11/libxres/APKBUILD b/x11/libxres/APKBUILD
deleted file mode 100644
index f446812fd..000000000
--- a/x11/libxres/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxres
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="X11 Resource extension library"
-url="http://xorg.freedesktop.org"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="pkgconfig libxext-dev resourceproto"
-depends=
-source="http://xorg.freedesktop.org/releases/individual/lib/libXres-$pkgver.tar.bz2"
-
-depends_dev="xproto libx11-dev libxext-dev"
-build ()
-{
-	cd "$srcdir"/libXres-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc 
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums="4daf91f93d924e693f6f6ed276791be2  libXres-1.0.4.tar.bz2"
diff --git a/x11/libxt/APKBUILD b/x11/libxt/APKBUILD
deleted file mode 100644
index aff62dcba..000000000
--- a/x11/libxt/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxt
-pkgver=1.0.7
-pkgrel=0
-pkgdesc="X11 toolkit intrinsics library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libsm-dev libice-dev libx11-dev e2fsprogs-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXt-$pkgver.tar.bz2"
-
-depends_dev="xproto libx11-dev libsm-dev"
-
-build () {
-	cd "$srcdir"/libXt-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-install-makestrs
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-md5sums="96f3c93434a93186d178b60d4a262496  libXt-1.0.7.tar.bz2"
diff --git a/x11/libxtst/APKBUILD b/x11/libxtst/APKBUILD
deleted file mode 100644
index c1e9c4b60..000000000
--- a/x11/libxtst/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxtst
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="X11 Testing -- Resource extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libxi-dev recordproto inputproto"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXtst-$pkgver.tar.bz2"
-depends_dev="recordproto libx11-dev libxext-dev inputproto libxi-dev"
-
-build ()
-{
-	cd "$srcdir"/libXtst-$pkgver
-	./configure --prefix=/usr \
-		--build=${CHOST} --host=${CHOST}
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums="dd6f3e20b87310187121539f9605d977  libXtst-1.1.0.tar.bz2"
diff --git a/x11/libxv/APKBUILD b/x11/libxv/APKBUILD
deleted file mode 100644
index ca40f7fd1..000000000
--- a/x11/libxv/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxv
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="X11 Video extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libx11-dev videoproto"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXv-$pkgver.tar.bz2"
-
-depends_dev="xproto videoproto libx11-dev libxext-dev"
-
-build() {
-	cd "$srcdir"/libXv-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXv-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="1d97798b1d8bbf8d9085e1b223a0738f  libXv-1.0.5.tar.bz2"
diff --git a/x11/libxvmc/APKBUILD b/x11/libxvmc/APKBUILD
deleted file mode 100644
index 3233ba405..000000000
--- a/x11/libxvmc/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxvmc
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="X11 Video Motion Compensation extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev"
-depends=
-makedepends="pkgconfig libxv-dev libxext-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXvMC-$pkgver.tar.bz2"
-
-depends_dev="xproto videoproto libxv-dev libx11-dev libxext-dev"
-
-build() {
-	cd "$srcdir"/libXvMC-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXvMC-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="16c3a11add14979beb7510e44623cac6  libXvMC-1.0.5.tar.bz2"
diff --git a/x11/libxxf86dga/APKBUILD b/x11/libxxf86dga/APKBUILD
deleted file mode 100644
index 5ac468660..000000000
--- a/x11/libxxf86dga/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxxf86dga
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="X11 Direct Graphics Access extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xf86dgaproto libxext-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-$pkgver.tar.bz2"
-
-depends_dev="xf86dgaproto libxext-dev libx11-dev"
-build() {
-	cd "$srcdir"/libXxf86dga-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXxf86dga-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="368837d3d7a4d3b4f70be48383e3544e  libXxf86dga-1.1.1.tar.bz2"
diff --git a/x11/libxxf86misc/APKBUILD b/x11/libxxf86misc/APKBUILD
deleted file mode 100644
index aa644d180..000000000
--- a/x11/libxxf86misc/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxxf86misc
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="X11 XFree86 miscellaneous extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxext-dev libx11-dev xf86miscproto"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2"
-depends_dev="xf86miscproto libx11-dev libxext-dev"
-
-build() {
-	cd "$srcdir"/libXxf86misc-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXxf86misc-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="51fed53e8de067d4b8666f75a0212400  libXxf86misc-1.0.2.tar.bz2"
diff --git a/x11/libxxf86vm/APKBUILD b/x11/libxxf86vm/APKBUILD
deleted file mode 100644
index 1a7ebc4fd..000000000
--- a/x11/libxxf86vm/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxxf86vm
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="X11 XFree86 video mode extension library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xproto libx11-dev xf86vidmodeproto xextproto
-	libxext-dev"
-source="http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2"
-
-depends_dev="xf86vidmodeproto libx11-dev libxext-dev"
-
-build() {
-	cd "$srcdir"/libXxf86vm-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/libXxf86vm-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b431ad7084e1055fef99a9115237edd8  libXxf86vm-1.1.0.tar.bz2"
diff --git a/x11/mesa/APKBUILD b/x11/mesa/APKBUILD
deleted file mode 100644
index 19c4d4c7a..000000000
--- a/x11/mesa/APKBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mesa
-pkgver=7.7
-pkgrel=0
-pkgdesc="Mesa DRI OpenGL library"
-url="http://www.mesa3d.org"
-license="LGPL"
-depends=
-subpackages="$pkgname-dev 
-	$pkgname-dri-ati:ati $pkgname-dri-ffb:ffb $pkgname-dri-intel:intel
-	$pkgname-dri-mach64:mach64 $pkgname-dri-mga:mga $pkgname-dri-r128:r128
-	$pkgname-dri-savage:savage $pkgname-dri-sis:sis
-	$pkgname-dri-tdfx:tdfx $pkgname-dri-unichrome:unichrome
-	"
-
-makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev
-	dri2proto xextproto libx11-dev glproto python"
-source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-	mesa-7.7-link-shared.patch
-	intel-revert-vbl.patch
-	mesa-7.4-parallel.patch
-	mesa-7.6.1-ldflags.patch
-	mesa-7.6.1-uclibc.patch"
-
-depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
-	libxdamage-dev libxfixes-dev libxcb-dev"
-
-_dri_driverdir=/usr/lib/xorg/modules/dri
-
-prepare() { 
-	cd "$srcdir"/Mesa-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 -i $i || return 1
-	done
-}
-
-build() {
-	cd "$srcdir"/Mesa-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
-		--with-dri-driverdir=$_dri_driverdir \
-		--disable-asm \
-		--disable-glx-tls \
-		--with-driver=dri \
-		--with-state-trackers=dri,egl \
-		--enable-xcb \
-		--disable-glut \
-		--disable-glw || return 1
-
-	make || return 1
-	# check so we dont have any bind NOW
-	scanelf -Rb . | grep NOW && return 1
-	return 0
-}
-
-package() {
-	cd "$srcdir"/Mesa-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-
-
-_mv_dri() {
-	pkgdesc="Mesa DRI driver for $@"
-	install -d "$subpkgdir"/$_dri_driverdir
-	
-	while [ $# -gt 0 ]; do
-		mv "$pkgdir"/$_dri_driverdir/${1}.so \
-			"$subpkgdir"/$_dri_driverdir/ || return 1
-		shift
-	done
-}
-
-ati() {		_mv_dri radeon_dri r200_dri r300_dri r600_dri; }
-ffb() {		_mv_dri ffb_dri; }
-intel() {	_mv_dri i810_dri i915_dri i965_dri; }
-mach64() {	_mv_dri mach64_dri; }
-mga() {		_mv_dri mga_dri; }
-r128() {	_mv_dri r128_dri; }
-s3v() {		_mv_dri s3v_dri; }
-savage() {	_mv_dri savage_dri; }
-sis() {		_mv_dri sis_dri; }
-tdfx() {	_mv_dri tdfx_dri; }
-trident() {	_mv_dri trident_dri; }
-unichrome() {	_mv_dri unichrome_dri; }
-
-md5sums="e3fa64a1508bc23dd9de9dd2cea7cfb1  MesaLib-7.7.tar.bz2
-a966f459b6430dbe87a57c5f28f19816  mesa-7.7-link-shared.patch
-a111f4dc82e894f8801bc3fa129af7af  intel-revert-vbl.patch
-75e1bb69f384e9d60544fa03c15cc0ec  mesa-7.4-parallel.patch
-eb6bb53bb1643782aa572edc40d28629  mesa-7.6.1-ldflags.patch
-8d98e15310e0f2e1520beb9e6cb6ab41  mesa-7.6.1-uclibc.patch"
diff --git a/x11/mesa/intel-revert-vbl.patch b/x11/mesa/intel-revert-vbl.patch
deleted file mode 100644
index 039441473..000000000
--- a/x11/mesa/intel-revert-vbl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 532d2051245a1d8afe7ca236f1d966d555bb121a
-Author: Dave Airlie <airlied@linux.ie>
-Date:   Fri Sep 12 17:21:25 2008 +1000
-
-    Revert "intel: sync to vblank by default"
-    
-    This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409.
-
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index c193830..f02192d 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
-    DRI_CONF_BEGIN
-    DRI_CONF_SECTION_PERFORMANCE
-       DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
--      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
-+      DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
-       /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
-        * DRI_CONF_BO_REUSE_ALL
-        */
diff --git a/x11/mesa/mesa-7.4-parallel.patch b/x11/mesa/mesa-7.4-parallel.patch
deleted file mode 100644
index b4e37049d..000000000
--- a/x11/mesa/mesa-7.4-parallel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Mesa-7.4.orig/src/mesa/drivers/dri/Makefile Mesa-7.4/src/mesa/drivers/dri/Makefile
---- Mesa-7.4.orig/src/mesa/drivers/dri/Makefile	2009-04-11 18:08:41.000000000 +0000
-+++ Mesa-7.4/src/mesa/drivers/dri/Makefile	2009-04-11 18:10:09.000000000 +0000
-@@ -18,7 +18,7 @@
- $(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
- 	$(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) 
- 
--subdirs:
-+subdirs: $(TOP)/$(LIB_DIR)/libdricore.so
- 	@for dir in $(DRI_DIRS) ; do \
- 		if [ -d $$dir ] ; then \
- 			(cd $$dir && $(MAKE)) || exit 1 ; \
diff --git a/x11/mesa/mesa-7.6.1-ldflags.patch b/x11/mesa/mesa-7.6.1-ldflags.patch
deleted file mode 100644
index 56914b711..000000000
--- a/x11/mesa/mesa-7.6.1-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
-index 9635c3c..88e02c0 100644
---- a/src/gallium/winsys/drm/Makefile.template
-+++ b/src/gallium/winsys/drm/Makefile.template
-@@ -83,6 +83,7 @@ default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- 	$(MKLIB) -noprefix -o $@ \
-+		-ldflags "$(LDFLAGS)" \
- 		$(OBJECTS) $(PIPE_DRIVERS) \
-                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
-                  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
-@@ -90,6 +91,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)
- $(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
- 	$(MKLIB) -o $(LIBNAME_EGL) \
- 		-linker "$(CC)" \
-+		-ldflags "$(LDFLAGS)" \
- 		-noprefix \
- 		$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
- 		--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
diff --git a/x11/mesa/mesa-7.6.1-uclibc.patch b/x11/mesa/mesa-7.6.1-uclibc.patch
deleted file mode 100644
index 4a4354d89..000000000
--- a/x11/mesa/mesa-7.6.1-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
-index 46ffb92..6192fe6 100644
---- a/src/mesa/main/imports.c
-+++ b/src/mesa/main/imports.c
-@@ -915,7 +915,7 @@ _mesa_atoi(const char *s)
- double
- _mesa_strtod( const char *s, char **end )
- {
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && ! defined(__UCLIBC__)
-    static locale_t loc = NULL;
-    if (!loc) {
-       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/x11/mesa/mesa-7.7-link-shared.patch b/x11/mesa/mesa-7.7-link-shared.patch
deleted file mode 100644
index 8c6b562d7..000000000
--- a/x11/mesa/mesa-7.7-link-shared.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
---- mesa-20091221/src/mesa/drivers/dri/Makefile.da	2009-12-21 08:09:11.000000000 +1000
-+++ mesa-20091221/src/mesa/drivers/dri/Makefile	2009-12-21 08:43:03.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
- 
- 
- 
--default: $(TOP)/$(LIB_DIR) subdirs dri.pc
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
- 
- 
- $(TOP)/$(LIB_DIR):
- 	-mkdir $(TOP)/$(LIB_DIR)
- 
-+libdricore.so:
-+	gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive $(LDFLAGS) -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+	$(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) 
- 
- subdirs:
- 	@for dir in $(DRI_DIRS) ; do \
-@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
- 	$(pcedit) $< > $@
- 
- 
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- 	@for dir in $(DRI_DIRS) ; do \
- 		if [ -d $$dir ] ; then \
- 			(cd $$dir && $(MAKE) install) || exit 1 ; \
- 		fi \
- 	done
-+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+	$(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- 	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- 	  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -51,5 +58,6 @@ clean:
- 			(cd $$dir && $(MAKE) clean) ; \
- 		fi \
- 	done
-+	-rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- 	-rm -f common/*.o
- 	-rm -f *.pc
-diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
---- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da	2009-12-21 08:09:11.000000000 +1000
-+++ mesa-20091221/src/mesa/drivers/dri/Makefile.template	2009-12-21 08:43:40.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
- 
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
- 
- COMMON_GALLIUM_SOURCES = \
-         ../common/utils.c \
-@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
- 		$(TOP)/src/mesa/drivers/dri/Makefile.template
- 	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
-+		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
- 		$(DRI_LIB_DEPS)
- 
- 
-diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da	2009-12-21 08:09:11.000000000 +1000
-+++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S	2009-12-21 08:43:03.000000000 +1000
-@@ -77,7 +77,6 @@
-  */
- 
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- 	pushl	%ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
-  */
- 
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- 	pushl	%esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
- 
- 	.text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- 	pushl	%esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
- 
- 	.text
- 	.globl	_generic_read_RGBA_span_RGB565_MMX
--        .hidden _generic_read_RGBA_span_RGB565_MMX
- 	.type	_generic_read_RGBA_span_RGB565_MMX, @function
- 
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
deleted file mode 100644
index e73bfe7f0..000000000
--- a/x11/midori/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=midori
-pkgver=0.2.2
-pkgrel=0
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-license="GPL"
-depends="
-	desktop-file-utils
-	hicolor-icon-theme
-	"
-makedepends="
-	git
-	intltool
-	pkgconfig
-	python
-	gettext-dev
-	libidn-dev
-	libnotify-dev
-	libxml2-dev
-	webkit-dev
-	sqlite-dev
-	paxctl
-	"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://archive.xfce.org/src/apps/midori/${pkgver%.*}/midori-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--jobs=${MAKEFLAGS/-j/} \
-		--enable-libidn \
-		--enable-sqlite \
-		--enable-addons \
-		--disable-hildon \
-		--disable-unique \
-		--enable-nls \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	# PAX does not like the JIT
-	paxctl -c -m -p "$pkgdir"/usr/bin/midori
-}
-md5sums="14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2"
diff --git a/x11/midori/midori.post-deinstall b/x11/midori/midori.post-deinstall
deleted file mode 100644
index 00ebf0b31..000000000
--- a/x11/midori/midori.post-deinstall
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-
diff --git a/x11/midori/midori.post-install b/x11/midori/midori.post-install
deleted file mode 100644
index 9f24aeca9..000000000
--- a/x11/midori/midori.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
diff --git a/x11/midori/midori.post-upgrade b/x11/midori/midori.post-upgrade
deleted file mode 120000
index 41bc70a93..000000000
--- a/x11/midori/midori.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-midori.post-install
\ No newline at end of file
diff --git a/x11/mkfontdir/APKBUILD b/x11/mkfontdir/APKBUILD
deleted file mode 100644
index 5858f6a92..000000000
--- a/x11/mkfontdir/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mkfontdir
-pkgver=1.0.5
-pkgrel=0
-pkgdesc="create an index of X font files in a directory"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends="mkfontscale"
-makedepends="pkgconfig"
-install=
-triggers="$pkgname.trigger:/usr/share/fonts/*"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr 
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="9365ac66d19186eaf030482d312fca06  mkfontdir-1.0.5.tar.bz2"
diff --git a/x11/mkfontdir/mkfontdir.trigger b/x11/mkfontdir/mkfontdir.trigger
deleted file mode 100644
index 4fce36a11..000000000
--- a/x11/mkfontdir/mkfontdir.trigger
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
-	mkfontdir "$i"
-done
-
diff --git a/x11/mkfontscale/APKBUILD b/x11/mkfontscale/APKBUILD
deleted file mode 100644
index 283a98567..000000000
--- a/x11/mkfontscale/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mkfontscale
-pkgver=1.0.7
-pkgrel=0
-pkgdesc="X.org font scale"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libfontenc-dev freetype-dev xproto zlib-dev"
-install=
-triggers="$pkgname.trigger:/usr/share/fonts/*"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr 
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="96ca346f185c0ab48e42bf5bb0375da5  mkfontscale-1.0.7.tar.bz2"
diff --git a/x11/mkfontscale/mkfontscale.trigger b/x11/mkfontscale/mkfontscale.trigger
deleted file mode 100644
index 2357e06dc..000000000
--- a/x11/mkfontscale/mkfontscale.trigger
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
-	mkfontscale "$i"
-done
-
diff --git a/x11/mousepad/APKBUILD b/x11/mousepad/APKBUILD
deleted file mode 100644
index ad5524f1d..000000000
--- a/x11/mousepad/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mousepad
-pkgver=0.2.16
-pkgrel=0
-pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)"
-url="http://www.xfce.org/~benny/apps.html"
-license="GPL-2"
-makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev
-	libsm-dev e2fsprogs-dev expat-dev"
-depends="desktop-file-utils"
-install="mousepad.post-install mousepad.post-deinstall"
-source="http://www.xfce.org/archive/xfce-4.6.0/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d98854edb76d823ac20b266fdf5a64a1  mousepad-0.2.16.tar.bz2
-5ee3bbceee9d5e58b6fd8afeba87980b  mousepad.post-install
-5ee3bbceee9d5e58b6fd8afeba87980b  mousepad.post-deinstall"
diff --git a/x11/mousepad/mousepad.post-deinstall b/x11/mousepad/mousepad.post-deinstall
deleted file mode 120000
index 4e963a9a0..000000000
--- a/x11/mousepad/mousepad.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-mousepad.post-install
\ No newline at end of file
diff --git a/x11/mousepad/mousepad.post-install b/x11/mousepad/mousepad.post-install
deleted file mode 100644
index e20da06b3..000000000
--- a/x11/mousepad/mousepad.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
-
diff --git a/x11/mrxvt/APKBUILD b/x11/mrxvt/APKBUILD
deleted file mode 100644
index 3dba1c4c8..000000000
--- a/x11/mrxvt/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Mark Constable <markc@renta.net>
-# Maintainer: Mark Constable <markc@renta.net>
-pkgname=mrxvt
-pkgver=0.5.4
-pkgrel=0
-pkgdesc="A multi-tabbed X terminal emulator based on rxvt code"
-url="http://materm.sourceforge.net/wiki/pmwiki.php"
-license="GPL"
-makedepends="libpng-dev jpeg-dev libxft-dev libxpm-dev libx11-dev"
-subpackages="$pkgname-doc"
-source="
-	http://downloads.sourceforge.net/sourceforge/materm/$pkgname-$pkgver.tar.gz
-	mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
-	mrxvt.desktop
-	"
-
-build()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch || return 1
-	 ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-xft \
-		--enable-text-shadow \
-		--enable-transparency \
-		--enable-smart-resize \
-		--enable-menubar \
-		--disable-ourstrings \
-		--enable-linespace \
-		--enable-256colors \
-		--enable-xim \
-		--enable-thai \
-		--enable-greek \
-		--enable-cjk \
-		--enable-backspace-key \
-		--with-save-lines=2048 || return 1
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
-	install -Dm644 ../mrxvt.desktop $pkgdir/usr/share/applications/mrxvt.desktop
-
-}
-md5sums="0232c8868484751dcb931a28f0756f69  mrxvt-0.5.4.tar.gz
-e4a8bb2521246aba85f8dcaa01aed527  mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
-6ba3bcd484c8dad1b0b48465ded54de3  mrxvt.desktop"
diff --git a/x11/mrxvt/mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch b/x11/mrxvt/mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
deleted file mode 100644
index c9af740e5..000000000
--- a/x11/mrxvt/mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru a/src/tabbar.c b/src/tabbar.c
---- a/src/tabbar.c	2009-08-19 21:12:48.000000000 +0000
-+++ b/src/tabbar.c	2009-08-19 21:13:35.000000000 +0000
-@@ -1314,7 +1314,7 @@
- 		if( p.we_wordc > 1)
- 		    rxvt_msg( DBG_ERROR, DBG_TABBAR,
- 			    "Too many words when expanding %s\n", cwdOption );
--		else
-+               else if( NOT_NULL( *p.we_wordv ) )
- 		{
- 		    filename = *p.we_wordv;
- 
diff --git a/x11/mrxvt/mrxvt.desktop b/x11/mrxvt/mrxvt.desktop
deleted file mode 100644
index fc2173ddb..000000000
--- a/x11/mrxvt/mrxvt.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=mrxvt
-Comment=MultiTabbed rxvt Terminal
-Exec=mrxvt
-Icon=mrxvt
-Terminal=false
-Type=Application
-Categories=Application;TerminalEmulator;
-GenericName=Terminal
diff --git a/x11/orage/APKBUILD b/x11/orage/APKBUILD
deleted file mode 100644
index b310c80c6..000000000
--- a/x11/orage/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=orage
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="A simple calendar application with reminders for Xfce"
-url="http://www.xfce.org/projects/orage/"
-license="GPL-2"
-subpackages="$pkgname-doc"
-depends="hicolor-icon-theme"
-makedepends="pkgconfig xfce4-panel-dev libnotify-dev intltool gettext-dev
-	libiconv-dev libsm-dev expat-dev e2fsprogs-dev"
-install="orage.post-install orage.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="24fa43dd86ec5af5a4766620fd972cf2  orage-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  orage.post-install
-db51db79681eadc47be4932355a77c25  orage.post-deinstall"
diff --git a/x11/orage/orage.post-deinstall b/x11/orage/orage.post-deinstall
deleted file mode 120000
index eef6db267..000000000
--- a/x11/orage/orage.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-orage.post-install
\ No newline at end of file
diff --git a/x11/orage/orage.post-install b/x11/orage/orage.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/orage/orage.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/pango/APKBUILD b/x11/pango/APKBUILD
deleted file mode 100644
index b7687936f..000000000
--- a/x11/pango/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=pango
-pkgver=1.26.2
-pkgrel=0
-pkgdesc="A library for layout and rendering of text"
-url="http://www.pango.org/"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig glib-dev cairo-dev libxft-dev gettext-dev libiconv-dev
-	expat-dev"
-install="pango.post-install $pkgname.pre-deinstall"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev freetype-dev fontconfig-dev libxft-dev"
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="f30212b8833af3ce5c82121dc309e3d0  pango-1.26.2.tar.bz2"
diff --git a/x11/pango/pango.post-install b/x11/pango/pango.post-install
deleted file mode 100644
index 15a6090db..000000000
--- a/x11/pango/pango.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pango-querymodules > /etc/pango/pango.modules
diff --git a/x11/pango/pango.pre-deinstall b/x11/pango/pango.pre-deinstall
deleted file mode 100644
index 92127b59d..000000000
--- a/x11/pango/pango.pre-deinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rm -f /etc/pango/pango.modules
diff --git a/x11/parole/APKBUILD b/x11/parole/APKBUILD
deleted file mode 100644
index e5db914d7..000000000
--- a/x11/parole/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=parole
-pkgver=0.2.0.1
-pkgrel=0
-pkgdesc="Media player for the Xfce desktop"
-url="http://goodies.xfce.org/projects/applications/parole/"
-license="GPL"
-depends=""
-makedepends="libxfcegui4-dev libxfce4util-dev intltool gstreamer-dev bash
-	gst-plugins-base-dev libsm-dev taglib-dev libnotify-dev"
-install=
-subpackages="$pkgname-dev"
-source="http://archive.xfce.org/src/apps/parole/0.2/parole-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--enable-browser-plugin \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="0c0dd481506e99fa4f28c69a93585322  parole-0.2.0.1.tar.bz2"
diff --git a/x11/pixman/APKBUILD b/x11/pixman/APKBUILD
deleted file mode 100644
index 7177427cb..000000000
--- a/x11/pixman/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=pixman
-pkgver=0.16.4
-pkgrel=0
-pkgdesc="Pixman library"
-url="http://xorg.freedesktop.org"
-license="custom"
-subpackages="$pkgname-dev"
-depends=
-makedepends="perl"
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="70c249a575ed02b7a5daa1bc9f9c6a4e  pixman-0.16.4.tar.bz2"
diff --git a/x11/poppler-gtk/APKBUILD b/x11/poppler-gtk/APKBUILD
deleted file mode 100644
index 7207f8393..000000000
--- a/x11/poppler-gtk/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-# this aport only includes glib/gtk support in order to break the
-# circular make dependency: gtk <- cups <- poppler <- gtk
-pkgname=poppler-gtk
-_realname=poppler
-pkgver=0.12.0
-pkgrel=1
-pkgdesc="PDF rendering library based on xpdf 3.0"
-url="http://poppler.freedesktop.org/"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig
-	glib-dev gtk+-dev poppler-dev"
-depends=
-replaces="poppler-glib"
-depends_dev="cairo-dev glib-dev gtk+-dev poppler-dev"
-source="http://poppler.freedesktop.org/poppler-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$_realname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-cairo-output \
-		--enable-xpdf-headers \
-		--enable-libjpeg \
-		--enable-zlib \
-		--enable-poppler-glib \
-		--enable-gdk \
-		--disable-poppler-qt4 \
-		--disable-poppler-qt \
-		--disable-utils \
-		|| return 1
-	make || return 1
-	install -D -m644 poppler-glib.pc "$pkgdir"/usr/lib/pkgconfig/poppler-glib.pc
-	cd glib
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="399b25d9d71ad22bc9a2a9281769c49c  poppler-0.12.0.tar.gz"
diff --git a/x11/poppler/APKBUILD b/x11/poppler/APKBUILD
deleted file mode 100644
index b93a93105..000000000
--- a/x11/poppler/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-# this aport does not include glib/gtk support in order to break the
-# circular make dependency: gtk <- cups <- poppler <- gtk
-# So we build gtk support in poppler-gtk
-pkgname=poppler
-pkgver=0.12.3
-pkgrel=0
-pkgdesc="PDF rendering library based on xpdf 3.0"
-url="http://poppler.freedesktop.org/"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig"
-depends=
-depends_dev="cairo-dev"
-source="http://$pkgname.freedesktop.org/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-cairo-output \
-		--enable-xpdf-headers \
-		--enable-libjpeg \
-		--enable-zlib \
-		--disable-poppler-glib \
-		--disable-gdk \
-		--disable-poppler-qt4 \
-		--disable-poppler-qt \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-utils() {
-	pkgdesc="Poppler's xpdf-workalike command line utilities"
-	install -d "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-md5sums="d0ca8344d8d94e27aaba6d432688365d  poppler-0.12.3.tar.gz"
diff --git a/x11/randrproto/APKBUILD b/x11/randrproto/APKBUILD
deleted file mode 100644
index 124c78db9..000000000
--- a/x11/randrproto/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=randrproto
-pkgver=1.3.1
-pkgrel=0
-pkgdesc="X11 RandR extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -d -m755 "$pkgdir"/usr/share/licenses/$pkgname
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2"
diff --git a/x11/rarian/APKBUILD b/x11/rarian/APKBUILD
deleted file mode 100644
index 764954490..000000000
--- a/x11/rarian/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=rarian
-pkgver=0.8.1
-pkgrel=1
-pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
-url="http://rarian.freedesktop.org/"
-license="GPL"
-subpackages="$pkgname-dev"
-depends="bash"
-makedepends="libxslt-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
-	user-segfault.patch"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p0 -i "$srcdir"/user-segfault.patch || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-scrollkeeper-compat \
-		--disable-static || return 1
-	make || return 1
-	make -j1 DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="75091185e13da67a0ff4279de1757b94  rarian-0.8.1.tar.bz2
-457e9827197009cfa360911fe49a5ad7  user-segfault.patch"
diff --git a/x11/rarian/user-segfault.patch b/x11/rarian/user-segfault.patch
deleted file mode 100644
index 3311cecdd..000000000
--- a/x11/rarian/user-segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/rarian-sk-get-cl.cpp~	2008-07-28 19:23:28.000000000 +0200
-+++ util/rarian-sk-get-cl.cpp	2008-07-28 19:23:28.000000000 +0200
-@@ -160,6 +160,11 @@
- {
-   char *filename = NULL;
-   char *user = getenv ("USERNAME");
-+
-+  if (user == NULL) {
-+    user = getenv ("USER");
-+  }
-+
-   char *basepath = NULL;
-   int i=0;
-   int last = 0;
diff --git a/x11/rdesktop/APKBUILD b/x11/rdesktop/APKBUILD
deleted file mode 100644
index b705c0ffc..000000000
--- a/x11/rdesktop/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=rdesktop
-pkgver=1.6.0
-pkgrel=0
-pkgdesc="rdesktop is used to connect to windows terminal servers"
-url="http://www.rdesktop.org/"
-license="GPL"
-subpackages="$pkgname-doc"
-depends="libx11 openssl libao libsamplerate"
-makedepends="libx11-dev libao-dev openssl-dev libsamplerate-dev"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-sound=ao
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-md5sums="c6fcbed7f0ad7e60ac5fcb2d324d8b16  rdesktop-1.6.0.tar.gz"
diff --git a/x11/recordproto/APKBUILD b/x11/recordproto/APKBUILD
deleted file mode 100644
index dd638a596..000000000
--- a/x11/recordproto/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=recordproto
-pkgver=1.14
-pkgrel=0
-pkgdesc="X11 Record extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums="70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2"
diff --git a/x11/renderproto/APKBUILD b/x11/renderproto/APKBUILD
deleted file mode 100644
index 195a760cf..000000000
--- a/x11/renderproto/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=renderproto
-pkgver=0.11
-pkgrel=0
-pkgdesc="X11 Render extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-subpackages="$pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2"
diff --git a/x11/resourceproto/APKBUILD b/x11/resourceproto/APKBUILD
deleted file mode 100644
index b688ccd8c..000000000
--- a/x11/resourceproto/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=resourceproto
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="X11 Resource extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2"
diff --git a/x11/rgb/APKBUILD b/x11/rgb/APKBUILD
deleted file mode 100644
index 73bbd8233..000000000
--- a/x11/rgb/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=rgb
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org utility to display an rgb color-name database"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig xproto"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="44ea16cc3104de6401bc74035f642357  rgb-1.0.3.tar.bz2"
diff --git a/x11/ristretto/APKBUILD b/x11/ristretto/APKBUILD
deleted file mode 100644
index 4daa72593..000000000
--- a/x11/ristretto/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ristretto
-pkgver=0.0.22
-pkgrel=1
-pkgdesc="Ristretto is a image viewer for Xfce"
-url="http://goodies.xfce.org/projects/applications/ristretto"
-license="GPL-2"
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkgconfig libxfcegui4-dev dbus-glib-dev libexif-dev intltool
-	gettext-dev libiconv-dev thunar-dev"
-install=
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-xfce-desktop \
-		--disable-static || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="978ae19472c5a0b7d4b6622a68234a67  ristretto-0.0.22.tar.gz"
diff --git a/x11/scrnsaverproto/APKBUILD b/x11/scrnsaverproto/APKBUILD
deleted file mode 100644
index 292827d0c..000000000
--- a/x11/scrnsaverproto/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=scrnsaverproto
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="X11 Screen Saver extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ || return 1
-}
-md5sums="9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2"
diff --git a/x11/scrot/APKBUILD b/x11/scrot/APKBUILD
deleted file mode 100644
index ee98edd62..000000000
--- a/x11/scrot/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=scrot
-pkgver=0.8
-pkgrel=3
-pkgdesc="A simple command-line screenshot utility for X"
-url="http://linuxbrit.co.uk/scrot/"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="giblib-dev imlib2-dev libx11-dev"
-source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" docsdir=/usr/share/doc/scrot install || return 1
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums="ccae904d225609571bdd3b03445c1e88  scrot-0.8.tar.gz"
diff --git a/x11/sdl/APKBUILD b/x11/sdl/APKBUILD
deleted file mode 100644
index e81c80644..000000000
--- a/x11/sdl/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=0
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-url="http://www.libsdl.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-depends_dev="libx11-dev libiconv-dev"
-makedepends="libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev 
-	libxrandr-dev mesa-dev alsa-lib-dev libiconv-dev"
-source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/SDL-$pkgver
-	./configure --prefix=/usr \
-		--disable-nasm \
-		--disable-esd \
-		--enable-alsa \
-		--with-x \
-		--disable-rpath \
-		--disable-nls 
-	make
-}
-
-package() {
-	cd "$srcdir"/SDL-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz"
diff --git a/x11/sessreg/APKBUILD b/x11/sessreg/APKBUILD
deleted file mode 100644
index 4e1cba4e0..000000000
--- a/x11/sessreg/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sessreg
-pkgver=1.0.5
-pkgrel=0
-pkgdesc="manage utmp/wtmp entries for non-init clients"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig xproto"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2"
diff --git a/x11/setxkbmap/APKBUILD b/x11/setxkbmap/APKBUILD
deleted file mode 100644
index 2b8eb19b6..000000000
--- a/x11/setxkbmap/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=setxkbmap
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="set the keyboard using the X Keyboard Extension"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libxkbfile-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR=""$pkgdir"" install || return 1
-}
-md5sums="2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2"
diff --git a/x11/shared-mime-info/APKBUILD b/x11/shared-mime-info/APKBUILD
deleted file mode 100644
index 551093e2e..000000000
--- a/x11/shared-mime-info/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=shared-mime-info
-pkgver=0.70
-pkgrel=0
-pkgdesc="Freedesktop.org Shared MIME Info"
-url="http://freedesktop.org/Software/shared-mime-info"
-license="GPL"
-makedepends="libxml2-dev glib-dev intltool"
-depends=
-install="$pkgname.post-deinstall"
-triggers="$pkgname.trigger:/usr/share/mime"
-subpackages="$pkgname-doc"
-source="http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-update-mimedb || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-md5sums="9032d98f14b8e13e0fea4bf45ca23401  shared-mime-info-0.70.tar.bz2"
diff --git a/x11/shared-mime-info/shared-mime-info.post-deinstall b/x11/shared-mime-info/shared-mime-info.post-deinstall
deleted file mode 100644
index afb88818c..000000000
--- a/x11/shared-mime-info/shared-mime-info.post-deinstall
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-[ -d usr/share/mime ] || exit 0
-
-cd /usr/share/mime
-rm -rf globs globs2 icons treemagic generic-icons types magic XMLnamespaces \
-	subclasses aliases mime.cache \
-	application audio image inode message model multipart text video \
-	x-content x-epoc
-rmdir packages
-cd /
-rmdir usr/share/mime 2>/dev/null
-
-exit 0
diff --git a/x11/shared-mime-info/shared-mime-info.trigger b/x11/shared-mime-info/shared-mime-info.trigger
deleted file mode 100644
index 51a3e4953..000000000
--- a/x11/shared-mime-info/shared-mime-info.trigger
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
-	if [ -d "$i" ]; then
-		update-mime-database "$i" > /dev/null 2>&1
-	fi
-done
diff --git a/x11/slim-themes/APKBUILD b/x11/slim-themes/APKBUILD
deleted file mode 100644
index 450ebbecd..000000000
--- a/x11/slim-themes/APKBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=slim-themes
-pkgver=1.2.3
-pkgrel=1
-pkgdesc="Themes Pack for Simple Login Manager"
-url="http://slim.berlios.de"
-license="GPL"
-depends="slim"
-makedepends=""
-options="!strip"
-source="http://download.berlios.de/slim/slim-$pkgver-themepack1a.tar.gz
-	http://download.berlios.de/slim/slim-lake.tar.gz
-	http://download.berlios.de/slim/slim-fingerprint.tar.gz
-	http://download.berlios.de/slim/slim-flat.tar.gz
-	http://download.berlios.de/slim/slim-lunar-0.4.tar.bz2
-	http://download.berlios.de/slim/slim-previous.tar.gz
-	http://download.berlios.de/slim/slim-rainbow.tar.gz
-	http://download.berlios.de/slim/slim-rear-window.tar.gz
-	http://download.berlios.de/slim/slim-scotland-road.tar.gz
-	http://download.berlios.de/slim/slim-subway.tar.gz
-	http://download.berlios.de/slim/slim-wave.tar.gz
-	http://download.berlios.de/slim/slim-zenwalk.tar.gz
-	http://download.berlios.de/slim/slim-debian-moreblue.tar.bz2
-	http://download.berlios.de/slim/slim-1.3.1.tar.gz"
-
-build ()
-{
-	mkdir -p "$pkgdir"/usr/share/slim/themes
-	cd "$srcdir"/
-	mv fingerprint "$pkgdir"/usr/share/slim/themes
-	mv flat "$pkgdir"/usr/share/slim/themes
-	mv previous "$pkgdir"/usr/share/slim/themes
-	mv lake "$pkgdir"/usr/share/slim/themes
-	mv rainbow "$pkgdir"/usr/share/slim/themes
-	mv rear-window "$pkgdir"/usr/share/slim/themes
-	mv scotland-road "$pkgdir"/usr/share/slim/themes
-	mv subway "$pkgdir"/usr/share/slim/themes
-	mv wave "$pkgdir"/usr/share/slim/themes
-	mv slim-lunar-0.4 "$pkgdir"/usr/share/slim/themes/lunar
-	mv Zenwalk "$pkgdir"/usr/share/slim/themes/zenwalk
-	mv parallel-dimensions "$pkgdir"/usr/share/slim/themes
-	mv capernoited "$pkgdir"/usr/share/slim/themes
-	mv mindlock "$pkgdir"/usr/share/slim/themes
-	mv flower2 "$pkgdir"/usr/share/slim/themes
-	mv debian-moreblue "$pkgdir"/usr/share/slim/themes
-	mv slim-1.3.1/themes/default "$pkgdir"/usr/share/slim/themes
-	cd "$pkgdir"/usr/share/slim/themes
-	find . -type f -exec chmod 644 {} \;
-}
-
-md5sums="fd1295d3a260849790dc17081da4a34f  slim-1.2.3-themepack1a.tar.gz
-c0cef9e7b95bdf2df3fb303d155f8476  slim-lake.tar.gz
-2981627a5822a535f3ebd0e21dba9f76  slim-fingerprint.tar.gz
-34696aef39fad7092c80ccf7a38886a5  slim-flat.tar.gz
-6fe38013c6eed67dead507616667ae9a  slim-lunar-0.4.tar.bz2
-6e846e8adafa70a7bd0e22d5bd06dc5f  slim-previous.tar.gz
-631a00eb27c09b0daa50b88bd9606d07  slim-rainbow.tar.gz
-337876e05b2bdf4bd657d114464ad46a  slim-rear-window.tar.gz
-fde18fb892bccc383c93fb7ed07fbe84  slim-scotland-road.tar.gz
-8417022e369be012f1b7a4ee04edf0f9  slim-subway.tar.gz
-c727aab888dde774acc04403c84b5b3b  slim-wave.tar.gz
-7a0bd7a0736794e638668769b9c4c745  slim-zenwalk.tar.gz
-5f3818e01b0593d0e576fcd7e2c6bafa  slim-debian-moreblue.tar.bz2
-727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz"
diff --git a/x11/slim/APKBUILD b/x11/slim/APKBUILD
deleted file mode 100644
index c0e0a22f6..000000000
--- a/x11/slim/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=slim
-pkgver=1.3.1
-pkgrel=3
-pkgdesc="Desktop-independent graphical login manager for X11"
-url="http://slim.berlios.de/"
-license="GPL-2"
-subpackages="$pkgname-doc"
-makedepends="libxmu-dev libpng-dev jpeg-dev libxft-dev"
-depends=
-install=
-source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
-	http://dev.alpinelinux.org/~/ncopa/alpine/slim-alpinelinux.tar.gz
-	$pkgname.logrotate
-	$pkgname.initd
-	slim-1.3.1-gcc4.4.patch
-	slim-restart.patch"
-
-prepare() {
-	cd "$srcdir/slim-$pkgver"
-	for i in ../*.patch; do
-		patch -p1 -i $i || return 1
-	done
-	sed -i -e 's|#xserver_arguments.*|xserver_arguments   -nolisten tcp vt07|'\
-		-e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
-		-e 's|halt_cmd.*|halt_cmd            /sbin/poweroff|'\
-		-e 's|reboot_cmd.*|reboot_cmd          /sbin/reboot|'\
-		-e 's|console_cmd.*|console_cmd         /usr/bin/terminal|'\
-		-e 's|login_cmd.*|login_cmd           exec /bin/sh -l /etc/X11/xinit/xinitrc|' \
-		-e 's|screenshot_cmd.*|screenshot_cmd      scrot /slim.png|' \
-		-e 's|imagemagick|scrot|' \
-		-e 's|current_theme.*|current_theme       alpinelinux|' \
-		slim.conf || return 1
-}
-
-build() {
-	cd "$srcdir/slim-$pkgver"
-	make CXX="${CXX:-g++}" CC="${CC:-gcc}" || return 1
-}
-
-package() {
-	cd "$srcdir/slim-$pkgver"
-	make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1
-
-	install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim || return 1
-	install -D -m644 ../slim.logrotate "$pkgdir"/etc/logrotate.d/slim
-
-	# install our default theme
-	cd "$srcdir"/slim-alpinelinux
-	install -d "$pkgdir"/usr/share/slim/themes/alpinelinux
-	cp background.png panel.png slim.theme \
-		"$pkgdir"/usr/share/slim/themes/alpinelinux/
-	rm -rf "$pkgdir"/usr/share/slim/themes/default
-}
-
-md5sums="727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz
-cd63232c7770b0e67a009a94c2a46b82  slim-alpinelinux.tar.gz
-43da096480bf72c3ccec8ad8400f34f0  slim.logrotate
-6ee3a023e56052528295034be809cfc6  slim.initd
-a00df4316e2392fff7e75daf5c826cae  slim-1.3.1-gcc4.4.patch
-648d871fe7d2a97b7d7b928019e2feee  slim-restart.patch"
diff --git a/x11/slim/slim-1.3.1-gcc4.4.patch b/x11/slim/slim-1.3.1-gcc4.4.patch
deleted file mode 100644
index 5708d7071..000000000
--- a/x11/slim/slim-1.3.1-gcc4.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch to allow compilation with gcc-4.4
-
-Notified by Daniel J. - from Debian bug tracker
-
-http://bugs.gentoo.org/252745
-
---- a/switchuser.h	2008-11-11 19:40:18.000000000 +0000
-+++ b/switchuser.h	2008-11-11 19:40:28.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <paths.h>
-+#include <cstdio>
- #include <iostream>
- #include "const.h"
- #include "cfg.h"
-
diff --git a/x11/slim/slim-restart.patch b/x11/slim/slim-restart.patch
deleted file mode 100644
index 1f9c02dff..000000000
--- a/x11/slim/slim-restart.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -ur slim-1.3.1.orig/app.cpp slim-1.3.1/app.cpp
---- slim-1.3.1.orig/app.cpp	2008-09-26 02:54:15.000000000 +0200
-+++ slim-1.3.1/app.cpp	2008-11-21 20:38:48.000000000 +0100
-@@ -102,6 +102,11 @@
- 
- extern App* LoginApp;
- 
-+int xioerror(Display *disp) {
-+	LoginApp->RestartServer();
-+    return 0;
-+}
-+
- void CatchSignal(int sig) {
-     cerr << APPNAME << ": unexpected signal " << sig << endl;
-     LoginApp->StopServer();
-@@ -109,19 +114,6 @@
-     exit(ERR_EXIT);
- }
- 
--
--void AlarmSignal(int sig) {
--    int pid = LoginApp->GetServerPID();
--    if(waitpid(pid, NULL, WNOHANG) == pid) {
--        LoginApp->StopServer();
--        LoginApp->RemoveLock();
--        exit(OK_EXIT);
--    }
--    signal(sig, AlarmSignal);
--    alarm(2);
--}
--
--
- void User1Signal(int sig) {
-     signal(sig, User1Signal);
- }
-@@ -267,7 +259,6 @@
-         signal(SIGHUP, CatchSignal);
-         signal(SIGPIPE, CatchSignal);
-         signal(SIGUSR1, User1Signal);
--        signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
-         OpenLog();
-@@ -287,7 +278,6 @@
- 
-         CreateServerAuth();
-         StartServer();
--        alarm(2);
- #endif
- 
-     }
-@@ -603,6 +593,8 @@
-     int status;
-     while (wpid != pid) {
-         wpid = wait(&status);
-+		if (wpid == ServerPID)
-+			xioerror(Dpy);	// Server died, simulate IO error
-     }
-     if (WIFEXITED(status) && WEXITSTATUS(status)) {
-         LoginPanel->Message("Failed to execute login command");
-@@ -648,9 +640,6 @@
- 
- 
- void App::Reboot() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -673,9 +662,6 @@
- 
- 
- void App::Halt() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -761,6 +747,7 @@
- 
-     StopServer(); 
-     RemoveLock();
-+	while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
-     Run();
- } 
- 
-@@ -831,6 +818,7 @@
- 
-     for(cycles = 0; cycles < ncycles; cycles++) {
-         if((Dpy = XOpenDisplay(DisplayName))) {
-+            XSetIOErrorHandler(xioerror);
-             return 1;
-         } else {
-             if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
-@@ -913,9 +901,6 @@
-             ServerPID = -1;
-             break;
-         }
--        alarm(15);
--        pause();
--        alarm(0);
- 
-         // Wait for server to start up
-         if(WaitForServer() == 0) {
-@@ -948,15 +933,12 @@
- 
- 
- void App::StopServer() {
--    // Stop alars clock and ignore signals
--    alarm(0);
-     signal(SIGQUIT, SIG_IGN);
-     signal(SIGINT, SIG_IGN);
-     signal(SIGHUP, SIG_IGN);
-     signal(SIGPIPE, SIG_IGN);
-     signal(SIGTERM, SIG_DFL);
-     signal(SIGKILL, SIG_DFL);
--    signal(SIGALRM, SIG_DFL);
- 
-     // Catch X error
-     XSetIOErrorHandler(IgnoreXIO);
-diff -ur slim-1.3.1.orig/app.h slim-1.3.1/app.h
---- slim-1.3.1.orig/app.h	2008-09-26 02:54:15.000000000 +0200
-+++ slim-1.3.1/app.h	2008-11-21 20:38:48.000000000 +0100
-@@ -34,6 +34,7 @@
-     ~App();
-     void Run();
-     int GetServerPID();
-+    void RestartServer();
-     void StopServer();
- 
-     // Lock functions
-@@ -48,7 +49,6 @@
-     void Console();
-     void Exit();
-     void KillAllClients(Bool top);
--    void RestartServer();
-     void ReadConfig();
-     void OpenLog();
-     void CloseLog();
diff --git a/x11/slim/slim.initd b/x11/slim/slim.initd
deleted file mode 100755
index 4ab113b6b..000000000
--- a/x11/slim/slim.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-
-depends() {
-	needs localmount
-}
-
-start() {
-	ebegin "Starting slim"
-	start-stop-daemon --start --quiet --exec /usr/bin/slim -- -d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping slim"
-	start-stop-daemon --stop --quiet --exec /usr/bin/slim
-	eend $?
-}
-
diff --git a/x11/slim/slim.install b/x11/slim/slim.install
deleted file mode 100644
index 45eb02fa1..000000000
--- a/x11/slim/slim.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat << _EOF
-
-  Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-_EOF
-}
diff --git a/x11/slim/slim.logrotate b/x11/slim/slim.logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/x11/slim/slim.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/x11/sox/APKBUILD b/x11/sox/APKBUILD
deleted file mode 100644
index 166d08b25..000000000
--- a/x11/sox/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sox
-pkgver=14.3.0
-pkgrel=0
-pkgdesc="The Swiss Army knife of sound processing tools"
-url="http://sox.sourceforge.net/"
-license="GPL LGPL"
-makedepends="ffmpeg-dev libao-dev libvorbis-dev libogg-dev lame-dev 
-	libmad-dev bash alsa-lib-dev libsndfile-dev libsamplerate-dev
-	libtool file-dev libid3tag-dev"
-depends=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	sox-uclibc.patch"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i ../sox-uclibc.patch
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--with-dyn-default \
-		--with-distro="Alpine Linux" || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	ln -sf play "$pkgdir"/usr/bin/rec || return 1
-	ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7
-}
-md5sums="8e3509804e6227273ef84092e1a2fea7  sox-14.3.0.tar.gz
-d8267f718ba6b4fb2f48c5104af31364  sox-uclibc.patch"
diff --git a/x11/sox/sox-uclibc.patch b/x11/sox/sox-uclibc.patch
deleted file mode 100644
index fb78cd096..000000000
--- a/x11/sox/sox-uclibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/formats.c b/src/formats.c
-index 556f611..6c2c5b0 100644
---- a/src/formats.c
-+++ b/src/formats.c
-@@ -395,7 +395,7 @@ static void UNUSED rewind_pipe(FILE * fp)
- #if defined _NEWLIB_VERSION || defined __APPLE__
-   fp->_p -= AUTO_DETECT_SIZE;
-   fp->_r += AUTO_DETECT_SIZE;
--#elif defined __GLIBC__
-+#elif defined __GLIBC__ && ! defined __UCLIBC__
-   fp->_IO_read_ptr = fp->_IO_read_base;
- #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H
-   fp->_ptr = fp->_base;
-@@ -403,7 +403,7 @@ static void UNUSED rewind_pipe(FILE * fp)
-   /* To fix this #error, either simply remove the #error line and live without
-    * file-type detection with pipes, or add support for your compiler in the
-    * lines above.  Test with cat monkey.au | ./sox --info - */
--  #error FIX NEEDED HERE
-+/*  #error FIX NEEDED HERE */
-   #define NO_REWIND_PIPE
-   (void)fp;
- #endif
diff --git a/x11/startup-notification/APKBUILD b/x11/startup-notification/APKBUILD
deleted file mode 100644
index 34f81011e..000000000
--- a/x11/startup-notification/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=startup-notification
-pkgver=0.10
-pkgrel=0
-pkgdesc="Monitor and display application startup"
-url="http://www.freedesktop.org"
-license="LGPL"
-subpackages="$pkgname-dev"
-depends="libx11 libsm xcb-util"
-makedepends="libx11-dev libsm-dev xcb-util-dev"
-source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="bca0ed1c74bc4e483ea2ed12a5717354  startup-notification-0.10.tar.gz"
diff --git a/x11/swfdec-mozilla/APKBUILD b/x11/swfdec-mozilla/APKBUILD
deleted file mode 100644
index b2409e8da..000000000
--- a/x11/swfdec-mozilla/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=swfdec-mozilla
-pkgver=0.8.2
-pkgrel=0
-pkgdesc="free plugin for Mozilla browsers that uses the Swfdec library for playing SWF files"
-url="http://swfdec.freedesktop.org"
-license="LGPL"
-makedepends="swfdec-dev"
-depends=
-source="http://swfdec.freedesktop.org/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static \
-		--with-plugin-dir=/usr/lib/mozilla/plugins/
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="716632e0d35b3c1582c180569ba30346  swfdec-mozilla-0.8.2.tar.gz"
diff --git a/x11/swfdec/APKBUILD b/x11/swfdec/APKBUILD
deleted file mode 100644
index 3225d0a46..000000000
--- a/x11/swfdec/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=swfdec
-pkgver=0.8.4
-pkgrel=1
-pkgdesc="free library for decoding and rendering Flash animations"
-url="http://swfdec.freedesktop.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="alsa-lib-dev liboil-dev gtk+-dev libsoup-dev gstreamer-dev
-	gst-plugins-base-dev"
-depends=
-depends_dev="glib-dev liboil-dev cairo-dev pango-dev gtk+-dev libsoup-dev
-	gstreamer-dev gst-plugins-base-dev alsa-lib-dev"
-source="http://$pkgname.freedesktop.org/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static \
-		--enable-gtk \
-		--enable-gstreamer \
-		--enable-soup \
-		--with-audio=alsa
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="aece501d0e73f3e564200a44ec03c385  swfdec-0.8.4.tar.gz"
diff --git a/x11/sylpheed/APKBUILD b/x11/sylpheed/APKBUILD
deleted file mode 100644
index f0fe701c2..000000000
--- a/x11/sylpheed/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sylpheed
-pkgver=2.7.1
-pkgrel=2
-pkgdesc="Lightweight and user-friendly e-mail client"
-url="http://sylpheed.sraoss.jp/en/"
-license="GPL"
-depends=
-makedepends="gtk+-dev openldap-dev openssl-dev"
-subpackages="$pkgname-dev"
-source="http://$pkgname.sraoss.jp/$pkgname/v2.7/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir/sylpheed-$pkgver"
-	./configure --prefix=/usr \
-		--enable-ldap \
-		--disable-gtkspell || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir/sylpheed-$pkgver"
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1f470525c1fbe53253813a0978c18228  sylpheed-2.7.1.tar.bz2"
diff --git a/x11/tango-icon-theme/APKBUILD b/x11/tango-icon-theme/APKBUILD
deleted file mode 100644
index 9c5e9f77b..000000000
--- a/x11/tango-icon-theme/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=tango-icon-theme
-pkgver=0.8.1
-pkgrel=0
-pkgdesc="The Tango Desktop Project exists to create a consistent user experience"
-url="http://tango.freedesktop.org"
-license="CCPL-Attribution-ShareAlike-2.5"
-depends=  #"librsvg"
-makedepends="pkgconfig intltool icon-naming-utils imagemagick-dev libiconv-dev"
-source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr 
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="32d5258f448b5982af9cfa4364f31d41  tango-icon-theme-0.8.1.tar.gz"
diff --git a/x11/terminal/APKBUILD b/x11/terminal/APKBUILD
deleted file mode 100644
index baae13eb5..000000000
--- a/x11/terminal/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=terminal
-pkgver=0.4.3
-pkgrel=0
-pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-url="http://www.xfce.org/projects/terminal/"
-license="GPL-2"
-subpackages="$pkgname-doc"
-depends="startup-notification hicolor-icon-theme"
-makedepends="pkgconfig exo-dev vte-dev dbus-glib-dev gettext-dev libiconv-dev
-	intltool"
-install=
-source="http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2
-	"
-
-build() {
-	cd "$srcdir"/Terminal-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/Terminal-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="0ce66b16bcb7ff274d7f93a69993f717  Terminal-0.4.3.tar.bz2"
diff --git a/x11/terminal/terminal-dont-die-on-dbus-kill.patch b/x11/terminal/terminal-dont-die-on-dbus-kill.patch
deleted file mode 100644
index 3b0da1709..000000000
--- a/x11/terminal/terminal-dont-die-on-dbus-kill.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/terminal/terminal-dbus.c.orig	2007-01-23 22:25:12.000000000 +0000
-+++ b/terminal/terminal-dbus.c	2007-01-23 22:25:50.000000000 +0000
-@@ -191,6 +191,7 @@ terminal_dbus_register_service (Terminal
- 
-   /* register DBus connection with GLib main loop */
-   dbus_connection_setup_with_g_main (connection, NULL);
-+  dbus_connection_set_exit_on_disconnect (connection, FALSE);
- 
-   if (dbus_bus_request_name (connection, TERMINAL_DBUS_SERVICE, 0, &derror) < 0)
-     {
diff --git a/x11/thunar-archive-plugin/APKBUILD b/x11/thunar-archive-plugin/APKBUILD
deleted file mode 100644
index 87162bbf0..000000000
--- a/x11/thunar-archive-plugin/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=thunar-archive-plugin
-pkgver=0.2.4
-pkgrel=0
-pkgdesc="create and deflate archives in thunar"
-url="http://xfce-goodies.berlios.de/"
-license="GPL2"
-depends=
-makedepends="gtk+-dev intltool thunar-dev"
-install=
-source="http://download.berlios.de/xfce-goodies/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	# dont want file-roller
-	rm -f "$pkgdir"/usr/lib/xfce4/thunar-archive-plugin/file-roller.tap
-}
-md5sums="4c389e6328af9322937af76382f0baec  thunar-archive-plugin-0.2.4.tar.bz2"
diff --git a/x11/thunar/APKBUILD b/x11/thunar/APKBUILD
deleted file mode 100644
index 2dde6a57f..000000000
--- a/x11/thunar/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=thunar
-pkgver=1.0.1
-pkgrel=4
-pkgdesc="File manager for Xfce"
-url="http://thunar.xfce.org"
-license="GPL2 LGPL2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkgconfig libexif-dev xfce4-panel-dev exo-dev pcre-dev
-	intltool gettext-dev libiconv-dev expat-dev startup-notification-dev
-	libsm-dev e2fsprogs-dev gamin-dev libexif-dev"
-install=
-source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2"
-
-depends_dev="exo-dev glib-dev gamin-dev"
-_builddir="$srcdir"/Thunar-$pkgver
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-gnome-thumbnailers \
-		--enable-exif \
-		--enable-pcre
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop
-}
-
-md5sums="218373aa45d74b6ba8c69c4d5af3bb19  Thunar-1.0.1.tar.bz2"
diff --git a/x11/thunar/thunar.post-deinstall b/x11/thunar/thunar.post-deinstall
deleted file mode 120000
index b2d507f24..000000000
--- a/x11/thunar/thunar.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-thunar.post-install
\ No newline at end of file
diff --git a/x11/thunar/thunar.post-install b/x11/thunar/thunar.post-install
deleted file mode 100644
index 591dfaf72..000000000
--- a/x11/thunar/thunar.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/thunar/thunar.post-upgrade b/x11/thunar/thunar.post-upgrade
deleted file mode 120000
index b2d507f24..000000000
--- a/x11/thunar/thunar.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-thunar.post-install
\ No newline at end of file
diff --git a/x11/transmission/APKBUILD b/x11/transmission/APKBUILD
deleted file mode 100644
index 7bd64c5ef..000000000
--- a/x11/transmission/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer:Carlo Landmeter
-pkgname=transmission
-pkgver=1.74
-pkgel=1
-pkgdesc="Lightweight GTK BitTorrent client"
-url="http://www.tansmissionbt.com"
-install="$pkgname.pre-install"
-license="MIT"
-depends=
-makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool"
-source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-	transmission-daemon.initd
-	transmission-daemon.confd
-	"
-subpackages="$pkgname-cli $pkgname-daemon $pkgname-doc"
-
-build() {
-        cd "$srcdir/$pkgname-$pkgver"
-
-        ./configure --prefix=/usr \
-		--mandir=/usr/share/man 
-        make || return 1
-        make DESTDIR="$pkgdir" install
-}
-
-daemon() {
-	pkgdesc="Lightweight BitTorrent client (daemon and webinterface)"
-	install -d "$subpkgdir"/usr/share "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/transmission-daemon "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/share/transmission "$subpkgdir"/usr/share/
-        install -D -m755 "$srcdir"/transmission-daemon.initd \
-		"$pkgdir"/etc/init.d/transmission-daemon
-        install -D -m644 "$srcdir"/transmission-daemon.confd \
-		"$pkgdir"/etc/conf.d/transmission-daemon
-}
-
-cli() {
-	pkgdesc="Lightweight BitTorrent client (cli  and remote)"
-	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/transmission-remote \
-		"$pkgdir"/usr/bin/transmissioncli \
-		"$subpkgdir"/usr/bin/
-}
-
-md5sums="6b1080800c62308179cfc7a691c82d63  transmission-1.74.tar.bz2
-f65b8ae46f8ac89b35844109b3aa0c18  transmission-daemon.initd
-89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/x11/transmission/transmission-daemon.confd b/x11/transmission/transmission-daemon.confd
deleted file mode 100644
index c1f338f07..000000000
--- a/x11/transmission/transmission-daemon.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# transmission-daemon options
-#
-# -a --acl          <list>      Access Control List.  (Default: +127.0.0.1)
-# -b --blocklist                Enable peer blocklists
-# -B --no-blocklist             Disable peer blocklists
-# -f --foreground               Run in the foreground instead of daemonizing
-# -g --config-dir   <path>      Where to look for configuration files
-# -p --port         <port>      RPC port (Default: 9091)
-# -t --auth                     Require authentication
-# -T --no-auth                  Don't require authentication
-# -u --username     <username>  Set username for authentication
-# -v --password     <password>  Set password for authentication
-# -w --download-dir <path>      Where to save downloaded data
-#
-# NOTE: webif does not work without the -f switch
-#
-TD_OPTS="-f -g /var/lib/transmission/.config -w /var/lib/transmission"
diff --git a/x11/transmission/transmission-daemon.initd b/x11/transmission/transmission-daemon.initd
deleted file mode 100644
index ecf3bdafe..000000000
--- a/x11/transmission/transmission-daemon.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-        need net
-	after firewall
-}
-
-start() {
-        ebegin "Starting transmission-daemon"
-                start-stop-daemon --start --quiet --background --make-pidfile \
-                --chuid transmission:transmission \
-                --pidfile /var/run/transmission-daemon.pid \
-                --exec /usr/bin/transmission-daemon -- ${TD_OPTS}
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping transmission-daemon"
-                start-stop-daemon --stop --quiet \
-                --pidfile /var/run/transmission-daemon.pid \
-        eend $?
-}
diff --git a/x11/transmission/transmission.pre-install b/x11/transmission/transmission.pre-install
deleted file mode 100644
index 44a14760f..000000000
--- a/x11/transmission/transmission.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -h /var/lib/transmission -s /bin/false -D transmission 2>/dev/null
-
-exit 0
diff --git a/x11/ttf-dejavu/APKBUILD b/x11/ttf-dejavu/APKBUILD
deleted file mode 100644
index a03d07ff5..000000000
--- a/x11/ttf-dejavu/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ttf-dejavu
-pkgver=2.29
-pkgrel=0
-pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
-url="http://dejavu.sourceforge.net/"
-license="custom"
-depends="fontconfig encodings mkfontdir mkfontscale"
-makedepends=""
-makedepends="pkgconfig font-util-dev"
-install="ttf-dejavu.post-install ttf-dejavu.post-upgrade ttf-dejavu.post-deinstall"
-source="http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2
-	$install"
-
-
-build ()
-{
-	cd "$srcdir/dejavu-fonts-ttf-$pkgver"
-	mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1
-	install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1
-	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1
-}
-
-md5sums="d8feb7d57d8b7cbac409df435daa9849  dejavu-fonts-ttf-2.29.tar.bz2
-856423a62dc28d29f91586286173b1ef  ttf-dejavu.post-install
-856423a62dc28d29f91586286173b1ef  ttf-dejavu.post-upgrade
-856423a62dc28d29f91586286173b1ef  ttf-dejavu.post-deinstall"
diff --git a/x11/ttf-dejavu/ttf-dejavu.post-deinstall b/x11/ttf-dejavu/ttf-dejavu.post-deinstall
deleted file mode 120000
index 8d3da7cfd..000000000
--- a/x11/ttf-dejavu/ttf-dejavu.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-ttf-dejavu.post-install
\ No newline at end of file
diff --git a/x11/ttf-dejavu/ttf-dejavu.post-install b/x11/ttf-dejavu/ttf-dejavu.post-install
deleted file mode 100644
index 90aedc0b1..000000000
--- a/x11/ttf-dejavu/ttf-dejavu.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-fc-cache -fs
-mkfontscale usr/share/fonts/TTF
-mkfontdir usr/share/fonts/TTF
-
diff --git a/x11/ttf-dejavu/ttf-dejavu.post-upgrade b/x11/ttf-dejavu/ttf-dejavu.post-upgrade
deleted file mode 120000
index 8d3da7cfd..000000000
--- a/x11/ttf-dejavu/ttf-dejavu.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-ttf-dejavu.post-install
\ No newline at end of file
diff --git a/x11/util-macros/APKBUILD b/x11/util-macros/APKBUILD
deleted file mode 100644
index 6a0f09ce0..000000000
--- a/x11/util-macros/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=util-macros
-pkgver=1.2.1
-pkgrel=0
-pkgdesc="X.Org Autotools macros"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/util/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="dc7ddaf9bea8b341510efe4dac125af4  util-macros-1.2.1.tar.bz2"
diff --git a/x11/videoproto/APKBUILD b/x11/videoproto/APKBUILD
deleted file mode 100644
index db19caa09..000000000
--- a/x11/videoproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=videoproto
-pkgver=2.3.0
-pkgrel=0
-pkgdesc="X11 Video extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2"
diff --git a/x11/vte/APKBUILD b/x11/vte/APKBUILD
deleted file mode 100644
index cae2d80b5..000000000
--- a/x11/vte/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=vte
-pkgver=0.22.5
-pkgrel=0
-pkgdesc="Virtual Terminal Emulator library"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig gtk+-dev intltool python ncurses-dev"
-source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev pango-dev gtk+-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/vte \
-		--localstatedir=/var \
-		--disable-static \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="cbb17696e40ee175977bf165ef838da2  vte-0.22.5.tar.bz2"
diff --git a/x11/webkit/APKBUILD b/x11/webkit/APKBUILD
deleted file mode 100644
index 4254b912b..000000000
--- a/x11/webkit/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=webkit
-pkgver=1.1.15.4
-pkgrel=0
-pkgdesc="portable web rendering engine WebKit for GTK+"
-url="http://webkitgtk.org/"
-license="LGPL BSD"
-depends=
-makedepends="
-	libsoup-dev pango-dev gtk+-dev jpeg-dev libpng-dev libxml2-dev
-	gperf pkgconfig bison flex icu-dev cairo-dev atk-dev
-	gnutls-dev sqlite-dev libxslt-dev libxt-dev libiconv-dev gettext-dev
-	zlib-dev libgcrypt-dev libgpg-error-dev expat-dev e2fsprogs-dev
-	enchant-dev libxi-dev libxrandr-dev libxcursor-dev libxdamage-dev
-	libxcomposite-dev gstreamer-dev gst-plugins-base-dev
-	"
-install=
-subpackages="$pkgname-dev gtklauncher"
-source="http://webkitgtk.org/$pkgname-$pkgver.tar.gz"
-
-depends_dev="gtk+-dev libsoup-dev gstreamer-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-
-gtklauncher() {
-	pkgdesc="Application to test WebKit"
-	depends=""
-	install=
-	install -Dm755 "$srcdir"/$pkgname-$pkgver/Programs/GtkLauncher \
-		"$subpkgdir"/usr/bin/GtkLauncher
-}
-
-md5sums="47301fb7120421ac38bf714db8f5d428  webkit-1.1.15.4.tar.gz"
diff --git a/x11/wv/APKBUILD b/x11/wv/APKBUILD
deleted file mode 100644
index c66ff3b11..000000000
--- a/x11/wv/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=wv
-pkgver=1.2.4
-pkgrel=0
-pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
-url="http://sourceforge.net/projects/wvware"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libgsf-dev libpng-dev bzip2-dev"
-source="http://downloads.sourceforge.net/sourceforge/wvware/$pkgname-$pkgver.tar.gz"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="c1861c560491f121e12917fa76970ac5  wv-1.2.4.tar.gz"
diff --git a/x11/x264/APKBUILD b/x11/x264/APKBUILD
deleted file mode 100644
index 2429f146b..000000000
--- a/x11/x264/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=x264
-pkgver=20100107
-pkgrel=0
-pkgdesc="free library for encoding H264/AVC video streams"
-url="http://www.videolan.org/developers/x264.html"
-license="GPL"
-depends=
-makedepends="libx11-dev bash"
-subpackages="$pkgname-dev"
-source="http://ftp.videolan.org/pub/videolan/$pkgname/snapshots/$pkgname-snapshot-$pkgver-2245.tar.bz2"
-
-_builddir="$srcdir/$pkgname-snapshot-$pkgver-2245"
-build() { 
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--enable-pthread \
-		--enable-visualize \
-		--enable-shared \
-		--disable-asm \
-		--enable-pic || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install || return 1
-}
-md5sums="58337bf425518cb79dd804bcfd10b7b7  x264-snapshot-20100107-2245.tar.bz2"
diff --git a/x11/xarchiver/APKBUILD b/x11/xarchiver/APKBUILD
deleted file mode 100644
index d114f14ca..000000000
--- a/x11/xarchiver/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xarchiver
-pkgver=0.5.2
-pkgrel=1
-pkgdesc="GTK+ frontend to various command line archivers"
-url="http://xarchiver.xfce.org/"
-license="GPL"
-depends="desktop-file-utils hicolor-icon-theme tar"
-makedepends="intltool gtk+-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	xarchiver-0.5.2-stack-smash.patch"
-
-prepare() {
-	cd "$srcdir/xarchiver-$pkgver"
-	patch -p1 -i "$srcdir"/xarchiver-0.5.2-stack-smash.patch
-}
-
-build() {
-	cd "$srcdir/xarchiver-$pkgver"
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/xfce4 || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir/xarchiver-$pkgver"
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="2bc7f06403cc6582dd4a8029ec9d038d  xarchiver-0.5.2.tar.bz2
-74cdf6a77e91ac7b02270002c582cea1  xarchiver-0.5.2-stack-smash.patch"
diff --git a/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch b/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch
deleted file mode 100644
index 66104822e..000000000
--- a/x11/xarchiver/xarchiver-0.5.2-stack-smash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xarchiver-0.5.2-old/src/window.c	2008-11-11 09:31:45.000000000 +0100
-+++ xarchiver-0.5.2/src/window.c	2009-01-25 16:26:07.000000000 +0100
-@@ -1447,7 +1447,7 @@
- 	GtkTreeIter iter;
- 	gint n_elem = 0,pos = 0,dirs = 0;
- 	unsigned long int total_size = 0;
--	unsigned long int size = 0;
-+	guint64 size = 0;
- 	XEntry *entry = NULL;
- 
- 	path = gtk_tree_path_new_first();
-@@ -1517,7 +1517,7 @@
- 	GtkTreeModel *model;
- 	gint selected = 0,pos = 0,dirs = 0;
- 	unsigned long int total_size = 0;
--	unsigned long int size = 0;
-+	guint64 size = 0;
- 	XEntry *entry;
- 
- 	switch (archive->type)
diff --git a/x11/xauth/APKBUILD b/x11/xauth/APKBUILD
deleted file mode 100644
index 0c16b8701..000000000
--- a/x11/xauth/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xauth
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="X.Org authorization settings program"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=
-makedepends="pkgconfig libxau-dev libxext-dev libxmu-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/xauth-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/xauth-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/xauth-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="fa00078c414c4a57cab7a6d89a0c8734  xauth-1.0.4.tar.bz2"
diff --git a/x11/xbacklight/APKBUILD b/x11/xbacklight/APKBUILD
deleted file mode 100644
index 6c0caaf05..000000000
--- a/x11/xbacklight/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xbacklight
-pkgver=1.1
-pkgrel=1
-pkgdesc="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev libxrandr-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="51b4a1c0ae2b3bd77417306fd78a3e94  xbacklight-1.1.tar.bz2"
diff --git a/x11/xbitmap/APKBUILD b/x11/xbitmap/APKBUILD
deleted file mode 100644
index 535572923..000000000
--- a/x11/xbitmap/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xbitmaps
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="X.org header files with bitmaps"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends="pkgconfig"
-source="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="b28a9840cde3c38d7c09716372fea257  xbitmaps-1.0.1.tar.bz2"
diff --git a/x11/xcb-proto/APKBUILD b/x11/xcb-proto/APKBUILD
deleted file mode 100644
index b5b6d966f..000000000
--- a/x11/xcb-proto/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-proto
-pkgver=1.6
-pkgrel=0
-pkgdesc="XML-XCB protocol descriptions"
-url="http://xcb.freedesktop.org/"
-license="custom"
-depends=
-makedepends="python"
-source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/${pkgname}-${pkgver}
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
-	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-md5sums="04313e1d914b44d0e457f6c494fc178b  xcb-proto-1.6.tar.bz2"
diff --git a/x11/xcb-util/APKBUILD b/x11/xcb-util/APKBUILD
deleted file mode 100644
index 820a4e1fa..000000000
--- a/x11/xcb-util/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util
-pkgver=0.3.6
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding"
-url="http://xcb.freedesktop.org"
-license="GPL"
-subpackages="$pkgname-dev"
-depends=
-makedepends="m4 libxcb-dev gperf pkgconfig"
-source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
-
-depend_dev="libxcb-dev"
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="dd8968b8ee613cb027a8ef1fcbdc8fc9  xcb-util-0.3.6.tar.bz2"
diff --git a/x11/xchat/APKBUILD b/x11/xchat/APKBUILD
deleted file mode 100644
index 7f215037a..000000000
--- a/x11/xchat/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xchat
-pkgver=2.8.6
-pkgrel=0
-pkgdesc="A GTK+ based IRC client"
-url="http://www.xchat.org/"
-license="GPL"
-makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev xextproto perl-dev"
-source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2
-	http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff
-	$pkgname-gtk2.patch"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../xc286-smallfixes.diff || return 1
-	patch -p1 < ../xchat-gtk2.patch || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-openssl \
-		--enable-dbus \
-		--disable-gnome \
-		--disable-textfe \
-		--disable-perl \
-		--disable-python \
-		--enable-ipv6 \
-		--enable-shm \
-		--enable-spell=static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="1f2670865d43a23a9abc596dde999aca  xchat-2.8.6.tar.bz2
-eb68b6261bf6740cb5f223627eb8f384  xc286-smallfixes.diff
-f3fe00982c0bec93152ed0b32438ef87  xchat-gtk2.patch"
diff --git a/x11/xchat/xchat-gtk2.patch b/x11/xchat/xchat-gtk2.patch
deleted file mode 100644
index 4e13a2cf5..000000000
--- a/x11/xchat/xchat-gtk2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xchat-2.8.6/src/fe-gtk/xtext.h.orig 2008-02-24 
-05:48:02.000000000 +0100
-+++ xchat-2.8.6/src/fe-gtk/xtext.h 2008-09-06 
-02:18:39.000000000 +0200
-@@ -270,6 +270,6 @@
- xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
- void gtk_xtext_buffer_free (xtext_buffer *buf);
- void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
--GtkType gtk_xtext_get_type (void);
-+GType gtk_xtext_get_type (void);
-
- #endif
diff --git a/x11/xcmiscproto/APKBUILD b/x11/xcmiscproto/APKBUILD
deleted file mode 100644
index e01070a77..000000000
--- a/x11/xcmiscproto/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcmiscproto
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="X11 XC-Miscellaneous extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2"
diff --git a/x11/xcmsdb/APKBUILD b/x11/xcmsdb/APKBUILD
deleted file mode 100644
index 778413b2a..000000000
--- a/x11/xcmsdb/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcmsdb
-pkgver=1.0.2
-pkgrel=0
-pkgdesc="Device Color Characterization utility for X Color Management System"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="7f2bed9f4dd3301d18d83eb296c3be0d  xcmsdb-1.0.2.tar.bz2"
diff --git a/x11/xdpyinfo/APKBUILD b/x11/xdpyinfo/APKBUILD
deleted file mode 100644
index 09f9affcc..000000000
--- a/x11/xdpyinfo/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xdpyinfo
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="display information utility for X"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-makedepends="pkgconfig libxtst-dev"
-depends=
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="b7cbab6cbcd12bf7ad65dbc12d86e104  xdpyinfo-1.0.3.tar.bz2"
diff --git a/x11/xdriinfo/APKBUILD b/x11/xdriinfo/APKBUILD
deleted file mode 100644
index ff9e76aa6..000000000
--- a/x11/xdriinfo/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xdriinfo
-pkgver=1.0.2
-pkgrel=0
-pkgdesc="query configuration information of DRI drivers"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-makedepends="pkgconfig libx11-dev glproto mesa-dev"
-depends=
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2"
diff --git a/x11/xev/APKBUILD b/x11/xev/APKBUILD
deleted file mode 100644
index c30c899aa..000000000
--- a/x11/xev/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xev
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="print contents of X events"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-makedepends="pkgconfig libx11-dev"
-depends=
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="a9532c3d1683c99bb5df1895cb3a60b1  xev-1.0.3.tar.bz2"
diff --git a/x11/xextproto/APKBUILD b/x11/xextproto/APKBUILD
deleted file mode 100644
index 7bf321218..000000000
--- a/x11/xextproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xextproto
-pkgver=7.1.1
-pkgrel=0
-pkgdesc="X11 various extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR=""$pkgdir"" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2"
diff --git a/x11/xf86-input-evdev/APKBUILD b/x11/xf86-input-evdev/APKBUILD
deleted file mode 100644
index c7461d3fc..000000000
--- a/x11/xf86-input-evdev/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-evdev
-pkgver=2.3.2
-pkgrel=0
-pkgdesc="X.org evdev input driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b2bfe368022eedf2671ee28daba31efc  xf86-input-evdev-2.3.2.tar.bz2"
diff --git a/x11/xf86-input-keyboard/APKBUILD b/x11/xf86-input-keyboard/APKBUILD
deleted file mode 100644
index 4c5fc14f7..000000000
--- a/x11/xf86-input-keyboard/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-keyboard
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="X.org keyboard input driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="fd17158ffeacecc8cc670604460cb98b  xf86-input-keyboard-1.4.0.tar.bz2"
diff --git a/x11/xf86-input-mouse/APKBUILD b/x11/xf86-input-mouse/APKBUILD
deleted file mode 100644
index b2aea2bb8..000000000
--- a/x11/xf86-input-mouse/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-mouse
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="X.org mouse input driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="c58629fddf0782dad5c02da6aeb35521  xf86-input-mouse-1.5.0.tar.bz2"
diff --git a/x11/xf86-input-synaptics/APKBUILD b/x11/xf86-input-synaptics/APKBUILD
deleted file mode 100644
index 7c4a4b264..000000000
--- a/x11/xf86-input-synaptics/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-synaptics
-pkgver=1.2.1
-pkgrel=0
-pkgdesc="X.org synaptics input driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="29a6f9da5123149e4abc8ff83880ed5c  xf86-input-synaptics-1.2.1.tar.bz2"
diff --git a/x11/xf86-video-apm/APKBUILD b/x11/xf86-video-apm/APKBUILD
deleted file mode 100644
index ae0582b5e..000000000
--- a/x11/xf86-video-apm/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-apm
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="Alliance ProMotion video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="48441a19aaf015570b267f2a8e67d8ab  xf86-video-apm-1.2.2.tar.bz2"
diff --git a/x11/xf86-video-ark/APKBUILD b/x11/xf86-video-ark/APKBUILD
deleted file mode 100644
index 79bb65c0f..000000000
--- a/x11/xf86-video-ark/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ark
-pkgver=0.7.2
-pkgrel=1
-pkgdesc="X.Org driver for ark cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="4745f5c722b030962cc56eb2443894a0  xf86-video-ark-0.7.2.tar.bz2"
diff --git a/x11/xf86-video-ast/APKBUILD b/x11/xf86-video-ast/APKBUILD
deleted file mode 100644
index a07d4933f..000000000
--- a/x11/xf86-video-ast/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ast
-pkgver=0.89.9
-pkgrel=0
-pkgdesc="X.Org driver for ASpeedTech cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="619f6ff15db869be3800bb001d5b0468  xf86-video-ast-0.89.9.tar.bz2"
diff --git a/x11/xf86-video-ati/APKBUILD b/x11/xf86-video-ati/APKBUILD
deleted file mode 100644
index 5037b2405..000000000
--- a/x11/xf86-video-ati/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ati
-pkgver=6.12.4
-pkgrel=1
-pkgdesc="ATI video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-ati"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev
-	xineramaproto
-	"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure --prefix=/usr \
-		--enable-dri \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="e662348f6f957fcedf52818d668ab9f5  xf86-video-ati-6.12.4.tar.bz2"
diff --git a/x11/xf86-video-chips/APKBUILD b/x11/xf86-video-chips/APKBUILD
deleted file mode 100644
index 74c98f96f..000000000
--- a/x11/xf86-video-chips/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-chips
-pkgver=1.2.2
-pkgrel=0
-pkgdesc="Chips and Technologies video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="a3969c28c3b36ab2caa852a9324e9b70  xf86-video-chips-1.2.2.tar.bz2"
diff --git a/x11/xf86-video-cirrus/APKBUILD b/x11/xf86-video-cirrus/APKBUILD
deleted file mode 100644
index 6b708a28a..000000000
--- a/x11/xf86-video-cirrus/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-cirrus
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="Cirrus Logic video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="8195d03ed0be0975c03441e66a9f53b3  xf86-video-cirrus-1.3.2.tar.bz2"
diff --git a/x11/xf86-video-dummy/APKBUILD b/x11/xf86-video-dummy/APKBUILD
deleted file mode 100644
index b8f5570fd..000000000
--- a/x11/xf86-video-dummy/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-dummy
-pkgver=0.3.3
-pkgrel=0
-pkgdesc="X.Org driver for dummy cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto xf86dgaproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="3ffe3a28f4452e66bf56180e7da9cbc5  xf86-video-dummy-0.3.3.tar.bz2"
diff --git a/x11/xf86-video-fbdev/APKBUILD b/x11/xf86-video-fbdev/APKBUILD
deleted file mode 100644
index 9a201e9a5..000000000
--- a/x11/xf86-video-fbdev/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-fbdev
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="video driver for framebuffer device"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="79ce1eb9f9d2ed56de70d8e06cb767d9  xf86-video-fbdev-0.4.1.tar.bz2"
diff --git a/x11/xf86-video-geode/APKBUILD b/x11/xf86-video-geode/APKBUILD
deleted file mode 100644
index 2ef39bf4d..000000000
--- a/x11/xf86-video-geode/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-geode
-pkgver=2.11.6
-pkgrel=1
-pkgdesc="AMD Geode GX and LX video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto xf86dgaproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="3ff0dfb4b3bd8872c6efb70371cb6b98  xf86-video-geode-2.11.6.tar.bz2"
diff --git a/x11/xf86-video-glint/APKBUILD b/x11/xf86-video-glint/APKBUILD
deleted file mode 100644
index 983b82015..000000000
--- a/x11/xf86-video-glint/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-glint
-pkgver=1.2.4
-pkgrel=1
-pkgdesc="GLINT/Permedia video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto xf86dgaproto glproto libdrm-dev xf86driproto
-	mesa-dev"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="960df34e129faa411e58c0d6b56d79a3  xf86-video-glint-1.2.4.tar.bz2"
diff --git a/x11/xf86-video-i128/APKBUILD b/x11/xf86-video-i128/APKBUILD
deleted file mode 100644
index 5374446fa..000000000
--- a/x11/xf86-video-i128/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-i128
-pkgver=1.3.3
-pkgrel=1
-pkgdesc="Number 9 I128 video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="a597e8efeec6ab8bc6ba6d87fceb2dba  xf86-video-i128-1.3.3.tar.bz2"
diff --git a/x11/xf86-video-i740/APKBUILD b/x11/xf86-video-i740/APKBUILD
deleted file mode 100644
index fe8db4e60..000000000
--- a/x11/xf86-video-i740/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-i740
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="Intel i740 video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="4ac1318788f62159965f15131c869e7a  xf86-video-i740-1.3.2.tar.bz2"
diff --git a/x11/xf86-video-intel/APKBUILD b/x11/xf86-video-intel/APKBUILD
deleted file mode 100644
index e922c388a..000000000
--- a/x11/xf86-video-intel/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-intel
-pkgver=2.9.1
-pkgrel=1
-pkgdesc="X.Org driver for Intel cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-intel"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto glproto xineramaproto libdrm-dev xf86driproto
-	mesa-dev"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="8951d0366c16991badb7f9050556f4f3  xf86-video-intel-2.9.1.tar.bz2"
diff --git a/x11/xf86-video-mach64/APKBUILD b/x11/xf86-video-mach64/APKBUILD
deleted file mode 100644
index ab361df52..000000000
--- a/x11/xf86-video-mach64/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-mach64
-pkgver=6.8.2
-pkgrel=1
-pkgdesc="ATI Mach64 video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-mach64"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto xineramaproto libdrm-dev xf86driproto glproto
-	mesa-dev
-	"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="6c0522b2b72a0a47c48d718443616651  xf86-video-mach64-6.8.2.tar.bz2"
diff --git a/x11/xf86-video-newport/APKBUILD b/x11/xf86-video-newport/APKBUILD
deleted file mode 100644
index bdf2f1e11..000000000
--- a/x11/xf86-video-newport/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-newport
-pkgver=0.2.3
-pkgrel=0
-pkgdesc="Newport video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="923baa1ee0429f03ed19ec0be6a4f62b  xf86-video-newport-0.2.3.tar.bz2"
diff --git a/x11/xf86-video-nv/APKBUILD b/x11/xf86-video-nv/APKBUILD
deleted file mode 100644
index 7dfa8e14e..000000000
--- a/x11/xf86-video-nv/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-nv
-pkgver=2.1.15
-pkgrel=1
-pkgdesc="Nvidia video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make 
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="1b22188bd9012a148206940708b52ea6  xf86-video-nv-2.1.15.tar.bz2"
diff --git a/x11/xf86-video-openchrome/APKBUILD b/x11/xf86-video-openchrome/APKBUILD
deleted file mode 100644
index f5b944c1e..000000000
--- a/x11/xf86-video-openchrome/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-openchrome
-pkgver=0.2.904
-pkgrel=1
-pkgdesc="X.Org driver for VIA/S3G cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev libxvmc-dev fontsproto glproto
-	randrproto videoproto renderproto xf86driproto mesa-dev
-	"
-
-source="http://www.openchrome.org/releases/xf86-video-openchrome-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="f2481d98ef54febf5bffbb88a2a2426d  xf86-video-openchrome-0.2.904.tar.bz2"
diff --git a/x11/xf86-video-r128/APKBUILD b/x11/xf86-video-r128/APKBUILD
deleted file mode 100644
index ffceb6ff9..000000000
--- a/x11/xf86-video-r128/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-r128
-pkgver=6.8.1
-pkgrel=2
-pkgdesc="ATI Rage128 video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-r128"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto xineramaproto libdrm-dev xf86driproto glproto
-	mesa-dev expat-dev
-	"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
-		--enable-dri \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="2b90854a62a4d45d652062f582dc8d13  xf86-video-r128-6.8.1.tar.bz2"
diff --git a/x11/xf86-video-radeonhd/APKBUILD b/x11/xf86-video-radeonhd/APKBUILD
deleted file mode 100644
index ebdba8c5b..000000000
--- a/x11/xf86-video-radeonhd/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-radeonhd
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="Experimental Radeon HD video driver."
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="7b6641aa9d836f1621b9b220ad6771b8  xf86-video-radeonhd-1.3.0.tar.bz2"
diff --git a/x11/xf86-video-rendition/APKBUILD b/x11/xf86-video-rendition/APKBUILD
deleted file mode 100644
index 672288248..000000000
--- a/x11/xf86-video-rendition/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-rendition
-pkgver=4.2.3
-pkgrel=1
-pkgdesc="Rendition video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="9a0a916fe1e7b5c81cd4c80a08e646cc  xf86-video-rendition-4.2.3.tar.bz2"
diff --git a/x11/xf86-video-s3/APKBUILD b/x11/xf86-video-s3/APKBUILD
deleted file mode 100644
index 03f54d238..000000000
--- a/x11/xf86-video-s3/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-s3
-pkgver=0.6.3
-pkgrel=1
-pkgdesc="X.Org driver for s3 cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="5eb06d88533fb327d067928faeb20860  xf86-video-s3-0.6.3.tar.bz2"
diff --git a/x11/xf86-video-s3virge/APKBUILD b/x11/xf86-video-s3virge/APKBUILD
deleted file mode 100644
index f00b0a413..000000000
--- a/x11/xf86-video-s3virge/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-s3virge
-pkgver=1.10.4
-pkgrel=0
-pkgdesc="S3 ViRGE video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="6517bbbf808c700502d51acdc44662f8  xf86-video-s3virge-1.10.4.tar.bz2"
diff --git a/x11/xf86-video-savage/APKBUILD b/x11/xf86-video-savage/APKBUILD
deleted file mode 100644
index e9a6d740e..000000000
--- a/x11/xf86-video-savage/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-savage
-pkgver=2.3.1
-pkgrel=1
-pkgdesc="S3 Savage video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-savage"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
-	"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="66c319f610e3699c3de0f3ef630abb32  xf86-video-savage-2.3.1.tar.bz2"
diff --git a/x11/xf86-video-siliconmotion/APKBUILD b/x11/xf86-video-siliconmotion/APKBUILD
deleted file mode 100644
index 52d91be12..000000000
--- a/x11/xf86-video-siliconmotion/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.3
-pkgrel=1
-pkgdesc="Silicon Motion video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="29fb322cd3adab52cc7f1ac86f9315bb  xf86-video-siliconmotion-1.7.3.tar.bz2"
diff --git a/x11/xf86-video-sis/APKBUILD b/x11/xf86-video-sis/APKBUILD
deleted file mode 100644
index ad3589a3e..000000000
--- a/x11/xf86-video-sis/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-sis
-pkgver=0.10.2
-pkgrel=0
-pkgdesc="X.org SiS video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto
-	fontsproto xf86dgaproto xineramaproto randrproto xextproto mesa-dev
-	xf86driproto glproto libxi-dev"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	fix-bios-read-on-650-760.patch"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir/fix-bios-read-on-650-760.patch" || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="f04baa307e49e9f0e5a5c3d2e89a5576  xf86-video-sis-0.10.2.tar.bz2
-827d289307badeae3778180ab19b7363  fix-bios-read-on-650-760.patch"
diff --git a/x11/xf86-video-sis/fix-bios-read-on-650-760.patch b/x11/xf86-video-sis/fix-bios-read-on-650-760.patch
deleted file mode 100644
index c948c833a..000000000
--- a/x11/xf86-video-sis/fix-bios-read-on-650-760.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Mon Sep 17 00:00:00 2001
-From: Matteo Delfino <kendatsuba@gmail.com>
-Date: Wed, 21 Oct 2009 14:26:45 +0000
-Subject: Fix BIOS read on 650 and 760. (#19070)
-
-Signed-off-by: Matteo Delfino <kendatsuba@gmail.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index 994b02d..b19e7a9 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     case SIS_315H:
- 	     case SIS_330:
- 	     case SIS_340:
-+	     case SIS_650:
-+	     case SIS_760:
- 	     case XGI_40:     readpci = TRUE;
- 			      break;
- 	     case XGI_20:     readpci = TRUE;
---
-cgit v0.8.2
diff --git a/x11/xf86-video-sunffb/APKBUILD b/x11/xf86-video-sunffb/APKBUILD
deleted file mode 100644
index e6a566d19..000000000
--- a/x11/xf86-video-sunffb/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-sunffb
-pkgver=1.2.1
-pkgrel=0
-pkgdesc="SUNFFB video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-ffb"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev
-	xineramaproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="1bb374fe5ab3ed780d353b2b12ba6255  xf86-video-sunffb-1.2.1.tar.bz2"
diff --git a/x11/xf86-video-sunleo/APKBUILD b/x11/xf86-video-sunleo/APKBUILD
deleted file mode 100644
index b6898904b..000000000
--- a/x11/xf86-video-sunleo/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-sunleo
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Leo video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="14fe008620940a674981912fa02ae133  xf86-video-sunleo-1.2.0.tar.bz2"
diff --git a/x11/xf86-video-tdfx/APKBUILD b/x11/xf86-video-tdfx/APKBUILD
deleted file mode 100644
index 2da071fd5..000000000
--- a/x11/xf86-video-tdfx/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-tdfx
-pkgver=1.4.3
-pkgrel=1
-pkgdesc="3Dfx video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="mesa-dri-tdfx"
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
-	"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="8161bbf2b100c21b609163f0010766b3  xf86-video-tdfx-1.4.3.tar.bz2"
diff --git a/x11/xf86-video-tseng/APKBUILD b/x11/xf86-video-tseng/APKBUILD
deleted file mode 100644
index c924a7c37..000000000
--- a/x11/xf86-video-tseng/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-tseng
-pkgver=1.2.3
-pkgrel=1
-pkgdesc="Tseng Labs video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="79f63999c88477801ae54dc486272ad6  xf86-video-tseng-1.2.3.tar.bz2"
diff --git a/x11/xf86-video-v4l/APKBUILD b/x11/xf86-video-v4l/APKBUILD
deleted file mode 100644
index 42c658b35..000000000
--- a/x11/xf86-video-v4l/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-v4l
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="video4linux driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="2251ae2a0a905764941cd7b098e85ad1  xf86-video-v4l-0.2.0.tar.bz2"
diff --git a/x11/xf86-video-vesa/APKBUILD b/x11/xf86-video-vesa/APKBUILD
deleted file mode 100644
index e2cd29d5f..000000000
--- a/x11/xf86-video-vesa/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-vesa
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="X.org vesa video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
-	videoproto renderproto"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="61a1dc9a22991bd04d0ff98f800775c1  xf86-video-vesa-2.2.1.tar.bz2"
diff --git a/x11/xf86-video-vmware/APKBUILD b/x11/xf86-video-vmware/APKBUILD
deleted file mode 100644
index bd979907d..000000000
--- a/x11/xf86-video-vmware/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-vmware
-pkgver=10.16.9
-pkgrel=0
-pkgdesc="X.org VMWare video driver"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto
-	fontsproto xf86dgaproto xineramaproto randrproto xextproto libxi-dev"
-
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	abi2.patch"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir/abi2.patch" || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure --prefix=/usr || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="3b3d38abfa1f8be4b1e26dcd236bc94f  xf86-video-vmware-10.16.9.tar.bz2
-cbc8e0bef13ccec7ceac233cd09233da  abi2.patch"
diff --git a/x11/xf86-video-vmware/abi2.patch b/x11/xf86-video-vmware/abi2.patch
deleted file mode 100644
index 29e8ddeb1..000000000
--- a/x11/xf86-video-vmware/abi2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
---- xf86-video-vmware-10.16.7/src/vmware.c.jx	2009-08-07 16:31:33.000000000 -0400
-+++ xf86-video-vmware-10.16.7/src/vmware.c	2009-08-07 16:32:10.000000000 -0400
-@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         return FALSE;
-     }
- 
--    xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
-     if (!vgaHWGetHWRec(pScrn)) {
-         return FALSE;
-     }
-@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         VMWAREFreeRec(pScrn);
-         return FALSE;
-     }
--    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
- 
-     /* Need ramdac for hwcursor */
-     if (pVMWARE->hwCursor) {
-@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-             VMWAREFreeRec(pScrn);
-             return FALSE;
-         }
--        xf86LoaderReqSymLists(ramdacSymbols, NULL);
-     }
- 
-     return TRUE;
-@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
-         setupDone = TRUE;
-         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
- 
--        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
--                          shadowfbSymbols, NULL);
--
-         return (pointer)1;
-     }
-     if (errmaj) {
diff --git a/x11/xf86bigfontproto/APKBUILD b/x11/xf86bigfontproto/APKBUILD
deleted file mode 100644
index dd4eef554..000000000
--- a/x11/xf86bigfontproto/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86bigfontproto
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="X11 Big Fonts extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2"
diff --git a/x11/xf86dgaproto/APKBUILD b/x11/xf86dgaproto/APKBUILD
deleted file mode 100644
index 71066c92c..000000000
--- a/x11/xf86dgaproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86dgaproto
-pkgver=2.1
-pkgrel=0
-pkgdesc="X11 Direct Graphics Access extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2"
diff --git a/x11/xf86driproto/APKBUILD b/x11/xf86driproto/APKBUILD
deleted file mode 100644
index 045dfe32c..000000000
--- a/x11/xf86driproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86driproto
-pkgver=2.1.0
-pkgrel=0
-pkgdesc="X11 DRI extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2"
diff --git a/x11/xf86miscproto/APKBUILD b/x11/xf86miscproto/APKBUILD
deleted file mode 100644
index e90b32db7..000000000
--- a/x11/xf86miscproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86miscproto
-pkgver=0.9.3
-pkgrel=0
-pkgdesc="X11 XFree86-Miscellaneous extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2"
diff --git a/x11/xf86vidmodeproto/APKBUILD b/x11/xf86vidmodeproto/APKBUILD
deleted file mode 100644
index 05c50e3c4..000000000
--- a/x11/xf86vidmodeproto/APKBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86vidmodeproto
-pkgver=2.3
-pkgrel=0
-pkgdesc="X11 Video Mode extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="4434894fc7d4eeb4a22e6b876d56fdaa  xf86vidmodeproto-2.3.tar.bz2"
diff --git a/x11/xfce-utils/APKBUILD b/x11/xfce-utils/APKBUILD
deleted file mode 100644
index c702096d9..000000000
--- a/x11/xfce-utils/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce-utils
-pkgver=4.6.1
-pkgrel=1
-pkgdesc="Utilities for Xfce"
-url="http://www.xfce.org/"
-license="GPL2"
-subpackages=
-depends="hicolor-icon-theme"
-makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev
-	libsm-dev expat-dev e2fsprogs-dev"
-install=
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static \
-		--with-xsession-prefix=/etc/X11/
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2"
diff --git a/x11/xfce4-appfinder/APKBUILD b/x11/xfce4-appfinder/APKBUILD
deleted file mode 100644
index 6f9f6a19a..000000000
--- a/x11/xfce4-appfinder/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-appfinder
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="Xfce application finder"
-url="http://www.xfce.org/"
-license="GPL-2"
-depends="hicolor-icon-theme"
-makedepends="pkgconfig thunar-dev libxfce4menu-dev intltool gtk+-dev
-	libxfce4util-dev libxfcegui4-dev gettext-dev libiconv-dev
-	startup-notification-dev libsm-dev expat-dev e2fsprogs-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a1bc7d88100cfd92714a300be531589b  xfce4-appfinder-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce4-appfinder.post-install
-db51db79681eadc47be4932355a77c25  xfce4-appfinder.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-appfinder.post-deinstall"
diff --git a/x11/xfce4-appfinder/xfce4-appfinder.post-deinstall b/x11/xfce4-appfinder/xfce4-appfinder.post-deinstall
deleted file mode 120000
index 18abfee4f..000000000
--- a/x11/xfce4-appfinder/xfce4-appfinder.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-appfinder.post-install
\ No newline at end of file
diff --git a/x11/xfce4-appfinder/xfce4-appfinder.post-install b/x11/xfce4-appfinder/xfce4-appfinder.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-appfinder/xfce4-appfinder.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-appfinder/xfce4-appfinder.post-upgrade b/x11/xfce4-appfinder/xfce4-appfinder.post-upgrade
deleted file mode 120000
index 18abfee4f..000000000
--- a/x11/xfce4-appfinder/xfce4-appfinder.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-appfinder.post-install
\ No newline at end of file
diff --git a/x11/xfce4-battery-plugin/APKBUILD b/x11/xfce4-battery-plugin/APKBUILD
deleted file mode 100644
index c0b271cff..000000000
--- a/x11/xfce4-battery-plugin/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-battery-plugin
-pkgver=0.5.1
-pkgrel=0
-pkgdesc="A battery monitor plugin for the Xfce panel"
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-license="GPL-2"
-makedepends="xfce4-panel-dev libxfcegui4-dev perl-xml-parser intltool"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-	compile_x86_64.diff
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir"/compile_x86_64.diff || return 1
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-md5sums="d8a666d85bb3c1dd007b547de4dd7037  xfce4-battery-plugin-0.5.1.tar.bz2
-d9a927bca032e9b10a04046c154243a1  compile_x86_64.diff
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-install
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-deinstall"
diff --git a/x11/xfce4-battery-plugin/compile_x86_64.diff b/x11/xfce4-battery-plugin/compile_x86_64.diff
deleted file mode 100644
index 102db1d95..000000000
--- a/x11/xfce4-battery-plugin/compile_x86_64.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
-@@ -17,8 +17,8 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--#include <linux/apm_bios.h>
- #include <sys/types.h>
-+#include <linux/apm_bios.h>
- 
- #define APM_PROC   "/proc/apm"
- #define APM_DEVICE "/dev/apm_bios"
-
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
deleted file mode 120000
index ffd189d10..000000000
--- a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-battery-plugin.post-install
\ No newline at end of file
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade b/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
deleted file mode 120000
index ffd189d10..000000000
--- a/x11/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-battery-plugin.post-install
\ No newline at end of file
diff --git a/x11/xfce4-cpufreq-plugin/APKBUILD b/x11/xfce4-cpufreq-plugin/APKBUILD
deleted file mode 100644
index 4f134440a..000000000
--- a/x11/xfce4-cpufreq-plugin/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-cpufreq-plugin
-pkgver=0.0.1
-pkgrel=0
-pkgdesc="CPU frequency plugin for the Xfce4 panel"
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-license="GPL2"
-depends=
-makedepends="pkgconfig xfce4-panel-dev intltool libsm-dev"
-install=
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/xfce4-cpu-freq-plugin-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/xfce4-cpu-freq-plugin-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-md5sums="7ad41541d8065aab941de7d62857aa8b  xfce4-cpufreq-plugin-0.0.1.tar.gz"
diff --git a/x11/xfce4-dev-tools/APKBUILD b/x11/xfce4-dev-tools/APKBUILD
deleted file mode 100644
index 80ca610d7..000000000
--- a/x11/xfce4-dev-tools/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-dev-tools
-pkgver=4.6.0
-pkgrel=2
-pkgdesc="Xfce developer tools"
-url="http://www.xfce.org/"
-license="GPL2"
-depends="automake autoconf make intltool pkgconfig gtk-doc"
-makedepends=
-source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	# bug in autoconf install which not explicit set -m755
-	chmod 755 "$pkgdir"/usr/bin/*
-}
-
-md5sums="c9587fa78e877eee858a33391d0afd62  xfce4-dev-tools-4.6.0.tar.bz2"
diff --git a/x11/xfce4-mixer/APKBUILD b/x11/xfce4-mixer/APKBUILD
deleted file mode 100644
index 1541cb92b..000000000
--- a/x11/xfce4-mixer/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-mixer
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="The volume control plugin for the Xfce panel"
-url="http://www.xfce.org/"
-license="GPL2"
-depends="hicolor-icon-theme"
-makedepends="pkgconfig xfce4-panel-dev gstreamer-dev intltool
-	gst-plugins-base-dev expat-dev libsm-dev e2fsprogs-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static \
-		--with-sound=alsa || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a99e2455445480ef5081fe69454a46fc  xfce4-mixer-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce4-mixer.post-install
-db51db79681eadc47be4932355a77c25  xfce4-mixer.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-mixer.post-deinstall"
diff --git a/x11/xfce4-mixer/xfce4-mixer.post-deinstall b/x11/xfce4-mixer/xfce4-mixer.post-deinstall
deleted file mode 120000
index 59bfac9d7..000000000
--- a/x11/xfce4-mixer/xfce4-mixer.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-mixer.post-install
\ No newline at end of file
diff --git a/x11/xfce4-mixer/xfce4-mixer.post-install b/x11/xfce4-mixer/xfce4-mixer.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-mixer/xfce4-mixer.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-mixer/xfce4-mixer.post-upgrade b/x11/xfce4-mixer/xfce4-mixer.post-upgrade
deleted file mode 120000
index 59bfac9d7..000000000
--- a/x11/xfce4-mixer/xfce4-mixer.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-mixer.post-install
\ No newline at end of file
diff --git a/x11/xfce4-notifyd/APKBUILD b/x11/xfce4-notifyd/APKBUILD
deleted file mode 100644
index 717b68470..000000000
--- a/x11/xfce4-notifyd/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-notifyd
-pkgver=0.1.0
-pkgrel=0
-pkgdesc="notification daemon for the xfce desktop"
-url="http://spuriousinterrupt.org/projects/xfce4-notifyd"
-license="GPL2"
-depends="hicolor-icon-theme"
-makedepends="gtk+-dev libxfce4util libxfcegui4-dev libsexy-dev xfconf-dev
-	dbus-glib-dev libglade-dev intltool"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 --localstatedir=/var --disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="659ecaf37f0f7ee9e31f7b25f9813778  xfce4-notifyd-0.1.0.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-install
-db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-notifyd.post-deinstall"
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall b/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall
deleted file mode 120000
index 2aa65d32e..000000000
--- a/x11/xfce4-notifyd/xfce4-notifyd.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-notifyd.post-install
\ No newline at end of file
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-install b/x11/xfce4-notifyd/xfce4-notifyd.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-notifyd/xfce4-notifyd.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade b/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade
deleted file mode 120000
index 2aa65d32e..000000000
--- a/x11/xfce4-notifyd/xfce4-notifyd.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-notifyd.post-install
\ No newline at end of file
diff --git a/x11/xfce4-panel/APKBUILD b/x11/xfce4-panel/APKBUILD
deleted file mode 100644
index 1124c8306..000000000
--- a/x11/xfce4-panel/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-panel
-pkgver=4.6.3
-pkgrel=0
-pkgdesc="Panel for the Xfce desktop environment"
-url="http://www.xfce.org/"
-license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="hicolor-icon-theme"
-makedepends="pkgconfig libxfcegui4-dev exo-dev libwnck-dev intltool gettext-dev
-	libiconv-dev expat-dev libsm-dev libice-dev startup-notification-dev
-	e2fsprogs zlib-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$pkgver.tar.bz2"
-depends_dev="libxfce4util-dev libxfcegui4-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="0b715abb929220f136483ccd7303ff62  xfce4-panel-4.6.3.tar.bz2"
diff --git a/x11/xfce4-panel/xfce4-panel.post-deinstall b/x11/xfce4-panel/xfce4-panel.post-deinstall
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-panel/xfce4-panel.post-deinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-panel/xfce4-panel.post-install b/x11/xfce4-panel/xfce4-panel.post-install
deleted file mode 100644
index 4a602f0b5..000000000
--- a/x11/xfce4-panel/xfce4-panel.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-exit 0
diff --git a/x11/xfce4-panel/xfce4-panel.post-upgrade b/x11/xfce4-panel/xfce4-panel.post-upgrade
deleted file mode 120000
index 3c863ae3d..000000000
--- a/x11/xfce4-panel/xfce4-panel.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-panel.post-install
\ No newline at end of file
diff --git a/x11/xfce4-screenshooter/APKBUILD b/x11/xfce4-screenshooter/APKBUILD
deleted file mode 100644
index cde73790c..000000000
--- a/x11/xfce4-screenshooter/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-screenshooter
-pkgver=1.6.0
-pkgrel=0
-pkgdesc="screenshot application for Xfce4"
-url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-license="GPL2"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xfce4-panel-dev intltool hicolor-icon-theme libsm-dev
-	e2fsprogs-dev"
-install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade
-	xfce4-screenshooter.post-deinstall"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="331750879b966eec639eb3fe3045cb16  xfce4-screenshooter-1.6.0.tar.gz
-db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-install
-db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-screenshooter.post-deinstall"
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall b/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
deleted file mode 120000
index 735306e31..000000000
--- a/x11/xfce4-screenshooter/xfce4-screenshooter.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-screenshooter.post-install
\ No newline at end of file
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-install b/x11/xfce4-screenshooter/xfce4-screenshooter.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-screenshooter/xfce4-screenshooter.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade b/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
deleted file mode 120000
index 735306e31..000000000
--- a/x11/xfce4-screenshooter/xfce4-screenshooter.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-screenshooter.post-install
\ No newline at end of file
diff --git a/x11/xfce4-session/APKBUILD b/x11/xfce4-session/APKBUILD
deleted file mode 100644
index a7c42b9b1..000000000
--- a/x11/xfce4-session/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-session
-pkgver=4.6.1
-pkgrel=1
-pkgdesc="A session manager for Xfce"
-url="http://www.xfce.org/"
-license="GPL2"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool
-	gettext-dev libiconv-dev iceauth libice-dev libsm-dev expat-dev
-	e2fsprogs-dev zlib-dev"
-depends="hicolor-icon-theme"
-install=
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	busybox-shutdown.patch"
-
-depends_dev="libxfcegui4-dev xfconf-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i ../busybox-shutdown.patch || return 1
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-legacy-sm \
-		--disable-gnome \
-		--enable-session-screenshots \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	# tips doesnt work and i dont like them.
-	# just remove to save space
-	rm -f "$pkgdir"/etc/xdg/autostart/xfce4-tips-autostart.desktop \
-		"$pkgdir"/usr/bin/xfce4-tips
-}
-
-md5sums="7628be41ed3511a20cff5673d9d39858  xfce4-session-4.6.1.tar.bz2
-bfd9132f08f4a92efbe982fb911c511c  busybox-shutdown.patch"
diff --git a/x11/xfce4-session/busybox-shutdown.patch b/x11/xfce4-session/busybox-shutdown.patch
deleted file mode 100644
index 37423618f..000000000
--- a/x11/xfce4-session/busybox-shutdown.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/xfsm-shutdown-helper/main.c	Thu Nov  5 17:34:17 2009
-+++ b/xfsm-shutdown-helper/main.c	Thu Nov  5 17:36:56 2009
-@@ -64,8 +64,8 @@
- #define POWEROFF_CMD  "/usr/sbin/shutdown -i 5 -g 0 -y"
- #define REBOOT_CMD    "/usr/sbin/shutdown -i 6 -g 0 -y"
- #else
--#define POWEROFF_CMD  "/sbin/shutdown -h now"
--#define REBOOT_CMD    "/sbin/shutdown -r now"
-+#define POWEROFF_CMD  "/sbin/poweroff"
-+#define REBOOT_CMD    "/sbin/reboot"
- #endif
- 
- 
diff --git a/x11/xfce4-session/xfce4-session.post-deinstall b/x11/xfce4-session/xfce4-session.post-deinstall
deleted file mode 120000
index 7242718fc..000000000
--- a/x11/xfce4-session/xfce4-session.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-session.post-install
\ No newline at end of file
diff --git a/x11/xfce4-session/xfce4-session.post-install b/x11/xfce4-session/xfce4-session.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfce4-session/xfce4-session.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce4-settings/APKBUILD b/x11/xfce4-settings/APKBUILD
deleted file mode 100644
index 2d048cfac..000000000
--- a/x11/xfce4-settings/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-settings
-pkgver=4.6.4
-pkgrel=0
-pkgdesc="Settings manager for xfce"
-url="http://www.xfce.org/"
-license="GPL-2"
-depends=
-makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev
-	libglade-dev pkgconfig intltool gettext-dev libiconv-dev expat-dev
-	libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev"
-source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i -e 's/Rodent/Tango/g' xfsettingsd/xsettings.xml \
-		dialogs/appearance-settings/main.c
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-libxklavier \
-		--enable-xrandr \
-		--enable-sound-settings
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="04985407e8e5b916c44780314a177e96  xfce4-settings-4.6.4.tar.bz2"
diff --git a/x11/xfce4-taskmanager/APKBUILD b/x11/xfce4-taskmanager/APKBUILD
deleted file mode 100644
index 039ca22d3..000000000
--- a/x11/xfce4-taskmanager/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-taskmanager
-pkgver=0.4.1
-pkgrel=0
-pkgdesc="a simple taskmanager for the Xfce Desktop Environment"
-url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
-license="GPL-2"
-depends=
-makedepends="pkgconfig intltool libxfcegui4-dev"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/xfce4 \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="4ed599faf6b734b2d2e7be16adf0b2d9  xfce4-taskmanager-0.4.1.tar.bz2"
diff --git a/x11/xfce4-vala/APKBUILD b/x11/xfce4-vala/APKBUILD
deleted file mode 100644
index e71e5bef0..000000000
--- a/x11/xfce4-vala/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-vala
-pkgver=4.6.0
-pkgrel=0
-pkgdesc="Vala bindings for Xfce4"
-url="http://wiki.xfce.org/vala-bindings"
-license="LGPL"
-depends="exo-dev libxfce4util-dev libxfce4menu-dev libxfcegui4-dev
-	xfce4-panel-dev xfconf-dev vala"
-makedepends=""
-install=
-subpackages=
-source="http://archive.xfce.org/src/bindings/xfce4-vala/4.6/xfce4-vala-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-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="0b74000bc2d999173af4ce98d32f5fc6  xfce4-vala-4.6.0.tar.bz2"
diff --git a/x11/xfce4-wavelan-plugin/APKBUILD b/x11/xfce4-wavelan-plugin/APKBUILD
deleted file mode 100644
index 27176f016..000000000
--- a/x11/xfce4-wavelan-plugin/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-wavelan-plugin
-pkgver=0.5.5
-pkgrel=0
-pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel"
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
-license="custom"
-depends=
-makedepends="pkgconfig xfce4-panel-dev intltool libsm-dev"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-	tooltip.diff"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir"/tooltip.diff || return 1
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-md5sums="1fa00ad9f24cc29536cb7622016c6a5e  xfce4-wavelan-plugin-0.5.5.tar.bz2
-923b1f2bf2d26cf01f784b6194f64d93  tooltip.diff"
diff --git a/x11/xfce4-wavelan-plugin/tooltip.diff b/x11/xfce4-wavelan-plugin/tooltip.diff
deleted file mode 100644
index f180f5694..000000000
--- a/x11/xfce4-wavelan-plugin/tooltip.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur xfce4-wavelan-plugin-0.5.5.old/panel-plugin/wavelan.c xfce4-wavelan-plugin-0.5.5/panel-plugin/wavelan.c
---- xfce4-wavelan-plugin-0.5.5.old/panel-plugin/wavelan.c	2009-10-09 14:42:54.427988584 +0200
-+++ xfce4-wavelan-plugin-0.5.5/panel-plugin/wavelan.c	2009-10-09 14:45:24.351280223 +0200
-@@ -199,6 +199,14 @@
-     if ((wavelan->device = wi_open(wavelan->interface)) != NULL) {
-       /* register the update timer */
-       TRACE ("Opened device");
-+	  /* reduce the default tooltip timeout to be smaller than the update interval otherwise
-+	   * we won't see tooltips on GTK 2.16 or newer */
-+	  GtkSettings *settings;
-+	  settings = gtk_settings_get_default();
-+	  if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
-+		  g_object_set(settings, "gtk-tooltip-timeout",
-+					   250 - 10, NULL);
-+
-       wavelan->timer_id = g_timeout_add(250, wavelan_timer, wavelan);
-     }
-   }
-
diff --git a/x11/xfce4-xkb-plugin/APKBUILD b/x11/xfce4-xkb-plugin/APKBUILD
deleted file mode 100644
index c7136cee3..000000000
--- a/x11/xfce4-xkb-plugin/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4-xkb-plugin
-pkgver=0.5.3.3
-pkgrel=1
-pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xfce4-panel-dev libxklavier-dev librsvg-dev intltool libwnck-dev
-	libxi-dev libxkbfile-dev libsm-dev libgsf-dev e2fsprogs-dev bzip2-dev"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-	xfce4-xkb-plugin-0.5.3.3-libxklavier.patch"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i ../xfce4-xkb-plugin-0.5.3.3-libxklavier.patch || return 1
-}
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz
-f805bf4d31d1a55176e479a3c253df95  xfce4-xkb-plugin-0.5.3.3-libxklavier.patch"
diff --git a/x11/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/x11/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
deleted file mode 100644
index fbb918905..000000000
--- a/x11/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2009-03-06 15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2009-07-20 18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
-     config->application_map = g_hash_table_new (g_direct_hash, NULL);
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
-     
-     config_item = xkl_config_item_new ();
- 
-@@ -547,7 +547,7 @@
-     if (!config) return NULL;
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
- 
-     return registry;
- }
diff --git a/x11/xfce4/APKBUILD b/x11/xfce4/APKBUILD
deleted file mode 100644
index 97db75c18..000000000
--- a/x11/xfce4/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfce4
-pkgver=4.6
-pkgrel=1
-pkgdesc="XFCE 4 meta package"
-url="http://www.xfce.org"
-license="GPL"
-depends="thunar xfce-utils xfce4-panel xfce4-session orage terminal mousepad
-	xfce4-settings xfdesktop xfwm4 xfce4-mixer xfce4-appfinder
-	tango-icon-theme ttf-dejavu gtk-xfce-engine"
-
-makedepends=
-install=
-subpackages=
-source=
-
-build() {
-	mkdir -p "$pkgdir"
-}
-
-md5sums="" #generate with 'abuild checksum'
diff --git a/x11/xfconf/APKBUILD b/x11/xfconf/APKBUILD
deleted file mode 100644
index f3be7d47d..000000000
--- a/x11/xfconf/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfconf
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="xfconf.. thingie"
-url="http://www.xfce.org/"
-license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig dbus-glib-dev libxfce4util-dev gettext-dev libiconv-dev"
-source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev dbus-dev dbus-glib-dev"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d4d3018767ea9eb4b57cc57d4038023b  xfconf-4.6.1.tar.bz2"
diff --git a/x11/xfdesktop/APKBUILD b/x11/xfdesktop/APKBUILD
deleted file mode 100644
index 4341fbf48..000000000
--- a/x11/xfdesktop/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfdesktop
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="A desktop manager for Xfce"
-url="http://www.xfce.org/"
-license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="hicolor-icon-theme thunar"
-makedepends="pkgconfig libxfce4menu-dev thunar-dev intltool gettext-dev
-	libiconv-dev libxfce4util-dev gtk+-dev libxfcegui4-dev libwnck-dev
-	libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev
-	e2fsprogs-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="ae15cacc3e3834cca7238a8e1035c50d  xfdesktop-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfdesktop.post-install
-db51db79681eadc47be4932355a77c25  xfdesktop.post-upgrade
-db51db79681eadc47be4932355a77c25  xfdesktop.post-deinstall"
diff --git a/x11/xfdesktop/xfdesktop.post-deinstall b/x11/xfdesktop/xfdesktop.post-deinstall
deleted file mode 120000
index 15a86781a..000000000
--- a/x11/xfdesktop/xfdesktop.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfdesktop.post-install
\ No newline at end of file
diff --git a/x11/xfdesktop/xfdesktop.post-install b/x11/xfdesktop/xfdesktop.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfdesktop/xfdesktop.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfdesktop/xfdesktop.post-upgrade b/x11/xfdesktop/xfdesktop.post-upgrade
deleted file mode 120000
index 15a86781a..000000000
--- a/x11/xfdesktop/xfdesktop.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfdesktop.post-install
\ No newline at end of file
diff --git a/x11/xfprint/APKBUILD b/x11/xfprint/APKBUILD
deleted file mode 100644
index a7788ee42..000000000
--- a/x11/xfprint/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfprint
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="A print dialog and a printer manager for Xfce"
-url="http://www.xfce.org/"
-license="GPL2"
-depends="hicolor-icon-theme"
-makedepends="libxfcegui4-dev xfconf-dev cups-dev gnutls-dev intltool libsm-dev"
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static || return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d92fca97a42816085080baf07a99a62e  xfprint-4.6.1.tar.bz2"
diff --git a/x11/xfwm4-themes/APKBUILD b/x11/xfwm4-themes/APKBUILD
deleted file mode 100644
index 78d9a6868..000000000
--- a/x11/xfwm4-themes/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfwm4-themes
-pkgver=4.6.0
-pkgrel=0
-pkgdesc="A set of additionnal themes for the Xfce window manager"
-url="http://www.xfce.org/"
-license="GPL2"
-depends="xfwm4"
-makedepends="pkgconfig"
-options="!strip"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="4dc5cb29cbd40e3b9dece12a85e20854  xfwm4-themes-4.6.0.tar.bz2"
diff --git a/x11/xfwm4/APKBUILD b/x11/xfwm4/APKBUILD
deleted file mode 100644
index 5f90698e7..000000000
--- a/x11/xfwm4/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xfwm4
-pkgver=4.6.1
-pkgrel=0
-pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
-url="http://www.xfce.org/"
-license="GPL-2"
-depends="hicolor-icon-theme"
-makedepends="pkgconfig libxfcegui4-dev libwnck-dev intltool gettext-dev
-	libiconv-dev libglade-dev expat-dev libsm-dev e2fsprogs"
-install="xfwm4.post-install xfwm4.post-upgrade xfwm4.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-compositor \
-		--enable-xsync || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="538ff2554a23bf877d336e573884da9a  xfwm4-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfwm4.post-install
-db51db79681eadc47be4932355a77c25  xfwm4.post-upgrade
-db51db79681eadc47be4932355a77c25  xfwm4.post-deinstall"
diff --git a/x11/xfwm4/xfwm4.post-deinstall b/x11/xfwm4/xfwm4.post-deinstall
deleted file mode 120000
index 822a58d8c..000000000
--- a/x11/xfwm4/xfwm4.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfwm4.post-install
\ No newline at end of file
diff --git a/x11/xfwm4/xfwm4.post-install b/x11/xfwm4/xfwm4.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/x11/xfwm4/xfwm4.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfwm4/xfwm4.post-upgrade b/x11/xfwm4/xfwm4.post-upgrade
deleted file mode 120000
index 822a58d8c..000000000
--- a/x11/xfwm4/xfwm4.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfwm4.post-install
\ No newline at end of file
diff --git a/x11/xgamma/APKBUILD b/x11/xgamma/APKBUILD
deleted file mode 100644
index a980fcf4c..000000000
--- a/x11/xgamma/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xgamma
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="Alter a monitor's gamma correction through the X server"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev libxxf86vm-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="e8a88bf1a18f35b724619849dca97f4f  xgamma-1.0.3.tar.bz2"
diff --git a/x11/xhost/APKBUILD b/x11/xhost/APKBUILD
deleted file mode 100644
index eb4989ed6..000000000
--- a/x11/xhost/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xhost
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="Controls host and/or user access to a running X server."
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev libxmu-dev libxau-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="c7f91b4a750d297f269c2a0a3206a1b2  xhost-1.0.3.tar.bz2"
diff --git a/x11/xineramaproto/APKBUILD b/x11/xineramaproto/APKBUILD
deleted file mode 100644
index 0c44492f0..000000000
--- a/x11/xineramaproto/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xineramaproto
-pkgver=1.2
-pkgrel=0
-pkgdesc="X11 Xinerama extension wire protocol"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2"
diff --git a/x11/xinit/APKBUILD b/x11/xinit/APKBUILD
deleted file mode 100644
index be135ed7a..000000000
--- a/x11/xinit/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xinit
-pkgver=1.1.1
-pkgrel=3
-pkgdesc="X.Org initialisation program "
-url="http://xorg.freedesktop.org/"
-license="GPL"
-subpackages="$pkgname-doc"
-depends="xauth"
-makedepends="pkgconfig libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2
-	xinitrc
-	xsession
-	xserverrc"
-
-build() { 
-	cd "$srcdir"/xinit-$pkgver
-	./configure --prefix=/usr || return 1
-	make XINITDIR=/etc/X11/xinit || return 1
-}
-
-package() {
-	cd "$srcdir"/xinit-$pkgver
-	make XINITDIR=/etc/X11/xinit DESTDIR="$pkgdir" install || return 1
-	chmod +x "$pkgdir"/usr/bin/startx
-	install -m755 -d "$pkgdir"/etc/skel
-	install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc
-	install -m755 "$srcdir"/xsession "$pkgdir"/etc/skel/.xsession || return 1
-	install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc || return 1
-}
-md5sums="93c73705ed9eb1e1a6b6938405672f2b  xinit-1.1.1.tar.bz2
-af322d72972d5722b7fc0a9e8f025b15  xinitrc
-4f04d2891ea87f50fde518267b7a1154  xsession
-bb550d3b9a2d2b6cbe6e2667a3a7cd03  xserverrc"
diff --git a/x11/xinit/xinitrc b/x11/xinit/xinitrc
deleted file mode 100644
index 005571359..000000000
--- a/x11/xinit/xinitrc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-xinitdir=/etc/X11
-sysresources=$xinitdir/Xresources
-sysmodmap=$xinitdir/Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    xmodmap $usermodmap
-fi
-
-# First try ~/.xinitrc
-if [ -f "$HOME/.xinitrc" ]; then
-	XINITRC="$HOME/.xinitrc"
-	if [ -x $XINITRC ]; then
-		# if the x bit is set on .xinitrc
-		# it means the xinitrc is not a
-		# shell script but something else
-		exec $XINITRC "$@"
-	else
-		exec /bin/sh "$HOME/.xinitrc" "$@"
-	fi
-fi
-
-# If not present, try the system default
-exec startxfce4
-
-
-# Fall back to fluxbox
-exec startfluxbox
-
-# Start only terminal as last resort
-exec terminal || exec aterm
diff --git a/x11/xinit/xserverrc b/x11/xinit/xserverrc
deleted file mode 100644
index 6a636c119..000000000
--- a/x11/xinit/xserverrc
+++ /dev/null
@@ -1 +0,0 @@
-exec /usr/bin/X -nolisten tcp
diff --git a/x11/xinit/xsession b/x11/xinit/xsession
deleted file mode 100644
index 819c248cd..000000000
--- a/x11/xinit/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/sh -l ~/.xinitrc
-
diff --git a/x11/xkbcomp/APKBUILD b/x11/xkbcomp/APKBUILD
deleted file mode 100644
index 13a7fd3eb..000000000
--- a/x11/xkbcomp/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xkbcomp
-pkgver=1.1.1
-pkgrel=0
-pkgdesc="compile XKB keyboard description"
-url="http://xorg.freedesktop.org"
-license="custom"
-depends=
-makedepends="pkgconfig libx11-dev libxkbfile-dev"
-subpackages="$pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/app/$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
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="38c387bacdc01038c8ac280588792bcf  xkbcomp-1.1.1.tar.bz2"
diff --git a/x11/xkeyboard-config/APKBUILD b/x11/xkeyboard-config/APKBUILD
deleted file mode 100644
index 3816ce62f..000000000
--- a/x11/xkeyboard-config/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xkeyboard-config
-pkgver=1.6
-pkgrel=0
-pkgdesc="X keyboard configuration files"
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-license="custom"
-depends=
-makedepends="xkbcomp intltool"
-source="http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--with-xkb-rules-symlink=xorg \
-		--enable-compat-rules=yes || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/share/X11/xkb/compiled || return 1
-	install -m755 -d "$pkgdir"/var/lib/xkb
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="5ae575a9073af12cd71773e065b38b3a  xkeyboard-config-1.6.tar.bz2"
diff --git a/x11/xmodmap/APKBUILD b/x11/xmodmap/APKBUILD
deleted file mode 100644
index 87d0d4ba8..000000000
--- a/x11/xmodmap/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xmodmap
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="utility for modifying keymaps and pointer button mappings in X"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2"
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD
deleted file mode 100644
index 4b9796e36..000000000
--- a/x11/xorg-server/APKBUILD
+++ /dev/null
@@ -1,137 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xorg-server
-pkgver=1.7.3.902
-pkgrel=0
-pkgdesc="X.Org X servers"
-url="http://xorg.freedesktop.org"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc xfbdev"
-depends="
-	font-misc-misc
-	font-cursor-misc
-	xkeyboard-config
-	xkbcomp
-	xinit
-	"
-makedepends="
-	libpciaccess-dev
-	libx11-dev
-	libxdamage-dev
-	libxfont-dev
-	libxkbfile-dev
-	libxkbui-dev	
-	libxv-dev
-	libxxf86dga-dev
-	libxxf86misc-dev
-	openssl-dev
-	pixman-dev
-
-	bigreqsproto
-	compositeproto
-	damageproto
-	dbus-dev
-	fixesproto
-	inputproto
-	pkgconfig
-	randrproto
-	renderproto
-	resourceproto
-	xcmiscproto
-	xextproto
-	xtrans
-	xf86driproto
-	glproto
-	mesa-dev
-	libdrm-dev
-	perl
-	scrnsaverproto
-	xineramaproto
-	libxinerama-dev
-	libtool
-	automake
-	autoconf
-	util-macros
-	"
-#	hal>=0.5.11 xcursor-themes xkeyboard-config>=1.3
-#	xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1
-#	diffutils xf86-input-evdev"
-
-source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
-	xorg-redhat-die-ugly-pattern-die-die-die.patch
-"
-
-depends_dev="pixman-dev libpciaccess-dev"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -Np1 -i "$i" || return 1
-	done
-	# Fix dbus config path
-	sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	# xorg modules does not work with the -z now and it seems like we
-	# cannot pass over the linker flag to .so files. so we tweak the
-	# gcc specs.
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var \
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/100dpi:unscaled,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
-		--with-xkb-path=/usr/share/X11/xkb \
-		--with-xkb-output=/var/lib/xkb \
-		--with-dri-driver-path=/usr/lib/xorg/modules/dri \
-		--enable-composite \
-		--enable-config-dbus \
-		--enable-dri \
-		--enable-ipv6 \
-		--enable-xfbdev \
-		--enable-kdrive \
-		--enable-xorg \
-		--enable-xv \
-		--enable-xres \
-		--disable-xephyr \
-		--disable-config-hal \
-		--disable-dmx \
-		--disable-tslib \
-		--disable-xnest \
-		--disable-xsdl \
-		--disable-aiglx \
-		--disable-xace \
-		|| return 1
-
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
-
-	install -m755 -d "$pkgdir"/etc/X11 || return 1
-	install -m755 -d "$pkgdir"/var/lib/xkb || return 1
-	install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-
-xfbdev() {
-	pkgdesc="X.org server for framebuffer"
-	depends=
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/
-}
-
-xephyr() {
-	pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer"
-	depends=
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
-}
-
-md5sums="5806bd9d1ed734a60db2e32473a720b4  xorg-server-1.7.3.902.tar.bz2
-222de594206d1148a90eddfda4f7a11a  xorg-redhat-die-ugly-pattern-die-die-die.patch"
diff --git a/x11/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch b/x11/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch
deleted file mode 100644
index 3ca10647c..000000000
--- a/x11/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove the default root window grey stipple pattern, replacing it with
-blackness.
-
---- Xserver/dix/window.c.die-ugly-pattern-die-die-die	Tue Feb 12 16:33:04 2002
-+++ Xserver/dix/window.c	Tue Feb 12 16:45:32 2002
-@@ -119,8 +119,8 @@
-  *
-  ******/
- 
--static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
--static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
-+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
-+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
- 
- int screenIsSaved = SCREEN_SAVER_OFF;
- 
diff --git a/x11/xproto/APKBUILD b/x11/xproto/APKBUILD
deleted file mode 100644
index 87f6c66d2..000000000
--- a/x11/xproto/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xproto
-pkgver=7.0.16
-pkgrel=0
-pkgdesc="X11 core wire protocol and auxiliary headers"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-md5sums="75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2"
diff --git a/x11/xrandr/APKBUILD b/x11/xrandr/APKBUILD
deleted file mode 100644
index fefa3aa84..000000000
--- a/x11/xrandr/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xrandr
-pkgver=1.3.2
-pkgrel=0
-pkgdesc="primitive command line interface to RandR extension"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libxrandr-dev libxrender-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2
-	$pkgname-1.3.0-clone-nameclash.patch"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../$pkgname-1.3.0-clone-nameclash.patch || return 1
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="2cb19bb1c19ccf77c40032b03dbe06f0  xrandr-1.3.2.tar.bz2
-b938aad95a5ea71bce7a2529fd8f6866  xrandr-1.3.0-clone-nameclash.patch"
diff --git a/x11/xrandr/xrandr-1.3.0-clone-nameclash.patch b/x11/xrandr/xrandr-1.3.0-clone-nameclash.patch
deleted file mode 100644
index 55af5590c..000000000
--- a/x11/xrandr/xrandr-1.3.0-clone-nameclash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xrandr-1.3.0/xrandr.c.orig	2009-04-10 12:26:02.000000000 +0000
-+++ xrandr-1.3.0/xrandr.c	2009-04-10 12:43:44.000000000 +0000
-@@ -209,7 +209,7 @@
- 
- #if HAS_RANDR_1_2
- typedef enum _policy {
--    clone, extend
-+    p_clone, extend
- } policy_t;
- 
- typedef enum _relation {
-@@ -2027,7 +2027,7 @@
-     int		ret = 0;
- #if HAS_RANDR_1_2
-     output_t	*output = NULL;
--    policy_t	policy = clone;
-+    policy_t	policy = p_clone;
-     Bool    	setit_1_2 = False;
-     Bool    	query_1_2 = False;
-     Bool	modeit = False;
-@@ -2401,7 +2401,7 @@
- 	    continue;
- 	}
- 	if (!strcmp ("--clone", argv[i])) {
--	    policy = clone;
-+	    policy = p_clone;
- 	    setit_1_2 = True;
- 	    continue;
- 	}
diff --git a/x11/xrdb/APKBUILD b/x11/xrdb/APKBUILD
deleted file mode 100644
index 271fdb293..000000000
--- a/x11/xrdb/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xrdb
-pkgver=1.0.6
-pkgrel=0
-pkgdesc="X server resource database utility"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libxmu-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="8dd881cd5a7dcb6e456549817f0fb475  xrdb-1.0.6.tar.bz2"
diff --git a/x11/xrefresh/APKBUILD b/x11/xrefresh/APKBUILD
deleted file mode 100644
index f82d40621..000000000
--- a/x11/xrefresh/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xrefresh
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="refresh all or part of an X screen"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="8f4fafcfb77b3c6972cc44bb3f1c899c  xrefresh-1.0.3.tar.bz2"
diff --git a/x11/xset/APKBUILD b/x11/xset/APKBUILD
deleted file mode 100644
index 2a46871db..000000000
--- a/x11/xset/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xset
-pkgver=1.1.0
-pkgrel=0
-pkgdesc="X.Org xset application"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libxmu-dev libx11-dev libxext-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="eeb0d02f69c76bd40470dede99b4bd49  xset-1.1.0.tar.bz2"
diff --git a/x11/xsetmode/APKBUILD b/x11/xsetmode/APKBUILD
deleted file mode 100644
index 13e8fd3eb..000000000
--- a/x11/xsetmode/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xsetmode
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="set the mode for an X Input device"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libxi-dev libx11-dev"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2"
diff --git a/x11/xsetroot/APKBUILD b/x11/xsetroot/APKBUILD
deleted file mode 100644
index cfcdb26be..000000000
--- a/x11/xsetroot/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xsetroot
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.Org xsetroot application"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-depends=
-makedepends="pkgconfig libx11-dev libxmu-dev xbitmaps"
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="cbda9b9b8da5af4614110883d5a276b8  xsetroot-1.0.3.tar.bz2"
diff --git a/x11/xtrans/APKBUILD b/x11/xtrans/APKBUILD
deleted file mode 100644
index 05f98885f..000000000
--- a/x11/xtrans/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xtrans
-pkgver=1.2.4
-pkgrel=0
-pkgdesc="X transport library"
-url="http://xorg.freedesktop.org/"
-license="custom"
-depends=""
-makedepends=""
-source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-md5sums="b3b57e78dc06885e79f8393a83619715  xtrans-1.2.4.tar.bz2"
diff --git a/x11/xvinfo/APKBUILD b/x11/xvinfo/APKBUILD
deleted file mode 100644
index 7edd4d03c..000000000
--- a/x11/xvinfo/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xvinfo
-pkgver=1.0.2
-pkgrel=0
-pkgdesc="Print out X-Video extension adaptor information"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-doc"
-makedepends="pkgconfig libxv-dev"
-depends=
-source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="e1e318436f49e2f0f3764593dadd9ad2  xvinfo-1.0.2.tar.bz2"
diff --git a/x11/zsnes/APKBUILD b/x11/zsnes/APKBUILD
deleted file mode 100644
index 5e7d5d2df..000000000
--- a/x11/zsnes/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=zsnes
-pkgver=1.51
-pkgrel=0
-pkgdesc="Super Nintendo emulator"
-url="http://www.zsnes.com/"
-license="GPL"
-makedepends="sdl-dev libpng-dev ncurses-dev mesa-dev automake autoconf nasm"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}151src.tar.bz2
-	$pkgname.desktop
-	zsnes.patch
-	zsnes-1.51-CC-quotes.patch
-	zsnes-1.51-depbuild.patch
-	zsnes_icon.png"
-
-build () 
-{ 
-	cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}
-	patch -p1 -i ../zsnes-1.51-CC-quotes.patch || return 1
-	patch -p1 -i ../zsnes-1.51-depbuild.patch || return 1
-	patch -p1 -i ../zsnes.patch || return 1
-	cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src
-	aclocal && autoconf  || return 1
-	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		x_libraries=/usr/lib \
-		force_arch=i486 \
-		--enable-release || return 1
-	make makefile.dep
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src
-	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir"/zsnes.desktop \
-		"$pkgdir"/usr/share/applications/zsnes.desktop
-	install -Dm644 "$srcdir"/zsnes_icon.png \
-		"$pkgdir"/usr/share/pixmaps/zsnes_icon.png
-	mv "$pkgdir"/usr/man "$pkgdir"/usr/share
-}
-md5sums="7071186bf80632ae88a153239498d8c9  zsnes151src.tar.bz2
-b100b2aa342c551167d7c5dcdcde9dd4  zsnes.desktop
-4df831b3d87a35949bcf3fd5547decb1  zsnes.patch
-69ca17611c0d4a21529a95eb37e05c2f  zsnes-1.51-CC-quotes.patch
-994af091cbb8f17f82d78c0ca89ac549  zsnes-1.51-depbuild.patch
-b5260c02adfc3b7ff725041214b00bfd  zsnes_icon.png"
diff --git a/x11/zsnes/zsnes-1.51-CC-quotes.patch b/x11/zsnes/zsnes-1.51-CC-quotes.patch
deleted file mode 100644
index a871b6260..000000000
--- a/x11/zsnes/zsnes-1.51-CC-quotes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.in.orig	2009-02-25 18:13:40.000000000 +0100
-+++ b/src/Makefile.in	2009-02-25 18:13:16.000000000 +0100
-@@ -95,7 +95,7 @@
- %.o: %.cpp
- 	@CXX@ @CXXFLAGS@ -o $@ -c $<
- %.o %.h: %.psr $(PSR)
--	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
-+	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
- 
- default: main
- all: main tools--- zsnes_1_51/src/Makefile.in.orig	2009-02-25 18:02:07.000000000 +0100
-@@ -133,7 +133,7 @@
- 
- include makefile.dep
- makefile.dep: $(TOOL_D)/depbuild Makefile
--	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
-+	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
- 
- Makefile: Makefile.in config.status
- 	./config.status
diff --git a/x11/zsnes/zsnes-1.51-depbuild.patch b/x11/zsnes/zsnes-1.51-depbuild.patch
deleted file mode 100644
index e2cc0d86f..000000000
--- a/x11/zsnes/zsnes-1.51-depbuild.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/tools/depbuild.cpp	Fri Nov 13 18:41:24 2009
-+++ b/src/tools/depbuild.cpp	Fri Nov 13 19:04:09 2009
-@@ -24,6 +24,9 @@
- #include <iostream>
- #include <string>
- #include <cstdio>
-+#include <cstdlib>
-+#include <unistd.h>
-+
- using namespace std;
- 
- #include "fileutil.h"
-@@ -130,7 +133,20 @@
- void dependency_calculate_asm(const char *filename)
- {
-   string command = nasm + " " + nflags + " -M " + filename;
--  system(command.c_str());
-+  FILE *fp = popen(command.c_str(), "r");
-+  if (fp)
-+  {
-+    char line[256];
-+    while (fgets(line, sizeof(line), fp)) //Process all lines of output
-+    {
-+      cout << line;
-+    }
-+    pclose(fp);
-+  }
-+  else
-+  {
-+    cerr << "Failed on: " << filename << "\n";
-+  }
- }
- 
- void dependency_calculate_psr(const char *filename)
diff --git a/x11/zsnes/zsnes.desktop b/x11/zsnes/zsnes.desktop
deleted file mode 100644
index db13ada4c..000000000
--- a/x11/zsnes/zsnes.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Zsnes
-Comment=Super Nintendo emulator
-Exec=/usr/bin/zsnes
-Icon=/usr/share/pixmaps/zsnes_icon.png
-Terminal=false
-Type=Application
-Categories=Application;Game
-StartupNotify=false
diff --git a/x11/zsnes/zsnes.patch b/x11/zsnes/zsnes.patch
deleted file mode 100644
index db0740384..000000000
--- a/x11/zsnes/zsnes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -cr zsnes_1_51/src/parsegen.cpp zsnes_1_51-patched/src/parsegen.cpp
-*** zsnes_1_51/src/parsegen.cpp	2007-10-31 01:30:26.000000000 -0300
---- zsnes_1_51-patched/src/parsegen.cpp	2008-07-13 18:28:53.000000000 -0300
-***************
-*** 19,24 ****
---- 19,27 ----
-  Config file handler creator by Nach (C) 2005-2007
-  */
-  
-+ #include <cstring>
-+ #include <cstdlib>
-+ 
-  #if !defined(__GNUC__) && !defined(_MSC_VER)
-  #error You are using an unsupported compiler
-  #endif
-***************
-*** 1822,1828 ****
-    }
-  }
-  
-! int main(size_t argc, const char *const *const argv)
-  {
-    const char *cheader_file = 0;
-    bool compile = false;
---- 1825,1831 ----
-    }
-  }
-  
-! int main(int argc, const char *const *const argv)
-  {
-    const char *cheader_file = 0;
-    bool compile = false;
-diff -cr zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-patched/src/tools/depbuild.cpp
-*** zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 08:04:05.000000000 -0300
---- zsnes_1_51-patched/src/tools/depbuild.cpp	2008-07-13 18:30:46.000000000 -0300
-***************
-*** 183,189 ****
-    }
-  }
-  
-! int main(size_t argc, const char *const *const argv)
-  {
-    if (argc < 5)
-    {
---- 183,189 ----
-    }
-  }
-  
-! int main(int argc, const char *const *const argv)
-  {
-    if (argc < 5)
-    {
-diff -cr zsnes_1_51/src/tools/strutil.h zsnes_1_51-patched/src/tools/strutil.h
-*** zsnes_1_51/src/tools/strutil.h	2006-12-27 08:04:05.000000000 -0300
---- zsnes_1_51-patched/src/tools/strutil.h	2008-07-13 18:30:27.000000000 -0300
-***************
-*** 15,20 ****
---- 15,23 ----
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-  
-+ #include <cstring>
-+ #include <cstdlib>
-+ 
-  /*
-  This is part of a toolkit used to assist in ZSNES development
-  */
diff --git a/x11/zsnes/zsnes_icon.png b/x11/zsnes/zsnes_icon.png
deleted file mode 100644
index 31608ba06..000000000
--- a/x11/zsnes/zsnes_icon.png
+++ /dev/null