Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-javacard/, profiles/
Date: Sat, 14 Sep 2019 15:37:56
Message-Id: 1568475441.ca7ea1c8fd6a27a574e1e1f016e4608da88fc085.mgorny@gentoo
1 commit: ca7ea1c8fd6a27a574e1e1f016e4608da88fc085
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 15:30:40 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 15:37:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7ea1c8
7
8 dev-java/netbeans-javacard: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-java/netbeans-javacard/Manifest | 5 -
13 dev-java/netbeans-javacard/metadata.xml | 12 ---
14 .../netbeans-javacard/netbeans-javacard-8.2.ebuild | 120 ---------------------
15 profiles/package.mask | 1 -
16 4 files changed, 138 deletions(-)
17
18 diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
19 deleted file mode 100644
20 index 2934927199b..00000000000
21 --- a/dev-java/netbeans-javacard/Manifest
22 +++ /dev/null
23 @@ -1,5 +0,0 @@
24 -DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 BLAKE2B e826ad6b908c476518086361384b498abb77703210c9702100c5e5ca87ef1038dbd448885ade5326878eb924298192714c76d07b30ac9080712ea20df53621e7 SHA512 119bfd0c03d8508251c1b70fb2ffaa2c096dbf12ee4558c689b81b33724d88ce03c7805dc473e806f49c0a400a9fd586e1d3c96a3362fa26a962144bc92e4abe
25 -DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 BLAKE2B 3eacce7db30ccc5f15ecf65bbcb24c24429646702e20d9a8983d4ac711bb62bde99999ef6f4e12118bf69e38716bbd96ec078f0129299538f93376ed0b74535a SHA512 4c61ac191ff528466d7112b7d162596ce6d636484bce84c1781f92e2c865592df8919ad410a1053a418710920815d7f04792b25275c5304a2b9107b5420bf792
26 -DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 BLAKE2B f5d82243a58e8dff86966d2d745ca2fd39654ba33d502cdd56ad4dcb88ca28bdf6e347dd48034bd2cb70318ff0cebc79c7b26887fcc5bad430c8ab13f9acc8f5 SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c
27 -DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
28 -DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
29
30 diff --git a/dev-java/netbeans-javacard/metadata.xml b/dev-java/netbeans-javacard/metadata.xml
31 deleted file mode 100644
32 index 85f4d904aad..00000000000
33 --- a/dev-java/netbeans-javacard/metadata.xml
34 +++ /dev/null
35 @@ -1,12 +0,0 @@
36 -<?xml version="1.0" encoding="UTF-8"?>
37 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
38 -<pkgmetadata>
39 -<maintainer type="person">
40 - <email>fordfrog@g.o</email>
41 - <name>Miroslav Šulc</name>
42 -</maintainer>
43 -<maintainer type="project">
44 - <email>java@g.o</email>
45 - <name>Java</name>
46 -</maintainer>
47 -</pkgmetadata>
48
49 diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
50 deleted file mode 100644
51 index 4d45318832a..00000000000
52 --- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
53 +++ /dev/null
54 @@ -1,120 +0,0 @@
55 -# Copyright 1999-2019 Gentoo Authors
56 -# Distributed under the terms of the GNU General Public License v2
57 -
58 -EAPI="6"
59 -inherit eutils java-pkg-2 java-ant-2
60 -
61 -DESCRIPTION="Netbeans JavaCard Cluster"
62 -HOMEPAGE="https://netbeans.org/projects/javacard"
63 -SLOT="8.2"
64 -SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
65 -SRC_URI="${SOURCE_URL}
66 - https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
67 - https://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
68 - https://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
69 - https://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
70 -LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
71 -KEYWORDS="amd64 ~x86"
72 -IUSE=""
73 -S="${WORKDIR}"
74 -
75 -CDEPEND="virtual/jdk:1.8
76 - ~dev-java/netbeans-extide-${PV}
77 - ~dev-java/netbeans-ide-${PV}
78 - ~dev-java/netbeans-java-${PV}
79 - ~dev-java/netbeans-platform-${PV}"
80 -DEPEND="${CDEPEND}
81 - app-arch/unzip
82 - dev-java/javahelp:0"
83 -RDEPEND="${CDEPEND}
84 - dev-java/ant-contrib:0
85 - dev-java/asm:3
86 - dev-java/bcel:0
87 - dev-java/commons-cli:1
88 - dev-java/commons-codec:0
89 - dev-java/commons-httpclient:3
90 - dev-java/commons-logging:0"
91 -
92 -INSTALL_DIR="/usr/share/${PN}-${SLOT}"
93 -
94 -EANT_BUILD_XML="nbbuild/build.xml"
95 -EANT_BUILD_TARGET="rebuild-cluster"
96 -EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
97 -EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
98 -JAVA_PKG_BSFIX="off"
99 -
100 -src_unpack() {
101 - unpack $(basename ${SOURCE_URL})
102 -
103 - einfo "Deleting bundled jars..."
104 - find -name "*.jar" -type f -delete
105 -
106 - unpack netbeans-8.2-build.xml.patch.bz2
107 -
108 - pushd "${S}" >/dev/null || die
109 - ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
110 - ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
111 - ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
112 - popd >/dev/null || die
113 -}
114 -
115 -src_prepare() {
116 - einfo "Deleting bundled class files..."
117 - find -name "*.class" -type f | xargs rm -vf
118 -
119 - eapply netbeans-8.2-build.xml.patch
120 -
121 - einfo "Symlinking external libraries..."
122 - java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
123 -
124 - einfo "Linking in other clusters..."
125 - mkdir "${S}"/nbbuild/netbeans || die
126 - pushd "${S}"/nbbuild/netbeans >/dev/null || die
127 -
128 - ln -s /usr/share/netbeans-extide-${SLOT} extide || die
129 - cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
130 - touch nb.cluster.extide.built
131 -
132 - ln -s /usr/share/netbeans-ide-${SLOT} ide || die
133 - cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
134 - touch nb.cluster.ide.built
135 -
136 - ln -s /usr/share/netbeans-java-${SLOT} java || die
137 - cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
138 - touch nb.cluster.java.built
139 -
140 - ln -s /usr/share/netbeans-platform-${SLOT} platform || die
141 - cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
142 - touch nb.cluster.platform.built
143 -
144 - popd >/dev/null || die
145 -
146 - java-pkg-2_src_prepare
147 - default
148 -}
149 -
150 -src_install() {
151 - pushd nbbuild/netbeans/javacard >/dev/null || die
152 -
153 - insinto ${INSTALL_DIR}
154 -
155 - grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
156 -
157 - doins -r *
158 - rm -fr "${D}"/${INSTALL_DIR}/bin || die
159 -
160 - popd >/dev/null || die
161 -
162 - local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
163 - pushd "${instdir}" >/dev/null || die
164 - rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
165 - rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
166 - rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
167 - rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
168 - rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
169 - rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
170 - rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
171 - popd >/dev/null || die
172 -
173 - dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
174 -}
175
176 diff --git a/profiles/package.mask b/profiles/package.mask
177 index b6c094608f4..68c0c44fcab 100644
178 --- a/profiles/package.mask
179 +++ b/profiles/package.mask
180 @@ -1151,7 +1151,6 @@ dev-java/netbeans-extide
181 dev-java/netbeans-groovy
182 dev-java/netbeans-java
183 dev-java/netbeans-java
184 -dev-java/netbeans-javacard
185 dev-java/netbeans-nb
186 dev-java/netbeans-php
187 dev-java/netbeans-profiler