From 1c1ff165dc890876d7e801fe2666e1c5edb889f1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Oct 2014 20:22:51 -0400 Subject: update libre/libretools --- libre-testing/libretools/PKGBUILD | 108 ---------------------------- libre-testing/libretools/libretools.install | 72 ------------------- libre/libretools/PKGBUILD | 46 +++++++----- 3 files changed, 29 insertions(+), 197 deletions(-) delete mode 100644 libre-testing/libretools/PKGBUILD delete mode 100644 libre-testing/libretools/libretools.install diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD deleted file mode 100644 index 24c2a1fea..000000000 --- a/libre-testing/libretools/PKGBUILD +++ /dev/null @@ -1,108 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Joshua Ismael Haase Hernández (xihh) -# Contributor: fauno -# Contributor: Márcio Silva - -pkgbase=libretools -pkgname=(libretools libretools-mips64el librelib gitget xbs) -pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3' 'GPL2') - -pkgver=20140726 -_libretools_commit=ccc84f329bd5c98b25a85422a0cf4e9b18324082 -_devtools_commit=33f227ec628f30b70ee5b1412fd47564325b4b4c -md5sums=('4960decf412771c5c4236118b20c06b8' - 'db5d0c0889a9f6e481c634d4f36eda49') - -_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 ronn) # 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-librelib build-doc -} - -check() { - cd "$srcdir/$pkgbase-$_libretools_commit" - - SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo' -} - -package_librelib() { - pkgdesc="The shell library portion of libretools" - license=(GPL2) - depends=( - wget # `blacklist` - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-librelib DESTDIR="$pkgdir" -} - -package_gitget() { - pkgdesc="A simple to use downloader for git URLs" - license=(GPL2) - depends=("librelib=$pkgver" git) - - provides=("libregit=$pkgver") - conflicts=("libregit") - replaces=("libregit") - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-gitget DESTDIR="$pkgdir" -} - -package_xbs() { - pkgdesc='A tool for working with arbitrary ABS-like build systems' - license=(GPL2) - depends=( - "gitget=$pkgver" # `helper-abslibre` - "librelib=$pkgver" - subversion # `helper-abs` - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-xbs DESTDIR="$pkgdir" -} - -package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) - install=libretools.install - conflicts=(devtools) - - depends=( - "librelib=$pkgver" - "xbs=$pkgver" # `createworkdir`, `librestage` - arch-install-scripts # `mkarchroot` uses `pacstrap` - openssh # `librerelease` - rsync # `librerelease` and `makechrootpkg.sh` - systemd # systemd-nspawn - tokyocabinet # `toru` - #namcap # Namcap is currently dissabled in libremakepkg :( - #subversion # `diff-unfree` # ignore because of xbs - #wget # `aur` # ignore because of librelib - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools install-doc DESTDIR="$pkgdir" -} - -package_libretools-mips64el() { - pkgdesc="Scripts for Parabola development (for mips64el architecture)" - license=(GPL3) - depends=("$pkgbase=$pkgver" - git # mips-add - ) - - cd "$srcdir/$pkgbase-$_libretools_commit" - make install-libretools-mips64el DESTDIR="$pkgdir" -} diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install deleted file mode 100644 index 35edf68c7..000000000 --- a/libre-testing/libretools/libretools.install +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - -_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'" -_edit_cmnt='#%s # commented out by the libretools post_install script' - -_add_cmnt='# The following line is added by the libretools post_install script' -_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' - -# These lines were installed by previous versions of this script -_old_code=( - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' - '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' - 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' -) - -# has_line $line -has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } -# add_line $line -add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; } -# del_line $line -del_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" -gt 0 ]]; then - sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf; - fi -} -# rep_line $orig $replacement_bre -rep_line() { - local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1)) - if [[ "${#lineno[@]}" == 1 ]]; then - sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf; - fi -} - -# arg 1: the new package version -post_install() { - if grep -q 'librefetch' etc/makepkg.conf; then - libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - local line del=false - for line in "${_old_code[@]}"; do - if has_line "$line"; then - pre_remove - post_install - return $? - fi - done - else - libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" - rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" - add_line "$_add_cmnt" - add_line "$_add_code" - fi -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install -} - -pre_remove() { - libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" - - rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code" - del_line "$_add_cmnt" - del_line "$_add_code" - - local line - for line in "${_old_code[@]}"; do - del_line "$line" - done -} diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 5e4a3267a..4a90c444e 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Márcio Silva pkgbase=libretools -pkgname=(libretools libretools-mips64el librelib gitget) +pkgname=(libretools libretools-mips64el librelib gitget xbs) pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20140515 -_libretools_commit=22bb572086ff1c1667d553ac8233fc053a1556f2 -_devtools_commit=d732aae2ca57430f3dd95c0ed4dcc05df4014f91 -md5sums=('fd9d872b8fe28e8d64d76b3ef2d0b6ec' - '615db785531757d3a849614bb117fba4') +pkgver=20141001 +_libretools_commit=42ed1183c123e9afb7fddadbbc4e62d89f82b63d +_devtools_commit=33f227ec628f30b70ee5b1412fd47564325b4b4c +md5sums=('854a89ca27dedb4efb52a876b6827812' + 'db5d0c0889a9f6e481c634d4f36eda49') _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -21,8 +21,8 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') -makedepends=(emacs ronn) # emacs --batch is used during the build to process text -checkdepends=(sh-roundup) +makedepends=(emacs ruby-ronn) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup git) build() { cd "$srcdir" @@ -61,24 +61,36 @@ package_gitget() { make install-gitget DESTDIR="$pkgdir" } +package_xbs() { + pkgdesc='A tool for working with arbitrary ABS-like build systems' + license=(GPL2) + depends=( + "gitget=$pkgver" # `helper-abslibre` + "librelib=$pkgver" + subversion # `helper-abs` + ) + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-xbs DESTDIR="$pkgdir" +} + package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install - replaces=(chroottools) - conflicts=(devtools chroottools) + conflicts=(devtools) depends=( "librelib=$pkgver" - "gitget=$pkgver" # `createworkdir` - "systemd>=212" # force newer systemd - arch-install-scripts # `archroot` uses `pacstrap` + "xbs=$pkgver" # `createworkdir`, `librestage` + arch-install-scripts # `mkarchroot` uses `pacstrap` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` - subversion # `diff-unfree` - tokyocabinet # `treepkg` - wget # `aur` + systemd # systemd-nspawn + tokyocabinet # `toru` + #namcap # Namcap is currently dissabled in libremakepkg :( + #subversion # `diff-unfree` # ignore because of xbs + #wget # `aur` # ignore because of librelib ) - optdepends=('namcap: to check package files') cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools install-doc DESTDIR="$pkgdir" -- cgit v1.2.3