Version bump, bug 428630. Remove old.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 44 insertions, 29 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index acd7d0b3475f..5d90bfaa8b1b 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/jde
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.46 2013/08/02 19:15:19 ulm Exp $
+
+*jde-2.4.1 (02 Aug 2013)
+
+  02 Aug 2013; Ulrich Müller <ulm@gentoo.org> -jde-2.4.1_pre20110622.ebuild,
+  +jde-2.4.1.ebuild:
+  Version bump, bug 428630. Remove old.
 
 *jde-2.4.1_pre20110622-r1 (06 May 2013)
 
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 285939843c9a..7cdfff977732 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -8,19 +8,23 @@ AUX jde-2.4.1-doc-directory.patch 1806 SHA256 1c6b745d3be3b6dd4641a90638d0429dec
 AUX jde-2.4.1-semantic-emacs-24.patch 1140 SHA256 3e6e3a9cb923a462433b6cc59495996ece78119ba32c5e88a137ea21333966d0 SHA512 6bcf4693809d0b10d03489c5d7ba997c96b697d425ac100fa5db73d3f781492c8ed164c32af484798158847b1061e64145b11a344a4a668917bdc1116773526c WHIRLPOOL c09ad469219340a250b875b641d24a0d4d316007d6cde810742884153ad7b8a312c2a195fe5b2b94a8a839464873894cbf03c1cb27671e615ad1971c0365f5b4
 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
+DIST jdee-2.4.1.tar.xz 2742232 SHA256 24241376837361e23a2c181775423ac248e441e3ced513e21cbef30529cbeb43 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359 WHIRLPOOL c20988fc59fdd453e9942b53d444605dd3738a9978e2bd6a67d30b550e5510926056bc0b7734a9fdf4fd7c4ac09a2bbd1baaf35b92bc94438b378d722ab76a37
 EBUILD jde-2.4.0.1.ebuild 1888 SHA256 9afdb4110cf5d4ff522776980155c7eee6f5d1ae87ab6c9b76749b7a925c19f9 SHA512 7ecc5533179fe687064ca12c5bc10e1396782980f0995113852a17d9fd6fbd6a28d26db64de239172d41248950ffe617686b088a6db4142455a2b1c7d95c4212 WHIRLPOOL 86f721b8ff5a2020cbb090eda8ac3117e15d7a186cad0c7e205bf5c0d2de1a364b4ed0351bf1f713e358ede2134f963e8a93454bded493d531b053dfb2bad077
+EBUILD jde-2.4.1.ebuild 2071 SHA256 0f749267d64dcd354103fd4f98daf868d31ba995544386248b8b42af173a836e SHA512 1d1fb01755db6bf917e72bbc18a4a1d922b48f5e49cfa387a541218e9873c3730309dd1bd918061c6a1e20be3702f6378a43333a2e2c9eba7cf60a366ddbfe16 WHIRLPOOL 19bbb564be4a4c4cb32c906dfc9596a7716ae2074921878b71c34b02f0a9f19c3d6a898d8e86db95af85e3c8b22a80824e77b628a7633b6935955052b30bdb28
 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 7683 SHA256 4a21dfc684ee10d594205b0edf1c7a81772ea0252cb07e7863480fe88272b63e SHA512 3b300d9cf3aeebaff96ad0fcf340359e50d424d276207092bfbe4cc6dec9f7115fc8fa81ed7bc6d71993487bddb40f156bf9b46f094cf363bc7dd3b11477d539 WHIRLPOOL e4e022bc324153da3d32be1f185dd701c8e365aade3439b9f6a16a2de3dca86c3b69a0278ecb1b7bab9446bc8ad6e0ca2509e5368e54afe06ee7fc930c769d4d
+MISC ChangeLog 7848 SHA256 612833f591d4d41636a9d8ea569bce2dc2c10c737763511643940e242d6eb41d SHA512 a8b26a9ddacaa0e28a619f56af6bf8c1a9fa79e4984f0e8ca6741f00348f7c69bda4662e182401c4a6711911655f8d9898f32494e40c9a2e5720780a19d58990 WHIRLPOOL a62c85811064b280b3f6cc1094722a1c017c540df91cb634b51aa864c00c242ad2d07b782bb55c71d36406793ae4714247aaee8110e64abc2414b0477f04b32b
 MISC metadata.xml 737 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce SHA512 87db26e6efdc3cbc6d97685fc3f1475a008299d3d22a14fa1a53f6180cdaa1e973203fa8db22cdf47aa598ef448ccf793071043199152a16893b2ea2163b291a WHIRLPOOL e72c4a3a8955d2681090e6a34c50d44391455ab283b49e082d7996ce280b5510fef382733349b492deab224cdf81a87ae87bc1f65ef3018f896a921ba8f947a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRh6b1AAoJELjwI6Q8XPdaLdsIAK0BMUUh13sBwq+PZyq+t3Fe
-PNvLIUrykGkKVsAMoxo+ucWnpTyx/2fG0RtvXVYJnGCg/oY7vz1uxDoOV6rXkYHE
-jypiVfmpPDKQYcU7/dY9+E5/MlI9oUooUtxEaUuKg9XkrNXluhiwOyJq1LoDI3Qw
-0k+MENQ2Bo3N4HBfe91eNKYIDcLTr7xqT+sUg+L/ARRwoI5KFfpdzkwFChDpwfMB
-Cz1Wzg5amSPRlknn8D35KufBJKCbu5JiXAXo+IkplxrU3yyhBW64ZcensvfXGZgn
-VwSXQYAsLawS752MUwks1PMwu5cJ5iAFuCoO+Ct7+SRJNrcn5oV2itTDEE/mnBo=
-=f8jM
+iQGcBAEBCAAGBQJR/AWqAAoJEJQzkH1pP7W4QNAL/RARVxD01FNfoKtWd+bMr3VI
+Ru6LjgswPMftfDz96RdtuSjb6w8vKY1j5Mf5Rhd3Y3MOBhLfCEq5pC7wgATO1hsu
+T+kxsZlb/re8tLXMEnI8qcfJWCoHMlF5e/zPzB8XJNWC1aTF0DpEd1rFdN7Sid8n
+hpQsppLA9YRZ2dJc9QxTlLLJFPIthxzIVTVATAHDbyY1Z6+jP4q6kcXYWdEz8kfL
+mA/f1rP2utrqbQ29v7JjSVakqCjyjdJqi+mUgcGmFGkpAW2beLeKW+kUmoxRAulv
+l/dRE6rA3tvvlOQ7Eih7g9W98BVFduBkqCbVGXP4pSPRs6D5KBKoVn6Wji3cii4A
+6MzV4QEmeiMlFS8EyBe55eMYyrVij/TE1udLdgecyviOk3xClJRtyx8Yq8UhyWuC
+5fG8UJInnH1rFH2O7FJpGkuEeGoIgRciZq3ola0NvX0fv5H4AHnFqNq4zevxYYxg
+gTlT+qKPwbGTrmb14WuKj8/ILEjh3+2/opIBPgICqg==
+=VudE
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/jde/jde-2.4.1_pre20110622.ebuild b/app-emacs/jde/jde-2.4.1.ebuild
index f3c23ccb308f..9c81afde46af 100644
--- a/app-emacs/jde/jde-2.4.1_pre20110622.ebuild
+++ b/app-emacs/jde/jde-2.4.1.ebuild
@@ -1,40 +1,44 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.1 2011/12/13 17:29:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.4.1.ebuild,v 1.1 2013/08/02 19:15:19 ulm Exp $
 
-EAPI=4
+EAPI=5
 NEED_EMACS=23
-WANT_ANT_TASKS="ant-nodeps ant-contrib"
 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"
+# snapshot of svn://svn.code.sf.net/p/jdee/code/branches/2.4.1 (rev 292)
+# (upstream's distfile misses build.xml)
+SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
-DEPEND=">=virtual/jdk-1.3
+RDEPEND=">=virtual/jdk-1.3
 	app-emacs/elib
 	virtual/emacs-cedet
-	dev-java/bsh
+	dev-java/bsh:0
 	dev-java/junit:0
-	dev-util/checkstyle"
-RDEPEND="${DEPEND}"
+	dev-util/checkstyle:0"
+DEPEND="${RDEPEND}
+	dev-java/ant-contrib:0"
 
-S="${WORKDIR}/jdee"
+S="${WORKDIR}/jdee-${PV}"
 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
@@ -49,8 +53,9 @@ src_prepare() {
 }
 
 src_compile() {
-	eant bindist -Delib.dir="${EPREFIX}${SITELISP}/elib"
-	use doc && eant source-doc
+	ANT_TASKS="ant-contrib" \
+		eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
+		bindist $(usex doc source-doc "")
 }
 
 src_install() {
@@ -63,8 +68,8 @@ src_install() {
 	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
+	elisp-install ${PN} ${dist}/lisp/*.{el,elc}
+	elisp-site-file-install "${SITEFILE}"
 
 	dobin ${dist}/lisp/jtags