Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/allegro/PKGBUILD
	community/erlang/PKGBUILD
	community/python-openbabel/PKGBUILD
	core/vi/PKGBUILD
	extra/accountsservice/PKGBUILD
	extra/calligra/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase-workspace/kde-np.pam
	kde-unstable/kdebase-workspace/kde.pam
	kde-unstable/kdebase-workspace/kdebase-workspace.install
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-korundum/ruby19.patch
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-marble/kdeedu-marble.install
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepim/fix-build.patch
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

1 files changed, 0 insertions, 129 deletions

diff --git a/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff b/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff
deleted file mode 100644
index a9ea10fc4..000000000
--- a/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 29 Aug 2012 13:01:15 +0000
-Subject: radeon/llvm: Cleanup makefile
-
-Hopefully, this will fix all the parallel make problems people have
-been having.
----
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 43f668a..7f1c613 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
-
- HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
-
--gen: $(GENERATED_SOURCES)
--
- SIRegisterInfo.td: SIGenRegisterInfo.pl
-	$(PERL) $^ > $@
-
-@@ -38,37 +36,37 @@ endif
- R600RegisterInfo.td: R600GenRegisterInfo.pl
-	$(PERL) $^ > $@
-
--AMDGPUGenRegisterInfo.inc: *.td
-+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-register-info, AMDGPU.td, $@)
-
--AMDGPUGenInstrInfo.inc: *.td
-+AMDGPUGenInstrInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-instr-info, AMDGPU.td, $@)
-
--AMDGPUGenAsmWriter.inc: *.td
-+AMDGPUGenAsmWriter.inc: $(TD_FILES)
-	$(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
-
--AMDGPUGenDAGISel.inc: *.td
-+AMDGPUGenDAGISel.inc: $(TD_FILES)
-	$(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
-
--AMDGPUGenCallingConv.inc: *.td
-+AMDGPUGenCallingConv.inc: $(TD_FILES)
-	$(call tablegen, -gen-callingconv, AMDGPU.td, $@)
-
--AMDGPUGenSubtargetInfo.inc: *.td
-+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-subtarget, AMDGPU.td, $@)
-
--AMDGPUGenEDInfo.inc: *.td
-+AMDGPUGenEDInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
-
--AMDGPUGenIntrinsics.inc: *.td
-+AMDGPUGenIntrinsics.inc: $(TD_FILES)
-	$(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
-
--AMDGPUGenCodeEmitter.inc: *.td
-+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
-	$(call tablegen, -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenMCCodeEmitter.inc: *.td
-+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
-	$(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenDFAPacketizer.inc: *.td
-+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
-	$(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
-
- LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 2eb1120..333dd03 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -1,4 +1,30 @@
-
-+TD_FILES := \
-+	AMDGPU.td		\
-+	AMDGPUInstrInfo.td	\
-+	AMDGPUInstructions.td	\
-+	AMDGPUIntrinsics.td	\
-+	AMDGPURegisterInfo.td	\
-+	AMDILBase.td		\
-+	AMDILInstrInfo.td	\
-+	AMDILIntrinsics.td	\
-+	AMDILRegisterInfo.td	\
-+	Processors.td		\
-+	R600InstrInfo.td	\
-+	R600Instructions.td	\
-+	R600Intrinsics.td	\
-+	R600IntrinsicsNoOpenCL.td	\
-+	R600IntrinsicsOpenCL.td	\
-+	R600RegisterInfo.td	\
-+	R600Schedule.td		\
-+	SIInstrFormats.td	\
-+	SIInstrInfo.td		\
-+	SIInstructions.td	\
-+	SIIntrinsics.td		\
-+	SIRegisterInfo.td	\
-+	SISchedule.td
-+
-+
- GENERATED_SOURCES := \
-	R600Intrinsics.td		\
-	R600RegisterInfo.td		\
---
-cgit v0.9.0.2-2-gbebe
-From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Thu, 06 Sep 2012 14:05:22 +0000
-Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES
-
-Fixes build bug introduced by
-cebbdd4ac23725963207bf6f8fc7101150e6065f
----
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 333dd03..f387636 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -10,7 +10,6 @@ TD_FILES := \
-	AMDILIntrinsics.td	\
-	AMDILRegisterInfo.td	\
-	Processors.td		\
--	R600InstrInfo.td	\
-	R600Instructions.td	\
-	R600Intrinsics.td	\
-	R600IntrinsicsNoOpenCL.td	\
---
-cgit v0.9.0.2-2-gbebe