Revert "main/mesa: add -dbg package"

This reverts commit 51d9d10efc580dfb4ce82848124ce7c19319e76e.

4 files changed, 20 insertions, 20 deletions

diff --git a/main/ebtables/APKBUILD b/main/ebtables/APKBUILD
index 3b77e0f6f3..0c05ae376c 100644
--- a/main/ebtables/APKBUILD
+++ b/main/ebtables/APKBUILD
@@ -31,7 +31,6 @@ prepare() {
 		-e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \
 		-e "s/^CFLAGS:=/CFLAGS?=/" \
 		-e "s,^CC:=,CC?=," Makefile
-	rm -r include/linux
 }
 
 build() {
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 40b4a59455..19923dbc14 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=llvm
-pkgver=3.4
-pkgrel=0
+pkgver=3.3
+pkgrel=1
 pkgdesc="low level virtual machine compiler system"
 arch="x86 x86_64"
 url="http://llvm.org/"
@@ -13,7 +13,9 @@ makedepends="$depends_dev groff libffi-dev python chrpath"
 install=
 subpackages="clang $pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
-	http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
+	http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
+	llvm-3.3-alpine-linux.patch
+	llvm-musl.patch
 	"
 # clang hardcodes linker paths; and don't know of a fix like the --with-dynamic-linker
 # patch we use for gcc. So llvm-3.2-alpine-linux.patch needs to be updated if/when the
@@ -24,11 +26,11 @@ _srcdir="$srcdir"/"$pkgname-$pkgver.src"
 
 prepare() {
 	msg "Preparing CLANG sources..."
-	mv "$srcdir"/clang-$pkgver \
-		"$srcdir"/$pkgname-$pkgver/tools/clang || return 1
+	mv "$srcdir"/cfe-$pkgver.src \
+		"$srcdir"/$pkgname-$pkgver.src/tools/clang || return 1
 
 	msg "Patching LLVM core..."
-	cd "$srcdir"/$pkgname-$pkgver || return 1
+	cd "$srcdir"/$pkgname-$pkgver.src || return 1
 	update_config_sub || return 1
 	for i in $source; do
 		case $i in
@@ -39,7 +41,7 @@ prepare() {
 		esac
 	done
 	# fails to link
-	#rm ./unittests/Support/formatted_raw_ostream_test.cpp
+	rm ./unittests/Support/formatted_raw_ostream_test.cpp
 }
 
 build() {
@@ -106,15 +108,15 @@ libs() {
 	mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/
 }
 
-md5sums="46ed668a1ce38985120dbf6344cf6116  llvm-3.4.src.tar.gz
-b378f1e2c424e03289effc75268d3d2c  clang-3.4.src.tar.gz
+md5sums="40564e1dc390f9844f1711c08b08e391  llvm-3.3.src.tar.gz
+8284891e3e311829b8e44ac813d0c9ef  cfe-3.3.src.tar.gz
 18f9165003a5b86101547d40ec5d3036  llvm-3.3-alpine-linux.patch
 517019fb4907cf5944c84315c681f905  llvm-musl.patch"
-sha256sums="25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628  llvm-3.4.src.tar.gz
-22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b  clang-3.4.src.tar.gz
+sha256sums="68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578  llvm-3.3.src.tar.gz
+b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996  cfe-3.3.src.tar.gz
 5a6e40c7ffe280534ce964eaca5bc8ec325cb747f8de1390f534be2944c72361  llvm-3.3-alpine-linux.patch
 3b653520e79933058e9b4ab0943a364a87babe8e5e6b520ac15660c146302c74  llvm-musl.patch"
-sha512sums="4ccd8c4fc15dd9abc43f93b62f0b1349c419a2afeba05304fa98c157325e31dbbdb1587afc18d0a3f5dba14c95d64a3d40a825efe89ddf6f93fa96002496675c  llvm-3.4.src.tar.gz
-eac282c26d46d04f3e74c6a34629aa6496882aa6f64387728be86de3eba963a97388fd4214aea7d47a801215e61c0a54663d65474effec8be2e39be1b1ed89f1  clang-3.4.src.tar.gz
+sha512sums="1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038  llvm-3.3.src.tar.gz
+06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc  cfe-3.3.src.tar.gz
 d240f0fbef611b9863cbe1a79c10b4383dabf8be2ee49fd0f853d23fb0b4c935a41f3d50456a05815102834f2a4b1ac3c9334b444ed3868b7f3fb24e14ff14eb  llvm-3.3-alpine-linux.patch
 52f9791a11c103ff8d1a35e0fd94a9d8e1379fd6f8046e346f52686bb256ca969ead77059271931ac1fff5581146dd7e3862a3a14d85b96555b8823e807f2d70  llvm-musl.patch"
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index c308f0544f..0e6bd95918 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
 pkgver=9.2.5
-pkgrel=1
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="all"
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev
 	$pkgname-dri-vmwgfx:vmwgfx
 	$pkgname-dricore $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
 	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
-	$pkgname-dbg
 	"
 
 depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD
index e1dba4d071..96835ffbb5 100644
--- a/main/xscreensaver/APKBUILD
+++ b/main/xscreensaver/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xscreensaver
-pkgver=5.26
+pkgver=5.23
 pkgrel=0
 pkgdesc="screensavers for X11 environment"
 url="http://www.jwz.org/xscreensaver/"
@@ -76,9 +76,9 @@ extras() {
 	mv "$pkgdir"/$_confdir/* "$subpkgdir"/$_confdir
 }
 
-md5sums="dd4390f36b9c9d79b66d18b145ca62ad  xscreensaver-5.26.tar.gz
+md5sums="da1fa6978520fc45b87155480ab222c9  xscreensaver-5.23.tar.gz
 7ab63bb0d5b5d043c94128dbd98cf311  intl-libs.patch"
-sha256sums="2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55  xscreensaver-5.26.tar.gz
+sha256sums="349d376e56accc100663315cb0de00699f4e9914f24f31d8723c3f28887779a3  xscreensaver-5.23.tar.gz
 d13e51b406e84f02901bd16f401c9ae897400b0567182f4b8092df1fcd51e754  intl-libs.patch"
-sha512sums="2b14c7b64c13860b7cb7ca93ae5c28c787d3aa017f1d7185d93c3db0a52fea4f97fd2a79bfc0c5f657541417130587865e5f4447bd54983a59bf3db7e50a2936  xscreensaver-5.26.tar.gz
+sha512sums="88750cf471816a43a3d69edc965aee22cc71654fda790743518567c3ddf1ba01a3e6b81c59bef6aa138acd682bef55380448001e28ed58a284f06bbbd6b275c7  xscreensaver-5.23.tar.gz
 3a4d750350bb1e5248fb03ea094001797e0628fb38c0ef854b9d30efd5d7a7f5a5b31fbac73816ae26a221201119be954c74fddbb863216ced4a5a63609720a2  intl-libs.patch"