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

21 files changed, 108 insertions, 114 deletions

diff --git a/.gitignore b/.gitignore
index a4f437311..9a6d4ab3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ src/
 pkg/
 *.pkg.tar.*
 *.src.tar.*
-namcap.log
\ No newline at end of file
+namcap.log
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index aca8c9a8d..b29567abf 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=audacious-plugins-libre
 pkgver=2.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Audacious without unfree plugins'
 arch=('i686' 'x86_64')
 url='http://audacious-media-player.org/'
@@ -63,15 +63,19 @@ mksource(){
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+
+	sed 's/libavcore >= 0.12.0//g' -i configure # FS#23549
+
+	[[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2'
 	./configure \
-		--build=$CHOST \
-		--host=$CHOST \
-		--target=$CHOST \
 		--prefix=/usr \
 		--enable-chardet \
 		--enable-amidiplug \
 		--disable-adplug \
-                --disable-psf  
+		--disable-psf \
+		$extraopts \
+		--disable-projectm # no support for projectm-2.0.1, cf. FS#21344
+		                   # would require libvisual-projectm in make/optdeps
 	make
 }
 
@@ -79,5 +83,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-
 md5sums=('df761a2d07e2ad1221c5fe61fa32dcb0')
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
index dc5725eff..41c332dca 100644
--- a/libre/ffmpeg-libre/PKGBUILD
+++ b/libre/ffmpeg-libre/PKGBUILD
@@ -17,9 +17,9 @@ makedepends=('yasm' 'git')
 source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
 md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
 #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=('ffmpeg')
+provides=("ffmpeg=$pkgver")
 conflicts=('ffmpeg')
-replaces=("ffmpeg=$pkgver")
+replaces=('ffmpeg')
 
 build() {
   cd "$srcdir/${pkgname%-libre}"
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index bdfbee155..7a9630c34 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=filesystem
-pkgver=2010.12
-pkgrel=2
+pkgver=2011.04
+pkgrel=1.1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -18,23 +18,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
         'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
-md5sums=('75c7e1770305e1f3b75c52785c137611'
-         '140787c0dc6f3f1272cfd381b92b0155'
-         '13753e4e0964f3652b0cc60a28528bdf'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
-         'b8355d9d2782f424f4cedcf682651be0'
-         'ef40305da5803ca69d22e428ffc2ab9b'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '40dac0de4c6b99c8ca97effbd7527c84'
-         '59768b5f4080b96b67bcde5f66984ad5'
-         '51ac5c337236235bf8fe85a9b07b6db1'
-         '8098ffd9fbf890468d3198277596b85a')
 
 package() {
 	cd ${srcdir}
@@ -42,7 +25,7 @@ package() {
 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys; do
+	for d in bin boot dev etc home lib/modules media mnt sbin usr var opt srv/http sys run; do
 		install -d -m755 ${pkgdir}/${d}
 	done
 	install -d -m555 ${pkgdir}/proc
@@ -93,3 +76,20 @@ package() {
 	done
 	ln -s ../man ${pkgdir}/usr/local/share/man
 }
+md5sums=('772fe869b921698cc3e6fde73c4ac85a'
+         '140787c0dc6f3f1272cfd381b92b0155'
+         '13753e4e0964f3652b0cc60a28528bdf'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '8a9042a2cedf6b6b47eb8973f14289cb'
+         'b8355d9d2782f424f4cedcf682651be0'
+         'ef40305da5803ca69d22e428ffc2ab9b'
+         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '40dac0de4c6b99c8ca97effbd7527c84'
+         'd2dc4e39dbdea75b107f91789e3274ab'
+         'f3b6ae7db8adffaaa4bffc6099dcbd50'
+         '8098ffd9fbf890468d3198277596b85a')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 4b2b261a4..640cd5c1d 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -2,6 +2,8 @@ post_install() {
 	[ -f var/log/lastlog ] ||  : >var/log/lastlog
 	[ -f var/log/wtmp ]    ||  : >var/log/wtmp
 	[ -f var/run/utmp ]    ||  : >var/run/utmp
+	chown root:20 var/run/utmp
+	chmod 664 var/run/utmp
 	[ -f var/log/btmp ]    || (: >var/log/btmp && bin/chmod 600 var/log/btmp)
 	# workaround for bug #7194
 	# readded due to bug #9465
@@ -32,6 +34,7 @@ post_upgrade() {
 	_addgroup floppy  -g 94
 	_addgroup storage -g 95
 	_addgroup log     -g 19
+	_addgroup utmp    -g 20
 	_addgroup power   -g 98
 	_addgroup network -g 90
 	_addgroup games   -g 50
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 4bd635c47..261746d9e 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -13,6 +13,7 @@ ftp:x:11:
 mail:x:12:
 uucp:x:14:
 log:x:19:root
+utmp:x:20:
 locate:x:21:
 rfkill:x:24:
 smmsp:x:25:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index 06b488fe9..ed176823e 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -13,6 +13,7 @@ ftp:::
 mail:::
 uucp:::
 log:::root
+utmp:x::
 locate:::
 rfkill:x::
 smmsp:::
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index ccc07a4e5..3bc22db9f 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -10,7 +10,7 @@ export PATH
 # Load profiles from /etc/profile.d
 if test -d /etc/profile.d/; then
 	for profile in /etc/profile.d/*.sh; do
-		test -r $profile && . $profile
+		test -r "$profile" && . "$profile"
 	done
 	unset profile
 fi
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 47f7aa9bb..22b381db4 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil
 
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.38
-pkgver=${_basekernel}.2
+pkgver=${_basekernel}.3
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
@@ -130,7 +130,8 @@ package_kernel26-libre-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
+  for i in acpi asm-generic config crypto drm generated linux math-emu \
+    media net pcmcia scsi sound trace video xen; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -203,18 +204,6 @@ package_kernel26-libre-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -252,9 +241,9 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('be3d43e110130d1081d444ce1cc02a72'
-         '73d295e41ce6969e49b226058f24ab07'
-         '894b125c751fdab56d6b021a598a3362'
-         '3a17465b512ed9148040cef7b8a7f2c7'
+md5sums=('ecc5aa47bbb433e48abade02824ba6ac'
+         '32053f02a898803ea9cf8cc7106473db'
+         'b7b18adb9de35b4ecb4d8724f27a2924'
+         '25c5f33e6b086fcc2020f8b85a63e1c3'
          '25584700a0a679542929c4bed31433b6'
-         '1bff12f1ba69206b1abee2bba4b7619c')
+         '2d68b4cf4caedd1f0188f4877eca1d43')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 0c1b80cb8..a8c4d4703 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.38 Kernel Configuration
-# Wed Mar 30 07:00:21 2011
+# Sun Apr 17 12:35:51 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2576,11 +2576,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2593,13 +2593,13 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
@@ -5211,7 +5211,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index 62dea6af1..d98f24533 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.38 Kernel Configuration
-# Wed Mar 30 08:32:36 2011
+# Sun Apr 17 14:31:49 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -2428,11 +2428,11 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2445,13 +2445,13 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
@@ -4954,7 +4954,7 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install
index 1292f1f3b..fc84323fc 100644
--- a/libre/kernel26-libre/kernel26.install
+++ b/libre/kernel26-libre/kernel26.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=2.6.37-LIBRE
+KERNEL_VERSION=2.6.38-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9c36c53db..a0d3f1497 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libretools
 pkgver=$(date -u +%Y%m%d)
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
 url="http://parabolagnulinux.org"
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 574fe6d84..6097d67b8 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=licenses-libre
-pkgver=2.6
+pkgver=2.8
 pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
@@ -19,6 +19,7 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cc-readme.txt
         cddl-1.0.txt
         eclipse-1.0.txt
+        http://www.gnu.org/licenses/agpl-3.0.txt
         http://www.gnu.org/licenses/gpl-2.0.txt
         http://www.gnu.org/licenses/gpl-3.0.txt
         http://www.gnu.org/licenses/lgpl-2.1.txt
@@ -28,39 +29,28 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         http://www.latex-project.org/lppl.txt
         http://www.mozilla.org/MPL/MPL-1.1.txt
         perlartistic.txt
+        http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
         php-3.0.txt::http://www.php.net/license/3_0.txt
         ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt
         cpl-1.0.txt
         python-2.txt
         ZopePublicLicense.txt)
-md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
-         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
-         '5367190077e12a7f55403d531ef3998e'
-         '77651e5c686cbc0f8cec5ac7e6504235'
-         '6cb35f3976cd093011967fa1abbce386'
-         'f300afd598546add034364cd0a533261'
-         'b234ee4d69f5fce4486a80fdaf4a4263'
-         'd32239bcb673463ab874e80d47fae504'
-         '4fbd65380cdd255951079008b364516c'
-         'e6a600fd5e1d9cbde2d983680233ad02'
-         '24ea4c7092233849b4394699333b5c56'
-         '10b9de612d532fdeeb7fe8fcd1435cc6'
-         '9f4337828d782bdea41f03dd2ad1b808'
-         'bfe1f75d606912a4111c90743d6c7325'
-         'd09c120ca7db95ef2aeecec0cb08293b'
-         'a45bb1bbeed9e26b26c5763df1d3913d'
-         '68d59ff8306e3a9f5f1c01462c77a317'
-         'f083e41c43db25e18f36c91e57750b64'
-         'a055911c32fb4ed6e96c453ceaeba857'
-         'dc8502850eab9e1ff330a12d7ca18a19')
 
 build() {
   cd $pkgdir
   mkdir -p usr/share/licenses/common
   cd usr/share/licenses/common
 
-  mkdir APACHE
-  cp $srcdir/apache-2.0.txt APACHE/license.txt
+  mkdir AGPL3
+  cp $srcdir/agpl-3.0.txt AGPL3/license.txt
+  ln -s AGPL3 AGPL
+
+  mkdir Apache
+  cp $srcdir/apache-2.0.txt Apache/license.txt
+  ln -s Apache APACHE
+
+  mkdir Artistic2.0
+  cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt
 
   mkdir CCPL
   cp $srcdir/cc-by-3.0.txt CCPL/
@@ -112,3 +102,25 @@ build() {
   mkdir ZPL
   cp $srcdir/ZopePublicLicense.txt ZPL/license.txt
 }
+md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
+         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
+         '5367190077e12a7f55403d531ef3998e'
+         '77651e5c686cbc0f8cec5ac7e6504235'
+         '6cb35f3976cd093011967fa1abbce386'
+         'f300afd598546add034364cd0a533261'
+         '73f1eb20517c55bf9493b7dd6e480788'
+         'b234ee4d69f5fce4486a80fdaf4a4263'
+         'd32239bcb673463ab874e80d47fae504'
+         '4fbd65380cdd255951079008b364516c'
+         'e6a600fd5e1d9cbde2d983680233ad02'
+         '24ea4c7092233849b4394699333b5c56'
+         '10b9de612d532fdeeb7fe8fcd1435cc6'
+         '9f4337828d782bdea41f03dd2ad1b808'
+         'bfe1f75d606912a4111c90743d6c7325'
+         'd09c120ca7db95ef2aeecec0cb08293b'
+         'b4a94da2a1f918b217ef5156634fc9e0'
+         'a45bb1bbeed9e26b26c5763df1d3913d'
+         '68d59ff8306e3a9f5f1c01462c77a317'
+         'f083e41c43db25e18f36c91e57750b64'
+         'a055911c32fb4ed6e96c453ceaeba857'
+         'dc8502850eab9e1ff330a12d7ca18a19')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 61c96f190..238fa973b 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -18,7 +18,7 @@ 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")
+replaces=('mplayer')
 md5sums=('caedcdc1e50b5575c38c2a85f9c53afc'
          '647b9f4ab5284a7fef3f84f992214e77'
          'd00874ccc644b7f43d6ef1c942fcef28')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 2f1028119..22517928e 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -18,9 +18,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
          '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")
+provides=("mplayer-vaapi=$pkgver" 'mplayer')
 conflicts=('mplayer' 'mplayer-vaapi')
-replaces=("mplayer-vaapi=$pkgver")
+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
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
index 13832bb91..3f88f1cee 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 pkgname=xorg-fonts-100dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install
index 3eb0455c9..5c5e8a2b4 100644
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-100dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/100dpi
+  mkfontdir /usr/share/fonts/100dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
index 5266bd550..c262229fc 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-75dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 75dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install
index 3eb0455c9..e52603946 100644
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-75dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/75dpi
+  mkfontdir /usr/share/fonts/75dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install
index 3eb0455c9..51688a1d1 100644
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ b/libre/xorg-fonts-type1-libre/xfonts.install
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*