[gentoo-commits] repo/gentoo:master commit in: dev-java/nachocalendar/

[gentoo-commits] repo/gentoo:master commit in: dev-java/nachocalendar/

[Patrice Clement]

commit:     5919325b42dc58cad9a00e5f65e8cf4c06309c77
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 09:13:43 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 10:01:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5919325b

dev-java/nachocalendar: Clean up old.

Package-Manager: portage-2.2.26

 dev-java/nachocalendar/Manifest                  |  1 -
 dev-java/nachocalendar/nachocalendar-0.23.ebuild | 47 ------------------------
 2 files changed, 48 deletions(-)

diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest
index ee0bdcd..802afe0 100644
--- a/dev-java/nachocalendar/Manifest
+++ b/dev-java/nachocalendar/Manifest
@@ -1,2 +1 @@
 DIST nachocalendar-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
-DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe

diff --git a/dev-java/nachocalendar/nachocalendar-0.23.ebuild b/dev-java/nachocalendar/nachocalendar-0.23.ebuild
deleted file mode 100644
index 7086110..0000000
--- a/dev-java/nachocalendar/nachocalendar-0.23.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Flexible Calendar component to the Java Platform"
-HOMEPAGE="http://nachocalendar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -r doc || die
-	rm -v lib/* || die
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	java-pkg_newjar lib/${P}-demo.jar ${PN}-demo.jar
-	java-pkg_dolauncher nachocalendar-demo --main net.sf.nachocalendar.demo.CalendarDemo
-	dodoc {CHANGELOG,README,TODO}.txt || die
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/java/net
-}
-
-src_test() {
-	cd src/test || die
-	ejavac -cp \
-		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
-		./net/sf/nachocalendar/model/DefaultDataModelTest.java
-	ejavac -cp \
-		"${S}/lib/${P}.jar:$(java-pkg_getjars --build-only junit)" \
-		./net/sf/nachocalendar/model/DefaultDateSelectionModelTest.java
-	ejunit -cp ".:${S}/lib/${P}.jar" \
-		net.sf.nachocalendar.model.DefaultDataModelTest \
-		net.sf.nachocalendar.model.DefaultDateSelectionModelTest
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/nachocalendar/

[Patrice Clement]

commit:     c97e37f27cd9dd03fdfb5adfdf95626a67c7fd4a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 09:12:16 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 10:01:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97e37f2

dev-java/nachocalendar: EAPI 5 bump.

Package-Manager: portage-2.2.26

 dev-java/nachocalendar/Manifest                    |  1 +
 .../nachocalendar/nachocalendar-0.23-r1.ebuild     | 40 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/dev-java/nachocalendar/Manifest b/dev-java/nachocalendar/Manifest
index a050faa..ee0bdcd 100644
--- a/dev-java/nachocalendar/Manifest
+++ b/dev-java/nachocalendar/Manifest
@@ -1 +1,2 @@
+DIST nachocalendar-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe
 DIST nachocalendar-src-0.23.tar.bz2 412489 SHA256 e276b0e7bd7abdeb37feebfc72343f48b617dde3644b20ca5f18ad72dac226c0 SHA512 a7b34d1caab2fb26856bd668a80b7f5c57f192be0729f4f9063600866160c26a4163389bf0136c3f101911f4547c5f474800c8e3d96cc77de6febd589564e98b WHIRLPOOL 1657f1c6c47ef7cd7476ce30b033311e2e56f041e2676ec256f81e9b5381716235a3cec45fd6aee98cef769d5ccc18e1fb356414d2bf901218673a17082cfabe

diff --git a/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
new file mode 100644
index 0000000..0e98741
--- /dev/null
+++ b/dev-java/nachocalendar/nachocalendar-0.23-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Flexible Calendar component to the Java Platform"
+HOMEPAGE="http://nachocalendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf src/test || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" resources
+}