Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/jedit/files/, app-editors/jedit/
Date: Fri, 26 Nov 2021 09:29:42
Message-Id: 1637918968.9f17a805baf9448fd15ccb295cdd2253fbbe50ce.fordfrog@gentoo
1 commit: 9f17a805baf9448fd15ccb295cdd2253fbbe50ce
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 26 09:29:28 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 26 09:29:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f17a805
7
8 app-editors/jedit: removed obsolete 5.2.0-r1
9
10 Bug: https://bugs.gentoo.org/783639
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 app-editors/jedit/Manifest | 1 -
15 .../jedit/files/jedit-5.2.0-build-xml.patch | 24 -----
16 app-editors/jedit/jedit-5.2.0-r1.ebuild | 102 ---------------------
17 3 files changed, 127 deletions(-)
18
19 diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
20 index e18bb3da8221..a3f2a1f02ddc 100644
21 --- a/app-editors/jedit/Manifest
22 +++ b/app-editors/jedit/Manifest
23 @@ -1,2 +1 @@
24 -DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126
25 DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112
26
27 diff --git a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch b/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
28 deleted file mode 100644
29 index da0a91d54d22..000000000000
30 --- a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch
31 +++ /dev/null
32 @@ -1,24 +0,0 @@
33 -From 4dc53a4c320af0894bd600c77d4432c414cdee16 Mon Sep 17 00:00:00 2001
34 -From: Sebastian Pipping <sebastian@×××××××.org>
35 -Date: Sat, 8 Aug 2015 00:05:20 +0200
36 -Subject: [PATCH] Do not have target "build" call target "test"
37 -
38 ----
39 - build.xml | 1 -
40 - 1 file changed, 1 deletion(-)
41 -
42 -diff --git a/build.xml b/build.xml
43 -index f34934f..da5272a 100644
44 ---- a/build.xml
45 -+++ b/build.xml
46 -@@ -504,7 +504,6 @@
47 - </copy>
48 - </contrib:then>
49 - </contrib:if>
50 -- <antcall target="test" />
51 - </target>
52 -
53 - <target name="build-exe-launcher"
54 ---
55 -2.5.0
56 -
57
58 diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild
59 deleted file mode 100644
60 index e6ff8beafda0..000000000000
61 --- a/app-editors/jedit/jedit-5.2.0-r1.ebuild
62 +++ /dev/null
63 @@ -1,102 +0,0 @@
64 -# Copyright 1999-2021 Gentoo Authors
65 -# Distributed under the terms of the GNU General Public License v2
66 -
67 -EAPI=5
68 -
69 -JAVA_PKG_IUSE="doc test"
70 -
71 -inherit epatch java-pkg-2 java-ant-2 xdg-utils
72 -
73 -DESCRIPTION="Programmer's editor written in Java"
74 -HOMEPAGE="http://www.jedit.org"
75 -SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
76 -
77 -LICENSE="BSD GPL-2"
78 -KEYWORDS="amd64 ppc64 x86"
79 -SLOT="0"
80 -IUSE=""
81 -
82 -CDEPEND="
83 - dev-java/bsh:0
84 - dev-java/jsr305:0
85 - dev-java/ant-contrib:0
86 - dev-java/ant-apache-bsf:0"
87 -
88 -RDEPEND="
89 - ${CDEPEND}
90 - >=virtual/jre-1.7"
91 -
92 -DEPEND="
93 - ${CDEPEND}
94 - >=virtual/jdk-1.7"
95 -
96 -S="${WORKDIR}/jEdit"
97 -
98 -JEDIT_HOME="/usr/share/${PN}"
99 -
100 -java_prepare() {
101 - mkdir -p lib/{ant-contrib,compile,default-plugins,scripting} || die
102 -
103 - epatch "${FILESDIR}"/${P}-build-xml.patch
104 -
105 - java-ant_xml-rewrite -f "${S}/build.xml" -c \
106 - -e javadoc \
107 - -a failonerror \
108 - -v no || die
109 -}
110 -
111 -JAVA_ANT_REWRITE_CLASSPATH="true"
112 -
113 -EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh"
114 -EANT_GENTOO_CLASSPATH="jsr305"
115 -EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true"
116 -EANT_BUILD_TARGET="build"
117 -# TODO could build more docs, ie generate-doc-faq generate-doc-news
118 -# generate-doc-users-guide ua.
119 -EANT_DOC_TARGET="generate-javadoc"
120 -# in fact needed only for docs, but shouldn't hurt
121 -EANT_NEEDS_TOOLS="true"
122 -
123 -src_test() {
124 - java-pkg-2_src_test
125 -}
126 -
127 -src_install() {
128 - dodir ${JEDIT_HOME}
129 -
130 - cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \
131 - "${D}${JEDIT_HOME}" || die
132 -
133 - java-pkg_regjar "${JEDIT_HOME}/${PN}.jar"
134 -
135 - java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit
136 -
137 - use doc && java-pkg_dojavadoc build/classes/javadoc/api
138 -
139 - make_desktop_entry ${PN} \
140 - jEdit \
141 - ${JEDIT_HOME}/doc/${PN}.png \
142 - "Development;Utility;TextEditor"
143 -
144 - # keep the plugin directory
145 - keepdir ${JEDIT_HOME}/jars
146 -}
147 -
148 -pkg_postinst() {
149 - xdg_desktop_database_update
150 - elog "The system directory for jEdit plugins is"
151 - elog "${JEDIT_HOME}/jars"
152 - elog "If you get plugin related errors on startup, first try updating them."
153 -}
154 -
155 -pkg_postrm() {
156 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
157 - xdg_desktop_database_update
158 - elog "jEdit plugins installed into /usr/share/jedit/jars"
159 - elog "(after installation of jEdit itself) haven't been"
160 - elog "removed. To get rid of jEdit completely, you may"
161 - elog "want to run"
162 - elog ""
163 - elog " rm -r ${JEDIT_HOME}"
164 - fi
165 -}