Merge updates from master

This commit is contained in:
Repository QA checks
2015-10-02 19:21:52 -04:00
6 changed files with 34 additions and 75 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="1"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5
-1
View File
@@ -1,2 +1 @@
DIST joni-1.1.4.tar.gz 120701 SHA256 644f24378cffa2efe9d59c3a28616c80319693a42eeb0234550f9e1f2e8ba11e SHA512 68ac4559e3b6ac2506126af7c8159a87a7906fe45e71828478051f1a84a10b9b62c966168b260d1e0b0395cbd1792a428b2e1ac458db32b57b7a84c81f9e7804 WHIRLPOOL fce0621bf6302423c31036cb084f92455578321b940ad6b9a91f078fdadd9a94a4e0f52aeb42a9beb7fb6be3b789a54f99becf094c3a7462d3b9246edbb4967f
DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d
-38
View File
@@ -1,38 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="3"
JAVA_PKG_IUSE="source"
inherit base java-pkg-2 java-ant-2
DESCRIPTION="Java port of the Oniguruma regular expression engine"
HOMEPAGE="http://jruby.codehaus.org/"
SRC_URI="https://github.com/jruby/joni/tarball/${PV} -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
CDEPEND="dev-java/asm:3
dev-java/jcodings:0"
RDEPEND="${CDEPEND}
>=virtual/jre-1.5"
DEPEND="${CDEPEND}
>=virtual/jdk-1.5"
src_unpack() {
unpack ${A}
mv j* "${S}"
}
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_BUILD_TARGET="build"
EANT_GENTOO_CLASSPATH="asm-3 jcodings"
src_install() {
java-pkg_dojar target/${PN}.jar
use source && java-pkg_dosrc src/*
}
+2 -2
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="2.1"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
CDEPEND="dev-java/asm:3
dev-java/jcodings:1"
@@ -0,0 +1,31 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
MY_PN="TGGraphLayout"
DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
HOMEPAGE="http://touchgraph.sourceforge.net"
SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
LICENSE="Apache-1.1"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}/${MY_PN}"
JAVA_SRC_DIR="com"
src_install() {
java-pkg-simple_src_install
dodoc "TGGL ReleaseNotes.txt"
}
@@ -1,33 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
MY_PN="TGGraphLayout"
JAVA_PKG_IUSE="source"
inherit java-pkg-2
DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization"
HOMEPAGE="http://touchgraph.sourceforge.net"
SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip"
LICENSE="Apache-1.1"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jre-1.4"
S="${WORKDIR}/${MY_PN}"
src_compile() {
mkdir -p bin || die
ejavac -d bin `find com -name "*.java" || die`
`java-config -j` cvf ${MY_PN}.jar -C bin . || die
}
src_install() {
java-pkg_newjar ${MY_PN}.jar
dodoc "TGGL ReleaseNotes.txt" || die
use source && java-pkg_dosrc com
}