public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2019-11-26 10:39 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2019-11-26 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b21e4c74285c8dd5fa00243c3ad136085bf9a675
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 10:10:49 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 10:38:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21e4c74

app-emacs/jde: Drop dependency on app-emacs/elib.

avltree.el from elib was only required for compatibility with old
Emacs versions. All versions >=emacs-23 include avl-tree.el, which
will be properly detected in jde-parse.el.

Other minor fixes to make repoman happy.

Bug: https://bugs.gentoo.org/701160
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../jde/{jde-2.4.1.ebuild => jde-2.4.1-r1.ebuild}  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app-emacs/jde/jde-2.4.1.ebuild b/app-emacs/jde/jde-2.4.1-r1.ebuild
similarity index 78%
rename from app-emacs/jde/jde-2.4.1.ebuild
rename to app-emacs/jde/jde-2.4.1-r1.ebuild
index fd50b7af19d..bddc407a743 100644
--- a/app-emacs/jde/jde-2.4.1.ebuild
+++ b/app-emacs/jde/jde-2.4.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2 elisp eutils
+inherit java-pkg-2 java-ant-2 elisp
 
 DESCRIPTION="Java Development Environment for Emacs"
 HOMEPAGE="http://jdee.sourceforge.net/"
@@ -16,8 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
-RDEPEND=">=virtual/jdk-1.3
-	app-emacs/elib
+RDEPEND=">=virtual/jdk-1.3:=
 	dev-java/bsh:0
 	dev-java/junit:0
 	dev-util/checkstyle:0"
@@ -33,9 +32,10 @@ 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"
+	eapply "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+	eapply_user
 
 	local bshjar csjar
 	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
@@ -51,8 +51,7 @@ src_prepare() {
 
 src_compile() {
 	ANT_TASKS="ant-contrib" \
-		eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
-		bindist $(usex doc source-doc "")
+		eant bindist $(usex doc source-doc "")
 }
 
 src_install() {
@@ -70,5 +69,6 @@ src_install() {
 
 	dobin ${dist}/lisp/jtags
 
-	dohtml -r doc/html/*
+	dodoc -r doc/html
+	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2021-01-06 13:07 Fabian Groffen
  0 siblings, 0 replies; 6+ messages in thread
From: Fabian Groffen @ 2021-01-06 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6e61824837e3cf532dbaecb1a9c561b18485e1ca
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 13:06:02 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 13:06:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e618248

app-emacs/jde: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-emacs/jde/jde-2.4.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emacs/jde/jde-2.4.1-r1.ebuild b/app-emacs/jde/jde-2.4.1-r1.ebuild
index bddc407a743..4937f40cb3c 100644
--- a/app-emacs/jde/jde-2.4.1-r1.ebuild
+++ b/app-emacs/jde/jde-2.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=virtual/jdk-1.3:=
 	dev-java/bsh:0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2021-11-13 10:24 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-11-13 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     666e5059ba434668a527e78d8fdc43705542a126
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 21 08:39:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 10:24:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666e5059

app-emacs/jde: min java 1.8

Bug: https://bugs.gentoo.org/787326
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20906
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emacs/jde/jde-2.4.1-r2.ebuild | 77 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/app-emacs/jde/jde-2.4.1-r2.ebuild b/app-emacs/jde/jde-2.4.1-r2.ebuild
new file mode 100644
index 00000000000..c1e9b794808
--- /dev/null
+++ b/app-emacs/jde/jde-2.4.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 elisp
+
+DESCRIPTION="Java Development Environment for Emacs"
+HOMEPAGE="http://jdee.sourceforge.net/"
+# 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+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=virtual/jdk-1.8:*
+	dev-java/bsh:0
+	dev-java/junit:0
+	dev-util/checkstyle:0"
+DEPEND="${RDEPEND}
+	dev-java/ant-contrib:0"
+
+S="${WORKDIR}/jdee-${PV}"
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+	"${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+	"${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	elisp_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	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 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}
+	elisp-site-file-install "${SITEFILE}"
+
+	dobin ${dist}/lisp/jtags
+
+	dodoc -r doc/html
+	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2022-02-25  7:55 Agostino Sarubbo
  0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo @ 2022-02-25  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6309bcd49bec6740dda464dcc459be615a986c14
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 07:55:19 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 07:55:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6309bcd4

app-emacs/jde: amd64 stable wrt bug #828450

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-emacs/jde/jde-2.4.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emacs/jde/jde-2.4.1-r2.ebuild b/app-emacs/jde/jde-2.4.1-r2.ebuild
index c1e9b794808b..7c9edcf7a5a6 100644
--- a/app-emacs/jde/jde-2.4.1-r2.ebuild
+++ b/app-emacs/jde/jde-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=virtual/jdk-1.8:*
 	dev-java/bsh:0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2022-02-25  7:57 Agostino Sarubbo
  0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo @ 2022-02-25  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     763df572c471b42a534fbd11d833f0a0153a6979
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 07:57:17 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 07:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763df572

app-emacs/jde: x86 stable wrt bug #828450

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-emacs/jde/jde-2.4.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emacs/jde/jde-2.4.1-r2.ebuild b/app-emacs/jde/jde-2.4.1-r2.ebuild
index 7c9edcf7a5a6..a4bcf20cc0e5 100644
--- a/app-emacs/jde/jde-2.4.1-r2.ebuild
+++ b/app-emacs/jde/jde-2.4.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=virtual/jdk-1.8:*
 	dev-java/bsh:0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/
@ 2022-02-25  8:10 Miroslav Šulc
  0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2022-02-25  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ad8b1b66bb085f0507aaf95548ca5f0e3812fea7
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 08:10:03 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 08:10:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8b1b66

app-emacs/jde: removed obsolete 2.4.1-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-emacs/jde/jde-2.4.1-r1.ebuild | 74 ---------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/app-emacs/jde/jde-2.4.1-r1.ebuild b/app-emacs/jde/jde-2.4.1-r1.ebuild
deleted file mode 100644
index 4937f40cb3c9..000000000000
--- a/app-emacs/jde/jde-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 elisp
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-# 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+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=virtual/jdk-1.3:=
-	dev-java/bsh:0
-	dev-java/junit:0
-	dev-util/checkstyle:0"
-DEPEND="${RDEPEND}
-	dev-java/ant-contrib:0"
-
-S="${WORKDIR}/jdee-${PV}"
-SITEFILE="70${PN}-gentoo.el"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	elisp_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
-	eapply_user
-
-	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 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}
-	elisp-site-file-install "${SITEFILE}"
-
-	dobin ${dist}/lisp/jtags
-
-	dodoc -r doc/html
-	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-02-25  8:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-25  8:10 [gentoo-commits] repo/gentoo:master commit in: app-emacs/jde/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2022-02-25  7:57 Agostino Sarubbo
2022-02-25  7:55 Agostino Sarubbo
2021-11-13 10:24 Sam James
2021-01-06 13:07 Fabian Groffen
2019-11-26 10:39 Ulrich Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox