dev-java/opencsv: Stable for amd64. Retroactively mark stable for the remaining arche...

Package-Manager: portage-2.2.26

diff --git a/dev-java/opencsv/Manifest b/dev-java/opencsv/Manifest
index ea2f0500b8c5b50fb399d7a861e385c0322a0089..583eedc6047edaa9e9b8ab2675ad08de9651cef1 100644 (file)
--- a/dev-java/opencsv/Manifest
+++ b/dev-java/opencsv/Manifest
@@ -1 +1 @@
-DIST opencsv-2.3-src-with-libs.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a
+DIST opencsv-2.3.tar.gz 280510 SHA256 04ebc52af08b20e18c193f194ea9d169a7737403b2376f1707d858dbd4e7950d SHA512 3831cb9c5aaf8b19ed6895406e7358ddb6b30cba1876b42daeab41230d83bd532b9db53c073960413a385222ca889f1aae14404fd46143aa28ee05b3d1019106 WHIRLPOOL 069c1bf477c04f0ad6db927e7179c0dc29104c48e179f0fcf8e4c42b0de2e83e3e3ab5fd80ebbd8e13e12cacfbe231097b675e99ecb0ef1610277dbc9a9c927a

diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index 242503b3aaf40d50ac1d4ebe8d9865c326318e79..a6f96d817d89cc244271243688d3150d197eeccc 100644 (file)
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/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
 }