Remove intermediate version.

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

4 files changed, 18 insertions, 131 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index 5d90bfaa8b1b..890ac26d6488 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2013/08/02 19:15:19 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.47 2014/02/27 19:54:40 ulm Exp $
+
+  27 Feb 2014; Ulrich Müller <ulm@gentoo.org>
+  -jde-2.4.1_pre20110622-r1.ebuild, -files/jde-2.4.1-semantic-emacs-24.patch:
+  Remove intermediate version.
 
 *jde-2.4.1 (02 Aug 2013)
 
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 7cdfff977732..02af9741ee2f 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -5,26 +5,23 @@ AUX 70jde-gentoo.el 406 SHA256 fbbd2eed01703b2223751e6df0fd34b2d86e1d10a9f1c6f63
 AUX jde-2.4.0.1-classpath-gentoo.patch 2291 SHA256 2b771ddecbed5ada026a1621ba92bcad29b0155549fa6a1a0495348c0c252504 SHA512 c18378500f04b2f6cbed5c4a20d03600ea01174faf93d460c1ea274c50ca95891096f49e471160255e4ec27cda2330ee6c28fe29e96633994c3d5f910876f848 WHIRLPOOL b6a28b830238c5eee937d59296414df21a61a57afeb842b6f814e8a37750fd02ea2a4cbba861b08e38c593d661ad84b79bae18b41e9faf1494b155902ed7d82b
 AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 SHA256 aad7376741dfca76781d2e0d4e93a05f6e1b50fad60d2eb826da6550d7d192f0 SHA512 179e6bd8cc0165ee1f0d3383aec76bdb97f6164562663fe577a9ef04ac236afeccf1137594d7d4d8962ce4577befeb81e393d03c08bf68473657de7e18debb7e WHIRLPOOL 7866a33b5f78c5cff9c62a0f405f726f527241c96e39f768e0ee4b9e164206f513524f2bdad7ab3ff1f4d7a55e235dc705ec958aee65ab021fe4307533440e35
 AUX jde-2.4.1-doc-directory.patch 1806 SHA256 1c6b745d3be3b6dd4641a90638d0429dece6f5729dae575b8be0a280400523bc SHA512 3818474077c2f387bdef6fb297a40b94529622e1da3fb31c3d7b3734111fb4e607062f9cdca9f1f5b020dec8d8e9e6601d5bf7831a20415f393f2f029e97c101 WHIRLPOOL 6f14f9a2fe8724fc2f0a896be1d3bdf349425275272f3a6a3ca80f5d2d141139322a11311bc2bdcfe54e878f712e92f89fea06e80f976739c297887a4c543b02
-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
-MISC ChangeLog 7848 SHA256 612833f591d4d41636a9d8ea569bce2dc2c10c737763511643940e242d6eb41d SHA512 a8b26a9ddacaa0e28a619f56af6bf8c1a9fa79e4984f0e8ca6741f00348f7c69bda4662e182401c4a6711911655f8d9898f32494e40c9a2e5720780a19d58990 WHIRLPOOL a62c85811064b280b3f6cc1094722a1c017c540df91cb634b51aa864c00c242ad2d07b782bb55c71d36406793ae4714247aaee8110e64abc2414b0477f04b32b
+MISC ChangeLog 8005 SHA256 27dd823c8353b1dedafa72a4c267b73fc1bf08b183c76c9b0ce80b03e753ff89 SHA512 9b8238c7804390dfce4f6e9de1c28c164e976381305e5172d48c780135e7153a8c889d5c247deeba874d143f0d9e39de94a25e7ea83a011f4c723df60ede12b2 WHIRLPOOL 1eb214c4dff8a26d1dcf19615407166a20f09ac4b4c17d054c3ce5d69dcc625d218d4660e21e7532a23a117a08d2e260c5bdf651745302f0034dd7da4e77c34f
 MISC metadata.xml 737 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce SHA512 87db26e6efdc3cbc6d97685fc3f1475a008299d3d22a14fa1a53f6180cdaa1e973203fa8db22cdf47aa598ef448ccf793071043199152a16893b2ea2163b291a WHIRLPOOL e72c4a3a8955d2681090e6a34c50d44391455ab283b49e082d7996ce280b5510fef382733349b492deab224cdf81a87ae87bc1f65ef3018f896a921ba8f947a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQGcBAEBCAAGBQJTD5lsAAoJEJQzkH1pP7W4RikMAKojZmC/YQqj6sCEX//jPlqR
+czazLFYZ8+DEspN/zMILBzc1Ph5cc28TfTHBePvVQA2VA/sFIj4k6BNrjBJRmKpX
+zlqwBNUZETq8zBYlq7JC2DqaNgEvez2tJPqrxTD6ur7o+aOgD4mkZHcWquTv17Ll
+hidrfxvVWNSYYK7tLX5rQBaLHsSdjsiAUXDIaiZ9Wc3JKhAGbM9BAtW7osLb5EXi
+briQTySM6zItg+b+/JA3jRCRMvD1JwLnPL098JtKHXz2C4oU8gkVmGS69xFSfsbD
+qr+1v382PMdjRLF4Bx8J9ho/rJ19oONgd6Q5Rc/N+luAc1rHIyrD9lIPx8GuPY1M
+OzRV4m56YJFs77EaAIleO28zB76ryhywEVA9auznG57rnySiMt3WvTACBNVLbAJ5
+T0uiNtBG8yfxDlXRjZUhINCxOF0qIo8YBOTFGJcBcM1hCwYUqI1t0tmAMoCoW227
+ZffTWn3WoOJgC5v8wHCcN0Qk5JHmhDf5r/ywMCVNHw==
+=g7Xu
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch b/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
deleted file mode 100644
index cafcc5ae9c4d..000000000000
--- a/app-emacs/jde/files/jde-2.4.1-semantic-emacs-24.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-semantic-add-minor-mode accepts two arguments only.
-http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/100114
-
---- jdee-orig/lisp/jde-bug.el
-+++ jdee/lisp/jde-bug.el
-@@ -570,7 +570,7 @@
- 
-   (run-hook-with-args 'jde-bug-minor-mode-hook jde-bug-minor-mode))
- 
--(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug" jde-bug-mode-map)
-+(semantic-add-minor-mode 'jde-bug-minor-mode " JDEbug")
- 
- ;; (fmakunbound 'jde-bug-key-bindings)
- (defcustom jde-bug-key-bindings
---- jdee-orig/lisp/jde-jdb.el
-+++ jdee/lisp/jde-jdb.el
-@@ -1830,7 +1830,7 @@
-     (if (featurep 'xemacs)
-       (easy-menu-remove jde-jdb-xemacs-menu-spec))))
- 
--(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb" jde-jdb-mode-map)
-+(semantic-add-minor-mode 'jde-jdb-minor-mode " jdb")
- 
- 
- ;; (fmakunbound 'jde-jdb-key-bindings)
---- jdee-orig/lisp/jde-plugins.el
-+++ jdee/lisp/jde-plugins.el
-@@ -194,7 +194,7 @@
- 		(easy-menu-add menu-spec jde-plugin-mode-map)
- 	      (easy-menu-remove menu-spec))))))
- 
--(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin" jde-plugin-mode-map)
-+(semantic-add-minor-mode 'jde-plugin-minor-mode " plugin")
- 
- 
- (provide 'jde-plugins)
diff --git a/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild b/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
deleted file mode 100644
index 7e6d0599b7dd..000000000000
--- a/app-emacs/jde/jde-2.4.1_pre20110622-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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/*
-}