From 5f74139e49aec90fef556447373608db10d9f1e6 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@kiwwwi.com.ar>
Date: Sat, 2 Jun 2012 22:53:38 -0300
Subject: don't build jit on mips64el

---
 libre/iceweasel-libre/PKGBUILD | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 66e441d75..fdca2f627 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -109,6 +109,17 @@ fi
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
 
+# From js on abslibre-mips64el.git
+  if [ "$CARCH" = "mips64el" ]; then
+      msg "Force disabling JIT."
+      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+          js/src/assembler/wtf/Platform.h
+      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
+
+      echo "ac_add_options --disable-methodjit" >> .mozconfig
+      echo "ac_add_options --disable-tracejit" >> .mozconfig
+  fi
+
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
-- 
cgit v1.2.3-54-g00ecf


From 88e5cb576d37f9ecc536c68eb1614fbd1f08e538 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 30 Oct 2012 23:44:24 -0400
Subject: improve java/java-rxtx

---
 java/java-rxtx/0000-configure-java-version.patch | 93 ++++++++++++++++++++++++
 java/java-rxtx/0001-makefile-destdir.patch       | 21 ++++++
 java/java-rxtx/0002-makefile-javadoc-dir.patch   | 13 ++++
 java/java-rxtx/0003-lockdir-location.patch       | 18 +++++
 java/java-rxtx/ChangeLog.txt                     |  8 --
 java/java-rxtx/GroupMembership.txt               |  7 ++
 java/java-rxtx/PKGBUILD                          | 83 +++++++++++++++------
 java/java-rxtx/destdir.patch                     | 20 -----
 java/java-rxtx/java7-configure.patch             | 38 ----------
 9 files changed, 213 insertions(+), 88 deletions(-)
 create mode 100644 java/java-rxtx/0000-configure-java-version.patch
 create mode 100644 java/java-rxtx/0001-makefile-destdir.patch
 create mode 100644 java/java-rxtx/0002-makefile-javadoc-dir.patch
 create mode 100644 java/java-rxtx/0003-lockdir-location.patch
 delete mode 100644 java/java-rxtx/ChangeLog.txt
 create mode 100644 java/java-rxtx/GroupMembership.txt
 delete mode 100644 java/java-rxtx/destdir.patch
 delete mode 100644 java/java-rxtx/java7-configure.patch

diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch
new file mode 100644
index 000000000..c9e37258a
--- /dev/null
+++ b/java/java-rxtx/0000-configure-java-version.patch
@@ -0,0 +1,93 @@
+Make the JAVA_VERSION checks future-proof (for Java 6 and 7)
+
+At this point Java is mature enough that support for older versions isn't
+going to be dropped, so instead of having a growing list of new versions that
+work by default, have a short list of old versions that need special measures.
+--- RXTX.orig/configure.in	2012-10-29 01:13:58.000000000 -0400
++++ RXTX/configure.in	2012-10-29 10:56:18.000000000 -0400
+@@ -463,12 +463,6 @@
+ 	CFLAGS=$CFLAGS" -D__need_timespec"
+ 	case $JAVA_VERSION in
+ 
+-	1.2*|1.3*|1.4*|1.5*) 
+-		#fix_parameters $JPATH/jre/lib/javax.comm.properties
+-		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+-		JHOME=$JPATH"/jre/lib/ext"
+-		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+-	;;
+ 	1.1*) 
+ 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \
+ 			if [ -d $JPATH/share/kaffe/ ]; then
+@@ -498,6 +492,12 @@
+ 			JHOME=$JPATH/"lib"
+ 		fi
+ 	;;
++	*) 
++		#fix_parameters $JPATH/jre/lib/javax.comm.properties
++		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++		JHOME=$JPATH"/jre/lib/ext"
++		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++	;;
+ 	esac 
+ 
+ 	# Cross Compilers
+@@ -533,12 +533,6 @@
+ 	TARGETLIB="\$(target_triplet)/librxtxSerial.la \
+ 			\$(target_triplet)/librxtxParallel.la"
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*) 
+-		#fix_parameters $JPATH/jre/lib/javax.comm.properties
+-		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
+-		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+-		JHOME=$JPATH/"jre/lib/ext"
+-	;;
+ 	1.1*) 
+ 		check_prefix
+ 		#fix_parameters $JPATH/lib/javax.comm.properties
+@@ -570,6 +564,10 @@
+ 		JHOME=$JPATH/"lib"
+ 	;;
+ 	*)
++		#fix_parameters $JPATH/jre/lib/javax.comm.properties
++		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++		JHOME=$JPATH/"jre/lib/ext"
+ 	;;
+ 	esac
+ ;;
+@@ -669,15 +667,15 @@
+ 
+ WIN32)
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*)
+-		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
+-		JHOME=$JPATH"/jre/lib/ext"
+-	;;
+ 	1.1*)
+ 		CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+ 		RXTX_PATH="\$(prefix)/lib/"
+ 		JHOME=$JPATH/"lib"
+ 	;;
++	*)
++		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
++		JHOME=$JPATH"/jre/lib/ext"
++	;;
+ 	esac
+ 	if test x$WIN32INCLUDE = x; then
+ 	echo "We need to know what directory the windows java include files"
+@@ -721,12 +719,12 @@
+ 	CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
+ 
+ 	case $JAVA_VERSION in
+-	1.2*|1.3*|1.4*|1.5*)
+-		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
+-	;;
+ 	1.1*)
+ 		RXTX_PATH="\$(JPATH)/lib/"
+ 	;;
++	*)
++		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++	;;
+ 	esac
+ ;;
+ 
diff --git a/java/java-rxtx/0001-makefile-destdir.patch b/java/java-rxtx/0001-makefile-destdir.patch
new file mode 100644
index 000000000..944654ab6
--- /dev/null
+++ b/java/java-rxtx/0001-makefile-destdir.patch
@@ -0,0 +1,21 @@
+Add DESTDIR support to Makefile
+--- RXTX.orig/Makefile.am
++++ RXTX/Makefile.am
+@@ -81,13 +81,15 @@
+ #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
+ #  proper location
+ install: all
++	$(mkinstalldirs) $(DESTDIR)$(RXTX_PATH)
++	$(mkinstalldirs) $(DESTDIR)$(JHOME)
+ 	@$(LIBTOOL_INST) \
+ 	`for i in $(TARGETLIB);do \
+ 		if [ -f $$i ];then \
+ 			echo $$i; \
+ 		fi; \
+-	done` $(RXTX_PATH)
+-	$(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/
++	done` $(DESTDIR)$(RXTX_PATH)
++	$(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/
+ 
+ clean-generic:
+ 	rm -rf $(DEST) $(TOP)/$(CLASSTOP)
diff --git a/java/java-rxtx/0002-makefile-javadoc-dir.patch b/java/java-rxtx/0002-makefile-javadoc-dir.patch
new file mode 100644
index 000000000..9b4eb0692
--- /dev/null
+++ b/java/java-rxtx/0002-makefile-javadoc-dir.patch
@@ -0,0 +1,13 @@
+Place the Javadoc output in its own directory
+--- RXTX.orig/Makefile.am
++++ RXTX/Makefile.am
+@@ -99,7 +99,8 @@
+ 
+ #  create the javadoc files.
+ docs: $(CLASSES)
+-	$(JAVADOC) $(javafiles)
++	mkdir javadoc
++	cd javadoc && $(JAVADOC) $(javafiles)
+ 
+ ################  WIN32 CrossCompiling from here down #######################
+ 
diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch
new file mode 100644
index 000000000..78a757f81
--- /dev/null
+++ b/java/java-rxtx/0003-lockdir-location.patch
@@ -0,0 +1,18 @@
+Fix the location of device lock files.
+
+Use the new semi-standard device lock file directory on GNU/Linux.  This is
+nescessary on (at least) Arch Linux and Parabola GNU/Linux.
+
+http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
+
+--- RXTX.orig/src/SerialImp.h
++++ RXTX/src/SerialImp.h
+@@ -109,7 +109,7 @@
+ /*  Ports known on the OS */
+ #if defined(__linux__)
+ #	define DEVICEDIR "/dev/"
+-#	define LOCKDIR "/var/lock"
++#	define LOCKDIR "/var/lock/lockdev"
+ #	define LOCKFILEPREFIX "LCK.."
+ #	define FHS
+ #endif /* __linux__ */
diff --git a/java/java-rxtx/ChangeLog.txt b/java/java-rxtx/ChangeLog.txt
deleted file mode 100644
index 7efab2514..000000000
--- a/java/java-rxtx/ChangeLog.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Differences from rxtx-2.1-7r2 made by Arduino:
- * Adding support for /dev/ttyACM* devices on Linux.
- * Fixing (I hope) problems on 64-bit Linux systems.
- * Adding checks for Java 1.6.
- * Removing unnecessary compiler warning.
-
-Differences from Arduino's version:
- * Adding checks for Java 1.7.
diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt
new file mode 100644
index 000000000..dd5c47076
--- /dev/null
+++ b/java/java-rxtx/GroupMembership.txt
@@ -0,0 +1,7 @@
+In order to use a program that makes use of rxtx, you must be a member
+of the groups:
+ * uucp: for access to hardware devices in /dev
+ * lock: for access to hardware lockfiles in /var/lock/lockdev
+
+Most documentation indicates that you must be in one or the other,
+depending on your distro; you must actually be in both.
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 30ed25967..8d609f5ae 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -1,54 +1,93 @@
 # Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): PyroPeter <googlemail.com@abi1789>
 
-pkgname=java-rxtx
 _pkgver=2.1-7r2-arduino4
 _gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638'
-pkgver=${_pkgver//-/.}
 
-pkgrel=1
+####
+
+pkgname=java-rxtx
+pkgver=${_pkgver//-/.}
 pkgdesc="A native library providing serial and parallel communication for Java"
+license=(LGPL2.1)
+
+pkgrel=2
 arch=('i686' 'x86_64')
-depends=('java-environment')
+depends=('java-runtime')
+makedepends=('java-environment' 'pacman>4.0.3')
 
 case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
-	source=("git://github.com/arduino/RXTX.git#${_gitver}"
-	    java7-configure.patch
-	    destdir.patch)
-	license=(LGPL)
-	changelog=ChangeLog.txt
+	source=("git://github.com/arduino/RXTX.git#${_gitver}")
+	md5sums=('SKIP')
 	_dirname=RXTX
 	;;
     *)
 	url="http://rxtx.qbang.org/"
-	source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip"
-	    destdir.patch)
-	# Todo: patch for Java 6 AND Java 7
-	license=('custom:LGPL-with-java-exception')
+	source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip")
+	md5sums=('9290b4832d46199f8d798a531209640b')
 	_dirname=rxtx-{$_pkgver}
 	;;
 esac
 
+source+=(
+  0000-configure-java-version.patch
+  0001-makefile-destdir.patch
+  0002-makefile-javadoc-dir.patch
+  0003-lockdir-location.patch
+  GroupMembership.txt)
+
+md5sums+=('a36caaca717018341d69605f962d1c2a'
+          '39c88043032de742c6b51d90a26eee2c'
+          'a910e0c75a9c687d2b2f782e3d9982e3'
+          '19b19c2514bce563be2a812888e1d9b4'
+          '9dc461eab358e3b78c4b688977997116')
+
+_MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib')
+
+_changelog() {
+  t="`echo -e '\t'`"
+  
+  # Parabola changes
+  ls "$srcdir"/*.patch | sort -r | while read file; do
+    echo "${file##*/}"
+    sed "1s/./$t$t&/;1q" "$file"
+  done
+
+  # Arduino changes
+  if [[ -d "$srcdir/$_dirname/.git" ]]; then
+    pushd "$srcdir/$_dirname" > /dev/null
+    git log --pretty=format:"%h %ad%n$t$t%s" --date=short|head -n-2
+    popd > /dev/null
+  fi
+
+  # RXTX ChangeLog
+  grep "^[0-9 $t]" "$srcdir/$_dirname/ChangeLog"
+}
+
 build() {
+  _changelog > "$srcdir/ChangeLog.txt"
   cd "$srcdir/$_dirname"
   . /etc/profile.d/jdk.sh
 
-  patch -i "$srcdir/java7-configure.patch"
-  patch -i "$srcdir/destdir.patch"
+  patch -Np1 -i "$srcdir/0000-configure-java-version.patch" # requires autogen
+  patch -Np1 -i "$srcdir/0001-makefile-destdir.patch" # requires autogen
+  patch -Np1 -i "$srcdir/0002-makefile-javadoc-dir.patch" # requires autogen
+  patch -Np1 -i "$srcdir/0003-lockdir-location.patch"
+  rm *.m4 && ./autogen.sh
 
   ./configure --prefix=/usr
-  make
+  make "${_MAKEFLAGS[@]}" all docs
 }
 
 package() {
   cd "$srcdir/$_dirname"
   . /etc/profile.d/jdk.sh
 
-  make DESTDIR="$pkgdir" install
-}
+  make "${_MAKEFLAGS[@]}" DESTDIR="$pkgdir" install
 
-md5sums=('SKIP'
-         'f07bc244660852dd9b016c190e38e1c9'
-         '90be9bdf1d8cbe5304739df066559a13')
+  install -d "$pkgdir/usr/share/doc/$pkgname/"
+  install -m644 "$srcdir/ChangeLog.txt" "$pkgdir/usr/share/doc/$pkgname/"
+  install -m644 "$srcdir/GroupMembership.txt" "$pkgdir/usr/share/doc/$pkgname/"
+  cp -r javadoc "$pkgdir/usr/share/doc/$pkgname/"
+}
diff --git a/java/java-rxtx/destdir.patch b/java/java-rxtx/destdir.patch
deleted file mode 100644
index 11416841f..000000000
--- a/java/java-rxtx/destdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2012-09-21 15:21:00.000000000 -0400
-+++ Makefile.in	2012-09-21 15:21:07.000000000 -0400
-@@ -566,13 +566,15 @@
- #  install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
- #  proper location
- install: all
-+	$(mkinstalldirs) $(DESTDIR)$(RXTX_PATH)
-+	$(mkinstalldirs) $(DESTDIR)$(JHOME)
- 	@$(LIBTOOL_INST) \
- 	`for i in $(TARGETLIB);do \
- 		if [ -f $$i ];then \
- 			echo $$i; \
- 		fi; \
--	done` $(RXTX_PATH)
--	$(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/
-+	done` $(DESTDIR)$(RXTX_PATH)
-+	$(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/
- 
- clean-generic:
- 	rm -rf $(DEST) $(TOP)/$(CLASSTOP)
diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch
deleted file mode 100644
index fed710200..000000000
--- a/java/java-rxtx/java7-configure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	2012-09-21 15:02:54.000000000 -0400
-+++ configure	2012-09-21 15:03:38.000000000 -0400
-@@ -21541,7 +21541,7 @@
- 	CFLAGS=$CFLAGS" -D__need_timespec"
- 	case $JAVA_VERSION in
- 
--	1.2*|1.3*|1.4*|1.5*|1.6*)
-+	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- 		#fix_parameters $JPATH/jre/lib/javax.comm.properties
- 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- 		JHOME=$JPATH"/jre/lib/ext"
-@@ -21611,7 +21611,7 @@
- 	TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- 			\$(target_triplet)/librxtxParallel.la"
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*|1.6*)
-+	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- 		#fix_parameters $JPATH/jre/lib/javax.comm.properties
- 		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- 		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-@@ -21747,7 +21747,7 @@
- 
- WIN32)
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*|1.6*)
-+	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- 		CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
- 		JHOME=$JPATH"/jre/lib/ext"
- 	;;
-@@ -21799,7 +21799,7 @@
- 	CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
- 
- 	case $JAVA_VERSION in
--	1.2*|1.3*|1.4*|1.5*|1.6*)
-+	1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- 		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
- 	;;
- 	1.1*)
-- 
cgit v1.2.3-54-g00ecf


From 72f1e7d07e6ceb249c6d85e427cca22d7063e44d Mon Sep 17 00:00:00 2001
From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 7 Nov 2012 13:21:06 +0100
Subject: your-freedom: update md5sum for a new release.

---
 libre/your-freedom/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 649cb962d..9c5f6242c 100755
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -24,4 +24,4 @@ package() {
         ))
 }
 
-md5sums=('5e50a4ec73267a732d153c1079e9b021')
+md5sums=('cc8ed9a33d0c58fcecc3323f831f687e')
-- 
cgit v1.2.3-54-g00ecf


From ff6fa124540d549a582aa5c80b08e4e883036868 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 7 Nov 2012 21:24:19 -0500
Subject: update libre/libretools

---
 libre/libretools/PKGBUILD           | 95 ++++++++-----------------------------
 libre/libretools/libretools.install |  0
 2 files changed, 19 insertions(+), 76 deletions(-)
 mode change 100755 => 100644 libre/libretools/PKGBUILD
 mode change 100755 => 100644 libre/libretools/libretools.install

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
old mode 100755
new mode 100644
index dec731c97..6efc06b90
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,102 +1,45 @@
 # Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 
 pkgbase=libretools
 pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=$(date -u +%Y%m%d)
-pkgrel=2
-pkgdesc="Scripts for easing Parabola's tasks"
-arch=('any')
+pkgver=20121107
+pkgdesc="Scripts for Parabola development"
 url="http://parabolagnulinux.org"
 license=('GPL3+')
-depends=(openssh rsync git wget)
-optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)')
-makedepends=(git)
-install=libretools.install
-source=()
-md5sums=()
 
-_gitroot="http://projects.parabolagnulinux.org/libretools.git"
-_gitname="libretools"
+pkgrel=1
+arch=('any')
+depends=(openssh rsync git wget devtools)
+install=libretools.install
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2)
 
 build() {
-  cd "$srcdir"
- ## Git checkout
-  if [ -d $srcdir/${_gitname} ] ; then
-    msg "Git checkout:  Updating existing tree"
-    cd ${_gitname} && git pull ${_gitroot}
-    msg "Git checkout:  Tree has been updated"
-  else
-    msg "Git checkout:  Retrieving sources"
-    git clone ${_gitroot}  
-  fi
-  msg "Checkout completed"
- ## Build
+  cd "$srcdir/$pkgbase-$pkgver"
+  make
 }
 
 package_libretools() {
   backup=(etc/libretools.conf)
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
-
-  install -d ${pkgdir}/usr/bin
-  install -d ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/abslibre-commit        ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/add-mips64el           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/aur                    ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/buildenv               ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/chcleanup              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/createworkdir          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/diff-unfree            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg                ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg-build          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg-find           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/is_built               ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/is_unfree              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/lb                     ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libreaddiff            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librebasebuilder       ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librechroot            ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/librecommit            ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librediff              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libremakepkg           ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/libremessages          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/libremkchroot          ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librerelease           ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librerepkg             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librestage             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru                   ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-path              ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-utils             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/toru-where             ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/updateabslibre         ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/update-cleansystem     ${pkgdir}/usr/sbin
-  
-  install -d ${pkgdir}/usr/share/pacman
-  install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools DESTDIR="$pkgdir"
+  install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto
 }
 
 package_libretools-pr() {
   backup=('etc/libretools.d/prtools.conf')
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools-pr DESTDIR="$pkgdir"
 }
 
 package_libretools-mips64el() {
   backup=('etc/libretools.d/mips64el.conf')
 
-  install -d ${pkgdir}/etc/libretools.d
-  install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make install-libretools-mips64el DESTDIR="$pkgdir"
 }
+
+md5sums=('d80cc433cc627b2d7aa1c37f794d2ef9')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
old mode 100755
new mode 100644
-- 
cgit v1.2.3-54-g00ecf


From 1e06c4bb94ff932781e9133d41b62420dc76a19e Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Thu, 8 Nov 2012 15:27:12 -0300
Subject: notmuch: added python3 support

---
 ~fauno/notmuch/PKGBUILD | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index b3ff31567..57d8d880d 100755
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=notmuch
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
 url="http://notmuchmail.org/"
 license=('GPL3')
 depends=('xapian-core' 'gmime' 'talloc')
-makedepends=('python2' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
+makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
 optdepends=('emacs: for using the emacs interface'
             'vim: for using the vim interface'
             'python2: for using the python bindings'
@@ -21,14 +21,25 @@ options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+#  ./configure --prefix=/usr --sysconfdir=/etc
+#  make 
+
+#  cd bindings/ruby
+#  ruby extconf.rb
+#  make
+
+  cp -r $srcdir/${pkgname}-${pkgver}/bindings/python{,2}
 
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make 
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python
+  env LD_LIBRARY_PATH="." python setup.py build
 
-  cd bindings/ruby
-  ruby extconf.rb
-  make
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
+  find "." -name '*.py' -print0 |xargs -0 \
+      sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
+      -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
+  env LD_LIBRARY_PATH="." python2 setup.py build
 }
 
 check() {
@@ -48,17 +59,14 @@ package(){
 
   # Install python bindings
 
-  cd $srcdir/${pkgname}-*/bindings/python
-
-  find "." -name '*.py' -print0 |xargs -0 \
-      sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-      -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-#  ln -s ../../lib/libnotmuch.so.1 libnotmuch.so.1
-  env LD_LIBRARY_PATH="." python2 setup.py build
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
   env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir
 
+  cd $srcdir/${pkgname}-${pkgver}/bindings/python
+  env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root=$pkgdir
+
 # Install ruby bindings
-  cd $srcdir/${pkgname}-*/bindings/ruby
+  cd $srcdir/${pkgname}-${pkgver}/bindings/ruby
   sed -i -e 's,/site_ruby,,g' Makefile
   make prefix=${pkgdir}/usr install
 
-- 
cgit v1.2.3-54-g00ecf


From 87a379782f447a957917250334350b25c431ad1f Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Thu, 8 Nov 2012 15:35:52 -0300
Subject: minidjvu

---
 pcr/minidjvu/PKGBUILD | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pcr/minidjvu/PKGBUILD

diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD
new file mode 100644
index 000000000..168f035cc
--- /dev/null
+++ b/pcr/minidjvu/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Orivej Desh <masecretaire@gmx.fr>
+# Maintainer: Orivej Desh <masecretaire@gmx.fr>
+pkgname=minidjvu
+pkgver=0.8
+pkgrel=3
+pkgdesc="Highly efficient DjVu encoder for black-and-white images"
+arch=('i686' 'x86_64')
+url="http://minidjvu.sourceforge.net/"
+license=('GPL')
+depends=("libtiff")
+options=("!libtool" "!makeflags")
+source=("http://downloads.sourceforge.net/project/minidjvu/minidjvu/$pkgver/minidjvu-$pkgver.tar.gz")
+md5sums=('b354eb74d83c6e2d91aab2a6c2879ba7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libdir=/usr/lib
+  sed -i -e 's#-9 \$(MANDIR)#-9 $(DESTDIR)$(MANDIR)#' Makefile
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  mkdir -p "$pkgdir"/usr/{bin,lib,share/man/man1}
+  make DESTDIR="$pkgdir/" install
+}
+
-- 
cgit v1.2.3-54-g00ecf


From f19d0f1aeaad720e0559769ce636b3283cf7b8c6 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Thu, 8 Nov 2012 16:05:48 -0300
Subject: notmuch: fixed PKGBUILD

---
 ~fauno/notmuch/PKGBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index 57d8d880d..58599073c 100755
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -23,12 +23,12 @@ source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
 
-#  ./configure --prefix=/usr --sysconfdir=/etc
-#  make 
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make 
 
-#  cd bindings/ruby
-#  ruby extconf.rb
-#  make
+  cd bindings/ruby
+  ruby extconf.rb
+  make
 
   cp -r $srcdir/${pkgname}-${pkgver}/bindings/python{,2}
 
@@ -43,12 +43,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
   make test
 }
 
 package(){
-  cd "$srcdir/${pkgname}-"*
+  cd "$srcdir/${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
 
   install -D notmuch $pkgdir/usr/sbin/notmuch
-- 
cgit v1.2.3-54-g00ecf


From dbb79f13e3330faa95b14e18f415a3363b6327bb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 16:42:33 -0200
Subject: kdelibs-libre-4.9.3-1: updating version

---
 libre/kdelibs-libre/PKGBUILD                       | 12 ++---
 .../use-pythondontwritebytecode.patch              | 62 +++++++++++++++-------
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 2a4f28f33..33b3e4554 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 169397 2012-10-20 10:02:56Z andrea $
+# $Id: PKGBUILD 170347 2012-11-06 13:29:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.9.2
-pkgrel=3
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -25,9 +25,9 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
         'khtml-fsdg.diff')
-sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
+sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
+          '08c20f4aaad076264402a1d84c559d75b37c66d3'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -37,7 +37,7 @@ build() {
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
 
        # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
-       patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
+       patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
        
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
index e221e939a..9734f44fb 100755
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -1,8 +1,8 @@
---- cmake/modules/PythonMacros.cmake
-+++ cmake/modules/PythonMacros.cmake
-@@ -23,40 +23,42 @@
+--- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~	2012-11-06 10:32:38.564034292 +0000
++++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake	2012-11-06 10:35:51.829341102 +0000
+@@ -23,53 +23,55 @@
    # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
 -  # Byte compile and install the .pyc file.        
 -  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
@@ -15,11 +15,19 @@
 -  endif(WIN32)
 -
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+-  # Python 3.2 changed the pyc file location
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    # To get the right version for suffix
+-    STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
+-    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
+-  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
+-    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
 -
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
 -
--  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-  SET(_message "Byte-compiling ${_bin_py}")
 -
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
@@ -38,7 +46,13 @@
 -      DEPENDS ${_absfilename}
 -    )
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+  # Byte compile and install the .pyc file.
+-
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+-  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+-      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+-  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
++  # Byte compile and install the .pyc file.       
 +  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
 +    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
 +    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
@@ -46,35 +60,47 @@
 +    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
 +
 +    if(WIN32)
-+      string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
 +    endif(WIN32)
 +
 +    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++
++    # Python 3.2 changed the pyc file location
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        # To get the right version for suffix
++        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
 +
 +    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
 +
-+    SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
++    SET(_message "Byte-compiling ${_bin_py}")
 +
 +    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 +    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
-+      ADD_CUSTOM_COMMAND(
++        ADD_CUSTOM_COMMAND(
 +        TARGET compile_python_files
 +        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
 +        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +        DEPENDS ${_absfilename}
-+      )
++        )
 +    ELSE(_abs_bin_py STREQUAL ${_absfilename})
-+      ADD_CUSTOM_COMMAND(
++        ADD_CUSTOM_COMMAND(
 +        TARGET compile_python_files
-+        COMMAND ${CMAKE_COMMAND} -E echo ${_message}
++        COMMAND ${CMAKE_COMMAND} -E echo ${_message} 
 +        COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
 +        COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
 +        DEPENDS ${_absfilename}
-+      )
++        )
 +    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- 
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
-+    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
++
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
++    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
++        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
++    ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
 +  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ 
  ENDMACRO(PYTHON_INSTALL)
-- 
cgit v1.2.3-54-g00ecf


From 0f5baf285bf9eae91aad2ba79f81e1450b460f07 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 16:43:23 -0200
Subject: kdebase-konqueror-libre-4.9.3-1: updating version

---
 libre/kdebase-konqueror-libre/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 17fafa08c..69951b8cf 100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66'
+sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
-- 
cgit v1.2.3-54-g00ecf


From e30a90a07ab1eab42e1ea8004909a8973b484994 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 16:43:48 -0200
Subject: kdebase-runtime-libre-4.9.3-1: updating version

---
 libre/kdebase-runtime-libre/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 008b94310..80537f26f 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,8 +5,8 @@
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}")
 install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_lite.desktop')
-sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd'
+sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
           '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
 
 build() {
-- 
cgit v1.2.3-54-g00ecf


From adebb68830b910fcb976bee704a96cd109d667fd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 16:44:26 -0200
Subject: kdenetwork-kopete-libre-4.9.3-1: updating version

---
 libre/kdenetwork-kopete-libre/PKGBUILD          | 17 ++++++++++-------
 libre/kdenetwork-kopete-libre/use-libotr3.patch | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 libre/kdenetwork-kopete-libre/use-libotr3.patch

diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index d5211499b..2b7a87dfa 100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $
+# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+        'use-libotr3.patch')
+sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
+          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
 
 build() {
     cd "${srcdir}"
+    patch -p1 -i ./use-libotr3.patch
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
     sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
     rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
@@ -40,7 +43,7 @@ build() {
 
 package_kdenetwork-kopete-libre() {
 	pkgdesc='Instant Messenger (without skype support)'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
+	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
 	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
         conflicts=('kdenetwork-kopete')
         provides=("kdenetwork-kopete=${pkgver}")
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch
new file mode 100644
index 000000000..c36d1a00c
--- /dev/null
+++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch
@@ -0,0 +1,20 @@
+--- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~	2012-11-06 10:51:56.566038215 +0000
++++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake	2012-11-06 10:53:38.861993686 +0000
+@@ -13,13 +13,13 @@
+     SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ 
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+ 
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+ 
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+-  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+   # Check if version is at least 3.2.0
-- 
cgit v1.2.3-54-g00ecf


From 90e74e389fa33e42edd1d538e661033929522027 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 16:45:02 -0200
Subject: kdeutils-ark-libre-4.9.3-1: updating version

---
 libre/kdeutils-ark-libre/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 68954e29b..e4d7d69ab 100755
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165999 2012-09-03 21:52:22Z andrea $
+# $Id: PKGBUILD 170330 2012-11-06 13:02:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c')
+sha1sums=('7bca83a9985e75e2c5c280c6beb5d16e5a136e90')
 
 build() {
   cd "${srcdir}"
-- 
cgit v1.2.3-54-g00ecf


From ba4c662f002990f3dfd05596e9b68ac3a7891ecc Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 21:38:03 -0200
Subject: kdenetwork-kopete-libre-4.9.3-1: fixing issues on building

---
 libre/kdenetwork-kopete-libre/PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 2b7a87dfa..facd65fad 100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -21,8 +21,9 @@ sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
           '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
 
 build() {
-    cd "${srcdir}"
-    patch -p1 -i ./use-libotr3.patch
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
     sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
     rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
-- 
cgit v1.2.3-54-g00ecf


From 03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 21:50:37 -0200
Subject: kdenetwork-kopete-libre-4.9.3-1: better version of use-libotr3 patch

---
 libre/kdenetwork-kopete-libre/PKGBUILD          |  4 +-
 libre/kdenetwork-kopete-libre/use-libotr3.patch | 55 ++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index facd65fad..71c772a4e 100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $
+# $Id: PKGBUILD 170697 2012-11-09 20:49:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -18,7 +18,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
 sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
-          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
     cd ${pkgbase}-${pkgver}
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch
index c36d1a00c..1e96c98d6 100644
--- a/libre/kdenetwork-kopete-libre/use-libotr3.patch
+++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch
@@ -1,5 +1,6 @@
---- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~	2012-11-06 10:51:56.566038215 +0000
-+++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake	2012-11-06 10:53:38.861993686 +0000
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
 @@ -13,13 +13,13 @@
      SET(LIBOTR_FIND_QUIETLY TRUE)
  ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
@@ -18,3 +19,53 @@
    STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
    STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
    # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
-- 
cgit v1.2.3-54-g00ecf


From f37ffba8ac626c65737150c2a46561d6d2db9005 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 22:24:19 -0200
Subject: kdelibs-libre-4.9.3-2: fix a regression in 'Save As'

---
 libre/kdelibs-libre/PKGBUILD                       | 13 +++-
 libre/kdelibs-libre/fix-save-path.patch            | 27 +++++++
 .../use-pythondontwritebytecode.patch              | 91 ++++++++++++----------
 3 files changed, 85 insertions(+), 46 deletions(-)
 create mode 100644 libre/kdelibs-libre/fix-save-path.patch

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 33b3e4554..0f1f3f558 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170347 2012-11-06 13:29:39Z andrea $
+# $Id: PKGBUILD 170700 2012-11-09 21:01:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -24,10 +24,12 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
+        'fix-save-path.patch'
         'khtml-fsdg.diff')
 sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '08c20f4aaad076264402a1d84c559d75b37c66d3'
+          '1138e78f15faa7221669ea81e313c595000cc953'
+          'e3d2621bd1451fe7f45a454af970fae108614ddd'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -35,9 +37,12 @@ build() {
 
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       # add Archlinux menu entry
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
-       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       # Fixed upstream
        patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
+       patch -p1 -i "${srcdir}"/fix-save-path.patch
        
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch
new file mode 100644
index 000000000..1a00221a7
--- /dev/null
+++ b/libre/kdelibs-libre/fix-save-path.patch
@@ -0,0 +1,27 @@
+commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
+Author: Jonathan Marten <jjm@keelhaul.me.uk>
+Date:   Wed Nov 7 12:45:03 2012 +0000
+
+    Fix regression: specified or remembered save path is not used
+    
+    As requested on review https://git.reviewboard.kde.org/r/106475/
+
+diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
+index 65deca2..e755aae 100644
+--- a/kfile/kfilewidget.cpp
++++ b/kfile/kfilewidget.cpp
+@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
+         }
+         else						// not special "kfiledialog" URL
+         {
+-            if (!startDir.isRelative())	// has directory, maybe with filename
+-            {
++            // We can use startDir as the starting directory if either:
++            // (a) it has a directory part, or
++            // (b) there is a scheme (protocol), and it is not just "file".
++            if (!startDir.directory().isEmpty() ||
++                (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
++            {						// can use start directory
+                 ret = startDir;				// will be checked by stat later
+                 // If we won't be able to list it (e.g. http), then use default
+                 if ( !KProtocolManager::supportsListing( ret ) ) {
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
index 9734f44fb..9b5d92042 100755
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -1,6 +1,18 @@
---- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~	2012-11-06 10:32:38.564034292 +0000
-+++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake	2012-11-06 10:35:51.829341102 +0000
-@@ -23,53 +23,55 @@
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Wed, 07 Nov 2012 19:08:01 +0000
+Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
+---
+Respect PYTHONDONTWRITEBYTECODE environmental variable.
+
+BUG: 276151
+REVIEW: 107228
+---
+
+
+--- a/cmake/modules/PythonMacros.cmake
++++ b/cmake/modules/PythonMacros.cmake
+@@ -23,54 +23,56 @@
    # Install the source file.
    INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
@@ -9,13 +21,23 @@
 -  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
 -  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
 -  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+ 
 -  if(WIN32)
 -    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
 -  endif(WIN32)
--
++    if(WIN32)
++        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
+ 
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+ 
 -  # Python 3.2 changed the pyc file location
 -  IF(PYTHON_SHORT_VERSION GREATER 3.1)
 -    # To get the right version for suffix
@@ -24,11 +46,21 @@
 -  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
 -    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
 -  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
++    # Python 3.2 changed the pyc file location
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        # To get the right version for suffix
++        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+ 
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+ 
 -  SET(_message "Byte-compiling ${_bin_py}")
--
++    SET(_message "Byte-compiling ${_bin_py}")
+ 
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
 -    ADD_CUSTOM_COMMAND(
@@ -46,38 +78,6 @@
 -      DEPENDS ${_absfilename}
 -    )
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
--  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
--      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
--  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+  # Byte compile and install the .pyc file.       
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+    if(WIN32)
-+        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+    # Python 3.2 changed the pyc file location
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        # To get the right version for suffix
-+        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    SET(_message "Byte-compiling ${_bin_py}")
-+
 +    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 +    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
 +        ADD_CUSTOM_COMMAND(
@@ -95,7 +95,12 @@
 +        DEPENDS ${_absfilename}
 +        )
 +    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+
+ 
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+-  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+-      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+-  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
 +    IF(PYTHON_SHORT_VERSION GREATER 3.1)
 +        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
 +    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
@@ -104,3 +109,5 @@
 +  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
  
  ENDMACRO(PYTHON_INSTALL)
+ 
+
-- 
cgit v1.2.3-54-g00ecf


From d8c0824a934857810ce8dc8d1bb87e20aa3aca71 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 9 Nov 2012 22:31:29 -0200
Subject: kdelibs-libre-4.9.3-2: fix a incorrection in PKGBUILD

---
 libre/kdelibs-libre/PKGBUILD | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 0f1f3f558..326eae2aa 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -37,8 +37,6 @@ build() {
 
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
        # Fixed upstream
        patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
-- 
cgit v1.2.3-54-g00ecf


From c088443e776244b71127d94565d735c9540b2382 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 00:07:44 -0200
Subject: grub-legacy-0.97-1: new package that replaces grub

---
 libre/grub-legacy/PKGBUILD            |  76 ++++----
 libre/grub-legacy/grub-0.97-gpt.patch | 315 ----------------------------------
 2 files changed, 34 insertions(+), 357 deletions(-)
 delete mode 100644 libre/grub-legacy/grub-0.97-gpt.patch

diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index d63a33ec9..a582a68fe 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
+# $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
-pkgname=grub
+pkgname=grub-legacy
+_srcname=grub
 pkgver=0.97
-pkgrel=21.4
+pkgrel=1
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
-groups=('base')
 depends=('ncurses' 'diffutils' 'sed')
+conflicts=('grub' 'grub-common')
+replaces=('grub')
+provides=("grub=${pkgver}")
+[ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
 optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
-source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
+source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
         menu.lst
         install-grub
         040_all_grub-0.96-nxstack.patch
@@ -23,8 +28,9 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
         more-raid.patch
         intelmac.patch
         grub-inode-size.patch
-	ext4.patch
-	grub-0.97-ldflags-objcopy-remove-build-id.patch)
+        ext4.patch
+        grub-0.97-ldflags-objcopy-remove-build-id.patch
+        automake-pkglib.patch)
 backup=('boot/grub/menu.lst')
 install=grub.install
 sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
@@ -38,16 +44,11 @@ sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
           '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
           '0436aa6fa0b6f768289172f983a3f4b69384629e'
           'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
-          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
-
-#set destination architecture here
-#DESTARCH="i686"
-DESTARCH="x86_64"
-
+          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869'
+          '776ed278eb8ff80e949834f763fad68b8741e7cd')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g'
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   # optimizations break the build -- disable them
   # adding special devices to grub, patches are from fedora
@@ -62,9 +63,11 @@ build() {
   patch -Np1 -i ../ext4.patch
   # binutils fix
   patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+  # "pkglib" is a reserved keyword in automake fix
+  patch -Np1 -i ../automake-pkglib.patch
 
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
 
   ## recreate ./configure script with the required changes in LDFLAGS and objcopy
   aclocal
@@ -72,36 +75,25 @@ build() {
   autoreconf
   automake
 
-  #arch64 fixes for static build
-  if [ "$CARCH" = "x86_64" ]; then  ## correcting problems for new wersion of autotools
-
-    echo "this package has to be built on i686, won't compile on x86_64"
-    sleep 5
+  if [ "$CARCH" = "x86_64" ]; then
+    # patch from gentoo for fixing a segfault
+    patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
+    # patch from frugalware to make it boot when more than 2GB ram installed
+    patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
+    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                         --mandir=/usr/share/man --infodir=/usr/share/info
   else
-    if [ "$DESTARCH" = "x86_64" ]; then
-      # patch from gentoo for fixing a segfault
-      patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
-      # patch from frugalware to make it boot when more than 2GB ram installed
-      patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
-      CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                           --mandir=/usr/share/man --infodir=/usr/share/info
-    else
-      CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                  --mandir=/usr/share/man --infodir=/usr/share/info
-    fi
+    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                --mandir=/usr/share/man --infodir=/usr/share/info
   fi
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   CFLAGS= make
-  make DESTDIR=$pkgdir install
-  install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
-  install -D -m755 ../install-grub $pkgdir/sbin/install-grub
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
+  install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub
 
-  if [ "$DESTARCH" = "x86_64" ]; then
-    # fool makepkg into building a x86_64 package
-    export CARCH="x86_64"
-  fi
 }
diff --git a/libre/grub-legacy/grub-0.97-gpt.patch b/libre/grub-legacy/grub-0.97-gpt.patch
deleted file mode 100644
index 7b1a55cd8..000000000
--- a/libre/grub-legacy/grub-0.97-gpt.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-diff -ruBbd --unidirectional-new-file grub-0.96/stage2/builtins.c grub-0.96-patched/stage2/builtins.c
---- grub-0.96/stage2/builtins.c	2004-06-20 09:33:04.000000000 -0400
-+++ grub-0.96-patched/stage2/builtins.c	2007-01-04 13:56:06.000000000 -0500
-@@ -1229,14 +1229,15 @@
-   for (drive = 0x80; drive < 0x88; drive++)
-     {
-       unsigned long part = 0xFFFFFF;
--      unsigned long start, len, offset, ext_offset;
--      int type, entry;
-+      unsigned long start, len, offset, ext_offset, gpt_offset;
-+      int type, entry, gpt_count, gpt_size;
-       char buf[SECTOR_SIZE];
- 
-       current_drive = drive;
-       while (next_partition (drive, 0xFFFFFF, &part, &type,
- 			     &start, &len, &offset, &entry,
--			     &ext_offset, buf))
-+                            &ext_offset, &gpt_offset,
-+                            &gpt_count, &gpt_size, buf))
- 	{
- 	  if (type != PC_SLICE_TYPE_NONE
- 	      && ! IS_PC_SLICE_TYPE_BSD (type)
-@@ -2806,8 +2807,8 @@
- {
-   int new_type;
-   unsigned long part = 0xFFFFFF;
--  unsigned long start, len, offset, ext_offset;
--  int entry, type;
-+  unsigned long start, len, offset, ext_offset, gpt_offset;
-+  int entry, type, gpt_count, gpt_size;
-   char mbr[512];
- 
-   /* Get the drive and the partition.  */
-@@ -2844,7 +2845,14 @@
-   /* Look for the partition.  */
-   while (next_partition (current_drive, 0xFFFFFF, &part, &type,
- 			 &start, &len, &offset, &entry,
--			 &ext_offset, mbr))
-+			 &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr))
-+	  /* The partition may not be a GPT partition.  */
-+	  if (gpt_offset != 0)
-+	    {
-+		errnum = ERR_BAD_ARGUMENT;
-+		return 1;
-+	    }
-+
-     {
-       if (part == current_partition)
- 	{
-diff -ruBbd --unidirectional-new-file grub-0.96/stage2/disk_io.c grub-0.96-patched/stage2/disk_io.c
---- grub-0.96/stage2/disk_io.c	2004-05-23 12:35:24.000000000 -0400
-+++ grub-0.96-patched/stage2/disk_io.c	2007-01-04 14:01:08.000000000 -0500
-@@ -21,6 +21,7 @@
- 
- #include <shared.h>
- #include <filesys.h>
-+#include <gpt.h>
- 
- #ifdef SUPPORT_NETBOOT
- # define GRUB	1
-@@ -502,8 +503,8 @@
- set_partition_hidden_flag (int hidden)
- {
-   unsigned long part = 0xFFFFFF;
--  unsigned long start, len, offset, ext_offset;
--  int entry, type;
-+  unsigned long start, len, offset, ext_offset, gpt_offset;
-+  int entry, type, gpt_count, gpt_size;
-   char mbr[512];
-   
-   /* The drive must be a hard disk.  */
-@@ -524,7 +525,14 @@
-   /* Look for the partition.  */
-   while (next_partition (current_drive, 0xFFFFFF, &part, &type,           
- 			 &start, &len, &offset, &entry,
--			 &ext_offset, mbr))
-+			 &ext_offset, &gpt_offset, &gpt_count, &gpt_size, mbr))
-+	  /* The partition may not be a GPT partition.  */
-+	  if (gpt_offset != 0)
-+	    {
-+		errnum = ERR_BAD_ARGUMENT;
-+		return 1;
-+	    }
-+
-     {                                                                       
-       if (part == current_partition)
- 	{
-@@ -577,11 +585,14 @@
- 		unsigned long *partition, int *type,
- 		unsigned long *start, unsigned long *len,
- 		unsigned long *offset, int *entry,
--		unsigned long *ext_offset, char *buf)
-+               unsigned long *ext_offset,
-+               unsigned long *gpt_offset, int *gpt_count,
-+               int *gpt_size, char *buf)
- {
-   /* Forward declarations.  */
-   auto int next_bsd_partition (void);
-   auto int next_pc_slice (void);
-+  auto int next_gpt_slice(void);
- 
-   /* Get next BSD partition in current PC slice.  */
-   int next_bsd_partition (void)
-@@ -666,6 +677,40 @@
- 	  return 0;
- 	}
- 
-+      /* If this is a GPT partition table, read it as such.  */
-+      if (*entry == -1 && *offset == 0 && PC_SLICE_TYPE (buf, 0) == PC_SLICE_TYPE_GPT)
-+       {
-+         struct grub_gpt_header *hdr = (struct grub_gpt_header *) buf;
-+
-+         /* Read in the GPT Partition table header.  */
-+         if (! rawread (drive, 1, 0, SECTOR_SIZE, buf))
-+           return 0;
-+
-+         if (hdr->magic == GPT_HEADER_MAGIC && hdr->version == 0x10000)
-+           {
-+             /* Let gpt_offset point to the first entry in the GPT
-+                partition table.  This can also be used by callers of
-+                next_partition to determine if a entry comes from a
-+                GPT partition table or not.  */
-+             *gpt_offset = hdr->partitions;
-+             *gpt_count = hdr->maxpart;
-+             *gpt_size =  hdr->partentry_size;
-+             
-+             return next_gpt_slice();
-+           }
-+         else
-+           {
-+             /* This is not a valid header for a GPT partition table.
-+                Re-read the MBR or the boot sector of the extended
-+                partition.  */
-+             if (! rawread (drive, *offset, 0, SECTOR_SIZE, buf))
-+               return 0;
-+           }
-+       }
-+
-+      /* Not a GPT partition.  */
-+      *gpt_offset = 0;
-+
-       /* Increase the entry number.  */
-       (*entry)++;
- 
-@@ -710,6 +755,43 @@
-       return 1;
-     }
- 
-+  /* Get the next GPT slice.  */
-+  int next_gpt_slice (void)
-+    {
-+      struct grub_gpt_partentry *gptentry = (struct grub_gpt_partentry *) buf;
-+      /* Make GPT partitions show up as PC slices.  */
-+      int pc_slice_no = (*partition & 0xFF0000) >> 16;
-+
-+      /* If this is the first time...  */
-+      if (pc_slice_no == 0xFF)
-+       {
-+         pc_slice_no = -1;
-+         *entry = -1;
-+       }
-+
-+      do {
-+       (*entry)++;
-+
-+       if (*entry >= *gpt_count)
-+         {
-+           errnum = ERR_NO_PART;
-+           return 0;
-+         }
-+       /* Read in the GPT Partition table entry.  */
-+       if (! rawread (drive, (*gpt_offset) + GPT_ENTRY_SECTOR (*gpt_size, *entry), GPT_ENTRY_INDEX (*gpt_size, *entry), *gpt_size, buf))
-+         return 0;
-+      } while (! (gptentry->type1 && gptentry->type2));
-+
-+      pc_slice_no++;
-+      *start = gptentry->start;
-+      *len = gptentry->end - gptentry->start + 1;
-+      *type = PC_SLICE_TYPE_EXT2FS;
-+      *entry = pc_slice_no;
-+      *partition = (*entry << 16) | 0xFFFF;
-+
-+      return 1;
-+    }
-+
-   /* Start the body of this function.  */
-   
- #ifndef STAGE1_5
-@@ -717,6 +799,9 @@
-     return 0;
- #endif
- 
-+  if (*partition != 0xFFFFFF && *gpt_offset != 0)
-+    return next_gpt_slice ();
-+
-   /* If previous partition is a BSD partition or a PC slice which
-      contains BSD partitions...  */
-   if ((*partition != 0xFFFFFF && IS_PC_SLICE_TYPE_BSD (*type & 0xff))
-@@ -755,6 +840,9 @@
-   unsigned long dest_partition = current_partition;
-   unsigned long part_offset;
-   unsigned long ext_offset;
-+  unsigned long gpt_offset;
-+  int gpt_count;
-+  int gpt_size;
-   int entry;
-   char buf[SECTOR_SIZE];
-   int bsd_part, pc_slice;
-@@ -766,7 +854,8 @@
-       int ret = next_partition (current_drive, dest_partition,
- 				&current_partition, &current_slice,
- 				&part_start, &part_length,
--				&part_offset, &entry, &ext_offset, buf);
-+                               &part_offset, &entry, &ext_offset,
-+                               &gpt_offset, &gpt_count, &gpt_size, buf);
-       bsd_part = (current_partition >> 8) & 0xFF;
-       pc_slice = current_partition >> 16;
-       return ret;
-diff -ruBbd --unidirectional-new-file grub-0.96/stage2/gpt.h grub-0.96-patched/stage2/gpt.h
---- grub-0.96/stage2/gpt.h	1969-12-31 19:00:00.000000000 -0500
-+++ grub-0.96-patched/stage2/gpt.h	2007-01-04 13:52:14.000000000 -0500
-@@ -0,0 +1,68 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2002,2005,2006   Free Software Foundation, Inc.
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program 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.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef _GPT_H
-+#define _GPT_H
-+
-+typedef signed char grub_int8_t;
-+typedef signed short grub_int16_t;
-+typedef signed int grub_int32_t;
-+typedef signed long long int grub_int64_t;
-+typedef unsigned char grub_uint8_t;
-+typedef unsigned short grub_uint16_t;
-+typedef unsigned int grub_uint32_t;
-+typedef unsigned long long int grub_uint64_t;
-+
-+struct grub_gpt_header
-+{
-+  grub_uint64_t magic;
-+  grub_uint32_t version;
-+  grub_uint32_t headersize;
-+  grub_uint32_t crc32;
-+  grub_uint32_t unused1;
-+  grub_uint64_t primary;
-+  grub_uint64_t backup;
-+  grub_uint64_t start;
-+  grub_uint64_t end;
-+  grub_uint8_t guid[16];
-+  grub_uint64_t partitions;
-+  grub_uint32_t maxpart;
-+  grub_uint32_t partentry_size;
-+  grub_uint32_t partentry_crc32;
-+} __attribute__ ((packed));
-+
-+struct grub_gpt_partentry
-+{
-+  grub_uint64_t type1;
-+  grub_uint64_t type2;
-+  grub_uint8_t guid[16];
-+  grub_uint64_t start;
-+  grub_uint64_t end;
-+  grub_uint8_t attrib;
-+  char name[72];
-+} __attribute__ ((packed));
-+
-+#define GPT_HEADER_MAGIC       0x5452415020494645UL
-+
-+#define        GPT_ENTRY_SECTOR(size,entry)                                    \
-+       ((((entry) * (size) + 1) & ~(SECTOR_SIZE - 1)) >> SECTOR_BITS)
-+#define        GPT_ENTRY_INDEX(size,entry)                                     \
-+       ((((entry) * (size) + 1) & (SECTOR_SIZE - 1)) - 1)
-+
-+#endif /* _GPT_H */
-diff -ruBbd --unidirectional-new-file grub-0.96/stage2/pc_slice.h grub-0.96-patched/stage2/pc_slice.h
---- grub-0.96/stage2/pc_slice.h	2003-07-09 07:45:53.000000000 -0400
-+++ grub-0.96-patched/stage2/pc_slice.h	2007-01-04 13:52:14.000000000 -0500
-@@ -115,6 +115,7 @@
- #define PC_SLICE_TYPE_LINUX_EXTENDED	0x85
- #define PC_SLICE_TYPE_VSTAFS		0x9e
- #define PC_SLICE_TYPE_DELL_UTIL		0xde
-+#define PC_SLICE_TYPE_GPT              0xee
- #define PC_SLICE_TYPE_LINUX_RAID	0xfd
- 
- 
-diff -ruBbd --unidirectional-new-file grub-0.96/stage2/shared.h grub-0.96-patched/stage2/shared.h
---- grub-0.96/stage2/shared.h	2004-06-19 12:40:09.000000000 -0400
-+++ grub-0.96-patched/stage2/shared.h	2007-01-04 13:52:15.000000000 -0500
-@@ -934,7 +934,9 @@
- 		    unsigned long *partition, int *type,
- 		    unsigned long *start, unsigned long *len,
- 		    unsigned long *offset, int *entry,
--		    unsigned long *ext_offset, char *buf);
-+                   unsigned long *ext_offset,
-+                   unsigned long *gpt_offset, int *gpt_count,
-+                   int *gpt_size, char *buf);
- 
- /* Sets device to the one represented by the SAVED_* parameters. */
- int make_saved_active (void);
-- 
cgit v1.2.3-54-g00ecf


From 90fc347fb05ba4c884743f9dbbfbd506738e4798 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 00:08:44 -0200
Subject: removing obsolete grub2

---
 libre/grub2/05_archtheme                           |   6 -
 libre/grub2/20_memtest86+                          |  29 ---
 libre/grub2/PKGBUILD                               | 243 ---------------------
 .../fix_stack_pointer_handling_16_relocator.patch  |  13 --
 libre/grub2/grub-install.fix                       |  11 -
 ...config-Use_outside_GRUB_PREFIX_if_defined.patch |  15 --
 libre/grub2/grub.cfg                               | 127 -----------
 libre/grub2/grub.default                           |  45 ----
 libre/grub2/grub2.install                          |  33 ---
 .../grub2_automake_1.11.2_pkglib_to_pkgdata.patch  | 134 ------------
 libre/grub2/grub2_bzr_export.sh                    | 113 ----------
 libre/grub2/grub_extras_lua_args_fix.patch         |  13 --
 libre/grub2/parabola-mkconfig.patch                |  32 ---
 libre/grub2/parabola_grub_mkconfig_fixes.patch     | 152 -------------
 14 files changed, 966 deletions(-)
 delete mode 100755 libre/grub2/05_archtheme
 delete mode 100755 libre/grub2/20_memtest86+
 delete mode 100755 libre/grub2/PKGBUILD
 delete mode 100755 libre/grub2/fix_stack_pointer_handling_16_relocator.patch
 delete mode 100755 libre/grub2/grub-install.fix
 delete mode 100755 libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
 delete mode 100755 libre/grub2/grub.cfg
 delete mode 100755 libre/grub2/grub.default
 delete mode 100755 libre/grub2/grub2.install
 delete mode 100755 libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
 delete mode 100755 libre/grub2/grub2_bzr_export.sh
 delete mode 100755 libre/grub2/grub_extras_lua_args_fix.patch
 delete mode 100755 libre/grub2/parabola-mkconfig.patch
 delete mode 100755 libre/grub2/parabola_grub_mkconfig_fixes.patch

diff --git a/libre/grub2/05_archtheme b/libre/grub2/05_archtheme
deleted file mode 100755
index 4d1b6fb20..000000000
--- a/libre/grub2/05_archtheme
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-cat << EOF
-set menu_color_normal=light-blue/black
-set menu_color_highlight=light-cyan/blue
-EOF
diff --git a/libre/grub2/20_memtest86+ b/libre/grub2/20_memtest86+
deleted file mode 100755
index 1d3096f6b..000000000
--- a/libre/grub2/20_memtest86+
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh -e
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system.               #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/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/grub2/PKGBUILD b/libre/grub2/PKGBUILD
deleted file mode 100755
index 5b1769f95..000000000
--- a/libre/grub2/PKGBUILD
+++ /dev/null
@@ -1,243 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-
-_pkgver="2.00~rc1"
-
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
-
-pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
-pkgbase=grub2
-pkgver=2.00rc1
-pkgrel=1.1
-url="http://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-epoch="1"
-makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo'
-	'help2man' 'gettext' 'device-mapper' 'fuse' 'dosfstools' 'efibootmgr')
-
-# source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz"
-source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
-        'parabola_grub_mkconfig_fixes.patch'
-        'grub.default'
-        'grub.cfg'
-        '20_memtest86+')
-
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-           "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-
-sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13'
-          '89290031b974780c6df76893836d2477d4add895'
-          'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
-          'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
-          '31aa740fc225b3f3ed4917843038f9e8658a71be'
-          '9a81f8bebcbee3d300315a29266ce7a5c9e5881c'
-          '9735043d518e16f147f64ef283eceb2549fed860'
-          'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
-
-_build_grub2-common_and_bios() {
-
-	## copy the source for building the common/bios package
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_bios-${_pkgver}"
-	cd "${srcdir}/grub_bios-${_pkgver}"
-
-	## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
-	echo
-
-	## add the grub-extra sources
-	export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${_pkgver}/grub-extras"
-
-	## Requires python2
-	# sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${_pkgver}/autogen.sh"
-
-	## start the actual build process
-	cd "${srcdir}/grub_bios-${_pkgver}"
-	./autogen.sh
-
-	## fix unifont.bdf location so grub-mkfont can create *.pf2 files
-	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${_pkgver}/configure"
-
-	# install -d "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS"
-	# cd "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS"
-
-	CFLAGS="" ./configure \
-		--with-platform="pc" \
-		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
-		"${_EFIEMU}" \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/sbin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-		--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-werror
-
-	CFLAGS="" make
-
-}
-
-_build_grub2-efi-i386() {
-
-	## copy the source for building the efi package
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_efi-${_pkgver}"
-	cd "${srcdir}/grub_efi-${_pkgver}"
-
-	export GRUB_CONTRIB="${srcdir}/grub_efi-${_pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_efi-${_pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${_pkgver}/grub-extras"
-
-	## Requires python2
-	# sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh"
-
-	cd "${srcdir}/grub_efi-${_pkgver}"
-	./autogen.sh
-
-	CFLAGS="" ./configure \
-		--with-platform="efi" \
-		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
-		--disable-efiemu \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/sbin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-		--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-werror
-
-	CFLAGS="" make
-}
-
-#_get_locale_files() {
-#
-#	cd "${srcdir}/grub-${_pkgver}"
-#	rsync -Lrtvz translationproject.org::tp/latest/grub/ "${srcdir}/grub-${_pkgver}/po" || true
-#	(cd "${srcdir}/grub-${_pkgver}/po" && ls *.po | cut -d. -f1 | xargs) > "${srcdir}/grub-${_pkgver}/po/LINGUAS"
-#}
-
-build() {
-
-	## set architecture dependent variables
-	if [[ "${CARCH}" == 'x86_64' ]]; then
-		_EFIEMU="--enable-efiemu"
-	else
-		_EFIEMU="--disable-efiemu"
-	fi
-
-	_HOST="${CARCH}"
-
-	cd "${srcdir}/grub-${_pkgver}"
-	# _get_locale_files
-
-	_build_grub2-common_and_bios
-	_build_grub2-efi-i386
-
-}
-
-package_grub2-common() {
-
-	pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms (Parabola rebranded)"
-	depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh')
-	conflicts=('grub')
-	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
-	optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue'
-	            'os-prober: to detect other OSes when generating grub.cfg in BIOS systems'
-	            'mtools: for grub-mkrescue FAT FS support')
-	install="grub2.install"
-	options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
-
-	cd "${srcdir}/grub_bios-${_pkgver}"
-	make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install
-
-	## install extra /etc/grub.d/ files
-	install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
-
-	## install /etc/default/grub (used by grub-mkconfig)
-	install -D -m0644 "${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 -D -m0644 "${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 i386 PC BIOS"
-	depends=("grub2-common=${epoch}:${pkgver}")
-	options=('!strip' '!emptydirs')
-
-	cd "${srcdir}/grub_bios-${_pkgver}"
-	make DESTDIR="${pkgdir}/" install
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
-	## remove gdb debugging related files
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
-	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
-
-}
-
-package_grub2-efi-i386() {
-
-	pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version"
-	depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr')
-	options=('!strip' '!emptydirs')
-
-	cd "${srcdir}/grub_efi-${_pkgver}"
-	make DESTDIR="${pkgdir}/" install
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
-	## remove gdb debugging related files
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
-}
diff --git a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
deleted file mode 100755
index edc0ef502..000000000
--- a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
-index c3768f4..982415d 100644
---- a/grub-core/lib/i386/relocator16.S
-+++ b/grub-core/lib/i386/relocator16.S
-@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss)
- 	.byte	0xb8
- VARIABLE(grub_relocator16_sp)
- 	.word	0
--	movw	%ax, %ss
-+	movzwl	%ax, %esp
- 
- 	/* movw imm32, %edx.  */
- 	.byte	0x66, 0xba
diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix
deleted file mode 100755
index 29e74bd44..000000000
--- a/libre/grub2/grub-install.fix
+++ /dev/null
@@ -1,11 +0,0 @@
-=== modified file 'grub-core/kern/emu/hostdisk.c'
---- grub-core/kern/emu/hostdisk.c       2012-04-18 21:48:52 +0000
-+++ grub-core/kern/emu/hostdisk.c       2012-04-19 18:35:06 +0000
-@@ -1081,7 +1081,7 @@
-     {
-       int fd;
-       grub_disk_addr_t max = ~0ULL;
--      fd = open_device (disk, sector, O_RDONLY, &max);
-+      fd = open_device (disk, sector, O_WRONLY, &max);
-       if (fd < 0)
-        return grub_errno;
diff --git a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
deleted file mode 100755
index e1de26859..000000000
--- a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 859c2e8..c4391dc 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -40,7 +40,9 @@ self=`basename $0`
- grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
- grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
- 
--GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
-+if test -z "${GRUB_PREFIX}"; then
-+    GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
-+fi
- 
- . "${datadir}/@PACKAGE@/grub-mkconfig_lib"
- 
diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg
deleted file mode 100755
index 6e60c70c4..000000000
--- a/libre/grub2/grub.cfg
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-insmod part_gpt
-insmod part_msdos
-if [ -s $prefix/grubenv ]; then
-  load_env
-fi
-set default="0"
-if [ "${prev_saved_entry}" ]; then
-  set saved_entry="${prev_saved_entry}"
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z "${boot_once}" ]; then
-    saved_entry="${chosen}"
-    save_env saved_entry
-  fi
-}
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
-   font=unicode
-else
-insmod part_gpt
-insmod ext2
-set root='hd0,gpt9'
-if [ x$feature_platform_search_hint = xy ]; then
-  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt9 --hint-efi=hd0,gpt9 --hint-baremetal=ahci0,gpt9  0cc6e472-7f98-42ff-b7f3-309b641377ad
-else
-  search --no-floppy --fs-uuid --set=root 0cc6e472-7f98-42ff-b7f3-309b641377ad
-fi
-    font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
-  set gfxmode=auto
-  load_video
-  insmod gfxterm
-  set locale_dir=$prefix/locale
-  set lang=en_US
-  insmod gettext
-fi
-terminal_input console
-terminal_output gfxterm
-set timeout=5
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os {
-	load_video
-	set gfxpayload=keep
-	insmod gzio
-	insmod part_gpt
-	insmod ext2
-	set root='hd0,gpt3'
-	if [ x$feature_platform_search_hint = xy ]; then
-	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3  2ccd62fe-2204-44e8-bcfd-ce33996f9852
-	else
-	  search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852
-	fi
-	echo	'Loading Linux libre ...'
-	linux	/vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro  quiet
-	echo	'Loading initial ramdisk ...'
-	initrd	/initramfs-linux-libre.img
-}
-menuentry 'Parabola GNU/Linux-libre, with Linux libre Fallback' --class parabola --class gnu-linux --class gnu --class os {
-	load_video
-	set gfxpayload=keep
-	insmod gzio
-	insmod part_gpt
-	insmod ext2
-	set root='hd0,gpt3'
-	if [ x$feature_platform_search_hint = xy ]; then
-	  search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3  2ccd62fe-2204-44e8-bcfd-ce33996f9852
-	else
-	  search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852
-	fi
-	echo	'Loading Linux libre ...'
-	linux	/vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro  quiet
-	echo	'Loading initial ramdisk ...'
-	initrd	/initramfs-linux-libre-fallback.img
-}
-### END /etc/grub.d/10_linux ###
-
-### BEGIN /etc/grub.d/20_linux_xen ###
-### END /etc/grub.d/20_linux_xen ###
-
-### BEGIN /etc/grub.d/20_memtest86+ ###
-### END /etc/grub.d/20_memtest86+ ###
-
-### BEGIN /etc/grub.d/30_os-prober ###
-### END /etc/grub.d/30_os-prober ###
-
-### BEGIN /etc/grub.d/40_custom ###
-# This file provides an easy way to add custom menu entries.  Simply type the
-# menu entries you want to add after this comment.  Be careful not to change
-# the 'exec tail' line above.
-### END /etc/grub.d/40_custom ###
-
-### BEGIN /etc/grub.d/41_custom ###
-if [ -f  $prefix/custom.cfg ]; then
-  source $prefix/custom.cfg;
-fi
-### END /etc/grub.d/41_custom ###
diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default
deleted file mode 100755
index d0c959059..000000000
--- a/libre/grub2/grub.default
+++ /dev/null
@@ -1,45 +0,0 @@
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet add_efi_memmap"
-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_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=auto
-
-# 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_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="magenta/black"
-GRUB_COLOR_HIGHLIGHT="white/magenta"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-#GRUB_BACKGROUND="/path/to/wallpaper"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"
diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install
deleted file mode 100755
index 000533553..000000000
--- a/libre/grub2/grub2.install
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
-  cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
-EOM
-  
-  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() {
-  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_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
deleted file mode 100755
index 0e396b210..000000000
--- a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav
-new file mode 100644
-index 0000000..0eafd65
---- /dev/null
-+++ b/ChangeLog_Keshav
-@@ -0,0 +1,12 @@
-+2012-01-04  Keshav P R  <the.ridikulus.rat@gmail.com>
-+
-+	Fixes for automake 1.11.2
-+
-+	* conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS.
-+	* conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA.
-+	* Makefile.am: Likewise.
-+	* gentpl.py: Likewise.
-+	* util/grub-mkstandalone.in: Likewise.
-+	* util/grub-mknetdir.in: Likewise.
-+	* util/grub-mkrescue.in: Likewise.
-+	* util/grub-mkstandalone.in: Likewise.
-diff --git a/Makefile.am b/Makefile.am
-index c5f486e..395b0dd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
- # Install config.h into platformdir
- platform_HEADERS = config.h
- 
--pkglib_DATA += grub-mkconfig_lib
--pkglib_DATA += update-grub_lib
-+pkgdata_DATA += grub-mkconfig_lib
-+pkgdata_DATA += update-grub_lib
- 
- 
- if COND_i386_coreboot
-diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 751188b..bbd59cc 100644
---- a/conf/Makefile.common
-+++ b/conf/Makefile.common
-@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
- 
- man_MANS =
- noinst_DATA =
--pkglib_DATA =
-+pkgdata_DATA =
- bin_SCRIPTS =
- sbin_SCRIPTS =
- bin_PROGRAMS =
-@@ -147,7 +147,7 @@ check_SCRIPTS =
- grubconf_DATA =
- check_PROGRAMS =
- noinst_SCRIPTS =
--pkglib_SCRIPTS =
-+pkgdata_SCRIPTS =
- noinst_PROGRAMS =
- grubconf_SCRIPTS =
- noinst_LIBRARIES =
-diff --git a/gentpl.py b/gentpl.py
-index 3008b80..a935f4d 100644
---- a/gentpl.py
-+++ b/gentpl.py
-@@ -512,7 +512,7 @@ def script(platform):
-     r += "[+ ENDIF +]"
- 
-     r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
--$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
-+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
- chmod a+x [+ name +]
- """)
- 
-diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
-index e5a2172..7f6a36d 100644
---- a/util/grub-mknetdir.in
-+++ b/util/grub-mknetdir.in
-@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
- host_os=@host_os@
- localedir=@datadir@/locale
- datarootdir=@datarootdir@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
- 
- self=`basename $0`
- 
-@@ -183,7 +183,7 @@ process_input_dir ()
-             cp -f "$file" "$grubdir/"
-         fi
-     done
--    for file in ${pkglib_DATA}; do
-+    for file in ${pkgdata_DATA}; do
- 	if test -f "${input_dir}/${file}"; then
-             cp -f "${input_dir}/${file}" "$grubdir/"
- 	fi
-diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
-index eff7708..f6b96d4 100644
---- a/util/grub-mkrescue.in
-+++ b/util/grub-mkrescue.in
-@@ -27,7 +27,7 @@ libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
- PACKAGE_TARNAME=@PACKAGE_TARNAME@
- PACKAGE_VERSION=@PACKAGE_VERSION@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
- 
- self=`basename $0`
- 
-@@ -163,7 +163,7 @@ process_input_dir ()
-             cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
-         fi
-     done
--    for file in ${pkglib_DATA}; do
-+    for file in ${pkgdata_DATA}; do
- 	if test -f "${input_dir}/${file}"; then
-             cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
- 	fi
-diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
-index b0dbf9b..92b7306 100644
---- a/util/grub-mkstandalone.in
-+++ b/util/grub-mkstandalone.in
-@@ -27,7 +27,7 @@ libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
- PACKAGE_TARNAME=@PACKAGE_TARNAME@
- PACKAGE_VERSION=@PACKAGE_VERSION@
--pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
-+pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
- 
- self=`basename $0`
- 
-@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
-     fi
- done
- 
--for file in ${pkglib_DATA}; do
-+for file in ${pkgdata_DATA}; do
-     if test -f "${source_directory}/${file}"; then
-         cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
-     fi
diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh
deleted file mode 100755
index f40588f82..000000000
--- a/libre/grub2/grub2_bzr_export.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-## 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:~the-ridikulus-rat/grub/grub2-extras-lua lua
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe
-# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img
-# bzr branch lp:~the-ridikulus-rat/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}/"
-
-_ACTUAL_PKGVER="1.99"
-
-_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/"
-_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/"
-_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/"
-
-_MAIN_SNAPSHOT() {
-	
-	cd "${_GRUB2_BZR_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --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_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --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_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_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
-
-echo
-
-_MAIN_SNAPSHOT
-
-echo
-
-# _EXP_SNAPSHOT
-
-echo
-
-_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
-
-echo
-
-set +x +e
-
-echo
-
-unset _WD
-unset _OUTPUT_DIR
-unset _GRUB2_BZR_REPO_DIR
-unset _GRUB2_EXTRAS_REPOS_DIR
-unset _GRUB2_EXTRAS_NAME
diff --git a/libre/grub2/grub_extras_lua_args_fix.patch b/libre/grub2/grub_extras_lua_args_fix.patch
deleted file mode 100755
index 5cb317ce3..000000000
--- a/libre/grub2/grub_extras_lua_args_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c
-index 9014320..055d620 100644
---- a/grub-extras/lua/grub_lib.c
-+++ b/grub-extras/lua/grub_lib.c
-@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state)
-       if (! p)
- 	return push_result (state);
- 
--      grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0);
-+      grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0);
-     }
-   else
-     {
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch
deleted file mode 100755
index 7c18a4cc2..000000000
--- a/libre/grub2/parabola-mkconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch
deleted file mode 100755
index 19022aec6..000000000
--- a/libre/grub2/parabola_grub_mkconfig_fixes.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 516be86..5f37db2 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -213,6 +213,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 765bfdc..b148558 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -115,6 +115,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 14402e8..64c9bb5 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,7 @@
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
- fi
-  
-@@ -87,6 +87,8 @@ linux_entry ()
-       case $type in
- 	  recovery)
- 	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
-+	  fallback)
-+	      title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;;
- 	  *)
- 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
-       esac
-@@ -100,7 +102,7 @@ linux_entry ()
-   else
-       echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-   fi      
--  if [ x$type != xrecovery ] ; then
-+  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | sed -e "s/^/\t/"
-   fi
- 
-@@ -132,7 +134,8 @@ linux_entry ()
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-+
-+  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
- 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-+  if test -e "/etc/arch-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
-+      
-+      if [ "x${version}" = "x" ] ; then
-+        version="core repo kernel"
-+      else
-+        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="${version} kernel"
-+      fi
-+    fi
-+  fi
-+  
-   initrd=
-+  initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
-+
-   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
--	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
-+	   "${initrd_arch}.img" ; do
-     if test -e "${dirname}/${i}" ; then
-       initrd="$i"
-       break
-@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do
-     linux_root_device_thisversion=${GRUB_DEVICE}
-   fi
- 
-+  if test -e "/etc/arch-release" ; then
-+    is_first_entry="false"
-+    
-+    linux_entry "${OS}" "${version}" true \
-+              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    
-+    for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
-+      if test -e "${dirname}/${i}" ; then
-+        initrd="${i}"
-+        linux_entry "${OS}" "${version}" fallback \
-+                    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+        break
-+      fi
-+    done
-+  fi
-+
-   if [ "x$is_first_entry" = xtrue ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do
-     echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
-   fi
- 
-+  if ! test -e "/etc/arch-release" ; then
-   linux_entry "${OS}" "${version}" advanced \
-               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  fi
-+
-   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-     linux_entry "${OS}" "${version}" recovery \
-                 "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +290,10 @@ done
- 
- # If at least one kernel was found, then we need to
- # add a closing '}' for the submenu command.
-+if ! test -e "/etc/arch-release" ; then
- if [ x"$is_first_entry" != xtrue ]; then
-   echo '}'
- fi
-+fi
- 
- echo "$title_correction_code"
-- 
cgit v1.2.3-54-g00ecf


From 41e92d3f9e945ff3e33d8f6416f2baf41323e9b5 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 01:58:05 -0200
Subject: grub-legacy-0.97-23: adding automake-pkglib.patch and updating
 revision due that is being synchronized with grub from AUR

---
 libre/grub-legacy/PKGBUILD              |  4 +--
 libre/grub-legacy/automake-pkglib.patch | 48 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 libre/grub-legacy/automake-pkglib.patch

diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index a582a68fe..0b4afaebc 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -7,13 +7,13 @@
 pkgname=grub-legacy
 _srcname=grub
 pkgver=0.97
-pkgrel=1
+pkgrel=23
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
 depends=('ncurses' 'diffutils' 'sed')
-conflicts=('grub' 'grub-common')
+conflicts=('grub')
 replaces=('grub')
 provides=("grub=${pkgver}")
 [ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
diff --git a/libre/grub-legacy/automake-pkglib.patch b/libre/grub-legacy/automake-pkglib.patch
new file mode 100644
index 000000000..a3fff27a1
--- /dev/null
+++ b/libre/grub-legacy/automake-pkglib.patch
@@ -0,0 +1,48 @@
+--- a/stage1/Makefile.am
++++ b/stage1/Makefile.am
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_stage_DATA = stage1
+ 
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_stage_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+--- a/stage2/Makefile.am
++++ b/stage2/Makefile.am
+@@ -27,12 +27,12 @@
+ 	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+ 
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ 
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+ 
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+ 	nbgrub pxegrub
+@@ -43,7 +43,7 @@
+ 	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+ 	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -112,7 +112,7 @@
+ BUILT_SOURCES = stage2_size.h
+ endif
+ 
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(stage_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+ 
+ stage2_size.h: pre_stage2
+ 	-rm -f stage2_size.h
-- 
cgit v1.2.3-54-g00ecf


From 7c14052bd274474f84df7d0d9590eb4b5eec4766 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 02:05:55 -0200
Subject: grub-legacy-0.97-23: updating sha1sums and removing unnecessaries
 files

---
 libre/grub-legacy/PKGBUILD   |  2 +-
 libre/grub-legacy/rePKGBUILD | 37 -------------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 libre/grub-legacy/rePKGBUILD

diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 0b4afaebc..ac446a458 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -34,7 +34,7 @@ source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
 backup=('boot/grub/menu.lst')
 install=grub.install
 sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
-          'e13bf0f91510fd6bb9451e6eb1b2a6e4a03e8b5f'
+          'de504b22f586a8919c12ea3446cae3300a8365f0'
           '3e23bfee50285c8c7b9ef9ec07964310278b1e09'
           '157b81dbad3576536b08642242accfa1aeb093a9'
           'adbb4685c98797ffb4dc83561ec75698991dddbd'
diff --git a/libre/grub-legacy/rePKGBUILD b/libre/grub-legacy/rePKGBUILD
deleted file mode 100644
index a73289fb5..000000000
--- a/libre/grub-legacy/rePKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor: André Silva <emulatorman@lavabit.com>
-source PKGBUILD
-CARCH=i686
-unset build package md5sums source
-_repo=core
-source=(PKGBUILD
-	#http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT
-        http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%}-$pkgver-21-$CARCH$PKGEXT
-	# files for pkg modifications
-  menu.lst
-  install-grub
-  )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  #rm PKGBUILD .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT
-   rm PKGBUILD .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-21-$CARCH$PKGEXT
-  # put actions for package modifications below this line
-
-  rm -v boot/grub/menu.lst sbin/install-grub
-}
-
-package() {
-  cd ${srcdir}
-  cp -a ./* ${pkgdir}
-
-  install -D -m644 menu.lst $pkgdir/boot/grub/menu.lst
-  install -D -m755 install-grub $pkgdir/sbin/install-grub
-
-  rm -v menu.lst install-grub ${pkgdir}/menu.lst ${pkgdir}/install-grub
-
-}
-
-
-# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf


From cba3ad97a673ed1bbd5369ac859a59aff9a7b17b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 02:22:07 -0200
Subject: grub-legacy-0.97-23: adding more packages in the conflicts list

---
 libre/grub-legacy/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index ac446a458..20e9fdb43 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
 depends=('ncurses' 'diffutils' 'sed')
-conflicts=('grub')
+conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64')
 replaces=('grub')
 provides=("grub=${pkgver}")
 [ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
-- 
cgit v1.2.3-54-g00ecf


From 830941ab1388a66d48af64128618b15d0205e63e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 10 Nov 2012 03:00:13 -0200
Subject: gnu-ghostscript-9.05.0-2: updating revision, keeping as optional way
 to choose ghostscript, ghostscript-libre is our main package for it

---
 libre/gnu-ghostscript/PKGBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 3270a3d4d..eb3a148e2 100755
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=ghostscript
 pkgname=gnu-ghostscript
 _pkgver=9.05
 pkgver=9.05.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -13,7 +13,6 @@ makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=${_pkgname}
-replaces=${_pkgname}
 provides="${_pkgname}=9.06"
 url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
-- 
cgit v1.2.3-54-g00ecf


From abe8590bae5a1ba3f4b1835a76335071b521369e Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@gmail.com>
Date: Sat, 10 Nov 2012 22:04:39 +1100
Subject: abuse-libre: added provides/replaces/conflicts

---
 libre/abuse-libre/PKGBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 829871791..196fb2c85 100755
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -7,12 +7,15 @@
 _pkgname=abuse
 pkgname=abuse-libre
 pkgver=0.8
-pkgrel=2
+pkgrel=3
 pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
 arch=('i686' 'x86_64')
 url='http://abuse.zoy.org/'
 license=('GPL' 'custom')
 depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
+provides=('$_pkgname=$pkgver')
+replaces=('$_pkgname')
+conflicts=('$_pkgname')
 install='abuse.install'
 source=("http://abuse.zoy.org/raw-attachment/wiki/download/${_pkgname}-${pkgver}.tar.gz"
         non-claudio.patch)
-- 
cgit v1.2.3-54-g00ecf


From 7d749da6d40997117dcd137cf5084192ad76572b Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@kiwwwi.com.ar>
Date: Sat, 10 Nov 2012 23:23:56 -0300
Subject: Deprecating systemd

---
 ...for-proper-return-from-dirent_ensure_type.patch |  27 ----
 ...close-FIFO-before-ending-sessions-cleanly.patch | 155 ---------------------
 ...l-never-follow-symlinks-in-rm_rf_children.patch |  31 -----
 libre/systemd/PKGBUILD                             | 123 ----------------
 libre/systemd/os-release                           |   7 -
 libre/systemd/rePKGBUILD                           |  52 -------
 libre/systemd/systemd.install                      |  50 -------
 7 files changed, 445 deletions(-)
 delete mode 100755 libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
 delete mode 100755 libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
 delete mode 100755 libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
 delete mode 100755 libre/systemd/PKGBUILD
 delete mode 100755 libre/systemd/os-release
 delete mode 100755 libre/systemd/rePKGBUILD
 delete mode 100755 libre/systemd/systemd.install

diff --git a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
deleted file mode 100755
index 06fc30944..000000000
--- a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 2 Apr 2012 08:20:34 -0400
-Subject: [PATCH] check for proper return from dirent_ensure_type
-
-Fixes 'systemctl list-unit-files', which previously returned only:
-
-  Failed to issue method call: No such file or directory
----
- src/install.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/install.c b/src/install.c
-index 174d79b..9256116 100644
---- a/src/install.c
-+++ b/src/install.c
-@@ -1853,7 +1853,7 @@ int unit_file_get_list(
-
-                         r = dirent_ensure_type(d, de);
-                         if (r < 0) {
--                                if (errno == ENOENT)
-+                                if (r == -ENOENT)
-                                         continue;
-
-                                 goto finish;
---
-1.7.9.5
diff --git a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
deleted file mode 100755
index 692d93356..000000000
--- a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Thu, 22 Mar 2012 02:06:40 +0100
-Subject: [PATCH] logind: close FIFO before ending sessions cleanly
-
-For clean session endings ask logind explicitly to get rid of the FIFO
-before closing it so that the FIFO logic doesn't result in su/sudo to be
-terminated immediately.
----
- src/login/logind-dbus.c |   30 ++++++++++++++++++++
- src/login/pam-module.c  |   71 +++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 98 insertions(+), 3 deletions(-)
-
-diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index d8f4d89..ea6b89f 100644
---- a/src/login/logind-dbus.c
-+++ b/src/login/logind-dbus.c
-@@ -80,6 +80,9 @@
-         "   <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n"        \
-         "   <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n"        \
-         "  </method>\n"                                                 \
-+        "  <method name=\"ReleaseSession\">\n"                          \
-+        "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
-+        "  </method>\n"                                                 \
-         "  <method name=\"ActivateSession\">\n"                         \
-         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
-         "  </method>\n"                                                 \
-@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler(
-                 if (r < 0)
-                         return bus_send_error_reply(connection, message, &error, r);
-
-+        } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) {
-+                const char *name;
-+                Session *session;
-+
-+                if (!dbus_message_get_args(
-+                                    message,
-+                                    &error,
-+                                    DBUS_TYPE_STRING, &name,
-+                                    DBUS_TYPE_INVALID))
-+                        return bus_send_error_reply(connection, message, &error, -EINVAL);
-+
-+                session = hashmap_get(m->sessions, name);
-+                if (!session)
-+                        return bus_send_error_reply(connection, message, &error, -ENOENT);
-+
-+                /* We use the FIFO to detect stray sessions where the
-+                process invoking PAM dies abnormally. We need to make
-+                sure that that process is not killed if at the clean
-+                end of the session it closes the FIFO. Hence, with
-+                this call explicitly turn off the FIFO logic, so that
-+                the PAM code can finish clean up on its own */
-+                session_remove_fifo(session);
-+
-+                reply = dbus_message_new_method_return(message);
-+                if (!reply)
-+                        goto oom;
-+
-         } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) {
-                 const char *name;
-                 Session *session;
-diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 8544413..4106d2b 100644
---- a/src/login/pam-module.c
-+++ b/src/login/pam-module.c
-@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
-                         "/org/freedesktop/login1",
-                         "org.freedesktop.login1.Manager",
-                         "CreateSession");
--
-         if (!m) {
-                 pam_syslog(handle, LOG_ERR, "Could not allocate create session message.");
-                 r = PAM_BUF_ERR;
-@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session(
-                 int argc, const char **argv) {
-
-         const void *p = NULL;
-+        const char *id;
-+        DBusConnection *bus = NULL;
-+        DBusMessage *m = NULL, *reply = NULL;
-+        DBusError error;
-+        int r;
-
--        pam_get_data(handle, "systemd.session-fd", &p);
-+        assert(handle);
-+
-+        dbus_error_init(&error);
-+
-+        id = pam_getenv(handle, "XDG_SESSION_ID");
-+        if (id) {
-+
-+                /* Before we go and close the FIFO we need to tell
-+                 * logind that this is a clean session shutdown, so
-+                 * that it doesn't just go and slaughter us
-+                 * immediately after closing the fd */
-+
-+                bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-+                if (!bus) {
-+                        pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
-+                        r = PAM_SESSION_ERR;
-+                        goto finish;
-+                }
-+
-+                m = dbus_message_new_method_call(
-+                                "org.freedesktop.login1",
-+                                "/org/freedesktop/login1",
-+                                "org.freedesktop.login1.Manager",
-+                                "ReleaseSession");
-+                if (!m) {
-+                        pam_syslog(handle, LOG_ERR, "Could not allocate release session message.");
-+                        r = PAM_BUF_ERR;
-+                        goto finish;
-+                }
-+
-+                if (!dbus_message_append_args(m,
-+                                              DBUS_TYPE_STRING, &id,
-+                                              DBUS_TYPE_INVALID)) {
-+                        pam_syslog(handle, LOG_ERR, "Could not attach parameters to message.");
-+                        r = PAM_BUF_ERR;
-+                        goto finish;
-+                }
-
-+                reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-+                if (!reply) {
-+                        pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error));
-+                        r = PAM_SESSION_ERR;
-+                        goto finish;
-+                }
-+        }
-+
-+        r = PAM_SUCCESS;
-+
-+finish:
-+        pam_get_data(handle, "systemd.session-fd", &p);
-         if (p)
-                 close_nointr(PTR_TO_INT(p) - 1);
-
--        return PAM_SUCCESS;
-+        dbus_error_free(&error);
-+
-+        if (bus) {
-+                dbus_connection_close(bus);
-+                dbus_connection_unref(bus);
-+        }
-+
-+        if (m)
-+                dbus_message_unref(m);
-+
-+        if (reply)
-+                dbus_message_unref(reply);
-+
-+        return r;
- }
---
-1.7.9.5
diff --git a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
deleted file mode 100755
index 9bf84dda6..000000000
--- a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Fri, 2 Mar 2012 10:39:10 +0100
-Subject: [PATCH] util: never follow symlinks in rm_rf_children()
-
-The function checks if the entry is a directory before recursing, but
-there is a window between the check and the open, during which the
-directory could be replaced with a symlink.
-
-CVE-2012-1174
-https://bugzilla.redhat.com/show_bug.cgi?id=803358
----
- src/util.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util.c b/src/util.c
-index 20cbc2b..dfc1dc6 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
-                 if (is_dir) {
-                         int subdir_fd;
-
--                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
-+                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-+                        if (subdir_fd < 0) {
-                                 if (ret == 0 && errno != ENOENT)
-                                         ret = -errno;
-                                 continue;
---
-1.7.9.4
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
deleted file mode 100755
index d4f08f7d5..000000000
--- a/libre/systemd/PKGBUILD
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> 
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-pkgbase=systemd
-pkgname=('systemd')
-pkgver=44
-pkgrel=7
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
-             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release"
-        0001-util-never-follow-symlinks-in-rm_rf_children.patch
-        0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
-        0001-check-for-proper-return-from-dirent_ensure_type.patch)
-md5sums=('11f44ff74c87850064e4351518bcff17'
-         'd0210754762d923d36c9452a1648d550'
-         'b5863d6d4b47e2b5bda8eb57bde0d327'
-         'd37833358ef6c23fad622ea4a0941d1f'
-         '11f930fd0a3966abc794bf9127a7dde0')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375)
-  patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
-
-  # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd)
-  patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
-
-  # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
-  patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch"
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --with-pamlibdir=/usr/lib/security \
-              --localstatedir=/var \
-              --with-distro=arch \
-              --enable-split-usr \
-              --disable-ima
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-              'dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/systemd-logind.conf
-          etc/systemd/systemd-journald.conf)
-  install="$pkgname.install"
-
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf"
-  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # use python2 for systemd-analyze
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # didn't build this...
-  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
-
-  # fix .so links in manpage stubs
-  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
-      -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-  cd "$pkgdir/usr/share/man"
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-  sed -i '1s|/\([^/]\+\)|/systemd.\1|' "$pkgdir"/usr/share/man/man8/systemd.{poweroff,reboot}.8
-
-  # move bash-completion and symlink for loginctl
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # fix systemctl where
-  find "$pkgdir" -type f -name '*.service' -exec \
-      sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} +
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
-
-  cd "$srcdir"/libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-}
-
-# vim: ft=sh syn=sh et
diff --git a/libre/systemd/os-release b/libre/systemd/os-release
deleted file mode 100755
index 65253e9c3..000000000
--- a/libre/systemd/os-release
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME=Parabola
-ID=parabola
-ID_LIKE=arch
-PRETTY_NAME="Parabola GNU/Linux-libre"
-ANSI_COLOR="1;35"
-HOME_URL="https://parabolagnulinux.org/"
-BUG_REPORT_URL="https://labs.parabola.nu/"
diff --git a/libre/systemd/rePKGBUILD b/libre/systemd/rePKGBUILD
deleted file mode 100755
index f825ee579..000000000
--- a/libre/systemd/rePKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
-source PKGBUILD
-unset build package md5sums source check
-_repo=extra
-pkgname='systemd'
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	# files for pkg modifications
-	os-release)
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-
-  rm -v etc/os-release
-}
-
-package_systemd() {
-  pkgdesc="system and service manager (Parabola rebranded)"
-  depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
-  optdepends=('cryptsetup: required for encrypted block devices'
-              'dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/systemd-logind.conf
-          etc/systemd/systemd-journald.conf)
-  install="$pkgname.install"
-
-  # Install Parabola os-release
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
deleted file mode 100755
index 0c3e9abee..000000000
--- a/libre/systemd/systemd.install
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    # we moved the binary in 44-2 to /usr, so a reexec leads to a
-    # coredump. refuse this reexec and warn the user that they should
-    # reboot instead.
-    if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
-      echo "warning: refusing to reexec systemd. the system should be rebooted."
-    else
-      systemctl daemon-reload
-      systemctl daemon-reexec
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf


From 57c4a12d7c00bb82275af154cbcdbb7ec871c57c Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@kiwwwi.com.ar>
Date: Sun, 11 Nov 2012 13:55:47 -0300
Subject: Upgraded netatalk

---
 pcr/minidjvu/PKGBUILD              |  2 +-
 social/netatalk/PKGBUILD           | 58 +++++++++++++++++---------------------
 social/netatalk/netatalk.changelog | 18 ++++++++++++
 social/netatalk/netatalk.install   |  7 ++---
 social/netatalk/netatalk.rc        | 44 -----------------------------
 5 files changed, 47 insertions(+), 82 deletions(-)
 delete mode 100644 social/netatalk/netatalk.rc

diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD
index 168f035cc..700f3c1f6 100644
--- a/pcr/minidjvu/PKGBUILD
+++ b/pcr/minidjvu/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=minidjvu
 pkgver=0.8
 pkgrel=3
 pkgdesc="Highly efficient DjVu encoder for black-and-white images"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://minidjvu.sourceforge.net/"
 license=('GPL')
 depends=("libtiff")
diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
index 7e2fe14aa..816174590 100644
--- a/social/netatalk/PKGBUILD
+++ b/social/netatalk/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=netatalk
 pkgver=3.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc='Open Source AFP fileserver'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -17,42 +17,36 @@ backup=('etc/afp.conf')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-	'62eb034011bb60b0bfd95072af3693dc')
+source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
 
 build() {
-	cd $pkgname-$pkgver
+  cd $pkgname-$pkgver
 
 # TODO what does this fix?
-	msg2 'Fixing...'
-	sed -i 's/x"linux/x"generic/' macros/netatalk.m4
-
-	autoreconf
-
-# disable bundled libevent
-	echo -e "all:\ninstall:" >libevent/Makefile
-
-	CFLAGS="-Wno-unused-result" \
-    LIBS=-levent \
-    ./configure --prefix=/usr \
-                --disable-static \
-                --localstatedir=/etc \
-                --sysconfdir=/etc \
-        		--disable-bundled-libevent \
-                --with-cracklib \
-                --with-cnid-cdb-backend \
-                --enable-pgp-uam \
-                --with-init-style=systemd
-
-	make 
+  msg2 'Fixing...'
+  sed -i 's/x"linux/x"generic/' macros/netatalk.m4
+  sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
+
+  autoreconf
+
+  CFLAGS="-Wno-unused-result" \
+  ./configure --prefix=/usr \
+              --disable-static \
+              --localstatedir=/var/state \
+              --sysconfdir=/etc \
+              --with-init-style=systemd \
+              --with-cracklib \
+              --with-cnid-cdb-backend \
+              --enable-pgp-uam \
+              --without-libevent-header \
+              --without-libevent-lib
+
+  sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
+  make 
 }
 package() {
-	cd $pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
 
-	msg2 'Copying initscripts...'
-	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-         'b4f5c932b2ca99f5292bd6b6d69b3ebc')
diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog
index b577562d4..b1ada018b 100644
--- a/social/netatalk/netatalk.changelog
+++ b/social/netatalk/netatalk.changelog
@@ -1,3 +1,21 @@
+2012-10-08 SJ_UnderWater
+
+	* 3.0.1-3 :
+	moved systemd from /etc
+	better rc.d install test
+
+2012-10-05 SJ_UnderWater
+
+	* 3.0.1-2 :
+	removed rc.d references
+
+2012-10-04 SJ_UnderWater
+
+	* 3.0.1-1 :
+	new version
+	moved to systemd
+	moved state to /var/db
+
 2012-07-14 SJ_UnderWater
 
 	* 3.0-3 :
diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install
index a385add10..629586531 100644
--- a/social/netatalk/netatalk.install
+++ b/social/netatalk/netatalk.install
@@ -2,11 +2,11 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
+	else echo '>>> Add "netatalk" to your DAEMONS list';fi
 	echo '>>>';
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
@@ -18,6 +18,3 @@ post_upgrade() {
 	echo '>>> Found *.conf in /opt/netatalk, please';
 	echo '>>> migrate these to /etc/netatalk before restarting';fi
 }
-pre_remove() {
-	rc.d stop netatalk
-}
diff --git a/social/netatalk/netatalk.rc b/social/netatalk/netatalk.rc
deleted file mode 100644
index f14d67ee3..000000000
--- a/social/netatalk/netatalk.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-NAME="Appletalk Services Daemon"
-ARGS=
-DAEMON=netatalk
-
-[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
-
-PID=`get_pid $DAEMON`
-
-case "$1" in
- start)
-   stat_busy "Starting $NAME"
-   [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
-   if [ $? = 0 ]; then
-     add_daemon $DAEMON
-     stat_done
-   else
-     stat_fail
-     exit 1
-   fi
-   ;;
- stop)
-   stat_busy "Stopping $NAME"
-   [ -n "$PID" ] && kill $PID &>/dev/null
-   if [ $? = 0 ]; then
-     rm_daemon $DAEMON
-     stat_done
-   else
-     stat_fail
-     exit 1
-   fi
-   ;;
- restart)
-   $0 stop
-   sleep 1
-   $0 start
-   ;;
- *)
-   echo "usage: $0 {start|stop|restart}"  
-esac
-- 
cgit v1.2.3-54-g00ecf