Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

4 files changed, 88 insertions, 3 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index e044c8a43..242561280 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -51,8 +51,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
         '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
         # armv7h patches
-        "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
-        "https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
+        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 90eff2b75..82c6ad117 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -2,7 +2,7 @@
 #Maintainer: André Silva <emulatorman@parabola.nu>
 pkgname=reflector
 pkgver=2015.12
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
 arch=(any)
 license=(GPL)
diff --git a/pcr/guix/PKGBUILD b/pcr/guix/PKGBUILD
new file mode 100644
index 000000000..fa2f9bbd3
--- /dev/null
+++ b/pcr/guix/PKGBUILD
@@ -0,0 +1,55 @@
+# Maintainer (Arch): lantw44 (at) gmail (dot) com
+# Modified from guix-git 20130119 PKGBUILD 
+
+# In order to verify the PGP signature of the source archive, you may need to
+# use this command to download the needed public key:
+#   gpg --recv-keys 090B11993D9AEBB5
+
+pkgname=guix
+pkgver=0.9.0
+pkgrel=2
+pkgdesc="GNU guix is a purely functional package manager"
+arch=('x86_64' 'i686')
+url="https://www.gnu.org/software/guix/"
+license=('GPL')
+makedepends=(
+  'bash-completion'
+  'emacs' # Please remove this if you are not going to use guix in emacs
+  'guile-json')
+depends=(
+  'guile>=2.0.7'
+  'sqlite>=3.6.19'
+  'bzip2'
+  'libgcrypt')
+optdepends=(
+  'bash-completion: to enable bash programmable completion'
+  'emacs: to enable Emacs Interface'
+  'guile-json: to import packages from cpan, gem, pypi')
+source=(
+  "ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+install="${pkgname}.install"
+sha1sums=('765de53aa344a801c3d376cf1e050650cec58039'
+          'ab25cfdb39ff6d53458c07a8ab9b397a7bc8c9c5')
+validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5')
+
+build() {
+	bash_completion_dir="`pkg-config --variable=completionsdir bash-completion`"
+	cd ${srcdir}/${pkgname}-${pkgver}
+	./configure --prefix=/usr --sbindir=/usr/bin --localstatedir=/var \
+		--sysconfdir=/etc --with-bash-completion-dir="${bash_completion_dir}" \
+		--disable-rpath
+	make
+}
+
+#check() {
+#	cd ${srcdir}/${pkgname}-${pkgver}
+#	# Don't run container tests if the kernel doesn't support user namespace
+#	zgrep "CONFIG_USER_NS=y" /proc/config.gz || \
+#		sed -i 's|tests/guix-environment-container.sh||' Makefile
+#	make check
+#}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/guix/guix.install b/pcr/guix/guix.install
new file mode 100644
index 000000000..54f7659b6
--- /dev/null
+++ b/pcr/guix/guix.install
@@ -0,0 +1,30 @@
+infodir=usr/share/info
+file=guix.info
+
+post_install() {
+  echo "Guix 0.8.3 already provides a systemd service file in its release,"
+  echo "so the one included in AUR package is now removed. Please use the"
+  echo "following commands to keep your installation compatible with the"
+  echo "new service file:"
+  echo
+  echo "  systemctl disable guix"
+  echo "  systemctl enable guix-daemon"
+  echo "  groupmod -n guixbuild guix-builder"
+  echo "  usermod -l guixbuild guix-builder"
+  echo
+  echo "If you have /etc/systemd/system/guix.service.d, please also remember"
+  echo "to review its content and rename it to guix-daemon.service.d."
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+# vim:set ts=2 sw=2 ft=sh et: