Merge remote-tracking branch 'libre/master' into merge-abslibre

24 files changed, 1042 insertions, 253 deletions

diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
index 68846736f..f75ecec4e 100644
--- a/libre/abs-libre/PKGBUILD
+++ b/libre/abs-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=abs
 pkgname=abs-libre
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=1
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,14 @@ url="http://projects.archlinux.org/abs.git/"
 license=('GPL')
 depends=('bash' 'rsync')
 backup=(etc/abs.conf)
-install=abs.install
 source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('7be7cfc67443cff62e20f27ca57dc17a')
+md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd')
 
 build() {
   cd ${srcdir}/${_pkgname}
 
-  make CONFDIR=/etc/
-  make CONFDIR=/etc/ DESTDIR=${pkgdir} install
+  make prefix=/usr sysconfdir=/etc prepare
+  make DESTDIR=${pkgdir} install
 
   # Add readme file, and make base /var/abs path
   install -dm0755 ${pkgdir}/var/abs/local/
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 7a9630c34..958d21e01 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 103015 2010-12-14 07:09:05Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 135046 2011-08-09 23:41:13Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=filesystem
-pkgver=2011.04
+pkgver=2011.08
 pkgrel=1.1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
-url='http://parabolagnulinux.org'
+url='https://parabolagnulinux.org'
 groups=('base')
 install='filesystem.install'
 depends=('iana-etc' 'bash' 'coreutils')
@@ -84,12 +84,12 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
          '8a9042a2cedf6b6b47eb8973f14289cb'
          'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
+         '6e81e088e67741210622e60292a39c9c'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
          '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
+         '22518e922891f9359f971f4f5b4e793c'
          'd2dc4e39dbdea75b107f91789e3274ab'
          'f3b6ae7db8adffaaa4bffc6099dcbd50'
          '8098ffd9fbf890468d3198277596b85a')
diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab
index a23e7955b..c1a07fcc7 100644
--- a/libre/filesystem/fstab
+++ b/libre/filesystem/fstab
@@ -1,6 +1,5 @@
 # 
 # /etc/fstab: static file system information
 #
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-devpts                 /dev/pts      devpts    defaults            0      0
-shm                    /dev/shm      tmpfs     nodev,nosuid        0      0
+# <file system>	<dir>	<type>	<options>		<dump>	<pass>
+tmpfs		/tmp	tmpfs	nodev,noexec,nosuid	0	0
diff --git a/libre/filesystem/shells b/libre/filesystem/shells
index ff9e38348..18c1aeffa 100644
--- a/libre/filesystem/shells
+++ b/libre/filesystem/shells
@@ -4,6 +4,5 @@
 
 /bin/sh
 /bin/bash
-/bin/dash
 
 # End of file
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index aa295065d..91b59e5e0 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -1,24 +1,28 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Keshav P R <skodabenz at rocketmail dot com>
 
-# _grub2_rev=3072
+# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly.
 
-_grub2_lua_ver=19
+# _grub2_rev=3238
+
+_grub2_lua_ver=20
 _grub2_gpxe_ver=12
-_grub2_ntldr_ver=13
-_grub2_915_ver=6
+_grub2_ntldr_ver=17
+_grub2_915_ver=7
 
 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
 pkgbase="grub2"
-pkgver='1.99~rc1'
+pkgver='1.99'
 pkgrel=4
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
+epoch=1
 makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper')
 options=(strip purge docs zipman !emptydirs)
 
-source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz"
+#	"http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
+source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz"
 	"ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
 	"ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
 	"ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
@@ -27,13 +31,25 @@ source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz"
 	'grub.default'
 	'grub.cfg'
 	'20_memtest86+'
-	'05_archtheme')
+	'grub2_bzr_export.sh'
+        'parabola-mkconfig.patch')
 
 noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz"
 	"grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz"
 	"grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz"
 	"grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz")
 
+sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
+          '9f2dbf7a3faab24ca92266400aa513fecd3895c8'
+          'b04994c005910b4bf123f034b30109d5c8d6fd86'
+          'e0c1a97770cc23226cf4535c029ef50b17f67974'
+          '8bcaed545956bb33581e1b97ac96a2c3717ec793'
+          'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de'
+          'd1252b837b13ebf817dbc45cfd4d772c7d1b621f'
+          '7df0516c6c45816aa330b775f1ed6f652e4f0380'
+          '82a27eca5277218cf57c6c5767e0b17a72f62229'
+          'beb31419045db70fee7401aa6448c220a491e2a3'
+          '27930016362d6647282405183b9977f0a7b15c1a')
 
 build() {
 	# set architecture dependent variables
@@ -55,6 +71,7 @@ build_grub2-common_and_bios() {
 	## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs
 	cd ${srcdir}/grub2_bios-${pkgver}
 	patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch
+	patch -Np1 -i ${srcdir}/parabola-mkconfig.patch
 
 	# add the grub-extra sources
 	export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/  
@@ -125,14 +142,11 @@ build_grub2-efi() {
 package_grub2-common() {
 	pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
 	install="grub2.install"
-	depends=('xz' 'freetype2' 'device-mapper')
+	depends=('xz' 'freetype2' 'device-mapper' 'gettext' 'texinfo')
 	conflicts=('grub')
 	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
 	cd ${srcdir}/grub2_bios-${pkgver}
-	make DESTDIR=${pkgdir} install 
-
-	## install grub2-extras ntldr-img's grubinst as /sbin/grubinst
-	install -Dm755 ${srcdir}/grub2_bios-${pkgver}/grub-core/grubinst ${pkgdir}/sbin/grubinst
+	make DESTDIR=${pkgdir} install
   
 	install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install
 	install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install
@@ -151,7 +165,6 @@ package_grub2-common() {
 		${pkgdir}/sbin/grub_efi_i386-install
   
 	## install extra /etc/grub.d/ files
-	install -Dm755 ${srcdir}/05_archtheme ${pkgdir}/etc/grub.d/05_archtheme
 	install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+
     
 	## install /etc/default/grub (used by grub-mkconfig)
@@ -166,9 +179,9 @@ package_grub2-common() {
 
 package_grub2-bios() {
 	pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS"
-	depends=(grub2-common=${pkgver})
-	replaces=('grub2')
-	provides=('grub2')
+	depends=(grub2-common=${epoch}:${pkgver})
+	replaces=('grub2' 'grub2-libre')
+	provides=('grub2' 'grub2-libre')
   
 	cd ${srcdir}/grub2_bios-${pkgver}
 	make DESTDIR=${pkgdir} install 
@@ -181,8 +194,8 @@ package_grub2-bios() {
 package_grub2-efi-i386() {
 
 	pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version"
-	depends=("grub2-common=${pkgver}" 'dosfstools')
-	optdepends=('efibootmgr')
+	depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr')
+	optdepends=('mtools')
   
 	cd ${srcdir}/grub2_efi-${pkgver}
 	make DESTDIR=${pkgdir} install 
@@ -191,14 +204,3 @@ package_grub2-efi-i386() {
         rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
         rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
 }
-
-md5sums=('fd602ffaada5ba7939d0ea47091841a5'
-         '21b709f119e0bef1c51978d757e885dc'
-         '9e0944f3e63586dc4242fd8b7977e3c4'
-         '0a124ffc9835100ba0e7de7a0ac1c389'
-         '0016761d429e6a77b90d09ed6ee8a47d'
-         '93f0f96911451e86014e04f96e13462f'
-         '50123c37cf145a98aba4ffb0fc4efba1'
-         '7cb90ebb04b856ded6ae171c3658fba2'
-         '5a07e04c4ecb8ed145d54fec3043e0d5'
-         'e143ae2e453b7c3ced309667df30da55')
diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch
index 62acd2ee8..11805e309 100644
--- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch
+++ b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch
@@ -1,21 +1,7 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b041a38..6f31dce 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -252,6 +252,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_BADRAM
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 420b3f3..79fd4fb 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -100,6 +100,14 @@ cat <<EOF
+diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+--- a/util/grub.d/00_header.in	2011-04-06 13:14:27.000000000 +0200
++++ b/util/grub.d/00_header.in	2011-08-01 15:19:57.919100452 +0200
+@@ -100,6 +100,14 @@
  
  EOF
  
@@ -30,64 +16,75 @@ index 420b3f3..79fd4fb 100644
  serial=0;
  gfxterm=0;
  for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a09c3e6..cf12ea9 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os"
+diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in	2011-05-14 22:36:49.000000000 +0200
++++ b/util/grub.d/10_linux.in	2011-08-01 15:56:53.324779083 +0200
+@@ -31,8 +31,8 @@
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
--  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 +  OS="${GRUB_DISTRIBUTOR}"
-+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | tr -d ' ') ${CLASS}"
++  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}"
  fi
  
  # loop-AES arranges things so that /dev/loop/X can be our root device, but
-@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue"
-     || uses_abstraction "${GRUB_DEVICE}" lvm; then
-   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
- else
--  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
-+  LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}"
- fi
+@@ -65,7 +65,9 @@
+   version="$2"
+   recovery="$3"
+   args="$4"
+-  if ${recovery} ; then
++  if [ -n "$5" ] ; then
++    title="$(gettext_quoted "%s, with Linux %s") $5"
++  elif ${recovery} ; then
+     title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
+   else
+     title="$(gettext_quoted "%s, with Linux %s")"
+@@ -132,7 +134,7 @@
  
- linux_entry ()
-@@ -111,7 +111,7 @@ EOF
- EOF
- }
- 
--list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
-+list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* ; do
-         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-       done`
- prepare_boot_cache=
-@@ -123,14 +123,12 @@ while [ "x$list" != "x" ] ; do
-   dirname=`dirname $linux`
-   rel_dirname=`make_system_path_relative_to_its_root $dirname`
-   version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
--  alt_version=`echo $version | sed -e "s,\.old$,,g"`
-+  base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"`
-+  alt_version="${base_init}-fallback"
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-   initrd=
--  for i in "initrd.img-${version}" "initrd-${version}.img" \
--	   "initrd-${version}" "initramfs-${version}.img" \
--	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
--	   "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
-+  for i in "${base_init}.img"; do
+ case x`uname -m` in
+     xi?86 | xx86_64)
+-	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
++	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
+                   if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+               done` ;;
+     *) 
+@@ -160,7 +162,8 @@
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ 	   "initramfs-genkernel-${version}" \
+-	   "initramfs-genkernel-${alt_version}"; do
++	   "initramfs-genkernel-${alt_version}" \
++	   "${basename/vmlinuz/kernel}.img"; do
      if test -e "${dirname}/${i}" ; then
        initrd="$i"
        break
-@@ -155,6 +153,9 @@ while [ "x$list" != "x" ] ; do
+@@ -190,6 +193,15 @@
  
    linux_entry "${OS}" "${version}" false \
        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  initrd="${alt_version}.img"
-+  linux_entry "${OS}" "${version} Fallback" false \
-+      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++  for i in "initramfs-${version}-fallback.img" \
++	   "${basename/vmlinuz/kernel}-fallback.img"; do
++    if test -e "${dirname}/${i}"; then
++      initrd="$i"
++      linux_entry "${OS}" "${version}" true \
++	  "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback
++      break
++    fi
++  done
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" true \
  	"single ${GRUB_CMDLINE_LINUX}"
+diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+--- a/util/grub-mkconfig.in	2011-04-06 17:45:53.000000000 +0200
++++ b/util/grub-mkconfig.in	2011-08-01 15:20:49.256867648 +0200
+@@ -252,6 +252,8 @@
+   GRUB_THEME \
+   GRUB_GFXPAYLOAD_LINUX \
+   GRUB_DISABLE_OS_PROBER \
++  GRUB_COLOR_NORMAL \
++  GRUB_COLOR_HIGHLIGHT \
+   GRUB_INIT_TUNE \
+   GRUB_SAVEDEFAULT \
+   GRUB_BADRAM
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
index 8302bdb3f..fecc09af6 100644
--- a/libre/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -3,31 +3,37 @@
 
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Arch Linux"
+GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre"
 GRUB_CMDLINE_LINUX_DEFAULT="quiet"
 GRUB_CMDLINE_LINUX=""
 
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
 # Uncomment to enable Hidden Menu, and optionally hide the timeout count
 #GRUB_HIDDEN_TIMEOUT=5
 #GRUB_HIDDEN_TIMEOUT_QUIET=true
 
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT=console
+
 # Uncomment to disable graphical terminal
-#GRUB_TERMINAL=console
+#GRUB_TERMINAL_OUTPUT=console
 
 # The resolution used on graphical terminal
 # note that you can use only modes which your graphic card supports via VBE
 # you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=1024x768x24
+GRUB_GFXMODE=auto
 
 # Uncomment to allow the kernel use the same resolution used by grub
-#GRUB_GFXPAYLOAD_LINUX=keep
+GRUB_GFXPAYLOAD_LINUX=keep
 
 # Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
 # format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
 #GRUB_DISABLE_LINUX_UUID=true
 
 # Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
+GRUB_DISABLE_RECOVERY=true
 
 # Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
 # modes only.  Entries specified as foreground/background.
diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install
index 898dc9246..9baf14776 100644
--- a/libre/grub2/grub2.install
+++ b/libre/grub2/grub2.install
@@ -1,30 +1,29 @@
-post_install() {
-
- if [ -f /boot/grub/grub.cfg.pacsave ]; then
-   echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
-   install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
- fi
-
- echo -n "Generating grub.cfg.example config file... "
- grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
- echo "done."
-
-cat << EOF 
- An example config file is created at /boot/grub/grub.cfg.example
- 
- For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2
-
-EOF
+infodir=usr/share/info
+filelist=(grub.info grub-dev.info)
 
+post_install() {
+  if [ -f /boot/grub/grub.cfg.pacsave ]; then
+    echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
+    install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+  fi
+
+  echo -n "Generating grub.cfg.example config file... "
+  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
+  echo "done."
+
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
 }
 
-
 post_upgrade() {
-cat << EOF
- An example config file is created at /boot/grub/grub.cfg.example
-
- For more information and additional config settings please see http://wiki.archlinux.org/index.php/GRUB2
-
-EOF
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
 }
 
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh
new file mode 100644
index 000000000..7c42d0c28
--- /dev/null
+++ b/libre/grub2/grub2_bzr_export.sh
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+## For actual repos
+
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
+# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
+
+## For launchpad mirror
+
+# bzr branch lp:~skodabenz/grub/grub2-extras-lua lua
+# bzr branch lp:~skodabenz/grub/grub2-extras-gpxe gpxe
+# bzr branch lp:~skodabenz/grub/grub2-extras-ntldr-img ntldr-img
+# bzr branch lp:~skodabenz/grub/grub2-extras-915resolution 915resolution
+
+## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately.
+
+wd=${PWD}/
+output_dir=${wd}/
+
+grub2_bzr_dir=${wd}/grub2_BZR/
+grub2_bzr_exp_dir=${wd}/grub2_experimental_BZR/
+grub2_extras_dir=${wd}/grub2_extras_BZR/
+
+main_snapshot() {
+	
+	cd ${grub2_bzr_dir}/
+	echo
+	
+	revnum=$(bzr revno ${grub2_bzr_dir})
+	bzr export --root=grub2 --format=tar ${output_dir}/grub2_r${revnum}.tar
+	echo
+	
+	cd ${output_dir}/
+	
+	xz -9 ${output_dir}/grub2_r${revnum}.tar
+	echo
+	
+}
+
+exp_snapshot() {
+	
+	cd ${grub2_bzr_exp_dir}/
+	echo
+	
+	revnum=$(bzr revno ${grub2_bzr_exp_dir})
+	bzr export --root=grub2_exp --format=tar ${output_dir}/grub2_exp_r${revnum}.tar
+	echo
+	
+	cd ${output_dir}/
+	
+	xz -9 ${output_dir}/grub2_exp_r${revnum}.tar
+	echo
+	
+}
+
+extras_snapshot() {
+	
+	cd ${grub2_extras_dir}/${grub2_extras_name}/
+	echo
+	
+	revnum=$(bzr revno ${grub2_extras_dir}/${grub2_extras_name})
+	bzr export --root=${grub2_extras_name} --format=tar ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar
+	echo
+	
+	cd ${output_dir}/
+	echo
+	
+	xz -9 ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar
+	echo
+	
+}
+
+echo
+
+set -x -e
+
+# main_snapshot
+
+# exp_snapshot
+
+grub2_extras_name="lua"
+extras_snapshot
+
+grub2_extras_name="gpxe"
+extras_snapshot
+
+grub2_extras_name="ntldr-img"
+extras_snapshot
+
+grub2_extras_name="915resolution"
+extras_snapshot
+
+set +x +e
+
+echo
+
+unset wd
+unset output_dir
+unset grub2_bzr_dir
+unset grub2_extras_dir
+unset grub2_extras_name
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
new file mode 100644
index 000000000..7c18a4cc2
--- /dev/null
+++ b/libre/grub2/parabola-mkconfig.patch
@@ -0,0 +1,32 @@
+diff -ru grub-1.99.orig/util/grub.d/10_linux.in grub-1.99/util/grub.d/10_linux.in
+--- grub-1.99.orig/util/grub.d/10_linux.in	2011-08-11 15:54:52.051246328 +0200
++++ grub-1.99/util/grub.d/10_linux.in	2011-08-11 15:55:41.297910793 +0200
+@@ -134,7 +134,7 @@
+ 
+ case x`uname -m` in
+     xi?86 | xx86_64)
+-	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
++	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* /boot/vmlinuz26 ; do
+                   if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+               done` ;;
+     *) 
+@@ -163,7 +163,8 @@
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+ 	   "initramfs-genkernel-${version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+-	   "${basename/vmlinuz/kernel}.img"; do
++	   "${basename/vmlinuz/kernel}.img" \
++	   "${basename/vmlinuz/initramfs}.img"; do
+     if test -e "${dirname}/${i}" ; then
+       initrd="$i"
+       break
+@@ -194,7 +195,8 @@
+   linux_entry "${OS}" "${version}" false \
+       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+   for i in "initramfs-${version}-fallback.img" \
+-	   "${basename/vmlinuz/kernel}-fallback.img"; do
++	   "${basename/vmlinuz/kernel}-fallback.img" \
++	   "${basename/vmlinuz/initramfs}-fallback.img"; do
+     if test -e "${dirname}/${i}"; then
+       initrd="$i"
+       linux_entry "${OS}" "${version}" true \
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 651cb40e9..9defcf845 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -11,23 +11,28 @@ _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
 pkgver=${_basekernel}.1
 pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-url="http://linux-libre.fsfla.org"
+arch=('i686' 'x86_64')
+url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "${pkgname}.preset"
-        'Kbuild'
-        'Kbuild.platforms'
         'boot-logo.patch'
         'fix-i915.patch'
         'change-default-console-loglevel.patch')
+md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
+         'af8d721036d89ed5500675c3289e3b48'
+         '66dff8af6b00eb8d054b2af85aaa5ef7'
+         '1a98b8b8f2140ac8f95c3814cba8cc95'
+         'a8a3843046926eb7ab81312cd438c5c5'
+         '04b21c79df0a952c22d681dd4f4562df'
+         '263725f20c0b9eb9c353040792d644e5'
+         '9d3c56a4b999c8bfbd4018089a62f662')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -45,18 +50,7 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
-    msg2 "Adding loongson-community patches"
-    patch -Np1 -i "${srcdir}/${_basekernel}-*-loongson-community.patch"
-    patch -Np0 -i "${srcdir}/lxo-config.patch"
-
-# ensure N32
-    sed -i "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" ./.config
-  else
-    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
-  fi
-
+  cat "${srcdir}/config.${CARCH}" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -64,7 +58,6 @@ build() {
 
   # remove the "-libre" extraversion from Makefile
   sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
-  sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|# CONFIG_LOCALVERSION_AUTO is not set|g" ./.config
 
   # remove the sublevel from Makefile
   # this ensures our kernel version is always 3.X-LIBRE
@@ -114,19 +107,13 @@ package_linux-libre() {
   cd "${srcdir}/linux-${_basekernel}"
 
   KARCH=x86
-  [[ $CARCH = "mips64el" ]] && KARCH=mips
 
   # get kernel version
   _kernver="$(make kernelrelease)"
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
-
-  if [ "$CARCH" == "mips64el" ]; then
-    cp vmlinuz ${pkgdir}/boot/vmlinuz-${pkgname}
-  else
-    cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
-  fi
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
 
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
@@ -158,15 +145,6 @@ package_linux-libre-headers() {
   conflicts=('kernel26-headers' 'linux-headers')
   replaces=('kernel26-headers' 'linux-headers')
 
-  KARCH=x86
-  [[ $CARCH = "mips64el" ]] && KARCH=mips
-
-# In case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
-    _kernver="$(make kernelrelease)"
-  fi
-
   mkdir -p "${pkgdir}/lib/modules/${_kernver}"
 
   cd "${pkgdir}/lib/modules/${_kernver}"
@@ -188,19 +166,13 @@ package_linux-libre-headers() {
   done
 
   # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
-  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86"
+  cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
 
   # copy files necessary for later builds
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
   cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    cp -a "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
-  fi
-
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
@@ -295,12 +267,7 @@ package_linux-libre-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
-  if [ "$CARCH" = "mips64el" ]; then
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
-  else
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
-  fi
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 
 package_linux-libre-docs() {
@@ -321,14 +288,3 @@ package_linux-libre-docs() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'af8d721036d89ed5500675c3289e3b48'
-         '9a5db9c3dfb190b91dfe7c3bdcfe67a8'
-         '66dff8af6b00eb8d054b2af85aaa5ef7'
-         '1a98b8b8f2140ac8f95c3814cba8cc95'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '263725f20c0b9eb9c353040792d644e5'
-         '9d3c56a4b999c8bfbd4018089a62f662')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 845854a7c..3cbb36576 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128080 2011-06-21 18:32:19Z ibiru $
+# $Id: PKGBUILD 134009 2011-07-31 18:23:34Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
@@ -6,11 +6,11 @@ _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=33805
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
+arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa')
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
@@ -32,6 +32,7 @@ build() {
         --disable-musepack \
         --disable-esd \
         --disable-mga \
+        --disable-ass-internal \
         --enable-xvmc \
         --language=all \
         --confdir=/etc/mplayer
@@ -46,7 +47,7 @@ package_mplayer-libre() {
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl' 'speex'
     'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'ladspa')
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
@@ -66,7 +67,7 @@ package_mplayer-libre() {
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
     depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123')
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 1cab3e716..e06c9a9b1 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -4,8 +4,9 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
+_pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
-pkgver=33025
+pkgver=33161
 _vaapi_version=20110127
 pkgrel=3
 pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support"
@@ -13,63 +14,73 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
-         'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+         'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa' 'smbclient'
          'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'speex'
          'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
-         'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils')
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
-provides=("mplayer-vaapi=$pkgver" 'mplayer')
-conflicts=('mplayer' 'mplayer-vaapi')
+         'libvpx' 'libpulse' 'fribidi' 'faad2' 'libva' 'libass'
+         'desktop-file-utils')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa')
+provides=("$_pkgname=$pkgver" 'mplayer')
+conflicts=('mplayer' "$_pkgname")
 replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
         http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
         mplayer.desktop
         mplayer.png
-        patch-fixes.patch)
+        patch-fixes.patch
+        gcc-4.6-mp3lib-sse-code-miscompilation.patch)
+options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
-md5sums=('3814e5c47458de4bf0878d3996820341'
+md5sums=('b8b2842ba3fff04a9b64a94bd2b0a667'
          'b39bd73ae8241dcb21dd1a8fa5eb87eb'
          '647b9f4ab5284a7fef3f84f992214e77'
          'd00874ccc644b7f43d6ef1c942fcef28'
-         '9f96a03dddbea8be5ff2fa3925311d04')
+         'c7a1df1c1d0f1e51ee400d96b0f34195'
+         'd56174335d3c5bcdf3732f4a869f01dd')
 
 build() {
   cd "$srcdir/mplayer-$pkgver"
 
-  # Custom CFLAGS break the mplayer build
-  unset CFLAGS LDFLAGS
-
   # Update vaapi patches for changes introduced in mplayer/ffmpeg
   patch -d "$srcdir/mplayer-vaapi-$_vaapi_version" -p1 -i \
     "$srcdir/patch-fixes.patch"
 
+  # Workaround mp3lib SSE code miscompilation with gcc 4.6 (r33469 upstream)
+  # Patch by Jindrich Makovicka <makovick <at> gmail>
+  patch -Np0 -i "$srcdir/gcc-4.6-mp3lib-sse-code-miscompilation.patch"
+
   for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do
     patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch"
   done
 
   ./configure --prefix=/usr \
-      --disable-faac \
-      --enable-runtime-cpudetection \
-      --disable-gui \
-      --disable-arts \
-      --disable-liblzo \
-      --enable-speex \
-      --disable-openal \
-      --disable-libdv \
-      --disable-musepack \
-      --disable-esd \
-      --disable-mga \
-      --enable-xvmc \
-      --disable-vdpau \
-      --enable-vaapi \
-      --language=all \
-      --confdir=/etc/mplayer
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --enable-speex \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-faac \
+    --enable-xvmc \
+    --disable-vdpau \
+    --enable-vaapi \
+    --language=all \
+    --confdir=/etc/mplayer
 
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
 
   make
-  make -j1 DESTDIR=$pkgdir install
+}
+
+package() {
+  cd "$srcdir/mplayer-$pkgver"
+
+  make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
   install -dm755 "$pkgdir/usr/share/mplayer/"
   ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
diff --git a/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch b/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch
new file mode 100644
index 000000000..58daa09e7
--- /dev/null
+++ b/libre/mplayer-vaapi-libre/gcc-4.6-mp3lib-sse-code-miscompilation.patch
@@ -0,0 +1,21 @@
+Index: mp3lib/dct64_sse.c
+===================================================================
+--- mp3lib/dct64_sse.c	(revision 33468)
++++ mp3lib/dct64_sse.c	(revision 33469)
+@@ -112,7 +112,6 @@
+     }
+ 
+     {
+-        real *costab = costab_mmx + 24;
+         int i;
+ 
+         __asm__(
+@@ -121,7 +120,7 @@
+             "movaps    %1, %%xmm5\n\t"
+             "movaps    %%xmm5, %%xmm6\n\t"
+             :
+-            :"m"(*costab), "m"(*nnnn)
++            :"m"(costab_mmx[24]), "m"(*nnnn)
+            );
+ 
+         for (i = 0; i < 0x20; i += 8)
diff --git a/libre/mplayer-vaapi-libre/patch-fixes.patch b/libre/mplayer-vaapi-libre/patch-fixes.patch
index 73153b3fe..5da97d1d9 100644
--- a/libre/mplayer-vaapi-libre/patch-fixes.patch
+++ b/libre/mplayer-vaapi-libre/patch-fixes.patch
@@ -1,7 +1,61 @@
+diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi-0.29.patch mplayer-vaapi-20110127/patches/mplayer-vaapi-0.29.patch
+--- mplayer-vaapi-20110127.orig/patches/mplayer-vaapi-0.29.patch	2011-01-27 17:15:16.000000000 +0200
++++ mplayer-vaapi-20110127/patches/mplayer-vaapi-0.29.patch	2011-03-30 21:22:32.000000000 +0300
+@@ -434,7 +434,7 @@ diff --git a/ffmpeg/libavcodec/vaapi_vc1
+ index 34e9056..b29e50e 100644
+ --- a/ffmpeg/libavcodec/vaapi_vc1.c
+ +++ b/ffmpeg/libavcodec/vaapi_vc1.c
+-@@ -146,101 +146,103 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
++@@ -146,103 +146,103 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
+      pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
+      if (!pic_param)
+          return -1;
+@@ -452,7 +452,9 @@ index 34e9056..b29e50e 100644
+ -    pic_param->sequence_fields.bits.syncmarker                      = s->resync_marker;
+ -    pic_param->sequence_fields.bits.rangered                        = v->rangered;
+ -    pic_param->sequence_fields.bits.max_b_frames                    = s->avctx->max_b_frames;
++-#if VA_CHECK_VERSION(0,32,0)
+ -    pic_param->sequence_fields.bits.profile                         = v->profile;
++-#endif
+ -    pic_param->coded_width                                          = s->avctx->coded_width;
+ -    pic_param->coded_height                                         = s->avctx->coded_height;
+ -    pic_param->entrypoint_fields.value                              = 0; /* reset all bits */
 diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch mplayer-vaapi-20110127/patches/mplayer-vaapi.patch
 --- mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch	2011-01-27 17:15:29.000000000 +0200
-+++ mplayer-vaapi-20110127/patches/mplayer-vaapi.patch	2011-03-05 06:47:20.000000000 +0200
-@@ -449,14 +449,15 @@ diff --git a/fmt-conversion.c b/fmt-conv
++++ mplayer-vaapi-20110127/patches/mplayer-vaapi.patch	2011-03-30 21:09:14.000000000 +0300
+@@ -207,15 +207,6 @@ index 1e0f7fc..45e4574 100755
+  echocheck "Xv"
+  if test "$_xv" = auto ; then
+    _xv=no
+-@@ -4372,7 +4435,7 @@ if test "$_vdpau" = yes ; then
+- else
+-   def_vdpau='#define CONFIG_VDPAU 0'
+-   novomodules="vdpau $novomodules"
+--  libavdecoders=$(echo $libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER// -e s/MPEG4_VDPAU_DECODER//)
+-+  libavdecoders=$(echo $libavdecoders | sed -e "s/\(MPEG\|MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_DECODER//g")
+- fi
+- echores "$_vdpau"
+- 
+ @@ -4791,6 +4854,31 @@ echores "$_corevideo"
+  fi #if darwin
+  
+@@ -433,30 +424,19 @@ index d353bb5..e39a926 100644
+    out YV12,I420,IYUV
+  
+  videocodec ffzygo
+-diff --git a/ffmpeg/libavcodec/vaapi_vc1.c b/ffmpeg/libavcodec/vaapi_vc1.c
+-index 2c24042..34e9056 100644
+---- a/ffmpeg/libavcodec/vaapi_vc1.c
+-+++ b/ffmpeg/libavcodec/vaapi_vc1.c
+-@@ -160,6 +160,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
+-     pic_param->sequence_fields.bits.syncmarker                      = s->resync_marker;
+-     pic_param->sequence_fields.bits.rangered                        = v->rangered;
+-     pic_param->sequence_fields.bits.max_b_frames                    = s->avctx->max_b_frames;
+-+    pic_param->sequence_fields.bits.profile                         = v->profile;
+-     pic_param->coded_width                                          = s->avctx->coded_width;
+-     pic_param->coded_height                                         = s->avctx->coded_height;
+-     pic_param->entrypoint_fields.value                              = 0; /* reset all bits */
+ diff --git a/fmt-conversion.c b/fmt-conversion.c
  index 9e88100..bd32ce8 100644
  --- a/fmt-conversion.c
  +++ b/fmt-conversion.c
@@ -20,7 +74,7 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch mplayer-vaapi-
   static const struct {
       int fmt;
       enum PixelFormat pix_fmt;
-@@ -503,14 +504,15 @@ diff --git a/fmt-conversion.h b/fmt-conv
+@@ -503,14 +483,15 @@ diff --git a/fmt-conversion.h b/fmt-conv
  index 9e133a8..962ca4e 100644
  --- a/fmt-conversion.h
  +++ b/fmt-conversion.h
@@ -39,10 +93,126 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vaapi.patch mplayer-vaapi-
  diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
  index 4f7ffb2..0da5434 100644
  --- a/gui/mplayer/gtk/opts.c
+@@ -808,7 +789,7 @@ index 7c68a20..609ac41 100644
+          sh_video_t *sh     = avctx->opaque;
+          vd_ffmpeg_ctx *ctx = sh->context;
+ @@ -295,6 +296,12 @@ static int init(sh_video_t *sh){
+-     avctx->codec_type = CODEC_TYPE_VIDEO;
++     avctx->codec_type = AVMEDIA_TYPE_VIDEO;
+      avctx->codec_id = lavc_codec->id;
+  
+ +#if CONFIG_VAAPI
+@@ -817,9 +798,9 @@ index 7c68a20..609ac41 100644
+ +        avctx->get_format = get_format;
+ +    }
+ +#endif /* CONFIG_VAAPI */
+- #if CONFIG_VDPAU
+-     if(lavc_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU){
+-         avctx->get_format = get_format;
++     avctx->get_format = get_format;
++     if(ctx->do_dr1){
++         avctx->flags|= CODEC_FLAG_EMU_EDGE;
+ @@ -487,7 +494,7 @@ static void draw_slice(struct AVCodecContext *s,
+                          const AVFrame *src, int offset[4],
+                          int y, int type, int height){
+@@ -841,12 +822,10 @@ index 7c68a20..609ac41 100644
+          ctx->vo_initialized = 1;
+      }
+      return 0;
+-@@ -972,24 +980,62 @@ static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
++@@ -974,22 +974,60 @@ static mp_image_t *decode(sh_video_t *sh
+      return mpi;
+  }
+  
+--#if CONFIG_XVMC || CONFIG_VDPAU
+-+#if CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU
+ +static inline int is_hwaccel_format(int imgfmt)
+ +{
+ +    switch (get_video_hwaccel()) {
+@@ -883,15 +862,14 @@ index 7c68a20..609ac41 100644
+      int imgfmt;
+      sh_video_t *sh = avctx->opaque;
+ -    int i;
+--
+++    int i, try_hwaccel;
++ 
+ -    for(i=0;fmt[i]!=PIX_FMT_NONE;i++){
+ -        imgfmt = pixfmt2imgfmt(fmt[i]);
+ -        if(!IMGFMT_IS_HWACCEL(imgfmt)) continue;
+ -        mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_TryingPixfmt, i);
+ -        if(init_vo(sh, fmt[i]) >= 0) {
+ -            break;
+-+    int i, try_hwaccel;
+-+
+ +    for (try_hwaccel = 1; try_hwaccel >= 0; --try_hwaccel) {
+ +        for (i = 0; fmt[i] != PIX_FMT_NONE; i++) {
+ +            imgfmt = pixfmt2imgfmt(fmt[i], avctx->codec_id);
+@@ -912,11 +890,9 @@ index 7c68a20..609ac41 100644
+ +            break;
+      }
+ -    selected_format = fmt[i];
++     if (selected_format == PIX_FMT_NONE)
++         selected_format = avcodec_default_get_format(avctx, fmt);
+      set_format_params(avctx, selected_format);
+-     return selected_format;
+- }
+--#endif /* CONFIG_XVMC || CONFIG_VDPAU */
+-+#endif /* CONFIG_XVMC || CONFIG_VAAPI || CONFIG_VDPAU */
+ diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
+ index 3619e69..fd869b7 100644
+ --- a/libmpcodecs/vf.h
 diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-20110127/patches/mplayer-vdpau.patch
 --- mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch	2010-11-15 08:41:19.000000000 +0200
-+++ mplayer-vaapi-20110127/patches/mplayer-vdpau.patch	2011-03-05 07:07:15.000000000 +0200
-@@ -133,7 +133,7 @@ index b0d00f4..745d3e4 100644
++++ mplayer-vaapi-20110127/patches/mplayer-vdpau.patch	2011-03-30 22:29:47.000000000 +0300
+@@ -11,15 +11,6 @@ index 91fd164..1f4434e 100755
+  libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+  libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
+  libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+-@@ -4466,7 +4466,7 @@ if test "$_vdpau" = yes ; then
+- else
+-   def_vdpau='#define CONFIG_VDPAU 0'
+-   novomodules="vdpau $novomodules"
+--  libavdecoders=$(echo $libavdecoders | sed -e "s/\(MPEG\|MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_DECODER//g")
+-+  libavhwaccels=$(echo $libavhwaccels | sed -e "s/\(MPEG[124]\|H26[34]\|WMV3\|VC1\)_VDPAU_HWACCEL//g")
+- fi
+- echores "$_vdpau"
+- 
+ diff --git a/etc/codecs.conf b/etc/codecs.conf
+ index b0d00f4..745d3e4 100644
+ --- a/etc/codecs.conf
+@@ -48,7 +39,7 @@ index b0d00f4..745d3e4 100644
+    out YV12,I420,IYUV
+    out 422P,444P
+  
+-@@ -332,41 +335,6 @@ videocodec ffmpeg12mc
++@@ -332,38 +335,6 @@ videocodec ffmpeg12mc
+    out IDCT_MPEG2
+    out MOCO_MPEG2
+  
+@@ -73,9 +64,6 @@ index b0d00f4..745d3e4 100644
+ -  fourcc xdv7,xdv8,xdv9
+ -  fourcc xdva,xdvb,xdvc
+ -  fourcc xdvd,xdve,xdvf
+--  fourcc xd5a,xd5b,xd5c
+--  fourcc xd5d,xd5e,xd5f
+--  fourcc xd59,xd54
+ -  fourcc mx5n,mx4n,mx4p
+ -  fourcc mx3n,mx3p
+ -  fourcc AVmp
+@@ -87,9 +75,9 @@ index b0d00f4..745d3e4 100644
+ -  out VDPAU_MPEG1
+ -  out VDPAU_MPEG2
+ -
+- videocodec mpegpes
+-   info "MPEG-PES output (.mpg or DXR3/IVTV/DVB/V4L2 card)"
+-   comment "for hardware decoding"
++ videocodec ffmpeg2crystalhd
++   info "FFmpeg MPEG-2 (CrystalHD)"
++   status working
+ @@ -943,6 +911,7 @@ videocodec ffwmv3
+    driver ffmpeg
+    dll wmv3
+@@ -133,7 +121,7 @@ index b0d00f4..745d3e4 100644
   
   videocodec ffh264
     info "FFmpeg H.264"
@@ -51,7 +221,7 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
     driver ffmpeg
     dll h264
     out VAAPI_H264
-@@ -146,6 +146,8 @@ index b0d00f4..745d3e4 100644
+@@ -146,6 +134,8 @@ index b0d00f4..745d3e4 100644
  -  fourcc X264,x264
  -  fourcc avc1,AVC1
  -  fourcc davc,DAVC
@@ -60,7 +230,111 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -  format 0x10000005
  -  driver ffmpeg
  -  dll h264_vdpau
-@@ -362,13 +364,13 @@ index f99f7ea..faafa97 100644
+@@ -200,55 +190,41 @@ diff --git a/ffmpeg/libavcodec/allcodecs
+ index fbae0f6..4b6d2e9 100644
+ --- a/ffmpeg/libavcodec/allcodecs.c
+ +++ b/ffmpeg/libavcodec/allcodecs.c
+-@@ -65,6 +65,13 @@ void avcodec_register_all(void)
+-     REGISTER_HWACCEL (WMV3_DXVA2, wmv3_dxva2);
+-     REGISTER_HWACCEL (WMV3_VAAPI, wmv3_vaapi);
+- 
+-+    REGISTER_HWACCEL (H264_VDPAU, h264_vdpau);
+-+    REGISTER_HWACCEL (MPEG1_VDPAU, mpeg1_vdpau);
+-+    REGISTER_HWACCEL (MPEG2_VDPAU, mpeg2_vdpau);
+-+    REGISTER_HWACCEL (MPEG4_VDPAU, mpeg4_vdpau);
+-+    REGISTER_HWACCEL (VC1_VDPAU, vc1_vdpau);
+-+    REGISTER_HWACCEL (WMV3_VDPAU, wmv3_vdpau);
+-+
+-     /* video codecs */
+-     REGISTER_ENCODER (A64MULTI, a64multi);
+-     REGISTER_ENCODER (A64MULTI5, a64multi5);
+ @@ -116,7 +123,6 @@ void avcodec_register_all(void)
+-     REGISTER_DECODER (H263I, h263i);
+      REGISTER_ENCODER (H263P, h263p);
+      REGISTER_DECODER (H264, h264);
++     REGISTER_DECODER (H264_CRYSTALHD, h264_crystalhd);
+ -    REGISTER_DECODER (H264_VDPAU, h264_vdpau);
+      REGISTER_ENCDEC  (HUFFYUV, huffyuv);
+      REGISTER_DECODER (IDCIN, idcin);
+      REGISTER_DECODER (IFF_BYTERUN1, iff_byterun1);
+ @@ -140,10 +146,7 @@ void avcodec_register_all(void)
+-     REGISTER_ENCDEC  (MPEG1VIDEO, mpeg1video);
+      REGISTER_ENCDEC  (MPEG2VIDEO, mpeg2video);
+      REGISTER_ENCDEC  (MPEG4, mpeg4);
++     REGISTER_DECODER (MPEG4_CRYSTALHD, mpeg4_crystalhd);
+ -    REGISTER_DECODER (MPEG4_VDPAU, mpeg4_vdpau);
+      REGISTER_DECODER (MPEGVIDEO, mpegvideo);
+ -    REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau);
+ -    REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau);
++     REGISTER_DECODER (MPEG2_CRYSTALHD, mpeg2_crystalhd);
++     REGISTER_DECODER (MSMPEG4_CRYSTALHD, msmpeg4_crystalhd);
+      REGISTER_ENCDEC  (MSMPEG4V1, msmpeg4v1);
+-     REGISTER_ENCDEC  (MSMPEG4V2, msmpeg4v2);
+-     REGISTER_ENCDEC  (MSMPEG4V3, msmpeg4v3);
+ @@ -196,7 +199,6 @@ void avcodec_register_all(void)
+-     REGISTER_DECODER (V210X, v210x);
+      REGISTER_DECODER (VB, vb);
+      REGISTER_DECODER (VC1, vc1);
++     REGISTER_DECODER (VC1_CRYSTALHD, vc1_crystalhd);
+ -    REGISTER_DECODER (VC1_VDPAU, vc1_vdpau);
+      REGISTER_DECODER (VCR1, vcr1);
+      REGISTER_DECODER (VMDVIDEO, vmdvideo);
+      REGISTER_DECODER (VMNC, vmnc);
+ @@ -210,7 +212,6 @@ void avcodec_register_all(void)
+-     REGISTER_ENCDEC  (WMV1, wmv1);
+      REGISTER_ENCDEC  (WMV2, wmv2);
+      REGISTER_DECODER (WMV3, wmv3);
++     REGISTER_DECODER (WMV3_CRYSTALHD, wmv3_crystalhd);
+ -    REGISTER_DECODER (WMV3_VDPAU, wmv3_vdpau);
+      REGISTER_DECODER (WNV1, wnv1);
+      REGISTER_DECODER (XAN_WC3, xan_wc3);
+-     REGISTER_DECODER (XL, xl);
++     REGISTER_DECODER (XAN_WC4, xan_wc4);
+ diff --git a/ffmpeg/libavcodec/avcodec.h b/ffmpeg/libavcodec/avcodec.h
+ index bff9477..1e77fa6 100644
+ --- a/ffmpeg/libavcodec/avcodec.h
+@@ -285,9 +261,9 @@ index b0a3a8a..b5b9026 100644
+  #include "mpeg4video_parser.h"
+  #include "msmpeg4.h"
+ -#include "vdpau_internal.h"
++ #include "thread.h"
+  #include "flv.h"
+  #include "mpeg4video.h"
+- 
+ @@ -620,11 +619,6 @@ retry:
+      if(MPV_frame_start(s, avctx) < 0)
+          return -1;
+@@ -305,23 +281,23 @@ index f99f7ea..faafa97 100644
+ --- a/ffmpeg/libavcodec/h264.c
+ +++ b/ffmpeg/libavcodec/h264.c
+ @@ -37,7 +37,6 @@
+- #include "golomb.h"
+  #include "mathops.h"
+  #include "rectangle.h"
++ #include "thread.h"
+ -#include "vdpau_internal.h"
+  #include "libavutil/avassert.h"
+  
+  #include "cabac.h"
+ @@ -1647,9 +1646,6 @@ static void field_end(H264Context *h){
+-     s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
+-     s->current_picture_ptr->pict_type= s->pict_type;
++         ff_thread_report_progress((AVFrame*)s->current_picture_ptr, (16*s->mb_height >> FIELD_PICTURE) - 1,
++                                  s->picture_structure==PICT_BOTTOM_FIELD);
+  
+ -    if (CONFIG_H264_VDPAU_DECODER && s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+ -        ff_vdpau_h264_set_reference_frames(s);
+ -
+-     if(!s->dropable) {
+-         ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
+-         h->prev_poc_msb= h->poc_msb;
++     if(in_setup || !(avctx->active_thread_type&FF_THREAD_FRAME)){
++     	 if(!s->dropable) {
++             ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
+ @@ -1663,9 +1659,6 @@ static void field_end(H264Context *h){
+              av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n");
+      }
+@@ -362,13 +338,13 @@ index f99f7ea..faafa97 100644
                       context_count++;
               }
               break;
@@ -76,7 +350,7 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "h264_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_H264,
-@@ -381,6 +383,7 @@ index f99f7ea..faafa97 100644
+@@ -381,6 +357,7 @@ index f99f7ea..faafa97 100644
  -    .flush= flush_dpb,
  -    .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
  -    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
@@ -84,7 +358,16 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -};
  -#endif
  diff --git a/ffmpeg/libavcodec/mpeg12.c b/ffmpeg/libavcodec/mpeg12.c
-@@ -458,7 +461,7 @@ index 6a331eb..c226797 100644
+@@ -449,7 +426,7 @@ index 6a331eb..c226797 100644
+ -                    break;
+ -                }
+ -
+-                 if(avctx->thread_count > 1){
++                 if(HAVE_THREADS && avctx->active_thread_type&FF_THREAD_SLICE){
+                      int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
+                      if(threshold <= mb_y){
+ @@ -2578,36 +2561,3 @@ AVCodec mpeg_xvmc_decoder = {
+@@ -458,7 +435,7 @@ index 6a331eb..c226797 100644
   #endif
  -
  -#if CONFIG_MPEG_VDPAU_DECODER
@@ -93,7 +376,7 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "mpegvideo_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_MPEG2VIDEO,
-@@ -474,7 +477,7 @@ index 6a331eb..c226797 100644
+@@ -474,7 +451,7 @@ index 6a331eb..c226797 100644
  -#endif
  -
  -#if CONFIG_MPEG1_VDPAU_DECODER
@@ -102,7 +385,7 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "mpeg1video_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_MPEG1VIDEO,
-@@ -500,7 +503,7 @@ index b339f78..1928d03 100644
+@@ -500,7 +477,7 @@ index b339f78..1928d03 100644
  -
  -
  -#if CONFIG_MPEG4_VDPAU_DECODER
@@ -111,7 +394,35 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "mpeg4_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_MPEG4,
-@@ -588,7 +591,7 @@ index c9a547b..71c50e7 100644
+@@ -527,9 +504,17 @@ index 9650066..5f8440b 100644
+      PIX_FMT_NONE
+  };
+ @@ -1064,7 +1065,6 @@ void MPV_frame_end(MpegEncContext *s)
+-     if(CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration){
+          ff_xvmc_field_end(s);
+-     }else if(!s->avctx->hwaccel
++     }else if((s->error_count || s->encoding)
++        && !s->avctx->hwaccel
++-       && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
++        && s->unrestricted_mv
++        && s->current_picture.reference
++        && !s->intra_only
++@@ -2254,7 +2254,6 @@ void ff_draw_horiz_band(MpegEncContext *
++     }
++ 
++     if (!s->avctx->hwaccel
+ -       && !(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+         && s->unrestricted_mv
+         && s->current_picture.reference
+@@ -582,13 +567,13 @@ index c9a547b..71c50e7 100644
+          if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)
+              return -1;
+          if (avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start) < 0)
+-@@ -3376,37 +3364,3 @@ AVCodec wmv3_decoder = {
+-     .pix_fmts = ff_hwaccel_pixfmt_list_420
++@@ -3376,39 +3364,3 @@ AVCodec wmv3_decoder = {
++     .profiles = NULL_IF_CONFIG_SMALL(profiles)
+  };
   #endif
  -
  -#if CONFIG_WMV3_VDPAU_DECODER
@@ -120,7 +431,14 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "wmv3_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_WMV3,
-@@ -605,7 +608,7 @@ index c9a547b..71c50e7 100644
+@@ -600,12 +585,13 @@ index c9a547b..71c50e7 100644
+ -    CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
+ -    NULL,
+ -    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
+--    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE}
++-    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE},
++-    .profiles = NULL_IF_CONFIG_SMALL(profiles)
+ -};
  -#endif
  -
  -#if CONFIG_VC1_VDPAU_DECODER
@@ -129,3 +447,45 @@ diff -upr mplayer-vaapi-20110127.orig/patches/mplayer-vdpau.patch mplayer-vaapi-
  -    "vc1_vdpau",
  -    AVMEDIA_TYPE_VIDEO,
  -    CODEC_ID_VC1,
+@@ -617,7 +603,8 @@ index c9a547b..71c50e7 100644
+ -    CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
+ -    NULL,
+ -    .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
+--    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE}
++-    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE},
++-    .profiles = NULL_IF_CONFIG_SMALL(profiles)
+ -};
+ -#endif
+ diff --git a/ffmpeg/libavcodec/vdpau.c b/ffmpeg/libavcodec/vdpau.c
+@@ -1163,9 +1150,9 @@ index 8ec91c8..2386a81 100644
+      PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+      PIX_FMT_Y400A,     ///< 8bit gray, 8bit alpha
+ +    PIX_FMT_VDPAU,     ///< HW decoding with VDPAU, Picture.data[3] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
++     PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
++     PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+      PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+- };
+- 
+ diff --git a/fmt-conversion.c b/fmt-conversion.c
+ index bd32ce8..8994caa 100644
+ --- a/fmt-conversion.c
+@@ -1198,19 +1185,6 @@ index bd32ce8..8994caa 100644
+      {0, PIX_FMT_NONE}
+  };
+  
+-diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
+-index 84b5430..aef79e9 100644
+---- a/libmpcodecs/vd_ffmpeg.c
+-+++ b/libmpcodecs/vd_ffmpeg.c
+-@@ -303,7 +303,7 @@ static int init(sh_video_t *sh){
+-     }
+- #endif /* CONFIG_VAAPI */
+- #if CONFIG_VDPAU
+--    if(lavc_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU){
+-+    if(get_video_hwaccel() == HWACCEL_VDPAU){
+-         avctx->get_format = get_format;
+-     }
+- #endif /* CONFIG_VDPAU */
+ diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
+ index 5133b66..0ce6104 100644
+ --- a/libvo/vo_vdpau.c
diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
new file mode 100644
index 000000000..503d3367f
--- /dev/null
+++ b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
@@ -0,0 +1,33 @@
+From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Tue, 28 Jun 2011 22:47:35 +1000
+Subject: [PATCH] makepkg: fix removing symbolic link
+
+The path was not being stripped from $file before prefixing with
+$srcdir resulting in the attempted removal of a very weird
+filename.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+Signed-off-by: Dan McGee <dan@archlinux.org>
+(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)
+---
+ scripts/makepkg.sh.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index 3ace945..b0b0882 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -509,7 +509,7 @@ download_sources() {
+ 		local file=$(get_filepath "$netfile" || true)
+ 		if [[ -n "$file" ]]; then
+ 			msg2 "$(gettext "Found %s")" "${file##*/}"
+-			rm -f "$srcdir/$file"
++			rm -f "$srcdir/${file##*/}"
+ 			ln -s "$file" "$srcdir/"
+ 			continue
+ 		fi
+-- 
+1.7.6
+
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 6401d86ed..dd7ff0497 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.5.3
-pkgrel=1
+pkgver=3.5.4
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base')
-depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
+depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
 optdepends=('fakeroot: for makepkg usage as normal user'
             'curl: for rankmirrors usage')
 backup=(etc/pacman.conf etc/makepkg.conf)
@@ -20,8 +20,13 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf
-        mips64el.patch
-        makepkg.conf)
+        0001-makepkg-fix-removing-symbolic-link.patch)
+md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
+         'ba85525fe868f030bef209b0487dd5a5'
+         '7aaccf24479f396d4a5987c8ccd2f3a2'
+         '150a2854816cd67b1608e00f99701c1c'
+         'be10d3d2e533515a0470237761415568'
+         '7fca372cdfc5d01896490563ee4e13be')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -29,8 +34,7 @@ PKGEXT='.pkg.tar.gz'
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-# Add the mips64el arch to configure.ac
-  patch -Np0 -i $srcdir/mips64el.patch
+  patch -Np1 < "$srcdir/0001-makepkg-fix-removing-symbolic-link.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc
@@ -48,14 +52,14 @@ package() {
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 -mtune=generic -O2 -pipe"
-      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
+      myflags="-mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     x86_64)
       install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 -mtune=generic -O2 -pipe"
+      myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
       myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
       ;;
     mips64el)
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 675956d3d..56f2b4670 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -79,6 +79,9 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index caee508fd..82955b965 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -79,6 +79,9 @@ Include = /etc/pacman.d/mirrorlist
 [community]
 Include = /etc/pacman.d/mirrorlist
 
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index ed460dd8b..503df75e2 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -88,6 +88,9 @@ Include = /etc/pacman.d/mirrorlist
 #[multilib]
 #Include = /etc/pacman.d/mirrorlist
 
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index af613dc74..2fd342c18 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-CARCH=x86_64
+#CARCH=x86_64
 unset build package md5sums source
 _repo=core
 source=(PKGBUILD
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
new file mode 100644
index 000000000..78550b63f
--- /dev/null
+++ b/libre/python2-libre/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributer: Allan McRae <allan@archlinux.org>
+# Contributer: Jason Chu <jason@archlinux.org>
+
+_pkgname=python2
+pkgname=python2-libre
+pkgver=2.7.2
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/"
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+makedepends=('tk')
+optdepends=('tk: for IDLE')
+conflicts=('python<3')
+options=('!makeflags')
+source=(http://repo.parabolagnulinux.org/other/Python-${pkgver}.tar.xz
+        doc_license_change.patch
+        WDAS.patch)
+md5sums=('5f8a18361784411b16dbb1cdcd6f6664'
+         '1e6595f85a1da7f42b69456119924d50'
+         '3f8c0e310a0be0bd8b319d6c46bbd427')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+
+mksource() {
+    [ ! -d "Python-${pkgver}" ] && \
+    wget -O - http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz |\
+        tar -xJf -
+
+    cd "Python-${pkgver}"
+# http://bugs.python.org/issue12417
+    patch -Np1 -i ../WDAS.patch || return 1
+    patch -Np0 -i ../doc_license_change.patch || return 1
+
+    cd ..
+    tar -cJf Python-${pkgver}.tar.xz "Python-${pkgver}"
+}
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
+              --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+
+  make
+}
+
+package() {
+  cd "${srcdir}/Python-${pkgver}"
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
+  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
+  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
+
+  ln -sf ../../libpython${_pybasever}.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
+
+  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
+
+  # some useful "stuff"
+  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
+  install -m755 Tools/scripts/{README,*py} \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
+
+  # fix conflicts with python
+  mv "${pkgdir}"/usr/bin/idle{,2}
+  mv "${pkgdir}"/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
+
+  # clean up #!s
+  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
+    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # clean-up reference to build directory
+  sed -i "s#${srcdir}/Python-${pkgver}:##" \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
+
+  # license
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+}
diff --git a/libre/python2-libre/WDAS.patch b/libre/python2-libre/WDAS.patch
new file mode 100644
index 000000000..86bc75e8c
--- /dev/null
+++ b/libre/python2-libre/WDAS.patch
@@ -0,0 +1,109 @@
+diff -r ac562d86ab71 Lib/profile.py
+--- a/Lib/profile.py	Fri Jun 03 17:50:59 2011 -0500
++++ b/Lib/profile.py	Mon Jun 27 00:02:20 2011 -0700
+@@ -2,35 +2,26 @@
+ #
+ # Class for profiling python code. rev 1.0  6/2/94
+ #
++# Written by James Roskind
+ # Based on prior profile module by Sjoerd Mullender...
+ #   which was hacked somewhat by: Guido van Rossum
+ 
+ """Class for profiling Python code."""
+ 
+-# Copyright 1994, by InfoSeek Corporation, all rights reserved.
+-# Written by James Roskind
+-#
+-# Permission to use, copy, modify, and distribute this Python software
+-# and its associated documentation for any purpose (subject to the
+-# restriction in the following sentence) without fee is hereby granted,
+-# provided that the above copyright notice appears in all copies, and
+-# that both that copyright notice and this permission notice appear in
+-# supporting documentation, and that the name of InfoSeek not be used in
+-# advertising or publicity pertaining to distribution of the software
+-# without specific, written prior permission.  This permission is
+-# explicitly restricted to the copying and modification of the software
+-# to remain in Python, compiled Python, or other languages (such as C)
+-# wherein the modified or derived code is exclusively imported into a
+-# Python module.
+-#
+-# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+-# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+-# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
+-# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+-# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+-# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-
++# Copyright Disney Enterprises, Inc.  All Rights Reserved.
++# Licensed to PSF under a Contributor Agreement
++# 
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#  
++# http://www.apache.org/licenses/LICENSE-2.0
++#  
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
++# either express or implied.  See the License for the specific language
++# governing permissions and limitations under the License.
+ 
+ 
+ import sys
+diff -r ac562d86ab71 Lib/pstats.py
+--- a/Lib/pstats.py	Fri Jun 03 17:50:59 2011 -0500
++++ b/Lib/pstats.py	Mon Jun 27 00:02:20 2011 -0700
+@@ -2,34 +2,26 @@
+ 
+ # Class for printing reports on profiled python code. rev 1.0  4/1/94
+ #
++# Written by James Roskind
+ # Based on prior profile module by Sjoerd Mullender...
+ #   which was hacked somewhat by: Guido van Rossum
+-#
+-# see profile.py for more info.
+ 
+-# Copyright 1994, by InfoSeek Corporation, all rights reserved.
+-# Written by James Roskind
+-#
+-# Permission to use, copy, modify, and distribute this Python software
+-# and its associated documentation for any purpose (subject to the
+-# restriction in the following sentence) without fee is hereby granted,
+-# provided that the above copyright notice appears in all copies, and
+-# that both that copyright notice and this permission notice appear in
+-# supporting documentation, and that the name of InfoSeek not be used in
+-# advertising or publicity pertaining to distribution of the software
+-# without specific, written prior permission.  This permission is
+-# explicitly restricted to the copying and modification of the software
+-# to remain in Python, compiled Python, or other languages (such as C)
+-# wherein the modified or derived code is exclusively imported into a
+-# Python module.
+-#
+-# INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+-# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+-# FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
+-# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+-# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+-# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++"""Class for profiling Python code."""
++
++# Copyright Disney Enterprises, Inc.  All Rights Reserved.
++# Licensed to PSF under a Contributor Agreement
++# 
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#  
++# http://www.apache.org/licenses/LICENSE-2.0
++#  
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
++# either express or implied.  See the License for the specific language
++# governing permissions and limitations under the License.
+ 
+ 
+ import sys
diff --git a/libre/python2-libre/doc_license_change.patch b/libre/python2-libre/doc_license_change.patch
new file mode 100644
index 000000000..18f9447d7
--- /dev/null
+++ b/libre/python2-libre/doc_license_change.patch
@@ -0,0 +1,44 @@
+--- Doc/library/profile.rst	2011-06-11 12:46:23.000000000 -0300
++++ Doc/library/profile.rst.orig	2011-08-12 11:35:25.000000000 -0300
+@@ -12,27 +12,23 @@
+ 
+ .. index:: single: InfoSeek Corporation
+ 
+-Copyright © 1994, by InfoSeek Corporation, all rights reserved.
++Copyright Disney Enterprises, Inc.  All Rights Reserved.
+ 
+ Written by James Roskind. [#]_
+ 
+-Permission to use, copy, modify, and distribute this Python software and its
+-associated documentation for any purpose (subject to the restriction in the
+-following sentence) without fee is hereby granted, provided that the above
+-copyright notice appears in all copies, and that both that copyright notice and
+-this permission notice appear in supporting documentation, and that the name of
+-InfoSeek not be used in advertising or publicity pertaining to distribution of
+-the software without specific, written prior permission.  This permission is
+-explicitly restricted to the copying and modification of the software to remain
+-in Python, compiled Python, or other languages (such as C) wherein the modified
+-or derived code is exclusively imported into a Python module.
+-
+-INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+-SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++Licensed to PSF under a Contributor Agreement
++
++Licensed under the Apache License, Version 2.0 (the "License");
++you may not use this file except in compliance with the License.
++You may obtain a copy of the License at
++ 
++http://www.apache.org/licenses/LICENSE-2.0
++ 
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
++either express or implied.  See the License for the specific language
++governing permissions and limitations under the License.
+ 
+ .. _profiler-introduction:
+