move libretools and depends from [libre-testing] to [libre]

8 files changed, 241 insertions, 32 deletions

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 <<EOF
-Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
-and follow instructions there before using libretools.
-
-If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
-and install libretools-\$arch if avaliable
-
-EOF
+	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() {
-  cat <<EOF
-Check your /etc/libretools.conf, it has changed substantially.
-
-If using fullpkg, you should install libretools-\$arch if avaliable
-
-EOF
+	post_install
 }
 
-# vim:set ts=2 sw=2 et:
+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/ronn/PKGBUILD b/libre/ronn/PKGBUILD
new file mode 100644
index 000000000..4bd097048
--- /dev/null
+++ b/libre/ronn/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+
+_gemname=ronn
+pkgname=$_gemname
+pkgver=0.7.3
+pkgdesc="The opposite of roff; manual authoring tool"
+url="http://rtomayko.github.io/ronn/"
+license=('custom:MIT')
+
+provides=(ruby-$_gemname=$pkgver)
+
+pkgrel=4
+arch=('any')
+depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache')
+makedepends=('rubygems')
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+md5sums=('c5aa4ef58d35d0cc635b769281e03225')
+
+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/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
new file mode 100644
index 000000000..ad9aefc36
--- /dev/null
+++ b/libre/ruby-hpricot/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+
+_gemname=hpricot
+pkgname=ruby-$_gemname
+pkgver=0.8.6
+pkgdesc="_why's old HTML parser"
+url="http://github.com/hpricot/hpricot"
+license=('custom:MIT')
+
+pkgrel=1
+arch=('i686' 'x86_64')
+depends=('ruby')
+makedepends=('rubygems')
+source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
+noextract=(${_gemname}-${pkgver}.gem)
+md5sums=('b0f1f02448037f4f6243c33d5f818fa4')
+
+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
+}
diff --git a/libre/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD
new file mode 100644
index 000000000..d7090cc0d
--- /dev/null
+++ b/libre/ruby-mustache/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): David Campbell <davekong@archlinux.us>
+
+_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 <lukeshu@sbcglobal.net
+# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
+
+_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 <lukeshu@sbcglobal.net
+
+pkgname=sh-roundup
+pkgver=0.0.5.git17
+_gitver='commit=695ae7609353a360556e1f465ac81ce447235179'
+
+pkgdesc='A unit testing framework for POSIX shell'
+license=("custom:MIT")
+url="http://bmizerany.github.io/roundup/"
+
+pkgrel=1
+arch=('any')
+depends=(sh)
+makedepends=(ronn)
+
+source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch')
+md5sums=('8b1f85316d178eb9e809e168f52d0f2d'
+         '9efcd83d666c1e84302fe611610c60fa')
+
+mksource=("git://github.com/bmizerany/roundup.git#${_gitver}")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "$srcdir"
+  rm -rf $pkgname-*
+  mv roundup $pkgname-$pkgver
+}
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -i ../makefile-fix.patch Makefile
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix="$pkgdir"/usr
+  make -j1 build man
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 install install-man
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
diff --git a/libre/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch
new file mode 100644
index 000000000..b97bebf23
--- /dev/null
+++ b/libre/sh-roundup/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig
++++ Makefile
+@@ -79,7 +79,7 @@
+ 	chmod 0755 $(bindir)/roundup
+ 
+ install-man: man
+-	-for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done
++	shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done
+ 
+ .PHONY: pages
+ pages : doc