Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/
Date: Sun, 02 Feb 2020 11:18:55
Message-Id: 1580642325.95f31cb0240fa74930e25d42271e4bca07ed6abe.voyageur@gentoo
1 commit: 95f31cb0240fa74930e25d42271e4bca07ed6abe
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 2 11:18:45 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 2 11:18:45 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f31cb0
7
8 net-misc/nx: drop old stable and ~arch versions
9
10 Package-Manager: Portage-2.3.86, Repoman-2.3.20
11 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
12
13 net-misc/nx/Manifest | 3 -
14 net-misc/nx/nx-3.5.0.33.ebuild | 102 -----------------------------
15 net-misc/nx/nx-3.5.99.17.ebuild | 138 ----------------------------------------
16 net-misc/nx/nx-3.5.99.20.ebuild | 138 ----------------------------------------
17 4 files changed, 381 deletions(-)
18
19 diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
20 index f094b7a6e28..282d7c4dbe2 100644
21 --- a/net-misc/nx/Manifest
22 +++ b/net-misc/nx/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
25 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
26 -DIST nx-libs-3.5.99.17-1-full.tar.gz 5287579 BLAKE2B 8ea54a55071e1161a349ecc1c897b1e774f43567e557cb5b06ed296922b87d2c9c613a58b2d86d7ef912d179d44ed09ca2aa6679c43c334bfbaa31edbf0aff11 SHA512 17c782ccd972c0b97de86195b5994e681570f0184813a8200fea4803d51e5033976e7c8300cb37ba6e811e26e526226a3d4e6a469eecdf772cbba7a12adeeabe
27 -DIST nx-libs-3.5.99.20-1-full.tar.gz 5404476 BLAKE2B 62509b76123373e5bed4e13d20ee22e5d52a2911a2a10db0bb73ba0ace4cd63d1f9e3aa900d4909f9a4b35be783d6b5246940108aef71ac785122982cf30d668 SHA512 7be65506c2345724de6986fca5c90d3a62f8a55e1b978d75e858324f85c63873b1ef882417ad313bf546a96252dc37fdaf401751b75cb71af8209002ecb0b602
28 DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
29
30 diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild
31 deleted file mode 100644
32 index 2623a5acd25..00000000000
33 --- a/net-misc/nx/nx-3.5.0.33.ebuild
34 +++ /dev/null
35 @@ -1,102 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -inherit autotools eutils toolchain-funcs
41 -
42 -DESCRIPTION="NX compression technology core libraries"
43 -HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
44 -
45 -SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="amd64 ~ppc x86"
50 -IUSE="elibc_glibc"
51 -
52 -RDEPEND="media-libs/freetype:2
53 - >=media-libs/libpng-1.2.8:*
54 - >=sys-libs/zlib-1.2.3
55 - virtual/jpeg:*"
56 -
57 -DEPEND="${RDEPEND}
58 - x11-base/xorg-proto
59 - x11-libs/libfontenc
60 - x11-misc/gccmakedep
61 - x11-misc/imake"
62 -
63 -S=${WORKDIR}/nx-libs-${PV}
64 -
65 -src_prepare() {
66 - default
67 -
68 - # run autoreconf in all neeed folders
69 - for i in nxcomp nxcompext nxcompshad nxproxy; do
70 - pushd "${S}"/${i} || die
71 - eautoreconf
72 - popd
73 - done
74 -
75 - # From xorg-x11-6.9.0-r3.ebuild
76 - pushd "${S}/nx-X11" || die
77 - HOSTCONF="config/cf/host.def"
78 - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
79 - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
80 - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
81 - # Respect LDFLAGS
82 - echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
83 - echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
84 - # Disable SunRPC, #370767
85 - echo "#define HasSecureRPC NO" >> ${HOSTCONF}
86 -
87 -}
88 -
89 -src_configure() {
90 - for i in nxcomp nxproxy; do
91 - pushd "${S}"/${i} || die
92 - econf
93 - popd
94 - done
95 -
96 - emake -C nx-X11 BuildEnv
97 -}
98 -
99 -src_compile() {
100 - emake -C nxcomp
101 -
102 - emake -C nx-X11/lib
103 -
104 - for i in nxcompext nxcompshad ; do
105 - pushd "${S}"/${i} || die
106 - # Configuration can only run after X11 lib compilation
107 - econf
108 - emake
109 - popd
110 - done
111 -
112 - pushd "${S}"/nx-X11 || die
113 - emake -C programs/Xserver
114 - emake -C programs/nxauth
115 - popd
116 -
117 - emake -C nxproxy
118 -}
119 -
120 -src_install() {
121 - dobin "${S}"/nx-X11/programs/Xserver/nxagent
122 - dobin "${S}"/nx-X11/programs/nxauth/nxauth
123 - dobin "${S}"/nxproxy/nxproxy
124 -
125 - for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
126 - do
127 - dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
128 - done
129 -
130 - dolib.so "${S}"/nxcomp/libXcomp.so*
131 - dolib.so "${S}"/nxcompext/libXcompext.so*
132 - dolib.so "${S}"/nxcompshad/libXcompshad.so*
133 -
134 - insinto /etc/nxagent
135 - newins etc/keystrokes.cfg keystroke.cfg
136 - doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
137 -}
138
139 diff --git a/net-misc/nx/nx-3.5.99.17.ebuild b/net-misc/nx/nx-3.5.99.17.ebuild
140 deleted file mode 100644
141 index 335570d48a4..00000000000
142 --- a/net-misc/nx/nx-3.5.99.17.ebuild
143 +++ /dev/null
144 @@ -1,138 +0,0 @@
145 -# Copyright 1999-2018 Gentoo Authors
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI=7
149 -inherit autotools toolchain-funcs
150 -
151 -DESCRIPTION="NX compression technology core libraries"
152 -HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
153 -
154 -SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-1-full.tar.gz"
155 -
156 -LICENSE="GPL-2"
157 -SLOT="0"
158 -KEYWORDS="~amd64 ~ppc ~x86"
159 -IUSE="elibc_glibc"
160 -
161 -RDEPEND="
162 - dev-libs/libxml2
163 - >=media-libs/libpng-1.2.8:0=
164 - >=sys-libs/zlib-1.2.3
165 - virtual/jpeg:*
166 - x11-libs/libX11
167 - x11-libs/libXcomposite
168 - x11-libs/libXdamage
169 - x11-libs/libXdmcp
170 - x11-libs/libXext
171 - x11-libs/libXfixes
172 - x11-libs/libXfont2
173 - x11-libs/libXinerama
174 - x11-libs/libXpm
175 - x11-libs/libXrandr
176 - x11-libs/libXrender
177 - x11-libs/libXtst
178 - x11-libs/pixman
179 -"
180 -
181 -DEPEND="${RDEPEND}
182 - x11-base/xorg-proto
183 - x11-libs/libfontenc
184 - x11-misc/gccmakedep
185 - x11-misc/imake"
186 -
187 -BDEPEND="
188 - virtual/pkgconfig
189 -"
190 -
191 -S="${WORKDIR}/nx-libs-HEAD"
192 -
193 -src_prepare() {
194 - default
195 -
196 - # We want predictable behavior. So let's assume we never
197 - # have quilt installed.
198 - sed 's@which quilt@false@' -i mesa-quilt || die
199 -
200 - # Do not compress man pages by default
201 - sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
202 -
203 - # run autoreconf in all needed folders
204 - local subdir
205 - for subdir in nxcomp nx-X11/lib nxcompshad nxproxy ; do
206 - pushd ${subdir} || die
207 - eautoreconf
208 - popd || die
209 - done
210 -
211 - # From xorg-x11-6.9.0-r3.ebuild
212 - pushd nx-X11 || die
213 - HOSTCONF="config/cf/host.def"
214 - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
215 - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
216 - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
217 - # Respect LDFLAGS
218 - echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
219 - echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
220 - # Disable SunRPC, #370767
221 - echo "#define HasSecureRPC NO" >> ${HOSTCONF}
222 -}
223 -
224 -src_configure() {
225 - local subdir
226 - for subdir in nxcomp nxcompshad nxproxy ; do
227 - pushd ${subdir} || die
228 - econf
229 - popd || die
230 - done
231 -
232 - pushd "nx-X11/lib" || die
233 - econf --disable-poll
234 - popd || die
235 -}
236 -
237 -src_compile() {
238 - # First set up the build environment
239 - emake build-env
240 -
241 - # We replicate the "build-full" make target here because
242 - # we cannot call "make build-full" as it
243 - # - calls autoreconf several times
244 - # - invokes make directly but we prefer our emake
245 -
246 - emake -C nxcomp
247 - emake -C nx-X11/lib
248 -
249 - mkdir -p nx-X11/exports/lib/ || die
250 - local nxlib
251 - for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
252 - ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
253 - done
254 -
255 - emake -C nxcompshad
256 -
257 - ./mesa-quilt push -a || die
258 -
259 - emake -C nx-X11 BuildDependsOnly
260 - # Parallel make issue resurfaced, upstream working on autotools switch
261 - emake -j1 -C nx-X11 World \
262 - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
263 - SHLIBDIR="/usr/$(get_libdir)"
264 -
265 - emake -C nxproxy
266 -}
267 -
268 -src_install() {
269 - emake \
270 - DESTDIR="${D}" \
271 - PREFIX="/usr" \
272 - NXLIBDIR="/usr/$(get_libdir)/${PN}" \
273 - SHLIBDIR="/usr/$(get_libdir)" \
274 - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
275 - install
276 -
277 - # Already provided by mesa & related packages
278 - rm -r "${ED}"/usr/include/GL || die
279 -
280 - # Get rid of libtool files and static libs.
281 - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
282 -}
283
284 diff --git a/net-misc/nx/nx-3.5.99.20.ebuild b/net-misc/nx/nx-3.5.99.20.ebuild
285 deleted file mode 100644
286 index a42650c086f..00000000000
287 --- a/net-misc/nx/nx-3.5.99.20.ebuild
288 +++ /dev/null
289 @@ -1,138 +0,0 @@
290 -# Copyright 1999-2019 Gentoo Authors
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI=7
294 -inherit autotools toolchain-funcs
295 -
296 -DESCRIPTION="NX compression technology core libraries"
297 -HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
298 -
299 -SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-1-full.tar.gz"
300 -
301 -LICENSE="GPL-2"
302 -SLOT="0"
303 -KEYWORDS="~amd64 ~ppc ~x86"
304 -IUSE="elibc_glibc"
305 -
306 -RDEPEND="
307 - dev-libs/libxml2
308 - >=media-libs/libpng-1.2.8:0=
309 - >=sys-libs/zlib-1.2.3
310 - virtual/jpeg:*
311 - x11-libs/libX11
312 - x11-libs/libXcomposite
313 - x11-libs/libXdamage
314 - x11-libs/libXdmcp
315 - x11-libs/libXext
316 - x11-libs/libXfixes
317 - x11-libs/libXfont2
318 - x11-libs/libXinerama
319 - x11-libs/libXpm
320 - x11-libs/libXrandr
321 - x11-libs/libXrender
322 - x11-libs/libXtst
323 - x11-libs/pixman
324 -"
325 -
326 -DEPEND="${RDEPEND}
327 - x11-base/xorg-proto
328 - x11-libs/libfontenc
329 - x11-misc/gccmakedep
330 - x11-misc/imake"
331 -
332 -BDEPEND="
333 - virtual/pkgconfig
334 -"
335 -
336 -S="${WORKDIR}/nx-libs-${PV}-1"
337 -
338 -src_prepare() {
339 - default
340 -
341 - # We want predictable behavior. So let's assume we never
342 - # have quilt installed.
343 - sed 's@which quilt@false@' -i mesa-quilt || die
344 -
345 - # Do not compress man pages by default
346 - sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
347 -
348 - # run autoreconf in all needed folders
349 - local subdir
350 - for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
351 - pushd ${subdir} || die
352 - eautoreconf
353 - popd || die
354 - done
355 -
356 - # From xorg-x11-6.9.0-r3.ebuild
357 - pushd nx-X11 || die
358 - HOSTCONF="config/cf/host.def"
359 - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
360 - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
361 - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
362 - # Respect LDFLAGS
363 - echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
364 - echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
365 - # Disable SunRPC, #370767
366 - echo "#define HasSecureRPC NO" >> ${HOSTCONF}
367 -}
368 -
369 -src_configure() {
370 - local subdir
371 - for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
372 - pushd ${subdir} || die
373 - econf
374 - popd || die
375 - done
376 -
377 - pushd "nx-X11/lib" || die
378 - econf --disable-poll
379 - popd || die
380 -}
381 -
382 -src_compile() {
383 - # First set up the build environment
384 - emake build-env
385 -
386 - # We replicate the "build-full" make target here because
387 - # we cannot call "make build-full" as it
388 - # - calls autoreconf several times
389 - # - invokes make directly but we prefer our emake
390 -
391 - emake -C nxcomp
392 - emake -C nx-X11/lib
393 -
394 - mkdir -p nx-X11/exports/lib/ || die
395 - local nxlib
396 - for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
397 - ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
398 - done
399 -
400 - emake -C nxcompshad
401 -
402 - ./mesa-quilt push -a || die
403 -
404 - emake -C nx-X11 BuildDependsOnly
405 - # Parallel make issue resurfaced, upstream working on autotools switch
406 - emake -j1 -C nx-X11 World \
407 - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
408 - SHLIBDIR="/usr/$(get_libdir)"
409 -
410 - emake -C nxproxy
411 -}
412 -
413 -src_install() {
414 - emake \
415 - DESTDIR="${D}" \
416 - PREFIX="/usr" \
417 - NXLIBDIR="/usr/$(get_libdir)/${PN}" \
418 - SHLIBDIR="/usr/$(get_libdir)" \
419 - USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
420 - install
421 -
422 - # Already provided by mesa & related packages
423 - rm -r "${ED}"/usr/include/GL || die
424 -
425 - # Get rid of libtool files and static libs.
426 - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
427 -}