summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Gardner <je_fro@gentoo.org>2012-05-31 20:27:46 +0000
committerJeffrey Gardner <je_fro@gentoo.org>2012-05-31 20:27:46 +0000
commit28d2c28943a8cbfa4a8113eb2671d320add8058d (patch)
treeae66322da7d6e9b8ace3a79fc15114df3f0f5d75
parentLatest Jmol for testing (diff)
downloadje_fro-28d2c28943a8cbfa4a8113eb2671d320add8058d.tar.gz
je_fro-28d2c28943a8cbfa4a8113eb2671d320add8058d.tar.bz2
je_fro-28d2c28943a8cbfa4a8113eb2671d320add8058d.zip
Cleanup
svn path=/; revision=336
-rw-r--r--sci-libs/naga/Manifest3
-rw-r--r--sci-libs/naga/naga-2.1.ebuild13
-rw-r--r--sci-libs/naga/naga-3.0.ebuild29
3 files changed, 8 insertions, 37 deletions
diff --git a/sci-libs/naga/Manifest b/sci-libs/naga/Manifest
index 36e44e8..9939372 100644
--- a/sci-libs/naga/Manifest
+++ b/sci-libs/naga/Manifest
@@ -1,4 +1,3 @@
-EBUILD naga-2.1.ebuild 578 RMD160 8e363a9fe7f811a36696d0b8ebd96b40089e45cb SHA1 1469b9f89f55418f02241aa3d7f9baff3f27fc5e SHA256 83fba6460c59f16f122ab45daf3124e022b0e6dffcd5a2571628febfd3b9e9d8
-EBUILD naga-3.0.ebuild 576 RMD160 75ff44344b5af9c3e888c8f176bc740192f8d4e7 SHA1 87fbb2b2d96705778f5b8c89523a656a5465618a SHA256 39628a3d8aeb42477a3d812b4985f115606bd91f7690532953214df95c4c0c81
+EBUILD naga-2.1.ebuild 591 RMD160 d06971567e4ff00520b36a77098ead399536a5c0 SHA1 53e19fa72038b2f6b1ebabb23f1cb27ee07ecd29 SHA256 83a0eb91324317332e5d0819c0a12a6345d12ce8cfaa168cc953014fe0754fe8
MISC ChangeLog 378 RMD160 c3995eb59b80fef5d249bbf3063d49ee0900d699 SHA1 5848423d1c159c180199cca740de4494a039ecbe SHA256 a12f9ae7dc4216c9deef15db5f7244eecd2842ede4ab0268664cd737c5f1130d
MISC metadata.xml 281 RMD160 8d2f06c351e0b0756ea539eb32e2faa8dec4b64a SHA1 9ee2c10cfadb609245eff08b108f809b1d0f1046 SHA256 d91256704dd7de0642182be6f861a9cdce239252bcd7567364dca852ef907b35
diff --git a/sci-libs/naga/naga-2.1.ebuild b/sci-libs/naga/naga-2.1.ebuild
index b74fe15..588e30e 100644
--- a/sci-libs/naga/naga-2.1.ebuild
+++ b/sci-libs/naga/naga-2.1.ebuild
@@ -5,7 +5,9 @@ EAPI=4
inherit subversion java-pkg-2 java-ant-2
-ESVN_REPO_URI="http://naga.googlecode.com/svn/trunk@42"
+ESVN_REPO_URI="http://naga.googlecode.com/svn/trunk@57"
+MY_PV=${PV//./_}
+MY_PVR="${MY_PV}-r43"
DESCRIPTION="Simplified Java NIO asynchronous sockets"
HOMEPAGE="http://code.google.com/p/naga/"
@@ -15,15 +17,14 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-
-# JAVA_PKG_BSFIX="off"
+RDEPEND=">=virtual/jre-1.5"
src_compile() {
eant build
}
+
src_install() {
- java-pkg_newjar _DIST/naga-debug-3_0-r49.jar ${PN}.jar
+ java-pkg_newjar _DIST/${PN}-${MY_PVR}.jar ${PN}.jar
}
diff --git a/sci-libs/naga/naga-3.0.ebuild b/sci-libs/naga/naga-3.0.ebuild
deleted file mode 100644
index dd558e8..0000000
--- a/sci-libs/naga/naga-3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=4
-
-inherit subversion java-pkg-2 java-ant-2
-
-ESVN_REPO_URI="http://naga.googlecode.com/svn/trunk@78"
-
-DESCRIPTION="Simplified Java NIO asynchronous sockets"
-HOMEPAGE="http://code.google.com/p/naga/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-
-JAVA_PKG_BSFIX="off"
-
-src_compile() {
- eant build
-}
-src_install() {
- java-pkg_newjar _DIST/naga-debug-3_0-r49.jar ${PN}.jar
-}