dev-java/javahelp: version bump

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 98 insertions, 3 deletions

diff --git a/dev-java/javahelp/ChangeLog b/dev-java/javahelp/ChangeLog
index ebb4a488fb52..64198b801ccc 100644
--- a/dev-java/javahelp/ChangeLog
+++ b/dev-java/javahelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/javahelp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp/ChangeLog,v 1.16 2010/01/15 17:32:51 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp/ChangeLog,v 1.17 2011/01/23 14:22:08 fordfrog Exp $
+
+*javahelp-2.0.05_p63 (23 Jan 2011)
+
+  23 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +javahelp-2.0.05_p63.ebuild:
+  Version bump, switched to EAPI3, switched to virtual servlet-api
 
   15 Jan 2010; Fabian Groffen <grobian@gentoo.org>
   javahelp-2.0.02_p46.ebuild:
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 071ae8fbe0d5..d33f66d81171 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,4 +1,6 @@
 DIST javahelp2-src-2.0.02_svn46.zip 6518989 RMD160 c9737aa99cc8c7143972cc3c2f53acd6d56db75b SHA1 93e03e15cefaae066abfb8b55507c30df3fe4d9e SHA256 97979f8cb8d8c43f040a1fb4ca998e9e209f5b7c898648e57c7337ec4458ea2f
+DIST javahelp2-src-2.0.05_svn63.zip 3747088 RMD160 20d510dea595d6c2edc2ecd46265eeb6cf509787 SHA1 478d71f4957c037c0da2f8a3b0eeb10bdd5f3acb SHA256 a864ac71701ed8d12ba192460cd7b4d51e78813f39a140ede5d9b04afd9eae92
 EBUILD javahelp-2.0.02_p46.ebuild 2382 RMD160 d575080112640d0f5c8d3bdf7ade628cdd1e8979 SHA1 001cfee1cf80d9451496e9d80cb031f3cb318689 SHA256 3d7d9a33452b8379558c025f76249a031269bc0a285fed59c349a7112d0249e8
-MISC ChangeLog 1656 RMD160 deee4ba36774147fdd0afcd52f71ddc871d56e8a SHA1 2529d476f446557b4dab1c0eb932ff43479e8ee9 SHA256 1104877014ab4a325b0ef8b9f6d4ba6e988f6e95689b14a95f76dc1bdca68b64
+EBUILD javahelp-2.0.05_p63.ebuild 2432 RMD160 89476fd248176664f2bba0a77308a66d715debdd SHA1 31a8b963627d370deae9d48fbf3665d41ff9ac30 SHA256 7ab4e250f6a09309b5edb09bc0cc406a8b37327cdde929d2cf4db1cbf896cf89
+MISC ChangeLog 1844 RMD160 90ec70f39505f8753eb8fd60d792088b45d6d2c0 SHA1 a98be8938e857fafb255e8b5d93fd50d7f120962 SHA256 ca979fd609cfba101e2185f9ec11cf666a4ce0f8bc47a01da6c6738d67bf21d8
 MISC metadata.xml 546 RMD160 89007ee65ee88928500aa82dbda962e5cde433bb SHA1 77b50fc864d994a7212414144c563db3e3941f7a SHA256 278d5c686df4b729411d0bf851424a4358f078d934f7a03d1f318176d6649d1a
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
new file mode 100644
index 000000000000..dfb9c943d0df
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javahelp/javahelp-2.0.05_p63.ebuild,v 1.1 2011/01/23 14:22:08 fordfrog Exp $
+
+EAPI="3"
+
+WANT_ANT_TASKS="ant-nodeps"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javahelp.dev.java.net/"
+
+MY_PV="${PV/_p/_svn}"
+MY_PN="${PN}2"
+SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${MY_PV}.zip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+
+COMMON_DEP="
+	java-virtuals/servlet-api:2.4"
+RDEPEND="
+	>=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND="
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/"
+BDIR="${S}/javahelp_nbproject"
+
+src_unpack() {
+	unpack ${A}
+	# jdic does not currently build out of the box against the browsers we have
+	cd "${S}/jhMaster/JavaHelp/src/new/" || die
+	rm -v javax/help/plaf/basic/BasicNativeContentViewerUI.java || die
+	mkdir "${BDIR}/lib" && cd "${BDIR}/lib" || die
+	java-pkg_jar-from --virtual servlet-api-2.4
+	java-pkg_filter-compiler jikes
+}
+
+_eant() {
+	cd ${BDIR} || die
+	eant \
+		-Dservlet-jar="$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar)" \
+		-Djsp-jar="$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)" \
+		-Djdic-jar-present=true \
+		-Djdic-zip-present=true \
+		-Dtomcat-zip-present=true \
+		-Dservlet-jar-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release $(use_doc)
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	pushd jhMaster/JavaHelp >/dev/null || die
+	java-pkg_dojar "${BDIR}"/dist/lib/*.jar
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+	use doc && java-pkg_dojavadoc "${BDIR}/dist/lib/javadoc"
+	popd >/dev/null || die
+
+	use source && java-pkg_dosrc \
+		./jhMaster/JSearch/*/com \
+		./jhMaster/JavaHelp/src/*/{javax,com}
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
+
+pkg_postinst() {
+	elog "Native browser integration is disabled because it needs jdic"
+	elog "which does not build out of the box. See"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=53897 for progress"
+}