From 1a8c8095946d9773aca8d2504f754e044e0cd08e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 7 Jan 2014 23:32:30 -0500 Subject: libre/libretools: revert to 20131112, move the new one to libre-testing --- libre-testing/libretools/PKGBUILD | 91 +++++++++++++++++++++++++++++ libre-testing/libretools/libretools.install | 64 ++++++++++++++++++++ libre/libretools/PKGBUILD | 12 ++-- libre/libretools/libretools.install | 56 ++++-------------- 4 files changed, 171 insertions(+), 52 deletions(-) create mode 100644 libre-testing/libretools/PKGBUILD create mode 100644 libre-testing/libretools/libretools.install diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD new file mode 100644 index 000000000..7daf4c071 --- /dev/null +++ b/libre-testing/libretools/PKGBUILD @@ -0,0 +1,91 @@ +# Maintainer: Joshua Haase +# Contributor: fauno +# Contributor: Márcio Silva + +pkgbase=libretools +pkgname=(libretools libretools-mips64el librelib gitget) +pkgdesc="Programs for Parabola development" +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3' 'GPL2') + +pkgver=20140106.1 +_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651 +_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd + +_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="Shell library portion of libretools" + depends=( + wget # `aur` and `lib/blacklist.sh` + ) + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-librelib DESTDIR="$pkgdir" +} + +package_gitget() { + depends=("librelib=$pkgver" git) + + provides=("libregit=$pkgver") + conflicts=("libregit") + replaces=("libregit") + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-gitget 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) + + depends=( + "librelib=$pkgver" + "gitget=$pkgver" # `createworkdir` + arch-install-scripts # `archroot` uses `pacstrap` + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + subversion # `diff-unfree` + tokyocabinet # `treepkg` + ) + 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" + git # mips-add + ) + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools-mips64el DESTDIR="$pkgdir" +} + +md5sums=('246274cf5974d6adee536edbdb2447c0' + 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install new file mode 100644 index 000000000..a451add36 --- /dev/null +++ b/libre-testing/libretools/libretools.install @@ -0,0 +1,64 @@ +#!/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='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' + +# This line was installed by previous versions of this script +_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$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" + if has_line "$_old_code"; then + libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf" + del_line "$_old_code" + post_install + else + return 0 + fi + 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" + + del_line "$_old_code" +} diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 7daf4c071..569706f80 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20140106.1 -_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651 -_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd +pkgver=20131112 +_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0 +_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390 _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -64,8 +64,8 @@ package_libretools() { depends=( "librelib=$pkgver" - "gitget=$pkgver" # `createworkdir` arch-install-scripts # `archroot` uses `pacstrap` + git # `createworkdir` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` @@ -87,5 +87,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('246274cf5974d6adee536edbdb2447c0' - 'ec69dffa68829f063224de19bbd55fa9') +md5sums=('81e6d3d6fe1964a407a4520ce0916c0d' + '656008e8e35e6adba527b7bfc367b9f7') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index a451add36..d46990da8 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,49 +1,14 @@ #!/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='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' - -# This line was installed by previous versions of this script -_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$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 -} +_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 'librefetch' etc/makepkg.conf; then + if grep -q 'libre::' etc/makepkg.conf; then libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - if has_line "$_old_code"; then - libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf" - del_line "$_old_code" - post_install - else - return 0 - fi 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" + libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" + printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf fi } @@ -54,11 +19,10 @@ post_upgrade() { } 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" - - del_line "$_old_code" + if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + sed -i '/libre::/d' etc/makepkg.conf + else + libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" + fi } -- cgit v1.2.3-54-g00ecf