Merge http://projects.parabolagnulinux.org/abslibre

19 files changed, 796 insertions, 0 deletions

diff --git a/libre-testing/grub2/05_archtheme b/libre-testing/grub2/05_archtheme
new file mode 100644
index 000000000..4d1b6fb20
--- /dev/null
+++ b/libre-testing/grub2/05_archtheme
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+cat << EOF
+set menu_color_normal=light-blue/black
+set menu_color_highlight=light-cyan/blue
+EOF
diff --git a/libre-testing/grub2/20_memtest86+ b/libre-testing/grub2/20_memtest86+
new file mode 100644
index 000000000..41ca11f02
--- /dev/null
+++ b/libre-testing/grub2/20_memtest86+
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system.               #
+########################################################
+
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+. ${libdir}/grub/grub-mkconfig_lib
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then
+  # image exists, create menu entry
+  echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2
+  cat << EOF
+menuentry "Memory test (memtest86+)" $CLASS {
+EOF
+  prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/  /"
+  cat << EOF
+  linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
+}
+EOF
+fi
diff --git a/libre-testing/grub2/PKGBUILD b/libre-testing/grub2/PKGBUILD
new file mode 100644
index 000000000..30ab7e893
--- /dev/null
+++ b/libre-testing/grub2/PKGBUILD
@@ -0,0 +1,204 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav P R <skodabenz at rocketmail dot com>
+
+# _grub2_rev=3072
+
+_grub2_lua_ver=19
+_grub2_gpxe_ver=12
+_grub2_ntldr_ver=13
+_grub2_915_ver=6
+
+pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
+pkgbase="grub2"
+pkgver='1.99~rc1'
+pkgrel=3
+url="http://www.gnu.org/software/grub/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+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"
+	"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"
+	"ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz"
+	'archlinux_grub2_mkconfig_fixes.patch'
+	'grub.default'
+	'grub.cfg'
+	'20_memtest86+'
+	'05_archtheme')
+
+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")
+
+
+build() {
+	# set architecture dependent variables
+	if [ "${CARCH}" = "x86_64" ] ; then
+		_EFIEMU="--enable-efiemu"
+	else
+		_EFIEMU="--disable-efiemu"
+	fi
+	_HOST="${CARCH}"
+
+	build_grub2-common_and_bios
+	build_grub2-efi
+}
+
+build_grub2-common_and_bios() {
+	# copy the source for building the common/bios package
+	cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_bios-${pkgver}
+  
+	## 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
+
+	# add the grub-extra sources
+	export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/  
+	install -d ${srcdir}/grub2_bios-${pkgver}/grub2-extras 
+	bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \
+		-C ${srcdir}/grub2_bios-${pkgver}/grub2-extras
+	bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \
+		-C ${srcdir}/grub2_bios-${pkgver}/grub2-extras
+	bsdtar xf ${srcdir}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz \
+		-C ${srcdir}/grub2_bios-${pkgver}/grub2-extras
+	bsdtar xf ${srcdir}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz \
+		-C ${srcdir}/grub2_bios-${pkgver}/grub2-extras
+  
+	## Need to use python2
+	sed -i 's|python|python2|' ${srcdir}/grub2_bios-${pkgver}/autogen.sh
+
+	# start the actual build process
+	cd ${srcdir}/grub2_bios-${pkgver}
+	./autogen.sh
+  
+	## fix unifont.bdf location so grub-mkfont can create *.pf2 files
+	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' ${srcdir}/grub2_bios-${pkgver}/configure
+  
+#	mkdir ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
+#	cd ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS
+  
+	CFLAGS="" ./configure \
+		--with-platform=pc --enable-mm-debug \
+		${_EFIEMU} --host=${CARCH}-unknown-linux-gnu \
+		--enable-grub-mkfont --prefix=/usr \
+		--bindir=/bin --sbindir=/sbin \
+		--mandir=/usr/share/man --infodir=/usr/share/info \
+		--sysconfdir=/etc --enable-nls \
+		--program-transform-name=s,grub,grub,
+	CFLAGS="" make 
+}
+
+build_grub2-efi() {
+	# copy the source for building the efi package
+	cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_efi-${pkgver}
+
+	# add the grub-extra sources
+	export GRUB_CONTRIB=${srcdir}/grub2_efi-${pkgver}/grub2-extras/  
+	install -d ${srcdir}/grub2_efi-${pkgver}/grub2-extras  
+	bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \
+		-C ${srcdir}/grub2_efi-${pkgver}/grub2-extras
+	bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \
+		-C ${srcdir}/grub2_efi-${pkgver}/grub2-extras
+  
+	## Need to use python2
+	sed -i 's|python|python2|' ${srcdir}/grub2_efi-${pkgver}/autogen.sh
+	
+	# start the actual build process
+	cd ${srcdir}/grub2_efi-${pkgver}
+	./autogen.sh
+
+	CFLAGS="" ./configure \
+		--with-platform=efi --target=i386 \
+		--enable-mm-debug --disable-efiemu \
+		--host=${CARCH}-unknown-linux-gnu \
+		--prefix=/usr --bindir=/bin \
+		--sbindir=/sbin --mandir=/usr/share/man \
+		--infodir=/usr/share/info --sysconfdir=/etc \
+		--enable-nls --program-transform-name=s,grub,grub,
+	CFLAGS="" make 
+}
+
+package_grub2-common() {
+	pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
+	install="grub2.install"
+	depends=('xz' 'freetype2' 'device-mapper')
+	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
+  
+	install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install
+	install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install
+	install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_i386-install
+    
+	sed -i "s|^\(target_cpu\)=.*|\1=i386|; \
+		s|^\(platform\)=.*|\1=pc|" \
+		${pkgdir}/sbin/grub_bios-install
+
+	sed -i "s|^\(target_cpu\)=.*|\1=x86_64|; \
+		s|^\(platform\)=.*|\1=efi|" \
+		${pkgdir}/sbin/grub_efi_x86_64-install
+
+	sed -i "s|^\(target_cpu\)=.*|\1=i386|; \
+		s|^\(platform\)=.*|\1=efi|" \
+		${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)
+	install -Dm644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub
+
+	## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
+	install -Dm644 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg
+
+	# remove platform specific files
+	rm -rf ${pkgdir}/usr/lib/grub/i386-pc/
+}
+
+package_grub2-bios() {
+	pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS"
+	depends=(grub2-common=${pkgver})
+	replaces=('grub2')
+	provides=('grub2')
+  
+	cd ${srcdir}/grub2_bios-${pkgver}
+	make DESTDIR=${pkgdir} install 
+
+	## remove non platform-specific files
+	rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share}
+	rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib}
+}
+
+package_grub2-efi-i386() {
+
+	pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version"
+	depends=("grub2-common=${pkgver}" 'dosfstools')
+	optdepends=('efibootmgr')
+  
+	cd ${srcdir}/grub2_efi-${pkgver}
+	make DESTDIR=${pkgdir} install 
+
+	## remove non platform-specific files
+        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'
+         'ff99d316b0c59e514e5bb641a392d330'
+         '7cb90ebb04b856ded6ae171c3658fba2'
+         '5a07e04c4ecb8ed145d54fec3043e0d5'
+         'e143ae2e453b7c3ced309667df30da55')
diff --git a/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch
new file mode 100644
index 000000000..62acd2ee8
--- /dev/null
+++ b/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch
@@ -0,0 +1,93 @@
+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
+ 
+ EOF
+ 
++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
++    cat << EOF
++set menu_color_normal=$GRUB_COLOR_NORMAL
++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
++
++EOF
++fi
++
+ 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"
+ 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}"
++  OS="${GRUB_DISTRIBUTOR}"
++  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
+ 
+ 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
+     if test -e "${dirname}/${i}" ; then
+       initrd="$i"
+       break
+@@ -155,6 +153,9 @@ while [ "x$list" != "x" ] ; do
+ 
+   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}"
+   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+     linux_entry "${OS}" "${version}" true \
+ 	"single ${GRUB_CMDLINE_LINUX}"
diff --git a/libre-testing/grub2/grub.cfg b/libre-testing/grub2/grub.cfg
new file mode 100644
index 000000000..1f0e41471
--- /dev/null
+++ b/libre-testing/grub2/grub.cfg
@@ -0,0 +1,26 @@
+# Config file for GRUB2 - The GNU GRand Unified Bootloader
+# /boot/grub/grub.cfg
+
+# DEVICE NAME CONVERSIONS
+#
+#  Linux           Grub
+# -------------------------
+#  /dev/fd0        (fd0)
+#  /dev/sda        (hd0)
+#  /dev/sdb2       (hd1,2)
+#  /dev/sda3       (hd0,3)
+#
+
+# Timeout for menu
+set timeout=5
+
+# Set default boot entry as Entry 0
+set default=0
+
+# (0) Parabola GNU/Linux-libre
+menuentry "Parabola GNU/Linux-libre" {
+set root=(hd0,1)
+linux /vmlinuz26 root=/dev/sda1 ro
+initrd /kernel26.img
+}
+
diff --git a/libre-testing/grub2/grub.default b/libre-testing/grub2/grub.default
new file mode 100644
index 000000000..e150e3af0
--- /dev/null
+++ b/libre-testing/grub2/grub.default
@@ -0,0 +1,42 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Arch Linux"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT=5
+#GRUB_HIDDEN_TIMEOUT_QUIET=true
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL=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
+
+# Uncomment to allow the kernel use the same resolution used by grub
+#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_LINUX_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"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
diff --git a/libre-testing/grub2/grub2.install b/libre-testing/grub2/grub2.install
new file mode 100644
index 000000000..898dc9246
--- /dev/null
+++ b/libre-testing/grub2/grub2.install
@@ -0,0 +1,30 @@
+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
+
+}
+
+
+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
+}
+
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
new file mode 100644
index 000000000..2d988c976
--- /dev/null
+++ b/libre/mplayer-libre/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Maintainer for Parabola GNU/Linux:  Omar Botta <omarbotta@gnulinuxlibre.net>
+
+pkgname=mplayer-libre
+pkgver=32792
+pkgrel=1
+pkgdesc="A movie player for linux. Libre version without faac."
+arch=('i686' 'x86_64')
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss'
+         'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau>=0.4'
+         'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
+provides=("mplayer=$pkgver")
+conflicts=('mplayer')
+replaces=("mplayer=$pkgver")
+
+build() {
+  # Custom CFLAGS break the mplayer build
+  unset CFLAGS LDFLAGS
+
+  cd ${srcdir}/${pkgname%-libre}
+
+  ./configure --prefix=/usr \
+      --enable-runtime-cpudetection \
+      --disable-gui \
+      --disable-arts \
+      --disable-liblzo \
+      --enable-speex \
+      --disable-openal \
+      --disable-fribidi \
+      --disable-libdv \
+      --disable-musepack \
+      --disable-esd \
+      --disable-mga \
+      --disable-faac \
+      --enable-xvmc \
+      --language=all \
+      --confdir=/etc/mplayer
+
+  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+  make
+  make -j1 DESTDIR=${pkgdir} install
+  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
+  rm -rf ${pkgdir}/usr/share/mplayer/font
+  #desktop file  FS#14770
+  install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
+  install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+}
+md5sums=('a48845de4b410ab7799ee87a038dd58e'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         'd00874ccc644b7f43d6ef1c942fcef28')
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
new file mode 100644
index 000000000..07acea13f
--- /dev/null
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny 
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
diff --git a/libre/mplayer-libre/mplayer.png b/libre/mplayer-libre/mplayer.png
new file mode 100644
index 000000000..799769335
--- /dev/null
+++ b/libre/mplayer-libre/mplayer.png
diff --git a/libre/p7zip-libre/9.04-makefile.patch b/libre/p7zip-libre/9.04-makefile.patch
new file mode 100644
index 000000000..93a99cc90
--- /dev/null
+++ b/libre/p7zip-libre/9.04-makefile.patch
@@ -0,0 +1,19 @@
+--- p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig	2010-01-04 13:58:54.527887746 +0100
++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile	2010-01-04 13:59:10.290868343 +0100
+@@ -247,8 +247,6 @@
+   MyAes.o \
+   Pbkdf2HmacSha1.o \
+   RandGen.o \
+-  Rar20Crypto.o \
+-  RarAes.o \
+   Sha1.o \
+   WzAes.o \
+   ZipCrypto.o \
+@@ -298,7 +296,6 @@
+   $(HFS_OBJS) \
+   $(ISO_OBJS) \
+   $(NSIS_OBJS) \
+-  $(RAR_OBJS) \
+   $(TAR_OBJS) \
+   $(UDF_OBJS) \
+   $(WIM_OBJS) \
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
new file mode 100644
index 000000000..02311eeba
--- /dev/null
+++ b/libre/p7zip-libre/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 85904 2010-07-22 04:49:57Z dgriffiths $
+# Contributor: Thayer Williams <thayer@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+
+pkgname=p7zip-libre
+_pkgname=${pkgname%-libre}
+pkgver=9.13
+pkgrel=2
+pkgdesc="A command-line port of the 7zip compression utility without RAR"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://p7zip.sourceforge.net"
+depends=('gcc-libs' 'bash')
+options=(!emptydirs)
+provides=("p7zip=$pkgver")
+replaces=('p7zip')
+conflicts=('p7zip')
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2
+9.04-makefile.patch)
+md5sums=('8ddb5053db3b1f2696407d01be145779'
+'dc3e929ead20d7133fb3cc453aa62156')
+options=(!emptydirs)
+
+build() {
+	cd ${srcdir}/${_pkgname}_${pkgver}
+
+    msg "Removing unRar"
+	sed -e '/Rar/d' -i makefile*
+	rm -rf CPP/7zip/Compress/Rar
+	patch -p1 -i $startdir/src/9.04-makefile.patch
+
+	#Arch64 fix
+	if [ "$CARCH" == "x86_64" ]; then
+		cp makefile.linux_amd64 makefile.machine
+	else
+		cp makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine
+	fi
+
+	sed -i "s|usr/local|usr|g" makefile
+
+	make all3 OPTFLAGS="${CXXFLAGS}" || return 1
+}
+
+package() {
+	cd ${srcdir}/${_pkgname}_${pkgver}
+
+	make install DEST_HOME="${pkgdir}/usr" \
+		DEST_MAN="${pkgdir}/usr/share/man" \
+		DEST_SHARE_DOC="http://www.bugaco.com/7zip"
+
+	mkdir -p ${pkgdir}/usr/share/doc/p7zip/DOCS
+	install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
+
+	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7z
+	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7za
+	sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7zr
+
+	# Install mc's virtual filesystem
+	install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z \
+		${pkgdir}/usr/lib/mc/extfs.d/u7z
+}
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
new file mode 100644
index 000000000..6ed3b7f60
--- /dev/null
+++ b/libre/psutils-libre/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: xihh <hahj87@gmail.com>
+
+pkgname=psutils-libre
+pkgver=1.17
+pkgrel=1
+pkgdesc="A set of postscript utilities"
+arch=(i686 x86_64)
+license=('custom')
+depends=('glibc' 'ghostscript')
+provides=('psutils-lprng' 'psutils')
+replaces=('psutils-lprng' 'psutils')
+conflicts=('psutils-lprng' 'psutils')
+url="http://www.connochaetos.org"
+source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5553b70be2484cef7a76d741a26f24d5')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  install -d -m755 "${pkgdir}/usr/share/man"
+  make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
+    PERL=/usr/bin/perl \
+    MANDIR="${pkgdir}/usr/share/man/man1" || return 1
+  make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
+    PERL=/usr/bin/perl \
+    MANDIR="${pkgdir}/usr/share/man/man1" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 LICENSE.orig "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+}
diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD
new file mode 100644
index 000000000..3d1d4ec3d
--- /dev/null
+++ b/libre/ttf-thai-libre/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+
+pkgname=ttf-thai-libre
+pkgver=0.4.14
+pkgrel=1
+pkgdesc="A collection of basic Thai fonts, libre version"
+arch=(any)
+license=('GPL')
+depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
+makedepends=(fontforge)
+provides=('thai-ttf' "ttf-thai=$pkgver")
+conflicts=('ttf-thai')
+replaces=('ttf-thai')
+url="http://www.connochaetos.org"
+install=ttf.install
+source=(http://www.connochaetos.org/misc/thaifonts-scalable-libre-${pkgver}.tar.gz)
+md5sums=('205436d69d273aca33dbbf31c61fa6b9')
+
+build() {
+  cd ${srcdir}/thaifonts-scalable-libre-${pkgver}
+  ./configure --prefix=/usr --with-ttfdir=/usr/share/fonts/TTF --sysconfdir=/etc
+  make
+  make DESTDIR=${pkgdir}/ install
+  rm ${pkgdir}/usr/share/fonts/TTF/fonts.dir
+  rm ${pkgdir}/usr/share/fonts/TTF/fonts.scale
+}
+
diff --git a/libre/ttf-thai-libre/ttf.install b/libre/ttf-thai-libre/ttf.install
new file mode 100644
index 000000000..203190187
--- /dev/null
+++ b/libre/ttf-thai-libre/ttf.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "Updating font cache... "
+  fc-cache -fs > /dev/null
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/unrar-libre/PKGBUILD b/libre/unrar-libre/PKGBUILD
new file mode 100644
index 000000000..e08e90220
--- /dev/null
+++ b/libre/unrar-libre/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Joshua Ismael Haase Hernández <hahj87@gmail.com>
+_pkgbase=unrar
+pkgname=unrar-libre
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="A free software library to decompress .rar files."
+arch=('i686' 'x86_64')
+url="http://gna.org/projects/unrar/"
+license=('GPL')
+provides=(unrar)
+conflicts=(unrar)
+replaces=(unrar)
+source=(http://download.gna.org/unrar/$_pkgbase-$pkgver.tar.gz)
+md5sums=('ac284a6739e3b8c794e7f9e8c20ed8f8') #generate with 'makepkg -g'
+
+build() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat-libre/ChangeLog
new file mode 100644
index 000000000..faa8383c8
--- /dev/null
+++ b/libre/xchat-libre/ChangeLog
@@ -0,0 +1,49 @@
+2010-08-21  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.8-3
+	* Rebuilt for python2
+
+2010-08-13  Ionut Biru <ibiru@archlinux.org>
+
+	* xchat 2.8.8-2
+	* perl 5.12 rebuild
+
+2010-05-30  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.8-1
+	* Upstream update
+	* Added python optdepends
+	* Removed old patches
+
+2010-03-29  Eric Belanger  <eric@archlinux.org>
+
+	* Fixed buttons hotkey (close FS#17076)
+
+2009-09-30  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.6-5
+	* Rebuilt against perl 5.10.1-3
+
+2009-09-28  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.6-4
+	* Fixed crash when transparent background is enabled (close FS#15360)
+
+2008-11-08  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.6-3
+	* Rebuild for python-2.6 (close FS#11998)
+	* Applied gtk2 patch
+
+2008-09-05  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.6-2
+	* Applied upstream maintenance patch
+	* Added tcl optdepends
+
+2008-06-13  Eric Belanger  <eric@archlinux.org>
+
+	* xchat 2.8.6-1
+	* Upstream update
+	* Added spell checking support (close FS#10395)
+	* Added ChangeLog
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
new file mode 100644
index 000000000..8262e03be
--- /dev/null
+++ b/libre/xchat-libre/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Eric Belanger <eric@archlinux.org>
+# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+
+pkgbasename=xchat
+pkgname=xchat-libre
+pkgver=2.8.8
+pkgrel=3
+pkgdesc="A GTK+ based IRC client without non-free browser reference"
+arch=('i686' 'x86_64')
+url="http://www.xchat.org/"
+provides=("xchat=$pkgver")
+replaces=('xchat')
+conflicts=('xchat')
+license=('GPL')
+depends=('gtk2' 'openssl' 'dbus-glib')
+makedepends=('tcl' 'perl' 'python2')
+optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \
+            'python2: for python plugin')
+options=('!libtool')
+changelog=ChangeLog
+source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz remove-non-free-suggestion.patch)
+md5sums=('9a11f13121ff0af787bba3b014378e58'
+         '47c665961f11a803e9a12007811a04c9')
+sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
+          '05e673aa44813ddac8aabb251d5f0124efde91a2')
+
+
+
+build() {
+  cd "${srcdir}/${pkgbasename}-${pkgver}"
+  patch -p1 < ../remove-non-free-suggestion.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \
+    --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgbasename}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
new file mode 100644
index 000000000..8b0f4e41f
--- /dev/null
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -0,0 +1,12 @@
+diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
+--- xchat-2.8.8.orig/src/common/xchat.c	2010-05-16 07:04:45.000000000 +0000
++++ xchat-2.8.8/src/common/xchat.c	2010-11-09 15:29:23.322458751 +0000
+@@ -602,7 +602,7 @@
+ 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
+ 
+ static char defaultconf_urlhandlers[] =
+-		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
++		"NAME Open Link in Web Browser\n"		"CMD !icecat 'openURL(%s)'\n\n";
+ 
+ #ifdef USE_SIGACTION
+ /* Close and open log files on SIGUSR1. Usefull for log rotating */