summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-01-04 01:09:11 +0100
committerUlrich Müller <ulm@gentoo.org>2018-02-12 23:28:43 +0100
commitd13ac84aa2c242cfe9ed49d55a6e97393d332369 (patch)
tree08ef6918a684ccd57b95b99bfd49c24c4d2d3826 /app-emacs
parentdev-java/ant-core: Update SRC_URI (diff)
downloadgentoo-d13ac84aa2c242cfe9ed49d55a6e97393d332369.tar.gz
gentoo-d13ac84aa2c242cfe9ed49d55a6e97393d332369.tar.bz2
gentoo-d13ac84aa2c242cfe9ed49d55a6e97393d332369.zip
app-emacs/emhacks: Unconditionally remove jsee.
Byte compilation of jsee.el fails with recent Emacs versions. After its removal, the jde USE flag is not needed any more. Closes: https://bugs.gentoo.org/642588 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/emhacks/emhacks-20070920-r1.ebuild25
-rw-r--r--app-emacs/emhacks/emhacks-20070920.ebuild38
-rw-r--r--app-emacs/emhacks/files/50emhacks-gentoo.el4
-rw-r--r--app-emacs/emhacks/metadata.xml3
4 files changed, 25 insertions, 45 deletions
diff --git a/app-emacs/emhacks/emhacks-20070920-r1.ebuild b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
new file mode 100644
index 00000000000..3fdd0d1d1b1
--- /dev/null
+++ b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
+HOMEPAGE="http://emhacks.sourceforge.net/"
+# CVS snapshot
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="Changelog"
+
+src_prepare() {
+ # remove files included in Emacs>=22 or not useful on GNU/Linux
+ # remove jsee #642588
+ rm -r findstr* jsee* overlay-fix* recentf* ruler-mode* tree-widget* || die
+ eapply_user
+}
diff --git a/app-emacs/emhacks/emhacks-20070920.ebuild b/app-emacs/emhacks/emhacks-20070920.ebuild
deleted file mode 100644
index b094ca266ce..00000000000
--- a/app-emacs/emhacks/emhacks-20070920.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
-HOMEPAGE="http://emhacks.sourceforge.net/"
-# CVS snapshot
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jde"
-
-DEPEND="jde? ( app-emacs/jde )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- # remove files included in Emacs>=22 or not useful on GNU/Linux
- rm -r findstr* overlay-fix* recentf* ruler-mode* tree-widget* || die
- # this requires jde and cedet, not everyone may want it
- use jde || rm jsee.el || die
-}
-
-src_install() {
- elisp-install ${PN} *.el *.elc
-
- cp "${FILESDIR}/${SITEFILE}" "${T}"
- use jde || sed -i -e '/;; jsee/,$d' "${T}/${SITEFILE}"
- elisp-site-file-install "${T}/${SITEFILE}"
-
- dodoc Changelog
-}
diff --git a/app-emacs/emhacks/files/50emhacks-gentoo.el b/app-emacs/emhacks/files/50emhacks-gentoo.el
index 14fd515ff68..1488d88313c 100644
--- a/app-emacs/emhacks/files/50emhacks-gentoo.el
+++ b/app-emacs/emhacks/files/50emhacks-gentoo.el
@@ -26,7 +26,3 @@ And update the status window if showing." t)
;; jmaker
(autoload 'jmaker-generate-makefile "jmaker"
"Generate and edit a Java Makefile in directory ROOT." t)
-
-;; jsee
-(autoload 'jsee-browse-api-doc "jsee"
- "Browse the Java API Documentation of the current Java file." t)
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index 17d3c9cfeb7..27c2365ffe3 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -16,9 +16,6 @@
swbuff, Quick switch between Emacs buffers;
tabbar, Display a tab bar in the header line.
</longdescription>
-<use>
- <flag name="jde">Enable support for Java Development Environment</flag>
-</use>
<upstream>
<remote-id type="sourceforge">emhacks</remote-id>
</upstream>