gentoo resync : 14.07.2018

11 files changed, 0 insertions, 806 deletions

diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
deleted file mode 100644
index 761bea0eaccd..000000000000
--- a/dev-java/maven-bin/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX maven 5108 BLAKE2B ea00d51464bb983871760ea1683a4b3f9129a5c91040fe7d1e86998e46c6938df49481f26a0d1c94d32d2419544824022aaa439cd7c01edaaa391428e455e32b SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b
-DIST apache-maven-2.0.11-bin.tar.bz2 2104711 BLAKE2B 4bc6272957f3e258135d4efacacc625f63522a7e0277e3383ec27a9906e8e4b41cb606d44b30ba870fa5c05d79a45d26af9af00cbffb7615087949c2eec563f7 SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de
-DIST apache-maven-2.2.1-bin.tar.bz2 2839688 BLAKE2B 64427a0e8925c7ec4567a96878c389635aaf578a6569825749fb5786ee7566654d5e6583d40cced8e3585b72bc1cee70567388cddf32393ff1fb5962a4ad96eb SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7
-DIST apache-maven-3.0.4-bin.tar.gz 4873043 BLAKE2B 6cdbc6362dfd766f8e14298873f574fff1a6b4c4e29011a234ff7f3f0d2350a7fe7ff26dd68d486b68d84ba575d77324d0cb950e0cea91894a2f0ce81da0f7de SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c
-DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
-DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
-DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
-DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0
-EBUILD maven-bin-1.1-r3.ebuild 943 BLAKE2B 184f9d88036feecc7cf657e8bd792c126d2a5bebdc232a62c80ae845df5b9800cec324e07d543fad664add754fdc611c5b45b37eaae40ffc29767bfd5d63c2d0 SHA512 cfde3cb81d60eca2ff500228baf7aa5aaffbaa333d8364f05143811aee48b263dc3df8f5f2764bd486f04271f916e52250b7ec019fa80792527a4ca2c591e110
-EBUILD maven-bin-2.0.11-r2.ebuild 1198 BLAKE2B 7077d0a91ecffc1f5fb6e018d11a4bc0f17b477d39a46e14a4017e0cbfa9ce8136a4fb8b54d89371aa317083b7aa3374b69fedc045e935c9e1bfb53209b86002 SHA512 87e71fab63238961ab03f2509c1b1a7f19e5d027072d1c48c8e4a0b726a15e5e502e1f5afbe19fb95a2159c48ce88e742f8266bbf154ddaebdeeb4cb82379433
-EBUILD maven-bin-2.2.1-r2.ebuild 1198 BLAKE2B 53c2334854fa9215a3f9fc3b444d06363b74a7aa6444d88c742c3fe7cd83d9bce570cb8a4142db22dd4fb109f384f37619b28f91b6d17c952b9ccc17feab5503 SHA512 81db5d6d926eba62e7104a832c50799474e7a1ff2aeda48c9f0d37cb9d5649159881afecc68850538f0f946c7de6559faf6fbe728b9e1199f4a55c9cc5c5cfdf
-EBUILD maven-bin-3.0.4-r1.ebuild 1275 BLAKE2B aa254e625be8d5697261fdcafb064050a4918a77e19bc1ff16381b344347e4da0eb33dd639e4cfc0c74bc5557879dc8156a9e5ab8f851c74d746ac778fb1884a SHA512 962818f9a4762a4422498d67ee878d2e2cf33f1372192e4d8c1becae1357daef156a6588a08e7b7d43190b914d9b6d341a7cac61ce4161fd9ca1b35a1eb74fd9
-EBUILD maven-bin-3.1.1.ebuild 2276 BLAKE2B 460b49a29f7aa9f07b672a2751b3a5df3ec6f7027380cb0c84ca4e6146c39da92f52dc6a3158c7e51e74311a1ef4d01402c27f426d9ce5bfb83ebe485b27c083 SHA512 42935864e2af19b20851fdada4ba22562a995fca5bcc63e178c0771ff5d6d9560806cb288ddf9663b1da12d1242627cf9c7903ad8acef32174b2848b4527a096
-EBUILD maven-bin-3.2.5.ebuild 2283 BLAKE2B 5d3292e5f0f2a50e0bb3fe71150d0853947af536432d6b7c6e159fd2cd16a387ee8aa0c3682ca4fc65211f1a32d8d246a901487c9445036285c57fa3397edbd8 SHA512 2a8e8145a454c2f88cf4d48c9cfc2a2cd7689f38f3ce53ffb6d579523aed92d04fe1c3368d8da1035c9ccff8c77142db25dd8fdb6a0d5a9682daf733bd6da71e
-EBUILD maven-bin-3.3.3-r1.ebuild 2220 BLAKE2B a781e334df1a9afd6b0ed76e0c67f29d20777384e7f99d54aea6c140669cdef3e060e3cac6925f7c77eabf5580296416984b21cf479d093f038e5276d09d99a3 SHA512 188beb36be65bc2699fee7ed75407399ecd66e13791242cb12de9a1c18a0c8a233018f5e86d779e597d6a7f7c0e7001a726b437a65c1e51bfba69af57a188683
-EBUILD maven-bin-3.3.9.ebuild 2222 BLAKE2B fe852cdf3e64577d3565cef67ac1be99e9d9a435dbae7609b46b53f18c0198da4da1f45bb5c55a9973eeb3d0656eee2cfe6fc52efe2dfa196c1142f2d2b7d165 SHA512 5ed211c1017f9079251f7888c9920d3bf37fe2d9be680f0d7dbc142da340da6467b328d3972c6d69cf26eb57f2e80d084f25344e02174953aa886f76b6a3a8ef
-MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/files/maven b/dev-java/maven-bin/files/maven
deleted file mode 100644
index 97f09f065f45..000000000000
--- a/dev-java/maven-bin/files/maven
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-#  Copyright 2001-2004 The Apache Software Foundation.
-#  
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#  
-#       http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# ----------------------------------------------------------------------------
-
-#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
-#   reserved.
-
-FOREHEAD_VERSION=1.0-beta-5
-
-if [ -z "$MAVEN_OPTS" ] ; then
-  MAVEN_OPTS="-Xmx256m"
-fi
-
-if [ -f "$HOME/.mavenrc" ] ; then
-  . "$HOME/.mavenrc"
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true 
-           if [ -z "$JAVA_VERSION" ] ; then
-             JAVA_VERSION="CurrentJDK"
-           else
-             echo "Using Java version: $JAVA_VERSION"
-           fi
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
-           fi
-           ;;
-esac
-
-  # try a couple ways to find MAVEN_HOME
-
-  if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
-    MAVEN_HOME=/opt/maven
-  fi
-
-  if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
-    MAVEN_HOME="$HOME/maven"
-  fi
-
-  # try to load from env.d file
-  if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
-  	MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
-  fi
-
- # try to figure it out from how this script was invoked
-  if [ -z ${MAVEN_HOME} ]; then
-    ## resolve links - $0 may be a link to maven's home
-    PRG=$0
-    progname=`basename $0`
-    saveddir=`pwd`
-
-    # need this for relative symlinks
-    cd `dirname $PRG`
-
-    while [ -h "$PRG" ] ; do
-      ls=`ls -ld "$PRG"`
-      link=`expr "$ls" : '.*-> \(.*\)$'`
-      if expr "$link" : '.*/.*' > /dev/null; then
-        PRG="$link"
-      else
-        PRG="`dirname $PRG`/$link"
-      fi
-    done
-
-    MAVEN_HOME=`dirname "$PRG"`/..
-
-    # make it fully qualified
-    MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-
-    cd $saveddir
-  fi
-
-[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=java
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
-fi
-
-MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$HOME" ] &&
-    HOME=`cygpath --path --windows "$HOME"`
-  [ -n "$MAVEN_ENDORSED" ] &&
-    MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
-fi
-
-# For Darwin, use classes.jar for TOOLS_JAR
-TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
-if $darwin; then
-  TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
-fi
-
-MAIN_CLASS=com.werken.forehead.Forehead
-if [ -n "$MAVEN_HOME_LOCAL" ]; then
-  MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}" 
-fi
-  
-"$JAVACMD" \
-  $MAVEN_OPTS \
-  -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-  -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
-  "-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
-  -classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
-  "-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf"  \
-  "-Dtools.jar=$TOOLS_JAR" \
-  "-Dmaven.home=${MAVEN_HOME}" \
-  $MAIN_CLASS "$@"
-
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
deleted file mode 100644
index dc990e66e4cb..000000000000
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_PN=${PN/-bin}
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-MAVEN=${PN}-${SLOT}
-MAVEN_HOME="/usr/share/${MAVEN}"
-MAVEN_BIN="${MAVEN_HOME}/bin"
-
-src_install() {
-	dodir ${MAVEN_HOME}
-	insinto ${MAVEN_HOME}
-	doins -r bin lib *.xsd plugins
-
-	dodir ${MAVEN_BIN}
-	exeinto ${MAVEN_BIN}
-	doexe "${FILESDIR}/${MY_PN}"
-
-	dodir /usr/bin
-	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
deleted file mode 100644
index 849b313ae57d..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.4
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
deleted file mode 100644
index 43b208161178..000000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
deleted file mode 100644
index 2a1fd224356b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
deleted file mode 100644
index 0063d4ff7c7b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-	dev-java/aopalliance:1
-	dev-java/avalon-framework:4.1
-	dev-java/commons-cli:1
-	dev-java/commons-io:1
-	dev-java/javax-inject:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/juel:0
-	dev-java/osgi-core-api:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
deleted file mode 100644
index a92297f4dfb0..000000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-dev-java/aopalliance:1
-dev-java/avalon-framework:4.1
-dev-java/commons-cli:1
-dev-java/commons-io:1
-dev-java/javax-inject:0
-dev-java/jsoup:0
-dev-java/jsr250:0
-dev-java/juel:0
-dev-java/osgi-core-api:0
-java-virtuals/interceptor-api:0
-java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.6
->=virtual/jre-1.6
-${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
deleted file mode 100644
index d0a6200c052b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
deleted file mode 100644
index a40b338ff43f..000000000000
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/metadata.xml b/dev-java/maven-bin/metadata.xml
deleted file mode 100644
index af5cc0fd07e0..000000000000
--- a/dev-java/maven-bin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM.</longdescription>
-</pkgmetadata>