diff options
| -rw-r--r-- | libre/filesystem/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/filesystem/crypttab | 12 | ||||
| -rw-r--r-- | libre/filesystem/locale.sh | 17 | ||||
| -rw-r--r-- | libre/filesystem/os-release | 2 | ||||
| -rw-r--r-- | nonprism/kdepim/PKGBUILD | 8 | ||||
| -rw-r--r-- | pcr/git-annex-static/PKGBUILD | 63 | ||||
| -rw-r--r-- | pcr/git-annex-static/SRCBUILD | 50 |
7 files changed, 140 insertions, 28 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 446d4e49d..0038abd3e 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 216487 2014-07-04 13:14:12Z dreisner $ +# $Id: PKGBUILD 225329 2014-10-25 18:44:19Z dreisner $ # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=filesystem -pkgver=2014.07 -pkgrel=1.parabola1 +pkgver=2014.10 +pkgrel=3.parabola1 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url='https://parabolagnulinux.org' +url='https://www.parabola.nu' groups=('base') install='filesystem.install' makedepends=('asciidoc') @@ -32,17 +32,17 @@ md5sums=('d46cb1adf8175888cc827a3dad8857d2' 'a998d1e6c7cc5791a7f4a2b49b2d10ce' '1ec1b16e2a71fad63ab8f147069a5d97' '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' + 'f0a5071f50d8864d2810c44e23eb00cc' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' + '83e0de34441a56684db8f813099d62f8' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' '09bce9236c3729d31aaa528bcf5d198e' '0b6f835598c7640184e476057b3c7722' 'a8a962370cd0128465d514e6a1f74130' 'd5732ffdb3488e1383d4ea199343e767' - '4fab2b798deff348e04f05152111aae0') + '2caa30a2c91580dc12f053231f237608') lint() { # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. @@ -109,7 +109,7 @@ package() { install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release # setup /var - for d in cache/man local opt log/old lib/misc empty; do + for d in cache local opt log/old lib/misc empty; do install -d -m755 var/${d} done install -d -m1777 var/{tmp,spool/mail} diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab index 195945a74..087d09eee 100644 --- a/libre/filesystem/crypttab +++ b/libre/filesystem/crypttab @@ -9,9 +9,9 @@ # NOTE: Do not list your root (/) partition here, it must be set up # beforehand by the initramfs (/etc/mkinitcpio.conf). -# <name> <device> <password> <options> -# home /dev/hda4 /etc/mypassword1 -# data1 /dev/hda3 /etc/mypassword2 -# data2 /dev/hda5 /etc/cryptfs.key -# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/hdb7 none +# <name> <device> <password> <options> +# home UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37 /etc/mypassword1 +# data1 /dev/sda3 /etc/mypassword2 +# data2 /dev/sda5 /etc/cryptfs.key +# swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 +# vol /dev/sdb7 none diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh index 3cfc89c1b..b66587203 100644 --- a/libre/filesystem/locale.sh +++ b/libre/filesystem/locale.sh @@ -1,14 +1,13 @@ #!/bin/sh -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf +if [ -z "$LANG" ]; then + if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" + elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" + elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf + fi fi LANG=${LANG:-C} diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release index fe5f20b4f..273a1dfbb 100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem/os-release @@ -3,6 +3,6 @@ ID=parabola ID_LIKE=arch PRETTY_NAME="Parabola GNU/Linux-libre" ANSI_COLOR="1;35" -HOME_URL="https://parabolagnulinux.org/" +HOME_URL="https://www.parabola.nu/" BUG_REPORT_URL="https://labs.parabola.nu/" diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 7695dca36..f6203f9af 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 224764 2014-10-18 11:43:49Z andrea $ +# $Id: PKGBUILD 225407 2014-10-28 18:32:14Z andrea $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -13,13 +13,13 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-korganizer' 'kdepim-libkdepim') pkgver=4.14.2 -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'baloo4' 'link-grammar') + 'baloo4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") sha1sums=('512e1da40c71128beb429b19e2377516241ee2e4') @@ -149,7 +149,7 @@ package_kdepim-korganizer() { package_kdepim-libkdepim() { pkgdesc='Library for KDE PIM, without Google Drive support' groups=() - depends=('kdepim-runtime' 'link-grammar' 'baloo4-akonadi') + depends=('kdepim-runtime' 'baloo4-akonadi') url='http://pim.kde.org' conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-akonadi' 'kdepim-libkdepim-nonprism') diff --git a/pcr/git-annex-static/PKGBUILD b/pcr/git-annex-static/PKGBUILD new file mode 100644 index 000000000..96477a265 --- /dev/null +++ b/pcr/git-annex-static/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Based on haskell-git-annex + +# Run `makepkg -sp SRCBUILD` if you want to update the source tarball + +# hslua fails if LANG is empty or C +test -z "$LANG" && export LANG="en_US.utf8" + +pkgname=git-annex-static +_pkgname=git-annex +pkgver=5.20141024 +pkgrel=1 +_srcrel=1 +pkgdesc='Manage files with git, without checking their contents in' +url='http://git-annex.branchable.com/' +license=('GPL') +arch=('i686' 'x86_64') +depends=('git' 'gsasl') +makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') +options=(strip !makeflags !distcc !emptydirs) +source=(https://repo.parabolagnulinux.org/other/git-annex-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig} + SRCBUILD) +replaces=('git-annex') +provides=('git-annex') +md5sums=('5c1760042568c068d76087a24776715f' + 'SKIP' + 'c62b7f7093662f2e672b562bb97c86ae') + +# PKGBUILD functions +build() { + mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} + cd ${srcdir}/${_pkgname}-${pkgver} + + export PATH=${srcdir}/build/usr/bin:$PATH + + while read _hkpkg extra; do +# Skip already built + [ -d "${srcdir}/build/usr/lib/i386-linux-ghc-7.8.3/$_hkpkg" ] && continue + + pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null || continue + + msg2 "Building $_hkpkg" + HOME=${srcdir}/${_pkgname}-${pkgver} \ + cabal install --prefix=${srcdir}/build/usr + + popd >/dev/null + done <BUILDORDER + +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver} + + install -Dm755 ${srcdir}/build/usr/bin/git-annex ${pkgdir}/usr/bin/git-annex + + msg2 "Installing manpages" + install -Dm644 git-annex.1 ${pkgdir}/usr/share/man/man1/git-annex.1 + install -Dm644 git-annex-shell.1 ${pkgdir}/usr/share/man/man1/git-annex-shell.1 + + msg2 "Installing licenses" + install -d ${pkgdir}/usr/share/licenses/${pkgname} + cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/${pkgname} +} diff --git a/pcr/git-annex-static/SRCBUILD b/pcr/git-annex-static/SRCBUILD new file mode 100644 index 000000000..bd596eb12 --- /dev/null +++ b/pcr/git-annex-static/SRCBUILD @@ -0,0 +1,50 @@ +# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Based on haskell-git-annex + +pkgname=git-annex +pkgver=5.20141024 +pkgrel=1 +pkgdesc='Manage files with git, without checking their contents in' +url='http://git-annex.branchable.com/' +license=('GPL3') +arch=('any') +makedepends=('ghc' 'sh' 'cabal-install') +options=(!strip) +_flags=() +_packages=(transformers-0.4.1.0 c2hs ${pkgname}-${pkgver}) + +_cabal() { + HOME=${srcdir}/${pkgname}-${pkgver} cabal $@ +} + +# PKGBUILD functions +build() { + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} + + _cabal --verbose=3 update + _cabal --verbose=3 fetch ${_packages[@]} + + msg2 "Getting the dependency build order" +# Ignore the cabal messages + _cabal install \ + --flags="${flags[@]}"\ + --dry-run \ + ${_packages[@]} | + grep "\-[0-9]\+" | + cut -d" " -f1 | + tee BUILDORDER +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mkdir -p ${pkgdir}/${pkgname}-${pkgver} + cd ${pkgdir}/${pkgname}-${pkgver} + + find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ + bsdtar xvf '{}' \; + + cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER . +} |