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 ------------ libre-testing/ronn/PKGBUILD | 32 -------------- libre-testing/ruby-hpricot/PKGBUILD | 25 ----------- libre-testing/ruby-mustache/PKGBUILD | 31 ------------- libre-testing/ruby-rdiscount/PKGBUILD | 38 ---------------- libre-testing/sh-roundup/PKGBUILD | 44 ------------------- libre-testing/sh-roundup/makefile-fix.patch | 11 ----- libre/libretools/PKGBUILD | 60 ++++++++++++++++++-------- libre/libretools/libretools.install | 32 +++++++------- libre/ronn/PKGBUILD | 32 ++++++++++++++ libre/ruby-hpricot/PKGBUILD | 25 +++++++++++ libre/ruby-mustache/PKGBUILD | 31 +++++++++++++ libre/ruby-rdiscount/PKGBUILD | 38 ++++++++++++++++ libre/sh-roundup/PKGBUILD | 44 +++++++++++++++++++ libre/sh-roundup/makefile-fix.patch | 11 +++++ 16 files changed, 241 insertions(+), 308 deletions(-) delete mode 100644 libre-testing/libretools/PKGBUILD delete mode 100644 libre-testing/libretools/libretools.install delete mode 100644 libre-testing/ronn/PKGBUILD delete mode 100644 libre-testing/ruby-hpricot/PKGBUILD delete mode 100644 libre-testing/ruby-mustache/PKGBUILD delete mode 100644 libre-testing/ruby-rdiscount/PKGBUILD delete mode 100644 libre-testing/sh-roundup/PKGBUILD delete mode 100644 libre-testing/sh-roundup/makefile-fix.patch create mode 100644 libre/ronn/PKGBUILD create mode 100644 libre/ruby-hpricot/PKGBUILD create mode 100644 libre/ruby-mustache/PKGBUILD create mode 100644 libre/ruby-rdiscount/PKGBUILD create mode 100644 libre/sh-roundup/PKGBUILD create mode 100644 libre/sh-roundup/makefile-fix.patch 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 -} diff --git a/libre-testing/ronn/PKGBUILD b/libre-testing/ronn/PKGBUILD deleted file mode 100644 index 4bd097048..000000000 --- a/libre-testing/ronn/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Luke Shumaker -# Maintainer (AUR): David Campbell - -_gemname=mustache -pkgname=ruby-$_gemname -pkgver=0.99.4 -pkgdesc="A framework-agnostic way to render logic-free views." -url="http://mustache.github.io/" -license=('custom:MIT') - -pkgrel=3 -arch=('any') -depends=('ruby>=2') -makedepends=('rubygems') -source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") -md5sums=('650194ec2c166feb087377647414b9dc') -noextract=($_gemname-$pkgver.gem) - -package() { - cd "${srcdir}" - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ - "$_gemname-$pkgver.gem" - - install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - shopt -s nullglob - for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do - install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} - done -} diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre-testing/ruby-rdiscount/PKGBUILD deleted file mode 100644 index 76e4b58bd..000000000 --- a/libre-testing/ruby-rdiscount/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor: Massimiliano Torromeo - -_gemname=rdiscount -pkgname=ruby-$_gemname -pkgver=1.6.5 -pkgdesc="C implementation of John Gruber's Markdown." -url="http://dafoster.net/projects/rdiscount/" - -# About the license: It is a 4-clause BSD license with the 3rd clause modified -# to mention documentation instead of advertising. Not to be confused with -# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license -# (dropping the 3rd clause). Because of the way it is modified, it doesn't have -# the problems normally associated with the 4-clause BSD license. -license=('custom:modified-BSD4') - -pkgrel=2 -arch=('i686' 'x86_64') -depends=('ruby') -makedepends=('rubygems') -source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) -noextract=($_gemname-$pkgver.gem) -md5sums=('2de321f1ba826f80b84fe45c0d013fcf') - -package() { - cd "${srcdir}" - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ - "$_gemname-$pkgver.gem" - - install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/COPYING - shopt -s nullglob - for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do - install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} - done -} diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre-testing/sh-roundup/PKGBUILD deleted file mode 100644 index 7c17669d3..000000000 --- a/libre-testing/sh-roundup/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Luke Shumaker /dev/null ; done -+ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done - - .PHONY: pages - pages : doc diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 9f67689df..07878d1c0 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -4,38 +4,64 @@ pkgbase=libretools pkgname=(libretools libretools-mips64el) -pkgver=20130117 pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/libretools.git/" -license=('GPL3+' 'GPL2') +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3' 'GPL2') -pkgrel=3 +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') -groups=(base-devel) -depends=(openssh rsync git wget tokyocabinet) -conflicts=(chroottools) -source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar) +makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { - cd "$srcdir/$pkgbase-$pkgver" - make + 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) + 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-$pkgver" - make install-libretools DESTDIR="$pkgdir" - install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools install-doc DESTDIR="$pkgdir" } package_libretools-mips64el() { pkgdesc="Scripts for Parabola development (for mips64el architecture)" - backup=('etc/libretools.d/mips64el.conf') + depends=("$pkgbase=$pkgver") - cd "$srcdir/$pkgbase-$pkgver" + cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('77dcfb2fbf5b8a9894a13c5e6151b693') +md5sums=('60a3bb7d86f1591658b74ed482bc0423' + 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 50f03ee88..ff6a238fe 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,26 +1,28 @@ #!/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() { - cat <> etc/makepkg.conf + fi } ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { - cat < +# Maintainer (AUR): David Campbell + +_gemname=mustache +pkgname=ruby-$_gemname +pkgver=0.99.4 +pkgdesc="A framework-agnostic way to render logic-free views." +url="http://mustache.github.io/" +license=('custom:MIT') + +pkgrel=3 +arch=('any') +depends=('ruby>=2') +makedepends=('rubygems') +source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") +md5sums=('650194ec2c166feb087377647414b9dc') +noextract=($_gemname-$pkgver.gem) + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD new file mode 100644 index 000000000..76e4b58bd --- /dev/null +++ b/libre/ruby-rdiscount/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Luke Shumaker +# Contributor: Massimiliano Torromeo + +_gemname=rdiscount +pkgname=ruby-$_gemname +pkgver=1.6.5 +pkgdesc="C implementation of John Gruber's Markdown." +url="http://dafoster.net/projects/rdiscount/" + +# About the license: It is a 4-clause BSD license with the 3rd clause modified +# to mention documentation instead of advertising. Not to be confused with +# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license +# (dropping the 3rd clause). Because of the way it is modified, it doesn't have +# the problems normally associated with the 4-clause BSD license. +license=('custom:modified-BSD4') + +pkgrel=2 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('2de321f1ba826f80b84fe45c0d013fcf') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD new file mode 100644 index 000000000..7c17669d3 --- /dev/null +++ b/libre/sh-roundup/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Luke Shumaker /dev/null ; done ++ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done + + .PHONY: pages + pages : doc -- cgit v1.2.3-2-g168b