Move virtual/jdk to RDEPEND, bug 219943. Update HOMEPAGE and SRC_URI.

Don't inherit eutils. Remove stray patches and init files.
Package-Manager: portage-2.1.5_rc6

8 files changed, 38 insertions, 63 deletions

diff --git a/app-emacs/jde/ChangeLog b/app-emacs/jde/ChangeLog
index 2d0bd9a42ab0..0d2524f5bbd8 100644
--- a/app-emacs/jde/ChangeLog
+++ b/app-emacs/jde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/jde
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.28 2007/10/06 19:28:20 ulm Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/ChangeLog,v 1.29 2008/05/01 19:16:44 ulm Exp $
+
+  01 May 2008; Ulrich Mueller <ulm@gentoo.org> -files/2.3.5-70jde-gentoo.el,
+  -files/2.3.5.1-70jde-gentoo.el,
+  -files/2.3.3-jde-new-buffer-menu-gentoo.patch,
+  -files/2.3.5-cedet-version-adjust-gentoo.patch, files/70jde-gentoo.el,
+  jde-2.3.5.1.ebuild:
+  Move virtual/jdk to RDEPEND, bug 219943. Update HOMEPAGE and SRC_URI.
+  Don't inherit eutils. Remove stray patches and init files.
 
   06 Oct 2007; Ulrich Mueller <ulm@gentoo.org> jde-2.3.5.1.ebuild:
   Minor QA: quote some variables, remove redundant virtual/emacs dependency.
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 1486c9fa1ddf..287125c45d11 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -1,9 +1,15 @@
-AUX 2.3.3-jde-new-buffer-menu-gentoo.patch 509 RMD160 4fa3d7976d5ff3a34b40e215bd72d9857bc7cee7 SHA1 9164beafddde058fcf2145658a7421fa41756b91 SHA256 a753cdda699327582e61ac46643be6e4dc925099d7fae2c865a589b437587b3d
-AUX 2.3.5-70jde-gentoo.el 101 RMD160 29b4060213b295253b98d8d87e1ca4ff0b4dc363 SHA1 2545b42717fe93d014c4dcbd9e9efb29db81f84e SHA256 70d74dbeb54df187a1b5752e0299316d017362a0f9295a741b6163a282eeef44
-AUX 2.3.5-cedet-version-adjust-gentoo.patch 549 RMD160 13314203797de62cc06ee58937d99fa7fdef0266 SHA1 9c5a25ccc902356a440a0257e5190ba0b712e168 SHA256 7557dfafc8ed08e664184acfdb4109f268d9cc6cd80623fca319098b0f68d761
-AUX 2.3.5.1-70jde-gentoo.el 101 RMD160 29b4060213b295253b98d8d87e1ca4ff0b4dc363 SHA1 2545b42717fe93d014c4dcbd9e9efb29db81f84e SHA256 70d74dbeb54df187a1b5752e0299316d017362a0f9295a741b6163a282eeef44
-AUX 70jde-gentoo.el 214 RMD160 50199a1831bc412fabc9abe6951dd004953f9883 SHA1 0d3494e490585c15c130457ac413d243db623346 SHA256 b6503261bf7df683d1e1650ef68fc8a0277da6e70ab9cd46e584acb2edde04ec
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 70jde-gentoo.el 101 RMD160 927bbbf452562db0fdfb21540e39d1c128d53637 SHA1 cec193709142f6bf3a6843c8a350e03689f2e200 SHA256 3aa98e237f164406ac0d1ad94afb09473008d8d2b264bf0cd9069a641c081df8
 DIST jde-2.3.5.1.tar.gz 3717565 RMD160 e505dcb11b4177857bafeb48236f9cf850172917 SHA1 4fe73ee61ca0bc6a76fef808313b3e4610c09143 SHA256 8e1643444637853ed8fb7969055c1518f318166a7d1b4222f682e212868c19bf
-EBUILD jde-2.3.5.1.ebuild 1178 RMD160 8449aaf3ff7694305855653d0c43e84e2db16db0 SHA1 7f9a9866940550a1185d34404911ba85d9cb8e7d SHA256 9a440eb1d017457ad18bac682197925e18b9c6cadb791f74305c1fcbc13996c8
-MISC ChangeLog 4131 RMD160 4d51cb7937cf5987acb96ddcadf3224e343056ec SHA1 ac376c54d579d3554f45b62abe1ed65e7506dfb1 SHA256 a6690087c0e5a085afc726dbd8d3ca441c78e6f9fb1d459d5de53b182bc4061a
+EBUILD jde-2.3.5.1.ebuild 1141 RMD160 2c0e29c78046f4e4b1ce95dd137b95d28f1d7e14 SHA1 b2dae8ec1039b9e4a90cf008ef4ba2cdc319805a SHA256 af172c7f92b8730c915a83bd7ea1c3ef5a44dbff45e01289f6147582a35690fb
+MISC ChangeLog 4520 RMD160 6ed8ef145f74b094a65939586c78506fa2ef7545 SHA1 14193bace1f569b38e4ded8b07a732429ff0fce5 SHA256 a01ccbc7547e4bb6f124abf878f8237af77f11e3b0f9b69617041480feb6de92
 MISC metadata.xml 737 RMD160 1ffe7fbd32a23f6167b4d233b5917c8daca2ec7a SHA1 7577584fcc9f9af7eb5a4c2ae205181862ae9fe9 SHA256 0be32d412b86728bc6f77b96859d0f0f786f9bdbe82dc7f719efb1233dbd82ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkgaFz8ACgkQOeoy/oIi7uxPcQCg6kVB2rsHlaCB/PLaNHxId6nO
+2jMAoLK3IPub1Fi2PQTOXt58eUo/q5mN
+=yjlJ
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch b/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch
deleted file mode 100644
index ec00c8b48806..000000000000
--- a/app-emacs/jde/files/2.3.3-jde-new-buffer-menu-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur jde-2.3.3.orig/lisp/jde.el jde-2.3.3/lisp/jde.el
---- jde-2.3.3.orig/lisp/jde.el	2003-12-07 21:22:40.000000000 -0600
-+++ jde-2.3.3/lisp/jde.el	2005-01-12 11:46:13.213198782 -0600
-@@ -1260,7 +1260,7 @@
- 			     (easy-menu-create-menu 
- 			      (car val) (cdr val))))
- 		   (menu-name (car val)))
--	      (define-key-after (cdr (cdr files)) [jde-new]
-+	      (define-key-after (or (cdr (cdr files)) (make-keymap)) [jde-new]
- 		(cons menu-name menu)
- 		'open-file)))))
- 
-Only in jde-2.3.3/lisp: jde.el~
diff --git a/app-emacs/jde/files/2.3.5-70jde-gentoo.el b/app-emacs/jde/files/2.3.5-70jde-gentoo.el
deleted file mode 100644
index 04674693d35d..000000000000
--- a/app-emacs/jde/files/2.3.5-70jde-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; JDE site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@/lisp")
-(require 'jde-autoload)
diff --git a/app-emacs/jde/files/2.3.5-cedet-version-adjust-gentoo.patch b/app-emacs/jde/files/2.3.5-cedet-version-adjust-gentoo.patch
deleted file mode 100644
index a4e3b45ae196..000000000000
--- a/app-emacs/jde/files/2.3.5-cedet-version-adjust-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur jde-2.3.5.orig/lisp/jde.el jde-2.3.5/lisp/jde.el
---- jde-2.3.5.orig/lisp/jde.el  2004-12-16 22:29:35.000000000 -0600
-+++ jde-2.3.5/lisp/jde.el       2005-09-22 17:24:06.000000000 -0500
-@@ -113,7 +113,7 @@
-   :prefix "jde-")
-
-
--(defcustom jde-check-version-flag t
-+(defcustom jde-check-version-flag nil
-   "*Non-nil means to check versions of semantic, eieio, and speedbar.
- That is if they meet the requirements for this version of the JDE.
- If nil only check if semantic, eieio, and speedbar are available.
-Only in jde-2.3.5/lisp: jde.el~
diff --git a/app-emacs/jde/files/2.3.5.1-70jde-gentoo.el b/app-emacs/jde/files/2.3.5.1-70jde-gentoo.el
deleted file mode 100644
index 04674693d35d..000000000000
--- a/app-emacs/jde/files/2.3.5.1-70jde-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; JDE site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@/lisp")
-(require 'jde-autoload)
diff --git a/app-emacs/jde/files/70jde-gentoo.el b/app-emacs/jde/files/70jde-gentoo.el
index 7ee44318415c..35cd6d2e6823 100644
--- a/app-emacs/jde/files/70jde-gentoo.el
+++ b/app-emacs/jde/files/70jde-gentoo.el
@@ -1,6 +1,5 @@
 
-;;; JDE site-lisp configuration
+;;; jde site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@/lisp")
-(autoload 'jde-mode "jde" "Java Development Environment Emacs" t)
-(setq auto-mode-alist (cons '("\\.java$" . jde-mode) auto-mode-alist))
+(require 'jde-autoload)
diff --git a/app-emacs/jde/jde-2.3.5.1.ebuild b/app-emacs/jde/jde-2.3.5.1.ebuild
index b44bda117447..5ee8b2e35660 100644
--- a/app-emacs/jde/jde-2.3.5.1.ebuild
+++ b/app-emacs/jde/jde-2.3.5.1.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.5.1.ebuild,v 1.6 2007/10/06 19:28:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/jde/jde-2.3.5.1.ebuild,v 1.7 2008/05/01 19:16:44 ulm Exp $
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sunsite.dk/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://jdee.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jdee/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.3
-	app-emacs/elib
+DEPEND="app-emacs/elib
 	>=app-emacs/cedet-1.0_beta3"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.3"
 
 SITEFILE=70${PN}-gentoo.el
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	cd "${S}"/lisp
-	cat >jde-compile-script-init <<EOF
-(load "${SITELISP}/cedet/common/cedet")
-(add-to-list 'load-path "$PWD")
-EOF
+	cat >jde-compile-script-init <<-EOF
+	(load "${SITELISP}/cedet/common/cedet")
+	(add-to-list 'load-path "$PWD")
+	EOF
 	emacs -batch -l jde-compile-script-init -f batch-byte-compile *.el
 }
 
@@ -37,8 +36,7 @@ src_install() {
 	cp -r doc/* "${D}"/usr/share/doc/${P}/
 	cd "${S}"/lisp
 	elisp-install ${PN}/lisp *.el *.elc *.bnf
-	cp "${FILESDIR}"/${PV}-${SITEFILE} "${S}"/${SITEFILE}
-	elisp-site-file-install "${S}"/${SITEFILE}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog ReleaseNotes.txt
 	find "${D}" -type f -print0 |xargs -0 chmod 644
 	exeinto /usr/bin