From c4062b116fa9b14497aa00fa15e3579c44565e61 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Jun 2013 20:52:49 -0600 Subject: update libre-testing/libretools --- libre-testing/libretools/PKGBUILD | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'libre-testing/libretools') diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 430ab93d5..07878d1c0 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -8,9 +8,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130528.2 -_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64 -_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e +pkgver=20130605 +_libretools_commit=adc6865b29b31a32cce195d6912af039ef7eab77 +_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -31,25 +31,18 @@ build() { check() { cd "$srcdir/$pkgbase-$_libretools_commit" - # some tests require 'sudo'; trick those into passing - mkdir "$srcdir/bin" - ln -s $(which true) "$srcdir/bin/sudo" - _PATH=$PATH - export PATH="$srcdir/bin:$PATH" - - make check - - export PATH=$_PATH + make check TESTENVFLAGS='--no-network --no-sudo' } package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install replaces=(chroottools) + conflicts=(devtools) depends=( arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` + git # `createworkdir` (also mips-add in -mips64el) openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -64,12 +57,11 @@ package_libretools() { package_libretools-mips64el() { pkgdesc="Scripts for Parabola development (for mips64el architecture)" - backup=('etc/libretools.d/mips64el.conf') depends=("$pkgbase=$pkgver") cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('47ff5308a56dd8ae2cf18b82a99b0021' - '05b987e6b39c963154489ac6d01d0965') +md5sums=('60a3bb7d86f1591658b74ed482bc0423' + 'b28b1492fda205be7c577fc03cbc3399') -- cgit v1.2.3-2-g168b From 84531aa9eb51c6fff1bc47aee6a25609bbf69126 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Jun 2013 20:55:26 -0600 Subject: move libretools and depends from [libre-testing] to [libre] --- libre-testing/libretools/PKGBUILD | 67 ----------------------------- libre-testing/libretools/libretools.install | 28 ------------ 2 files changed, 95 deletions(-) delete mode 100644 libre-testing/libretools/PKGBUILD delete mode 100644 libre-testing/libretools/libretools.install (limited to 'libre-testing/libretools') diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD deleted file mode 100644 index 07878d1c0..000000000 --- a/libre-testing/libretools/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Maintainer: Joshua Haase -# Contributor: fauno - -pkgbase=libretools -pkgname=(libretools libretools-mips64el) -pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3' 'GPL2') - -pkgver=20130605 -_libretools_commit=adc6865b29b31a32cce195d6912af039ef7eab77 -_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f - -_packages_url=https://projects.parabolagnulinux.org/packages -source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 - $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) - -pkgrel=1 -arch=('any') -makedepends=(emacs) # emacs --batch is used during the build to process text -checkdepends=(sh-roundup) - -build() { - cd "$srcdir" - ln -sf devtools-par-$_devtools_commit devtools-par - cd "$srcdir/$pkgbase-$_libretools_commit" - make build-libretools build-libretools-mips64el build-doc -} - -check() { - cd "$srcdir/$pkgbase-$_libretools_commit" - - make check TESTENVFLAGS='--no-network --no-sudo' -} - -package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) - install=libretools.install - replaces=(chroottools) - conflicts=(devtools) - - depends=( - arch-install-scripts # `archroot` uses `pacstrap` - git # `createworkdir` (also mips-add in -mips64el) - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - subversion # `diff-unfree` - tokyocabinet # `treepkg` - wget # `aur` and `lib/blacklist.sh` - ) - optdepends=('namcap: to check package files') - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools install-doc DESTDIR="$pkgdir" -} - -package_libretools-mips64el() { - pkgdesc="Scripts for Parabola development (for mips64el architecture)" - depends=("$pkgbase=$pkgver") - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools-mips64el DESTDIR="$pkgdir" -} - -md5sums=('60a3bb7d86f1591658b74ed482bc0423' - 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install deleted file mode 100644 index ff6a238fe..000000000 --- a/libre-testing/libretools/libretools.install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' - -# arg 1: the new package version -post_install() { - if grep -q 'libre::' etc/makepkg.conf; then - libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - else - libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" - printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf - fi -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install -} - -pre_remove() { - if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - sed -i '/libre::/d' - else - libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" - fi -} -- cgit v1.2.3-2-g168b