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: profiles/, dev-java/netbeans-javafx/
Date: Sat, 14 Sep 2019 15:37:55
Message-Id: 1568475440.b106e7cd572978e36e215c7a48f8be762cc88fe1.mgorny@gentoo
1 commit: b106e7cd572978e36e215c7a48f8be762cc88fe1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 15:29:58 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 15:37:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b106e7cd
7
8 dev-java/netbeans-javafx: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-java/netbeans-javafx/Manifest | 8 --
13 dev-java/netbeans-javafx/metadata.xml | 12 ---
14 .../netbeans-javafx/netbeans-javafx-8.2.ebuild | 110 ---------------------
15 profiles/package.mask | 1 -
16 4 files changed, 131 deletions(-)
17
18 diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
19 deleted file mode 100644
20 index a1290a3f119..00000000000
21 --- a/dev-java/netbeans-javafx/Manifest
22 +++ /dev/null
23 @@ -1,8 +0,0 @@
24 -DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 BLAKE2B 4b4c47851bca5a7cb4e81791ed186790167e5804a072f52a0ad75d6e133f7f37875ed20350f6d39b72da32aa659486e4d3334972f21ff27d8f0a400545bc3793 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900
25 -DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 BLAKE2B e58aecad031e08a69d9f3f69be74960a9ed8049a94d8445bf5750c6b2907b4739f63d1f37ac6aa50a5fe96c02cba7d3ccfb836304b6956d3a21add3d8c83f32a SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58
26 -DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 BLAKE2B 8b20b89514fec78b00ce9f8c5cd04105f23b7c5637d7f741ee9a95fd888a2394ea269166b5ca065c25ab13e4a0edeaba4adb20c834c20cb5417ea8518eab3c1a SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2
27 -DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 BLAKE2B ac04471f6fd5869d4fff8fe86749b599cd49d81d55319085c01f7fdd7ff30aebeffafa46dad254e7193fe3d035f3b4d0310a7e9242cb54daf82188510e4fcafb SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399
28 -DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAKE2B e06b4df3e96cdaf8150c74f2039a28251a55469449674cbb045a46d7866ddfa52f6e3ac4a01a7c7da4f40906038245574f1cb208aa3385bdc48f88ece3924519 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359
29 -DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
30 -DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
31 -DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
32
33 diff --git a/dev-java/netbeans-javafx/metadata.xml b/dev-java/netbeans-javafx/metadata.xml
34 deleted file mode 100644
35 index 85f4d904aad..00000000000
36 --- a/dev-java/netbeans-javafx/metadata.xml
37 +++ /dev/null
38 @@ -1,12 +0,0 @@
39 -<?xml version="1.0" encoding="UTF-8"?>
40 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
41 -<pkgmetadata>
42 -<maintainer type="person">
43 - <email>fordfrog@g.o</email>
44 - <name>Miroslav Šulc</name>
45 -</maintainer>
46 -<maintainer type="project">
47 - <email>java@g.o</email>
48 - <name>Java</name>
49 -</maintainer>
50 -</pkgmetadata>
51
52 diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
53 deleted file mode 100644
54 index 5e72a9f1475..00000000000
55 --- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
56 +++ /dev/null
57 @@ -1,110 +0,0 @@
58 -# Copyright 1999-2019 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI="6"
62 -inherit eutils java-pkg-2 java-ant-2
63 -
64 -DESCRIPTION="Netbeans JavaFX Cluster"
65 -HOMEPAGE="https://netbeans.org/projects/javafx"
66 -SLOT="8.2"
67 -SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
68 -SRC_URI="${SOURCE_URL}
69 - https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
70 - https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
71 - https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
72 - https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
73 - https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
74 - https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
75 - https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
76 -LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
77 -KEYWORDS="amd64 ~x86"
78 -IUSE=""
79 -S="${WORKDIR}"
80 -
81 -CDEPEND="virtual/jdk:1.8
82 - ~dev-java/netbeans-extide-${PV}
83 - ~dev-java/netbeans-ide-${PV}
84 - ~dev-java/netbeans-java-${PV}
85 - ~dev-java/netbeans-platform-${PV}"
86 -DEPEND="${CDEPEND}
87 - app-arch/unzip
88 - dev-java/javahelp:0
89 - dev-java/junit:4"
90 -RDEPEND="${CDEPEND}"
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.javafx -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}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
110 - ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
111 - ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
112 - ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
113 - ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
114 - ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
115 - popd >/dev/null || die
116 -}
117 -
118 -src_prepare() {
119 - einfo "Deleting bundled class files..."
120 - find -name "*.class" -type f | xargs rm -vf
121 -
122 - eapply netbeans-8.2-build.xml.patch
123 -
124 - einfo "Symlinking external libraries..."
125 - java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
126 - java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
127 - java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
128 -
129 - einfo "Linking in other clusters..."
130 - mkdir "${S}"/nbbuild/netbeans || die
131 - pushd "${S}"/nbbuild/netbeans >/dev/null || die
132 -
133 - ln -s /usr/share/netbeans-extide-${SLOT} extide || die
134 - cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
135 - touch nb.cluster.extide.built
136 -
137 - ln -s /usr/share/netbeans-ide-${SLOT} ide || die
138 - cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
139 - touch nb.cluster.ide.built
140 -
141 - ln -s /usr/share/netbeans-java-${SLOT} java || die
142 - cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
143 - touch nb.cluster.java.built
144 -
145 - ln -s /usr/share/netbeans-platform-${SLOT} platform || die
146 - cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
147 - touch nb.cluster.platform.built
148 -
149 - popd >/dev/null || die
150 -
151 - java-pkg-2_src_prepare
152 - default
153 -}
154 -
155 -src_install() {
156 - pushd nbbuild/netbeans/javafx >/dev/null || die
157 -
158 - insinto ${INSTALL_DIR}
159 -
160 - grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
161 -
162 - doins -r *
163 -
164 - popd >/dev/null || die
165 -
166 - dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
167 -}
168
169 diff --git a/profiles/package.mask b/profiles/package.mask
170 index 6364473811d..b6c094608f4 100644
171 --- a/profiles/package.mask
172 +++ b/profiles/package.mask
173 @@ -1152,7 +1152,6 @@ dev-java/netbeans-groovy
174 dev-java/netbeans-java
175 dev-java/netbeans-java
176 dev-java/netbeans-javacard
177 -dev-java/netbeans-javafx
178 dev-java/netbeans-nb
179 dev-java/netbeans-php
180 dev-java/netbeans-profiler