Drop WANT_ANT_TASKS, add slots to deps, call java-pkg-2_pkg_setup. #466684

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 95 insertions, 16 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index d92995e8af70..acd7d0b3475f 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/jde
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.44 2012/08/23 18:50:34 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.45 2013/05/06 12:49:46 sera Exp $
+
+*jde-2.4.1_pre20110622-r1 (06 May 2013)
+
+  06 May 2013; Ralph Sennhauser <sera@gentoo.org>
+  +jde-2.4.1_pre20110622-r1.ebuild:
+  Drop WANT_ANT_TASKS, add slots to deps, call java-pkg-2_pkg_setup. #466684
 
   23 Aug 2012; Ulrich Müller <ulm@gentoo.org> files/70jde-gentoo.el:
   Suppress checking of CEDET version, bug 431108.
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 36880f6c6ff7..285939843c9a 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -9,23 +9,18 @@ AUX jde-2.4.1-semantic-emacs-24.patch 1140 SHA256 3e6e3a9cb923a462433b6cc5949599
 DIST jde-2.4.0.1.tar.bz2 3719643 SHA256 1481962464e18a11e6dc52a175200d726b0731cca5e09367f510266a424f822a SHA512 ed7957c5ec7a0fb9cdfc87d2f227f7850627e494a4d85712dfb401f4dbb64bad764b104ce41cbd363d4779c404997cd9adb2fa32a33bba4bc644ac1a5aee9ff1 WHIRLPOOL 9f71e0527b2af496c60c4e5549838cb907af4257e07a857eaa00b4ffe8d2a9be2b3d91340b5352c7a55bf540c225d8a621c811df29f095a630f80f11e89ac45f
 DIST jde-2.4.1_pre20110622.tar.gz 3813917 SHA256 ed565e4c644ade7d30d2f7c3e811d9c10df9e86b1aa1ebc81a8d66d62537b5f8 SHA512 b3b653eb396059d7d3de50f9f35869920c901580b18529c5cd4e8c52629bab81a253f0792369c63137570554b44d29417ff42299b8fcf6e2e86941164a1b7498 WHIRLPOOL 961ed023d2af3cdbb5166bb4fdfb32dd176eda18d750180dfec397c6278edb7c914c7925e59ffd5aeeac62ea4baf12dac7fe371b6f89931aa2b6a75e4829c2ac
 EBUILD jde-2.4.0.1.ebuild 1888 SHA256 9afdb4110cf5d4ff522776980155c7eee6f5d1ae87ab6c9b76749b7a925c19f9 SHA512 7ecc5533179fe687064ca12c5bc10e1396782980f0995113852a17d9fd6fbd6a28d26db64de239172d41248950ffe617686b088a6db4142455a2b1c7d95c4212 WHIRLPOOL 86f721b8ff5a2020cbb090eda8ac3117e15d7a186cad0c7e205bf5c0d2de1a364b4ed0351bf1f713e358ede2134f963e8a93454bded493d531b053dfb2bad077
+EBUILD jde-2.4.1_pre20110622-r1.ebuild 2131 SHA256 14eb5b44dd196590679d3372d8bb2e241f6b57c5efea496fcdea52360895cda7 SHA512 4905a017302a628f7a162606579b11c3ac0462b199fff9f9b457c43f30ee60a21dccfeb0f5ed983d23e6619aa00976ef9181ef2a4961b7733a9bcc2190c4b861 WHIRLPOOL c274d07ce934c4cc210de5a0ccb3a79b8f52b50c6809231036c9877a3b52a473f7141738dc347add53fc57ee36217b1bd269ed93d0414ed692c42feef5690dee
 EBUILD jde-2.4.1_pre20110622.ebuild 2052 SHA256 471c8fb4015a04b9a8972ce5198d23259342cb3516601e8a0f9e21744299264d SHA512 0102920403dd660be5de1bdcc15198740d7784ebb3a373421d25bf2957c267a1bba6fe6a65104c597a47cbf7e19a3f5b21c26580c2fc3ea9c5acb09feddc1c02 WHIRLPOOL a21a582a1d2b5d8d857084f8c649559f48063242e8c946a19351b707071b50e89fb1954c6396700ab45f9d9c55d30010263cd61ec4994aa672a0508620d90647
-MISC ChangeLog 7477 SHA256 5249e58a795063e3a55043f4f1a477ecf25cd5942268724decb7094803b36d07 SHA512 c8ff5dd0c3c7862fd028d8debd874e085b05a107557f4bc516d54855426f37cf56c82ab031060d085d2b2c50dadc9b1e8c45ef84b894579d10ec7510b33438c9 WHIRLPOOL 24fffc1261e56012bce405d01719179b80369397b88c50ce5a92157f22e7a1fe822d2e251c6163ddcbb633b8b68ad3e6d2c10803f0a7da962d18bfc33bea2872
+MISC ChangeLog 7683 SHA256 4a21dfc684ee10d594205b0edf1c7a81772ea0252cb07e7863480fe88272b63e SHA512 3b300d9cf3aeebaff96ad0fcf340359e50d424d276207092bfbe4cc6dec9f7115fc8fa81ed7bc6d71993487bddb40f156bf9b46f094cf363bc7dd3b11477d539 WHIRLPOOL e4e022bc324153da3d32be1f185dd701c8e365aade3439b9f6a16a2de3dca86c3b69a0278ecb1b7bab9446bc8ad6e0ca2509e5368e54afe06ee7fc930c769d4d
 MISC metadata.xml 737 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce SHA512 87db26e6efdc3cbc6d97685fc3f1475a008299d3d22a14fa1a53f6180cdaa1e973203fa8db22cdf47aa598ef448ccf793071043199152a16893b2ea2163b291a WHIRLPOOL e72c4a3a8955d2681090e6a34c50d44391455ab283b49e082d7996ce280b5510fef382733349b492deab224cdf81a87ae87bc1f65ef3018f896a921ba8f947a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQNn1FAAoJEDxpGckxwJCBBfMP/1WJg/NsMAk7FIJf2OeG9dz9
-dtsRSvdhCisUshwHZW0Jsd4CDTzIPAXjvzHspNN2IfoKdRkuqJLd590TVouFfOUI
-iyvyC1iR2nILTpvEaHQnviLoobsG0/yTPGDOLRW+QwqhCWemZjfp4//Ef2wekJkY
-iylsmuLZlVtQzJNKnZBP0Kw/i+1ZVay5rNtRlu0gBAoULoBkRIKQCSdD5jbAeEtp
-W+UKo1oJY3uK5DRmHaad19//1Ea2GzUqjuvcjWzlzVPdVeRRAxYZMjSn7VLj4oV+
-ohnIYT2EdWbOzqd2wh1ZSZ+1njBrnYadRGfHFBoTJuEQj+K3a5lxDaPpjxLQryDV
-EG8NUfT4zo90a5a6SOXYNL6HDIF4gYMTJXsCHhkIsyQjs2Q5mJnjZFX8YYOmmAXk
-M6EE3/uZF07EBZvbI+V7uspc4UGvORyO+675k0FhUwBXQ0Z9h13ZVbWz+133XzT/
-OHOzecyyi2nvrDioBNy5Wi164qcZf+p/suGGDJT9XM0NIxGDG/P5qTsltaNnFEZF
-MijVw1RqUBDvXVJiF5qKbtYvNX07/k4y4HTmRT8VZrJQWXZ0DeL9CzKg9jqxAaaY
-gtTeNx9I4pyOC2IVrEhYq0q/wRqh70yUkDOLYUXN4tQa0Iyzjdj82r57iIErbaoN
-6DaQbpEm5g30JvEuf9M8
-=IAJO
+iQEcBAEBCAAGBQJRh6b1AAoJELjwI6Q8XPdaLdsIAK0BMUUh13sBwq+PZyq+t3Fe
+PNvLIUrykGkKVsAMoxo+ucWnpTyx/2fG0RtvXVYJnGCg/oY7vz1uxDoOV6rXkYHE
+jypiVfmpPDKQYcU7/dY9+E5/MlI9oUooUtxEaUuKg9XkrNXluhiwOyJq1LoDI3Qw
+0k+MENQ2Bo3N4HBfe91eNKYIDcLTr7xqT+sUg+L/ARRwoI5KFfpdzkwFChDpwfMB
+Cz1Wzg5amSPRlknn8D35KufBJKCbu5JiXAXo+IkplxrU3yyhBW64ZcensvfXGZgn
+VwSXQYAsLawS752MUwks1PMwu5cJ5iAFuCoO+Ct7+SRJNrcn5oV2itTDEE/mnBo=
+=f8jM
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild b/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
new file mode 100644
index 000000000000..7e6d0599b7dd
--- /dev/null
+++ b/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild,v 1.1 2013/05/06 12:49:46 sera Exp $
+
+EAPI=4
+NEED_EMACS=23
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 elisp eutils
+
+DESCRIPTION="Java Development Environment for Emacs"
+HOMEPAGE="http://jdee.sourceforge.net/"
+# taken from: http://jdee.svn.sourceforge.net/viewvc/jdee/trunk/jdee/?view=tar&pathrev=254
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/jdk-1.3
+	app-emacs/elib
+	virtual/emacs-cedet
+	dev-java/bsh:0
+	dev-java/junit:0
+	dev-util/checkstyle:0"
+DEPEND="${RDEPEND}
+	dev-java/ant-contrib:0"
+
+S="${WORKDIR}/jdee"
+SITEFILE="70${PN}-gentoo.el"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	elisp_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+	epatch "${FILESDIR}/${PN}-2.4.1-semantic-emacs-24.patch"
+
+	local bshjar csjar
+	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
+	csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
+	sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
+		-e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
+
+	cd java/lib || die
+	java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
+	java-pkg_jar-from junit
+	java-pkg_jar-from bsh
+}
+
+src_compile() {
+	ANT_TASKS="ant-contrib" \
+		eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
+		bindist $(usex doc source-doc "")
+}
+
+src_install() {
+	local dist="dist/jdee-${PV%_*}"
+
+	java-pkg_dojar ${dist}/java/lib/jde.jar
+	insinto "${JAVA_PKG_SHAREPATH}"
+	doins -r java/bsh-commands
+
+	use source && java-pkg_dosrc java/src/*
+	use doc && java-pkg_dojavadoc ${dist}/doc/java/api
+
+	elisp-install ${PN} ${dist}/lisp/*.{el,elc} || die
+	elisp-site-file-install "${SITEFILE}" || die
+
+	dobin ${dist}/lisp/jtags
+
+	dohtml -r doc/html/*
+}