| 1 |
commit: b21e4c74285c8dd5fa00243c3ad136085bf9a675 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 10:10:49 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 26 10:38:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21e4c74 |
| 7 |
|
| 8 |
app-emacs/jde: Drop dependency on app-emacs/elib. |
| 9 |
|
| 10 |
avltree.el from elib was only required for compatibility with old |
| 11 |
Emacs versions. All versions >=emacs-23 include avl-tree.el, which |
| 12 |
will be properly detected in jde-parse.el. |
| 13 |
|
| 14 |
Other minor fixes to make repoman happy. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/701160 |
| 17 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 18 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 19 |
|
| 20 |
.../jde/{jde-2.4.1.ebuild => jde-2.4.1-r1.ebuild} | 22 +++++++++++----------- |
| 21 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emacs/jde/jde-2.4.1.ebuild b/app-emacs/jde/jde-2.4.1-r1.ebuild |
| 24 |
similarity index 78% |
| 25 |
rename from app-emacs/jde/jde-2.4.1.ebuild |
| 26 |
rename to app-emacs/jde/jde-2.4.1-r1.ebuild |
| 27 |
index fd50b7af19d..bddc407a743 100644 |
| 28 |
--- a/app-emacs/jde/jde-2.4.1.ebuild |
| 29 |
+++ b/app-emacs/jde/jde-2.4.1-r1.ebuild |
| 30 |
@@ -1,10 +1,10 @@ |
| 31 |
-# Copyright 1999-2016 Gentoo Foundation |
| 32 |
+# Copyright 1999-2019 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
-EAPI=5 |
| 36 |
+EAPI=6 |
| 37 |
JAVA_PKG_IUSE="doc source" |
| 38 |
|
| 39 |
-inherit java-pkg-2 java-ant-2 elisp eutils |
| 40 |
+inherit java-pkg-2 java-ant-2 elisp |
| 41 |
|
| 42 |
DESCRIPTION="Java Development Environment for Emacs" |
| 43 |
HOMEPAGE="http://jdee.sourceforge.net/" |
| 44 |
@@ -16,8 +16,7 @@ LICENSE="GPL-2+" |
| 45 |
SLOT="0" |
| 46 |
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 47 |
|
| 48 |
-RDEPEND=">=virtual/jdk-1.3 |
| 49 |
- app-emacs/elib |
| 50 |
+RDEPEND=">=virtual/jdk-1.3:= |
| 51 |
dev-java/bsh:0 |
| 52 |
dev-java/junit:0 |
| 53 |
dev-util/checkstyle:0" |
| 54 |
@@ -33,9 +32,10 @@ pkg_setup() { |
| 55 |
} |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
- epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch" |
| 59 |
- epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch" |
| 60 |
- epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch" |
| 61 |
+ eapply "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch" |
| 62 |
+ eapply "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch" |
| 63 |
+ eapply "${FILESDIR}/${PN}-2.4.1-doc-directory.patch" |
| 64 |
+ eapply_user |
| 65 |
|
| 66 |
local bshjar csjar |
| 67 |
bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die |
| 68 |
@@ -51,8 +51,7 @@ src_prepare() { |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
ANT_TASKS="ant-contrib" \ |
| 72 |
- eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \ |
| 73 |
- bindist $(usex doc source-doc "") |
| 74 |
+ eant bindist $(usex doc source-doc "") |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
@@ -70,5 +69,6 @@ src_install() { |
| 79 |
|
| 80 |
dobin ${dist}/lisp/jtags |
| 81 |
|
| 82 |
- dohtml -r doc/html/* |
| 83 |
+ dodoc -r doc/html |
| 84 |
+ find "${ED}"/usr/share/doc -iname "*makefile" -delete || die |
| 85 |
} |
Archives