Sun Jan 12 03:35:50 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-12 03:39:46 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-12 03:39:46 +0000
commit: 61e090957dbc6b062f3a1af7eeb0d58478c6657d (patch)
tree: 768f076ead75d57e34580da0d78ff9f5afe170fd /libre
parent: b8322aaddc0dc6b249457dd19ab7fb246b92c997 (diff)
15 files changed, 423 insertions, 134 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 75d6d8b63..799e57b23 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103342 2014-01-03 12:23:23Z jelle $
+# $Id: PKGBUILD 103745 2014-01-11 10:18:19Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.18.0
+pkgver=1.19.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('6a89229787a8ca63ece9c905df304222'
+md5sums=('5ce57bf48ed7f534fe9d5c55157dd15a'
          '95ca4eb3afa7c737c8371708a23bdad9'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola
new file mode 100644
index 000000000..49cbad4ba
--- /dev/null
+++ b/libre/grub/09_parabola
@@ -0,0 +1,178 @@
+#!/usr/bin/env bash
+
+##
+## grub-mkconfig helper script specific to Parabola GNU/Linux-libre
+## Contributed by "Keshav Padram Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm>
+## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu>
+##
+## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script 
+## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream
+##
+## This script can be freely distributed and/or modified 
+## under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This script is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+_FUNC_GRUB_FILE_PRESENT() {
+    
+    [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86"
+    
+    if [[ "${GRUB_PLATFORM}" == "x86" ]]; then
+        check="--is-x86-linux32"
+    elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then
+        check="--is-i386-xen-pae-domu"
+    elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then
+        check="--is-x86_64-xen-domu"
+    else
+        check="--is-${GRUB_PLATFORM}-linux"
+    fi
+    
+    case "${GRUB_PLATFORM}" in
+        x86)
+            list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
+                        if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
+                    done)" ;;
+        *) 
+          list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
+                      if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
+                  done)" ;;
+    esac
+}
+
+set -e
+
+prefix="/usr"
+exec_prefix="${prefix}"
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+sysconfdir="/etc"
+
+. "${datarootdir}/grub/grub-mkconfig_lib"
+
+. "${sysconfdir}/default/grub"
+
+export TEXTDOMAIN="grub"
+export TEXTDOMAINDIR="${datarootdir}/locale"
+
+CLASS="--class parabola --class gnu-linux --class gnu --class os"
+
+[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT
+
+BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)"
+BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null)"
+BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)"
+
+ROOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/" 2>/dev/null)"
+ROOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/" 2>/dev/null)"
+ROOT_PART_FS="$(${grub_probe} --target="fs" "/" 2>/dev/null)"
+
+if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then
+    SUBDIR="/boot"
+else
+    SUBDIR=""
+fi
+
+if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then
+    if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \
+       [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \
+       [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \
+       uses_abstraction "${GRUB_DEVICE}" lvm ; then
+           GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}"
+    else
+       GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}"
+    fi
+fi
+
+[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+
+for _KERNEL_ in ${list} ; do
+    
+    echo "Found linux image: ${_KERNEL_}" >&2
+    
+    _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')"
+    _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')"
+    
+    _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img"
+    
+    if [[ -e "/boot/${_INITRAMFS_}" ]]; then
+    
+    echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2
+    
+cat << EOF
+
+menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} {
+    if [ x\$feature_all_video_module = xy ]; then
+        insmod all_video
+    fi
+    set gfxpayload=keep
+    insmod ${BOOT_PART_FS}
+    if [ x\$feature_platform_search_hint = xy ]; then
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
+    else
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
+    fi
+    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
+    linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...'
+    initrd ${SUBDIR}/${_INITRAMFS_}
+}
+
+EOF
+    fi
+    
+    _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img"
+    
+    if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then
+    
+    echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2
+    
+cat << EOF
+
+menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} {
+    if [ x\$feature_all_video_module = xy ]; then
+        insmod all_video
+    fi
+    set gfxpayload=keep
+    insmod ${BOOT_PART_FS}
+    if [ x\$feature_platform_search_hint = xy ]; then
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
+    else
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
+    fi
+    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
+    linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...'
+    initrd ${SUBDIR}/${_INITRAMFS_FALLBACK_}
+}
+
+EOF
+    fi
+    
+    if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then
+cat << EOF
+
+menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} {
+    if [ x\$feature_all_video_module = xy ]; then
+        insmod all_video
+    fi
+    set gfxpayload=keep
+    insmod ${BOOT_PART_FS}
+    if [ x\$feature_platform_search_hint = xy ]; then
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
+    else
+        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
+    fi
+    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
+    linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+}
+
+EOF
+    fi
+    
+done
diff --git a/libre/grub/10_linux.in.patch b/libre/grub/10_linux.in.patch
new file mode 100644
index 000000000..c9285e699
--- /dev/null
+++ b/libre/grub/10_linux.in.patch
@@ -0,0 +1,31 @@
+diff -Nur grub.orig/util/grub.d/10_linux.in grub/util/grub.d/10_linux.in
+--- grub.orig/util/grub.d/10_linux.in	2014-01-11 06:07:40.750886565 -0200
++++ grub/util/grub.d/10_linux.in	2014-01-11 06:14:19.032955542 -0200
+@@ -30,8 +30,25 @@
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+   OS=GNU/Linux
+-else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
++      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
++      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++  else
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  fi
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index a4a17b4c8..c82b41a13 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -4,18 +4,18 @@
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
 
-_pkgver="2.00"
-_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953"
+_pkgver="2.02"
+_GRUB_GIT_TAG="grub-2.02-beta2"
 
-## grub-extras gpxe is not needed
+_UNIFONT_VER="6.3.20131217"
 
 [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
 [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
 
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
-pkgver=2.00.1282.g5ae5c54
-pkgrel=1.3
+pkgver=2.02.beta2
+pkgrel=1
 epoch="1"
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
@@ -28,9 +28,8 @@ conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
 replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
 provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
 
-makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu'
-             'python2' 'autogen' 'texinfo' 'help2man'
-             'gettext' 'device-mapper' 'fuse')
+makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
+             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
 depends=('sh' 'xz' 'gettext' 'device-mapper')
 optdepends=('freetype2: For grub-mkfont usage'
             'fuse: For grub-mount usage'
@@ -40,59 +39,62 @@ optdepends=('freetype2: For grub-mkfont usage'
             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
             'mtools: For grub-mkrescue FAT FS support')
 
-# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
-        'http://unifoundry.com/unifont-5.1.20080820.bdf.gz'
-        'parabola_grub_mkconfig_fixes.patch'
+source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}"
+        "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master"
+        "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"
+        "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig"
+        'grub-add-GRUB_COLOR_variables.patch'
+        '09_parabola'
         '60_memtest86+'
-        'grub.default')
-
+        'grub.default'
+        '10_linux.in.patch')
 md5sums=('SKIP'
-         '6b8263ceccef33bd633aa019d74b7943'
-         'aec37e36ba7806217be33d12a7eed062'
-         'be55eabc102f2c60b38ed35c203686d6'
-         'a9ef0067f6824944fa1ae22a5162d7d4'
          'SKIP'
+         '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
-         'SKIP')
-
-for _DIR_ in 915resolution lua ntldr-img ; do
-	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
-done
+         'e506ae4a9f9f7d1b765febfa84e10d48'
+         'd272e5fa811859838cfb60cc656d66ed'
+         'be55eabc102f2c60b38ed35c203686d6'
+         '52d374e0194e3f2e39ff7c92ecd58a6c'
+         'b23a144b7001c88734b79ed3bec491c4')
 
 pkgver() {
 	cd "${srcdir}/grub-${_pkgver}/"
-	echo "$(git describe --tags)" | sed -e 's|-|\.|g'
+	echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
 }
 
 prepare() {
 	
 	cd "${srcdir}/grub-${_pkgver}/"
 	
-	msg "Patch to enable grub-mkconfig detect Parabola kernels and initramfs"
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
+	msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig"
+	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
+	patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch"
+	echo
 	
 	msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
 	
+        msg "Rebranding for some free distros"
+        patch -Np1 -i "${srcdir}/10_linux.in.patch"
+        echo
+
 	msg "Fix mkinitcpio 'rw' FS#36275"
 	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
 	
-	msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3"
-	sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
+	# msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3"
+	# sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
 	
 	msg "Pull in latest language files"
 	./linguas.sh
 	echo
 	
-	msg "Remove non working langs which need LC_ALL=C.UTF-8"
+	msg "Remove not working langs which need LC_ALL=C.UTF-8"
 	sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
 	
 	msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847"
-	cp "${srcdir}/unifont-5.1.20080820.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
+	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
 	
-	msg "Fix freetype header path file"
-	sed 's|freetype/ftsynth[.]h|freetype2/ftsynth.h|g' -i "${srcdir}/grub-${_pkgver}/util/grub-"{gen-{asciih,widthspec},mkfont}.c
 }
 
 _build_grub-common_and_bios() {
@@ -104,16 +106,14 @@ _build_grub-common_and_bios() {
 		_EFIEMU="--disable-efiemu"
 	fi
 	
-	msg "Copy the source for building the bios package"
+	msg "Copy the source for building the bios part"
 	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
 	cd "${srcdir}/grub-${_pkgver}-bios/"
 	
 	msg "Add the grub-extra sources for bios build"
 	install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
-	for _DIR_ in 915resolution ntldr-img ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}"
-	done
-	export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
+	cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution"
+	export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/"
 	
 	msg "Unset all compiler FLAGS for bios build"
 	unset CFLAGS
@@ -161,31 +161,24 @@ _build_grub-common_and_bios() {
 
 _build_grub-efi() {
 	
-	msg "Copy the source for building the efi package"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi"
-	cd "${srcdir}/grub-${_pkgver}-efi/"
-	
-	msg "Add the grub-extra sources for efi build"
-	install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/"
-	for _DIR_ in lua ; do
-		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}"
-	done
-	# export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
+	msg "Copy the source for building the ${_EFI_ARCH} efi part"
+	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}"
+	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
 	
-	msg "Unset all compiler FLAGS for efi build"
+	msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build"
 	unset CFLAGS
 	unset CPPFLAGS
 	unset CXXFLAGS
 	unset LDFLAGS
 	unset MAKEFLAGS
 	
-	cd "${srcdir}/grub-${_pkgver}-efi/"
+	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
 	
-	msg "Run autogen.sh for efi build"
+	msg "Run autogen.sh for ${_EFI_ARCH} efi build"
 	./autogen.sh
 	echo
 	
-	msg "Run ./configure for efi build"
+	msg "Run ./configure for ${_EFI_ARCH} efi build"
 	./configure \
 		--with-platform="efi" \
 		--target="${_EFI_ARCH}" \
@@ -211,7 +204,7 @@ _build_grub-efi() {
 		--disable-werror
 	echo
 	
-	msg "Run make for efi build"
+	msg "Run make for ${_EFI_ARCH} efi build"
 	make
 	echo
 	
@@ -225,7 +218,7 @@ build() {
 	_build_grub-common_and_bios
 	echo
 	
-	msg "Build grub efi stuff"
+	msg "Build grub ${_EFI_ARCH} efi stuff"
 	_build_grub-efi
 	echo
 	
@@ -244,38 +237,36 @@ _package_grub-common_and_bios() {
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
 	
+	msg "Install 09_parabola helper script for grub-mkconfig"
+	install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola"
+	
 	msg "Install extra /etc/grub.d/ files"
 	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
 	
 	msg "Install /etc/default/grub (used by grub-mkconfig)"
 	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
 	
-	msg "Add msdos.mod symlink"
-	ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/i386-pc/msdos.mod" || true
 	
 }
 
 _package_grub-efi() {
 	
-	cd "${srcdir}/grub-${_pkgver}-efi/"
+	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
 	
-	msg "Run make install for efi build"
+	msg "Run make install for ${_EFI_ARCH} efi build"
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
 	
-	msg "Remove gdb debugging related files for efi build"
+	msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build"
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
 	
-	msg "Add msdos.mod symlink"
-	ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi/msdos.mod" || true
-	
 }
 
 package() {
 	
-	msg "Package grub efi stuff"
+	msg "Package grub ${_EFI_ARCH} efi stuff"
 	_package_grub-efi
 	
 	msg "Package grub bios stuff"
diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub/grub-add-GRUB_COLOR_variables.patch
new file mode 100644
index 000000000..c113a81d5
--- /dev/null
+++ b/libre/grub/grub-add-GRUB_COLOR_variables.patch
@@ -0,0 +1,32 @@
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 3390ba9..c416489 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -218,6 +218,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_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index d2e7252..8259f45 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -125,6 +125,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/libre/grub/grub.default b/libre/grub/grub.default
index 38bb4a57f..8455b67dd 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -45,6 +45,3 @@ GRUB_COLOR_HIGHLIGHT="white/magenta"
 #GRUB_INIT_TUNE="480 440 1"
 
 #GRUB_SAVEDEFAULT="true"
-
-# Disable advanced submenu, due 10_linux script file generates submenu without closing bracket with grub-mkconfig
-GRUB_DISABLE_SUBMENU="y"
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 76bca922a..7172dbc05 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 203283 2014-01-07 12:58:21Z heftig $
+# $Id: PKGBUILD 203419 2014-01-10 16:09:41Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gst-plugins-bad
 pkgname=$_pkgname-libre
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi'
-             'gobject-introspection')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi' 'librsvg'
+             'gobject-introspection' 'gtk-doc')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
@@ -24,7 +24,7 @@ build() {
   cd $_pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
+    --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
     --with-package-origin="https://parabolagnulinux.org/" \
     --with-gtk=3.0
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 301ecb4a1..bfbb1e633 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103300 2014-01-02 22:41:39Z spupykin $
+# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.8.10
+pkgver=2.6.8.11
 pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('0029627acf4d8e838b24e04eb01c948e')
+md5sums=('ba1d61d4abbf664f9f04689710d895c1')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index f6d46a656..5c0c84158 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103300 2014-01-02 22:41:39Z spupykin $
+# $Id: PKGBUILD 103700 2014-01-10 10:25:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.8.10
+pkgver=2.6.8.11
 pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('0029627acf4d8e838b24e04eb01c948e')
+md5sums=('ba1d61d4abbf664f9f04689710d895c1')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index 338fc5d7a..77bd49440 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -10,16 +10,18 @@ arch=('any')
 license=('GPL3' 'custom')
 url="http://code.google.com/p/vdrift-ogre"
 makedepends=('cmake' 'boost' 'libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor')
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz"
-        "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz"
-        libre.patch )
+mksource=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz"
+          "$_pkgname-tracks-$pkgver.tar.gz::https://github.com/stuntrally/tracks/archive/${pkgver}.tar.gz"
+          libre.patch )
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver.tar.gz")
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51'
-            '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565'
-            '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64')
-prepare() {
+mksha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51'
+              '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565'
+              '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64')
+sha256sums=('3159f8e2b33d5685fb3e7320ab8ce4a60a35830a4dac7b9c3c8aeebf9a38f8d5')
+mksource() {
   # patch some data files and remove nonfree data files
   cd "${srcdir}/stuntrally-${pkgver}/"
 
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 6bd33d769..af4881e7e 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -25,7 +25,9 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core')
 provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
+mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
+noextract=("$_pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz"
         "$_pkgname.maps"
         "texmf.cnf"
         "09-texlive-fonts.conf")
@@ -43,60 +45,79 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
-md5sums=('80c7fa3db1b468f9043c6acdd941a526'
+mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526')
+md5sums=('a005881089830e47c8502849055e866e'
          '306ab28bb9b070fc3e40d86d28ea7e8e'
          'd5a3f442ec3b7aa1518170f64f9d006b'
          '393a4bf67adc7ca5df2b386759d1a637')
 
-build() {
-   cd "$srcdir"
+mksource() {
+   mkdir $_pkgname-$pkgver
+   pushd $_pkgname-$pkgver
+   bsdtar xfv ../$_pkgname-$pkgver-src.zip
 
    # remove nonfree packages
    # MeX licensed packages.
-   rm {cc-pl,cs,ec,mex,pl}.tar.xz
+   rm -v {cc-pl,cs,ec,mex,pl}.tar.xz
    # Public domain, will be relicensed.
-   rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
+   rm -v context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
    # No specific free license.
-   rm euro-ce.tar.xz
-   # Remove them from package list.
+   rm -v euro-ce.tar.xz
+   # Remove their references from package list.
    sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
 
-   echo -n "   --> extracting all packages... "
-   for p in *.tar.xz; do 
-     bsdtar -xf $p
-   done
-   echo "done"
-   rm -rf {tlpkg,doc,source,omega} || true
+   # remove nonfree packages references from updmap.cfg
+   tar xvpf tetex.tar.xz
+   rm -v tetex.tar.xz
 
-   # remove nonfree packages from updmap.cfg
    sed -i '/ccpl.map/d'       texmf-dist/web2c/updmap.cfg
    sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg
    sed -i '/csfonts.map/d'    texmf-dist/web2c/updmap.cfg
    sed -i '/plother.map/d'    texmf-dist/web2c/updmap.cfg
-   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
+   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg
 
-   # remove nonfree packages from texlive-core.maps
-   sed -i '/ccpl.map/d'       texlive-core.maps
-   sed -i '/cs-charter.map/d' texlive-core.maps
-   sed -i '/csfonts.map/d'    texlive-core.maps
-   sed -i '/plother.map/d'    texlive-core.maps
-   sed -i '/pltext.map/d'     texlive-core.maps
+   tar cvJf tetex.tar.xz texmf-dist tlpkg
+   rm -rv texmf-dist tlpkg
+
+   # remove nonfree packages references from fmtutil.cnf
+   tar xvpf kpathsea.tar.xz
+   rm -v kpathsea.tar.xz
 
-   # remove nonfree packages from fmtutil.cnf
    sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
    sed -i '/csplain/d'     texmf-dist/web2c/fmtutil.cnf
    sed -i '/from mex/d'    texmf-dist/web2c/fmtutil.cnf
    sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf
+
+   tar cvJf kpathsea.tar.xz texmf-dist tlpkg
+   rm -rv texmf-dist tlpkg
+
+   popd
 }
 
-package() {
-   cd "$srcdir"
+build() {
+   cd $srcdir/$_pkgname-$pkgver
+   echo -n "   --> extracting all packages... "
+   for p in *.tar.xz; do 
+     bsdtar -xf $p
+   done
+   echo "done"
+   rm -rf {tlpkg,doc,source,omega} || true
 
+   # remove nonfree packages from texlive-core.maps
+   sed -i '/ccpl.map/d'       $srcdir/$_pkgname.maps
+   sed -i '/cs-charter.map/d' $srcdir/$_pkgname.maps
+   sed -i '/csfonts.map/d'    $srcdir/$_pkgname.maps
+   sed -i '/plother.map/d'    $srcdir/$_pkgname.maps
+   sed -i '/pltext.map/d'     $srcdir/$_pkgname.maps
+}
+
+package() {
+   cd $srcdir/$_pkgname-$pkgver
    # Install packages.
    install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
    install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
    install -m755 -d $pkgdir/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 7d3fc7d20..55a117c79 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -16,20 +16,32 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
+noextract=("$_pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('3f519371dd2e22e5b32daa461b89aea2'
+mkmd5sums=('3f519371dd2e22e5b32daa461b89aea2')
+md5sums=('e6b12e482913169f44c54172316416bc'
          'f489cc5f762dcdbe6acb11624de7e138')
 
-build() {
-   cd "$srcdir"
+mksource() {
+   mkdir $_pkgname-$pkgver
+   pushd $_pkgname-$pkgver
+   bsdtar xfv ../$_pkgname-$pkgver-src.zip
+
    # remove nonfree packages
    # No specific free license.
-   rm ogham.tar.xz
+   rm -v ogham.tar.xz
    # Remove them from package list.
    sed -ri '/^ogham /d' CONTENTS
+
+   popd
+}
+
+build() {
+   cd $srcdir/$_pkgname-$pkgver
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
@@ -37,11 +49,11 @@ build() {
 }
 
 package() {
-   cd "$srcdir"
+   cd $srcdir/$_pkgname-$pkgver
    install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
    install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
    install -m755 -d $pkgdir/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index ba22b53be..dce3903aa 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -25,29 +25,42 @@ replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
+noextract=("$_pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('7c9755ca4e104089fab816d805990f6f'
+mkmd5sums=('7c9755ca4e104089fab816d805990f6f')
+md5sums=('7e6ff7b61faf268fe2b814c4949ab364'
          '9e4825f47dac663dd62c4bfa67899e84')
 
-build() {
+mksource() {
+   mkdir $_pkgname-$pkgver
+   pushd $_pkgname-$pkgver
+   bsdtar xfv ../$_pkgname-$pkgver-src.zip
+
    # remove nonfree packages
    # No specific free license.
-   rm {authoraftertitle,clock,fnpara}.tar.xz
+   rm -v {authoraftertitle,clock,fnpara}.tar.xz
    # Remove them from package list.
    sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS
+
+   popd
+}
+build() {
+   cd $srcdir/$_pkgname-$pkgver
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
    rm -rf {tlpkg,doc,source} || true
 }
 package() {
+   cd $srcdir/$_pkgname-$pkgver
    install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
    install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
+   install -m644 $srcdir/$_pkgname.maps "$pkgdir"/var/lib/texmf/arch/installedpkgs/
    install -m755 -d "$pkgdir"/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 020740313..b9e4550a4 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -15,16 +15,22 @@ depends=('bzip2' 'bash')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
 replaces=("${_pkgname}")
-source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
-        'match.patch')
-md5sums=('62b490407489521db863b523a7f86375'
-         'e6d9f0c204c2abe6a57dc5e1637d5140')
-
-build() {
+mksource=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
+          'match.patch')
+source=('https://repo.parabolagnulinux.org/sources/unzip60-libre.tar.gz')
+mkmd5sums=('62b490407489521db863b523a7f86375'
+           'e6d9f0c204c2abe6a57dc5e1637d5140')
+md5sums=('bbe4b7f4d48b2f939b5e43fde0ac7762')
+
+mksource() {
   cd ${srcdir}/${_pkgname}${pkgver/./}
 
   # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
   patch -Np0 -i ${srcdir}/match.patch
+}
+
+build() {
+  cd ${srcdir}/${_pkgname}${pkgver/./}
 
   # set CFLAGS -- from Debian
   export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index c2eddaafc..1a63f6f79 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -17,20 +17,26 @@ replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
+mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz)
+source=(https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz \
         xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc'
+mksha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc')
+sha1sums=('f041ac860f52fab79c438012ebf58a021ef9bfea'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
           '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
-prepare() {
+mksource() {
   cd ${_pkgname}-${pkgver}
-  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
 
   # Deleting dmsc.asm file due which don't have source code supplied
   rm -v hacks/images/m6502/dmsc.asm
 }
 
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+}
+
 build() {
   cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-12 03:39:46 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-12 03:39:46 +0000
commit	61e090957dbc6b062f3a1af7eeb0d58478c6657d (patch)
tree	768f076ead75d57e34580da0d78ff9f5afe170fd /libre
parent	b8322aaddc0dc6b249457dd19ab7fb246b92c997 (diff)