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-php/, profiles/
Date: Sat, 14 Sep 2019 15:37:56
Message-Id: 1568475442.ebf553670789ff87caa3c630eada00b1d566325e.mgorny@gentoo
1 commit: ebf553670789ff87caa3c630eada00b1d566325e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 15:30:54 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 15:37:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf55367
7
8 dev-java/netbeans-php: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-java/netbeans-php/Manifest | 5 --
13 dev-java/netbeans-php/metadata.xml | 12 ---
14 dev-java/netbeans-php/netbeans-php-8.2.ebuild | 113 --------------------------
15 profiles/package.mask | 1 -
16 4 files changed, 131 deletions(-)
17
18 diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
19 deleted file mode 100644
20 index e17f028bbe6..00000000000
21 --- a/dev-java/netbeans-php/Manifest
22 +++ /dev/null
23 @@ -1,5 +0,0 @@
24 -DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 BLAKE2B ac7a248bd3431c2421474065fc1886f7861445c1ec29bfc48de91bffc7f1ebe9256dbd3413fab96276ff3fd26b46ac095cb86b15571dd8e75ac71da13868fda3 SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076
25 -DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 BLAKE2B b116ea4bdfa656e618ee850fa59b74cb1adbc79a263eabd6a87c0b49037308d40d187643de843bfd89a963d2b7e912a70b9e84ee5a3d43a109a046100aa474ae SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01
26 -DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 BLAKE2B b66803089a422d55a9187a51e3381f6bae6eb80d602b4bbe51423fe46065c5b8ff23ed22f8b55e3743d851b6a6c603c09daf4233e244fb5ce87ba9943e460eef SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341
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-php/metadata.xml b/dev-java/netbeans-php/metadata.xml
31 deleted file mode 100644
32 index 85f4d904aad..00000000000
33 --- a/dev-java/netbeans-php/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-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
50 deleted file mode 100644
51 index 0b3de0e070d..00000000000
52 --- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
53 +++ /dev/null
54 @@ -1,113 +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 PHP Cluster"
62 -HOMEPAGE="https://netbeans.org/projects/php"
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/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
68 - https://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
69 - https://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.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-platform-${PV}
79 - ~dev-java/netbeans-webcommon-${PV}
80 - ~dev-java/netbeans-websvccommon-${PV}
81 - dev-java/javacup:0"
82 -DEPEND="${CDEPEND}
83 - app-arch/unzip
84 - dev-java/javahelp:0"
85 -RDEPEND="${CDEPEND}"
86 -
87 -INSTALL_DIR="/usr/share/${PN}-${SLOT}"
88 -
89 -EANT_BUILD_XML="nbbuild/build.xml"
90 -EANT_BUILD_TARGET="rebuild-cluster"
91 -EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
92 -EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
93 -JAVA_PKG_BSFIX="off"
94 -
95 -src_unpack() {
96 - unpack $(basename ${SOURCE_URL})
97 -
98 - einfo "Deleting bundled jars..."
99 - find -name "*.jar" -type f -delete
100 -
101 - unpack netbeans-8.2-build.xml.patch.bz2
102 -
103 - pushd "${S}" >/dev/null || die
104 - ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
105 - ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
106 - ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
107 - popd >/dev/null || die
108 -}
109 -
110 -src_prepare() {
111 - einfo "Deleting bundled class files..."
112 - find -name "*.class" -type f | xargs rm -vf
113 -
114 - eapply netbeans-8.2-build.xml.patch
115 -
116 - einfo "Symlinking external libraries..."
117 - java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
118 - java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
119 -
120 - einfo "Linking in other clusters..."
121 - mkdir "${S}"/nbbuild/netbeans || die
122 - pushd "${S}"/nbbuild/netbeans >/dev/null || die
123 -
124 - ln -s /usr/share/netbeans-extide-${SLOT} extide || die
125 - cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
126 - touch nb.cluster.extide.built
127 -
128 - ln -s /usr/share/netbeans-ide-${SLOT} ide || die
129 - cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
130 - touch nb.cluster.ide.built
131 -
132 - ln -s /usr/share/netbeans-platform-${SLOT} platform || die
133 - cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
134 - touch nb.cluster.platform.built
135 -
136 - ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
137 - cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
138 - touch nb.cluster.webcommon.built
139 -
140 - ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
141 - cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
142 - touch nb.cluster.websvccommon.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/php >/dev/null || die
152 -
153 - insinto ${INSTALL_DIR}
154 -
155 - grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
156 -
157 - doins -r *
158 -
159 - popd >/dev/null || die
160 -
161 - local instdir="${D}"/${INSTALL_DIR}/modules/ext
162 - pushd "${instdir}" >/dev/null || die
163 - rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
164 - popd >/dev/null || die
165 -
166 - dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
167 -}
168
169 diff --git a/profiles/package.mask b/profiles/package.mask
170 index 68c0c44fcab..8610f26661a 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-nb
177 -dev-java/netbeans-php
178 dev-java/netbeans-profiler
179 dev-java/netbeans-webcommon
180 dev-java/netbeans-websvccommon