[arch-commits] Commit in ditaa/repos/community-any (4 files)

[Alexander Rødseth]

    Date: Sunday, July 22, 2018 @ 19:49:21
  Author: arodseth
Revision: 362870

archrelease: copy trunk to community-any

Added:
  ditaa/repos/community-any/PKGBUILD
    (from rev 362869, ditaa/trunk/PKGBUILD)
  ditaa/repos/community-any/ditaa.sh
    (from rev 362869, ditaa/trunk/ditaa.sh)
Deleted:
  ditaa/repos/community-any/PKGBUILD
  ditaa/repos/community-any/ditaa.sh

----------+
 PKGBUILD |   91 ++++++++++++++++++++++++++++++++-----------------------------
 ditaa.sh |    6 ++--
 2 files changed, 52 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-22 19:49:11 UTC (rev 362869)
+++ PKGBUILD	2018-07-22 19:49:21 UTC (rev 362870)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Florian Pritz <bluewind at xinu.at>
-# Contributor: domanov <domanov at gmail.com>
-
-pkgname=ditaa
-pkgver=0.10
-pkgrel=1
-pkgdesc='Java utility to convert diagrams drawn using ascii art to bitmap'
-arch=('any')
-url='https://github.com/stathissideris/ditaa'
-license=('GPL')
-depends=('java-environment' 'gsfonts')
-makedepends=('git' 'apache-ant')
-source=("git://github.com/stathissideris/ditaa#tag=v$pkgver"
-        "$pkgname.sh")
-sha256sums=('SKIP'
-            '77f95a7c3235a1263b560844f988445083895550385bff1a4c28313b0767e38f')
-
-prepare() {
-  cd "$pkgname"
-
-  sed -i 's/0_9/0_10/g' build/release.xml
-  sed -i 's/version 0.9/version 0.10/g' \
-    src/org/stathissideris/ascii2image/core/CommandLineConverter.java
-  sed -i "s:VERSION:${pkgver/./_}:" "$srcdir/$pkgname.sh"
-  mkdir -p bin
-}
-
-build() {
-  cd "$pkgname"
-
-  ant -buildfile build/release.xml release-jar
-}
-
-package() {
-  install -Dm755 "$pkgname/releases/$pkgname${pkgver/./_}.jar" \
-    "$pkgdir/usr/share/java/$pkgname/ditaa-${pkgver/./_}.jar"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ditaa/repos/community-any/PKGBUILD (from rev 362869, ditaa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-22 19:49:21 UTC (rev 362870)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Florian Pritz <bluewind at xinu.at>
+# Contributor: domanov <domanov at gmail.com>
+
+pkgname=ditaa
+pkgver=0.11.0
+pkgrel=1
+pkgdesc='Utility for converting ASCII art diagrams into bitmaps'
+arch=('any')
+url='https://github.com/stathissideris/ditaa'
+license=('GPL')
+depends=('gsfonts' 'java-environment>=8')
+makedepends=('apache-ant' 'git')
+source=("https://github.com/stathissideris/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-standalone.jar"
+        "git+https://github.com/stathissideris/$pkgname#tag=v$pkgver"
+        $pkgname.sh)
+sha256sums=('9418aa63ff6d89c5d2318396f59836e120e75bea7a5930c4d34aa10fe7a196a9'
+            'SKIP'
+            '77f95a7c3235a1263b560844f988445083895550385bff1a4c28313b0767e38f')
+
+prepare() {
+  local oldver="0_9"
+  local shortver=${pkgver%.0}
+  local underver=${shortver/./_}
+  sed -i "s|$oldver|${shortver/./_}|" $pkgname/build/release.xml
+  sed -i 's|1.6|1.8|g' $pkgname/build/release.xml
+  sed -i "s|VERSION|$shortver|" $pkgname.sh
+  mkdir -p $pkgname/{bin,lib}
+  sed -i 's|</javac>|<compilerarg value="-Xlint:unchecked"/></javac>|g' $pkgname/build/release.xml
+}
+
+build() {
+  cd "$pkgname"
+
+  # TODO: Build with leiningen, after moving it from AUR to [community]
+  #ant -buildfile build/release.xml release-jar
+}
+
+package() {
+  local shortver=${pkgver%.0}
+  install -Dm644 "$srcdir/$pkgname-$pkgver-standalone.jar" \
+    "$pkgdir/usr/share/java/$pkgname/$pkgname-$shortver.jar"
+  #install -Dm644 "$pkgname/releases/$pkgname$shortver.jar" \
+  #  "$pkgdir/usr/share/java/$pkgname/$pkgname-$shortver.jar"
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: ditaa.sh
===================================================================
--- ditaa.sh	2018-07-22 19:49:11 UTC (rev 362869)
+++ ditaa.sh	2018-07-22 19:49:21 UTC (rev 362870)
@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=/usr/share/java/ditaa
-${JAVA_HOME}/bin/java -jar $DIR/ditaa-VERSION.jar "$@"

Copied: ditaa/repos/community-any/ditaa.sh (from rev 362869, ditaa/trunk/ditaa.sh)
===================================================================
--- ditaa.sh	                        (rev 0)
+++ ditaa.sh	2018-07-22 19:49:21 UTC (rev 362870)
@@ -0,0 +1,3 @@
+#!/bin/sh
+DIR=/usr/share/java/ditaa
+${JAVA_HOME}/bin/java -jar $DIR/ditaa-VERSION.jar "$@"