dev-java/opencsv: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy.

Package-Manager: portage-2.2.26

dev-java/opencsv/opencsv-2.3.ebuild

@@ -6,32 +6,32 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A very simple csv (comma-separated values) parser library for Java"
 HOMEPAGE="http://opencsv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src-with-libs.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
-S="${WORKDIR}/${P}"
+RESTRICT="test"
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="app-arch/unzip
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
-RESTRICT="test"
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
 
 java_prepare() {
 	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_newjar deploy/${P}.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/au
+	rm -rf test || die
 }