Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/gcin/PKGBUILD
	extra/qt/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-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	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-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-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/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/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	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
	kde-unstable/soprano/PKGBUILD
	testing/systemd/PKGBUILD

9 files changed, 44 insertions, 24 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 94e4e7f62..ace2f8986 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,11 +1,11 @@
 # $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 pkgname=grub
 pkgver=0.97
-pkgrel=21.3
+pkgrel=21.4
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/grub/menu.lst b/libre/grub/menu.lst
index 43d2ac8db..f405baa91 100644
--- a/libre/grub/menu.lst
+++ b/libre/grub/menu.lst
@@ -26,7 +26,7 @@
 # general configuration:
 timeout   5
 default   0
-color light-blue/black light-cyan/blue
+color magenta/black white/magenta
 
 # boot sections follow
 # each is implicitly numbered from 0 in the order of appearance below
diff --git a/libre/grub/rePKGBUILD b/libre/grub/rePKGBUILD
index b14550034..a73289fb5 100644
--- a/libre/grub/rePKGBUILD
+++ b/libre/grub/rePKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: André Silva <andre.paulista@adinet.com.uy>
+# Contributor: André Silva <emulatorman@lavabit.com>
 source PKGBUILD
 CARCH=i686
 unset build package md5sums source
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 0e03539ba..a326fc8eb 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 [ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson')
 pkgbase=grub2
 pkgver=2.00rc1
-pkgrel=1
+pkgrel=1.1
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -39,7 +39,7 @@ sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
           'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
           'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
           '31aa740fc225b3f3ed4917843038f9e8658a71be'
-          '348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
+          '9a81f8bebcbee3d300315a29266ce7a5c9e5881c'
           '9735043d518e16f147f64ef283eceb2549fed860'
           'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
 
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
index 4ab37bbfc..d0c959059 100644
--- a/libre/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -34,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
 # modes only.  Entries specified as foreground/background.
-#GRUB_COLOR_NORMAL="light-blue/black"
-#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+GRUB_COLOR_NORMAL="magenta/black"
+GRUB_COLOR_HIGHLIGHT="white/magenta"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
 #GRUB_BACKGROUND="/path/to/wallpaper"
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 3a6390613..aee2585d9 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.06.11
+pkgver=2012.06.28
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
@@ -13,8 +13,7 @@ url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('glibc' 'bash' 'grep' 'coreutils' 'systemd-tools' 'iproute2'
-         'ncurses' 'kbd' 'findutils' 'sysvinit')
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
             'net-tools: legacy network support'
@@ -29,5 +28,5 @@ package() {
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('886fba51e5ec348f64604ac91c13548e'
+md5sums=('21651eaba1fd34542c78f39c755cd171'
          '027576534885b8d5dded9be546057b12')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index b7dc50f94..083cce961 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,15 +1,15 @@
 # $Id$
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
-_pkgname=('perf' 'cpupower')
-pkgname=('perf-libre' 'cpupower-libre')
+_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
+pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre')
 _basekernel=3.4
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -34,7 +34,6 @@ build() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  cd ${srcdir}
   msg2 'Build perf'
   pushd linux-$pkgver/tools/perf
   make \
@@ -47,10 +46,16 @@ build() {
   popd
 
   msg2 'Build cpupower'
-  cd linux-$pkgver/tools/power/cpupower
+  pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
   LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
+  popd
+
+  msg2 'Build x86_energy_perf_policy'
+  pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  make
+  popd
 }
 
 package_perf-libre() {
@@ -91,4 +96,15 @@ package_cpupower-libre() {
   install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
 }
 
+package_x86_energy_perf_policy-libre() {
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+  replaces=('x86_energy_perf_policy')
+  conflicts=('x86_energy_perf_policy')
+  provides=("x86_energy_perf_policy=$pkgver")
+
+  cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
index 31fafc3c4..155785fbd 100644
--- a/libre/python-reportlab-libre/PKGBUILD
+++ b/libre/python-reportlab-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 29478 2010-10-14 14:58:41Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $
+# Maintainer:
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor: borgo <nomail>
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index ad5f4e365..41021cf24 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texlive-core-libre
 _pkgname=texlive-core
 pkgver=2012.26892
 _revnr=${pkgver#2012.}
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=(any)
@@ -26,7 +26,7 @@ provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
 source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
-        "${_pkgname}.maps")
+        "$_pkgname.maps")
 options=(!strip)
 install=texlive.install
 #backup=(etc/texmf/tex/context/config/cont-usr.tex)
@@ -80,8 +80,12 @@ package() {
    
    # remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
    rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
-   sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \
-       "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
+   #sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \
+   #    "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+   # remove upstream updmap.cfg: it contains too many maps.
+   rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg"
+ 
    # more cleanup
    rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/