Merge branch 'master-remote' into master-undelete

4 files changed, 0 insertions, 167 deletions

diff --git a/java-ugly/junit/PKGBUILD b/java-ugly/junit/PKGBUILD
deleted file mode 100644
index 7204cd5c9..000000000
--- a/java-ugly/junit/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
-
-pkgname=junit
-pkgver=4.10
-pkgrel=1
-pkgdesc="Automated testing framework for Java"
-arch=('any')
-url="http://www.junit.org/"
-license=('CPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'jh')
-source=("$pkgname::git://github.com/KentBeck/junit.git#tag=r$pkgver")
-
-mksource() {
-  cd "${srcdir}/${pkgname}"
-  #find . -name '*.jar' -delete
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"|\0 source="\1"|' build.xml
-}
-
-build() {
-  mksource
-  cd "${srcdir}/${pkgname}"
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"$|\0 source="\1"|' build.xml
-  
-  ant jars
-  for pkg in junit junit-dep; do
-    sed \
-      -e "s|@artifactID@|$pkg|" \
-      -e "s|@version@|$pkgver|" \
-      < build/maven/pom-template.xml > $pkgname$pkgver/$pkg-$pkgver.pom
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm644 cpl-v10.html "$pkgdir/usr/share/licenses/junit/cpl-v10.html"
-
-  cd "${srcdir}/${pkgname}/${pkgname}${pkgver}"
-
-  export DESTDIR="$pkgdir"
-  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{jar,pom}
-  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.{jar,pom}
-  install -d "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit     $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit-dep $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s ${pkgname}/${pkgname}-${pkgver}.jar     ${pkgdir}/usr/share/java/${pkgname}.jar
-  ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}-dep.jar
-}
-
-md5sums=('SKIP')
diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD
deleted file mode 100644
index 3f8e5071d..000000000
--- a/java-ugly/maven/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=maven
-pkgver=3.0.5
-pkgdesc="A Java project management and project comprehension tool"
-url="http://maven.apache.org"
-license=('Apache')
-
-replaces=('maven-libre')
-conflicts=('maven-libre')
-
-pkgrel=1
-arch=('any')
-options=(!emptydirs)
-conflicts=('maven')
-depends=('java-environment' 'sh')
-makedepends=('apache-ant' 'jh' 'imake'
-	java-antlr2
-	java-asm3
-)
-backup=('etc/maven/settings.xml')
-
-_mirror=http://archive.apache.org/dist
-source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz
-	maven.sh maven.csh)
-
-_setup_env() {
-  unset _JAVA_OPTIONS
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  export MAVEN_OPTS=-Xmx512m
-  export M2_HOME="$pkgdir"/opt/maven
-  export PATH="$PATH:$M2_HOME/bin"
-  _M2_LOCALREPO=$(jh mvn-localrepo)
-  ant_args=(
-    -Dmaven.repo.local="$srcdir"/maven.repo.local
-  )
-}
-
-prepare() {
-  if type mvn &>/dev/null; then
-    error "maven cannot be built while an existing version is installed"
-    return 1
-  fi
-}
-
-build() (
-  _setup_env
-  install -d "$srcdir"/maven.repo.local
-  lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local
-
-  cd "$srcdir"/apache-maven-$pkgver
-
-  # FIXME: downloads makedepends from the Internet. Add them to makedepends=()
-  ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt
-
-  < "$srcdir"/ant-log.txt \
-    sed -nr 's/.*Download(ed|ing):\s*//p' | \
-    sed 's/ .*//' | \
-    sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \
-    sort -u > "$srcdir"/downloaded-artifacts.txt
-)
-
-package() (
-  _setup_env
-  cd "$srcdir"/apache-maven-$pkgver
-  ant "${ant_args[@]}" extract-assembly
-  #rm "$pkgdir"/opt/maven/*.txt
-
-  # Install config file in /etc
-  #  Unlike the other directories, we symlink from the system to /opt/maven
-  #  because that way all conf files stay in /etc
-  install -d "$pkgdir"/etc/maven
-  sed "55i<localRepository>$_M2_LOCALREPO</localRepository>" \
-    < "$pkgdir"/opt/maven/conf/settings.xml \
-    > "$pkgdir"/etc/maven/settings.xml
-  rm -rf "$pkgdir"/opt/maven/conf
-  ln -s /etc/maven "$pkgdir"/opt/maven/conf
-
-  # Install profile.d settings
-  install -d "$pkgdir"/etc/profile.d
-  install -m 755 "$srcdir"/maven.{csh,sh} "$pkgdir"/etc/profile.d
-
-  # Link executables to /usr/bin
-  install -d "$pkgdir"/usr/bin
-  ln -s /opt/maven/bin/{mvn,mvnDebug,mvnyjp} "$pkgdir"/usr/bin
-
-  # Link jar files to appropriate place in /usr/share
-  install -d "$pkgdir"/usr/share/java
-  ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven
-
-  # Install the local repo
-  mkdir -p "$pkgdir"${_M2_LOCALREPO%/*}
-  cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO
-  # Remove extra artifacts
-  find "$pkgdir"$_M2_LOCALREPO -type l -delete
-  find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete
-  cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do
-    rm -f "$pkgdir"$_M2_LOCALREPO/$artifact*
-  done
-)
-
-md5sums=('b88becd8fe5a9665191e05945942db64'
-         '58820067a4d7384477daa134023d9b57'
-         'e2bbdeffed100cd51d05b2ba8ebd6321')
diff --git a/java-ugly/maven/maven.csh b/java-ugly/maven/maven.csh
deleted file mode 100644
index f5750cfc8..000000000
--- a/java-ugly/maven/maven.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv MAVEN_OPTS -Xmx512m
-setenv M2_HOME=/opt/maven
diff --git a/java-ugly/maven/maven.sh b/java-ugly/maven/maven.sh
deleted file mode 100644
index b6655cc22..000000000
--- a/java-ugly/maven/maven.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-export MAVEN_OPTS=-Xmx512m
-export M2_HOME=/opt/maven