[gentoo-commits] repo/proj/prefix:master commit in: dev-java/maven-bin/, dev-java/maven-bin/files/, dev-java/winjdk-bin/, ...

[Fabian Groffen]

commit:     e7e33afb7ad6eab1639c6cb7a86c93295f75851b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 19:21:39 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May  4 19:21:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e7e33afb

dev-java: drop obsoleted pkgs

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-java/jgoodies-forms/Manifest                   |   2 -
 .../jgoodies-forms/jgoodies-forms-1.1.0.ebuild     |  59 -----------
 .../jgoodies-forms/jgoodies-forms-1.3.0.ebuild     |  59 -----------
 dev-java/jgoodies-forms/metadata.xml               |   8 --
 dev-java/maven-bin/Manifest                        |   4 -
 .../maven-bin/files/maven-bin-2.0.8-prefix.patch   |  35 -------
 .../maven-bin/files/maven-bin-3.0.3-prefix.patch   |  37 -------
 dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild       |  63 ------------
 dev-java/maven-bin/maven-bin-2.2.1.ebuild          |  53 ----------
 dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild       |  64 ------------
 dev-java/maven-bin/maven-bin-3.2.5.ebuild          |  93 -----------------
 dev-java/maven-bin/maven-bin-3.3.9.ebuild          | 114 ---------------------
 dev-java/maven-bin/metadata.xml                    |   9 --
 dev-java/winjdk-bin/Manifest                       |   1 -
 dev-java/winjdk-bin/metadata.xml                   |  34 ------
 dev-java/winjdk-bin/winjdk-bin-1.6.0.07-r1.ebuild  |  91 ----------------
 16 files changed, 726 deletions(-)

diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
deleted file mode 100644
index a7d4372a5b..0000000000
--- a/dev-java/jgoodies-forms/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST forms-1_1_0.zip 1174978 BLAKE2B ff551a826394f0de8e75fc4617de72534bf64c6386afba8655285426b56a86558cc0b86929df27fc7dbb26866c205774b31c39c15feadc4bd7232e23b8c067fc SHA512 fa08486d5f743910e7476ce102c7b3d11fc66b8c44931fe8396825be293c04be85cc497d33c8494faa7d9296bb557623e2cc6674c614642fd864fcad8db9e6b0
-DIST forms-1_3_0.zip 1320397 BLAKE2B a520ffe8a5487d125a53bed8d8524b68f68aaf1444389e4038af5f9a035ce800fdb1a470d172ec442240d5530e4c34cd34a0523a5ab92888daa57f543defd296 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8

diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.1.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.1.0.ebuild
deleted file mode 100644
index 56409b420b..0000000000
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.1.0.ebuild,v 1.7 2009/12/29 17:35:23 josejx Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 java-utils-2 eutils
-
-MY_PN="forms"
-MY_PV=${PV//./_}
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="JGoodies Forms Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A} || die "Unpack failed"
-	cd "${S}"
-
-	# Remove the packaged jars
-	rm -v *.jar || die "rm failed"
-}
-
-src_compile() {
-	# it does not like unset ${build.compiler.executable}
-	# feel free to fix if you want jikes back
-	java-pkg_filter-compiler jikes
-	# not setting the bootcp breaks ecj, javac apparently ignores nonsense
-	[[ $(java-pkg_get-vm-vendor) == apple ]] && \
-	eant jar || \
-	eant -Dbuild.boot.classpath="$(java-config -g BOOTCLASSPATH)" jar
-}
-
-#Needs X
-#src_test() {
-#	ANT_TASKS="ant-junit" eant test \
-#		-Djunit.jar="$(java-pkg_getjars junit)"
-#}
-
-src_install() {
-	java-pkg_dojar build/${MY_PN}.jar
-
-	dodoc RELEASE-NOTES.txt README.html
-
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/{core,extras}/com
-	use examples && java-pkg_doexamples src/tutorial
-}

diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
deleted file mode 100644
index c080ffa186..0000000000
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.3.0.ebuild,v 1.6 2012/09/29 17:43:42 grobian Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 java-utils-2 eutils
-
-MY_PN="forms"
-MY_PV=${PV//./_}
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="JGoodies Forms Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A} || die "Unpack failed"
-	cd "${S}"
-
-	# Remove the packaged jars
-	rm -v *.jar || die "rm failed"
-}
-
-src_compile() {
-	# it does not like unset ${build.compiler.executable}
-	# feel free to fix if you want jikes back
-	java-pkg_filter-compiler jikes
-	# not setting the bootcp breaks ecj, javac apparently ignores nonsense
-	[[ $(java-pkg_get-vm-vendor) == apple ]] && \
-	eant jar || \
-	eant -Dbuild.boot.classpath="$(java-config -g BOOTCLASSPATH)" jar
-}
-
-#Needs X
-#src_test() {
-#	ANT_TASKS="ant-junit" eant test \
-#		-Djunit.jar="$(java-pkg_getjars junit)"
-#}
-
-src_install() {
-	java-pkg_dojar build/${MY_PN}.jar
-
-	dodoc RELEASE-NOTES.txt README.html || die
-
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/{core,extras}/com
-	use examples && java-pkg_doexamples src/tutorial
-}

diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
deleted file mode 100644
index 952a4b9b60..0000000000
--- a/dev-java/jgoodies-forms/metadata.xml
+++ /dev/null
@@ -1,8 +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@g.o</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
deleted file mode 100644
index 8022679aff..0000000000
--- a/dev-java/maven-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
-DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0

diff --git a/dev-java/maven-bin/files/maven-bin-2.0.8-prefix.patch b/dev-java/maven-bin/files/maven-bin-2.0.8-prefix.patch
deleted file mode 100644
index 6e04de732f..0000000000
--- a/dev-java/maven-bin/files/maven-bin-2.0.8-prefix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- bin/mvn
-+++ bin/mvn
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # ----------------------------------------------------------------------------
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-@@ -41,8 +41,8 @@
- 
- done
- 
--if [ -f /etc/mavenrc ] ; then
--  . /etc/mavenrc
-+if [ -f @GENTOO_PORTAGE_EPREFIX@/etc/mavenrc ] ; then
-+  . @GENTOO_PORTAGE_EPREFIX@/etc/mavenrc
- fi
- 
- if [ -f "$HOME/.mavenrc" ] ; then
-@@ -62,14 +62,11 @@
-            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
- 
- if [ -z "$JAVA_HOME" ] ; then
--  if [ -r /etc/gentoo-release ] ; then
-+  if [ -r @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release ] ; then
-     JAVA_HOME=`java-config --jre-home`
-   fi
- fi

diff --git a/dev-java/maven-bin/files/maven-bin-3.0.3-prefix.patch b/dev-java/maven-bin/files/maven-bin-3.0.3-prefix.patch
deleted file mode 100644
index 69fdde95cd..0000000000
--- a/dev-java/maven-bin/files/maven-bin-3.0.3-prefix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur apache-maven-3.0.3.orig/bin/mvn apache-maven-3.0.3/bin/mvn
---- apache-maven-3.0.3.orig/bin/mvn	2011-02-28 18:33:40.000000000 +0100
-+++ apache-maven-3.0.3/bin/mvn	2011-05-01 12:59:46.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # ----------------------------------------------------------------------------
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements.  See the NOTICE file
-@@ -36,8 +36,8 @@
- 
- if [ -z "$MAVEN_SKIP_RC" ] ; then
- 
--  if [ -f /etc/mavenrc ] ; then
--    . /etc/mavenrc
-+  if [ -f @GENTOO_PORTAGE_EPREFIX@/etc/mavenrc ] ; then
-+    . @GENTOO_PORTAGE_EPREFIX@/etc/mavenrc
-   fi
- 
-   if [ -f "$HOME/.mavenrc" ] ; then
-@@ -57,14 +57,11 @@
-            if [ -z "$JAVA_VERSION" ] ; then
-              JAVA_VERSION="CurrentJDK"
-            fi
--           if [ -z "$JAVA_HOME" ] ; then
--             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
--           fi
-            ;;
- esac
- 
- if [ -z "$JAVA_HOME" ] ; then
--  if [ -r /etc/gentoo-release ] ; then
-+  if [ -r @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release ] ; then
-     JAVA_HOME=`java-config --jre-home`
-   fi
- fi
-Only in apache-maven-3.0.3: prefix.patch

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 eda3d7d584..0000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.6 2015/03/31 18:58:00 ulm Exp $
-
-EAPI="4"
-
-inherit java-pkg-2 prefix
-
-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-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
-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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.8-prefix.patch
-	eprefixify bin/mvn
-}
-
-# 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.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
deleted file mode 100644
index bbcaf5ba2f..0000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.8 2015/03/31 18:58:00 ulm Exp $
-
-inherit java-pkg-2 prefix
-
-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-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-eselect/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.8-prefix.patch
-	eprefixify bin/mvn
-}
-
-# 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 || die
-
-	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}"
-}

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 8706973e65..0000000000
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.6 2015/03/31 18:58:00 ulm Exp $
-
-EAPI="4"
-
-inherit java-pkg-2 prefix
-
-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-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
-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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.3-prefix.patch
-	eprefixify bin/mvn
-}
-
-# 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.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
deleted file mode 100644
index 68aa4d133b..0000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.5.ebuild,v 1.2 2015/03/31 18:58:00 ulm Exp $
-
-EAPI="5"
-
-inherit java-pkg-2 prefix
-
-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-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-# 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
-
-	hprefixify -w 1 bin/mvn
-	hprefixify -q '"' bin/mvn
-	# disable searching for JDKs on Darwin, rely on java-config instead
-	sed -i -e 's/Darwin/Gentoo-no-Darwin/' bin/mvn
-
-	# 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.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
deleted file mode 100644
index 3c146d7c3a..0000000000
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 prefix
-
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# 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
-
-	hprefixify -w 1 bin/mvn
-	hprefixify -q '"' bin/mvn
-	# disable searching for JDKs on Darwin, rely on java-config instead
-	sed -i -e 's/Darwin/Gentoo-no-Darwin/' bin/mvn
-
-	# 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 af5cc0fd07..0000000000
--- 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@g.o</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>

diff --git a/dev-java/winjdk-bin/Manifest b/dev-java/winjdk-bin/Manifest
deleted file mode 100644
index 495ed19fd8..0000000000
--- a/dev-java/winjdk-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jdk1.6.0_07-windows-i586.tar.bz2 53649266 RMD160 513480b31eb8c5ebc8d2010e3467f5aa3e4f6619 SHA1 343ef929a2ffd98250fa053d3453f976491c5e62 SHA256 dc265c4b4841265e38c8c24298ceb76a8c653df292791e75063daca2337a4053

diff --git a/dev-java/winjdk-bin/metadata.xml b/dev-java/winjdk-bin/metadata.xml
deleted file mode 100644
index 46a44e5754..0000000000
--- a/dev-java/winjdk-bin/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!-- 
-$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
-
-This is the example metadata file.
-The root element of this file is <pkgmetadata>. Within this element a 
-number of subelements are allowed: herd, maintainer, and 
-longdescription. herd is a required subelement.
-
-For a full description look at:
-http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
-
-
-Before committing, please remove the comments from this file. They are 
-not relevant for general metadata.xml files.
--->
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
-</maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
-<!--
-<use>
-  <flag name='flag'>Description of how USE='flag' affects this package</flag>
-  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
-	  package</flag>
-  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
-	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
-</use>
--->
-</pkgmetadata>

diff --git a/dev-java/winjdk-bin/winjdk-bin-1.6.0.07-r1.ebuild b/dev-java/winjdk-bin/winjdk-bin-1.6.0.07-r1.ebuild
deleted file mode 100644
index f10eb77e91..0000000000
--- a/dev-java/winjdk-bin/winjdk-bin-1.6.0.07-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.07-r1.ebuild,v 1.1 2008/09/09 14:00:30 betelgeuse Exp $
-
-inherit versionator eutils
-
-UPDATE="$(get_version_component_range 4)"
-UPDATE="${UPDATE#0}"
-MY_PV="$(get_version_component_range 2)u${UPDATE}"
-
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/javase/6/"
-
-# the winnt source file is a repackage of a normal windows installation.
-# the normal sdk setup .exe was installed with this command line:
-# jdk-6u7-windows-i586-p.exe /s /v "/qn ADDLOCAL=ToolsFeature,DemosFeature INSTALLDIR=C:\java\jdk1.6.0_07 REBOOT=SUPPRESS"
-# then the C:\java\jdk1.6.0_07 dir was added to a bz2 and thats it...
-SRC_URI="http://dev.gentoo.org/~mduft/java/jdk$(replace_version_separator 3 _)-windows-i586.tar.bz2"
-LICENSE="dlj-1.1"
-
-# WARNING: windows JDK not slotted for now, since we cannot use java-config
-SLOT="0"
-KEYWORDS="-* ~x86-winnt"
-RESTRICT="strip"
-IUSE="doc examples"
-
-RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* )"
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _)"
-
-src_install() {
-	local dirs="bin include jre lib"
-	local javadir=/usr
-
-	dodir ${javadir}
-
-	cp -pPR $dirs "${ED}${javadir}/" || die "failed to copy"
-	dodoc COPYRIGHT || die
-	dohtml README.html || die
-
-	# not necessarily there.
-	if [[ -f src.zip ]]; then
-		cp -pP src.zip "${ED}${javadir}/" || die
-	fi
-
-	if use examples; then
-		cp -pPR demo sample "${ED}${javadir}" || die
-	fi
-
-	echo > "${T}"/java-win32-gui.sh <<EOF
-#!/bin/env bash
-executable=
-case "\$0" in
-/*) executable=\$(unixpath2win \$0.exe) ;;
-*) executable=\$0.exe ;;
-esac
-
-runwin32 \$executable
-EOF
-
-	into /usr
-	dobin "${T}"/java-win32-gui.sh
-
-	# for easy work from command lines, create links to .exe files:
-	for x in $(find "${ED}" -name '*.exe'); do
-		if file ${x} | grep "GUI" > /dev/null 2>&1; then
-			# don't create a link, but rather create a small wrapper calling
-			# runwin32.
-			ln -sf java-win32-gui.sh "${x%.exe}"
-		else
-			ln -sf "$(basename "${x}")" "${x%.exe}"
-		fi
-	done
-
-	ln -sf ../../bin/java-win32-gui.sh "${ED}${javadir}"/jre/bin/java-win32-gui.sh
-
-	echo "JDK_HOME=${EPREFIX}${javadir}" >> "${T}"/98winjdk.env
-	echo "JAVA_HOME=${EPREFIX}${javadir}" >> "${T}"/98winjdk.env
-	echo "JAVAC=javac" >> "${T}"/98winjdk.env
-
-	doenvd "${T}"/98winjdk.env
-}
-
-pre_pkg_preinst() {
-	# remove the jre/bin/java symlink again, which has been created by
-	# profile.bashrc. this causes problems with java when trying to execute
-	# itself from this dir (because it omits .exe and cannot execute a link from
-	# native windows ... )
-	rm -f "${ED}"/usr/jre/bin/java
-}