Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/files/1.5.0/, net-misc/nx/files/, net-misc/nx/
Date: Mon, 07 Mar 2016 13:55:46
Message-Id: 1457358873.14bf9d4f5d5f546edf36bf411b5622e42433ef90.voyageur@gentoo
1 commit: 14bf9d4f5d5f546edf36bf411b5622e42433ef90
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 7 13:53:32 2016 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 7 13:54:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bf9d4f
7
8 net-misc/nx: drop some old versions
9
10 Package-Manager: portage-2.2.27
11
12 net-misc/nx/Manifest | 2 -
13 .../nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch | 11 ---
14 net-misc/nx/files/nx-3.3.0-cflags.patch | 54 -----------
15 net-misc/nx/nx-3.5.0.20.ebuild | 96 -------------------
16 net-misc/nx/nx-3.5.0.28.ebuild | 104 ---------------------
17 5 files changed, 267 deletions(-)
18
19 diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
20 index 41c7275..b398152 100644
21 --- a/net-misc/nx/Manifest
22 +++ b/net-misc/nx/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST nx-libs-3.5.0.20-full.tar.gz 21875905 SHA256 ce53b1c1cc5115d1303b652099c7b7e1a50a996ff0f136853a6fd54bb5668da8 SHA512 0cecdde638c454e6bf48cb73037a0b6651eda4cf93c5953f678a122219df6c06cea70509b044482ea1b630ae413b26a701341b20d55347b57170517aa9709eef WHIRLPOOL a2d8e64db333d02ca22d0d0a8e9e2ea97199fb3315af8cb60ffd617a8e8a0b2851ce87d912d40c3cd00e7455a67a096ac48360a5a1df2ffb4c627ecd0dbed513
25 -DIST nx-libs-3.5.0.28-full.tar.gz 15589759 SHA256 c0448884f35280f92db639a91d3f3a35b3b57581949bd3a4b9da0ae685b57429 SHA512 1139e1f48f566fc9c5ef105ba5f674e6a3881f75b96fc0e1dbdc9e450b53bcf3a29d2422573b69e240840c2941cee67efc96f2024b24f69068c4abebee42660c WHIRLPOOL 4e062aea33fe2d2ac2ffa6baba29cab3a91c6d34cc3b35e95219de83f22ae1e77d55d4b77502a96ad3bd8dc0a3c500e839ec1dbae6b5c98f74baf70bd2ebfcce
26 DIST nx-libs-3.5.0.30-full.tar.gz 6639925 SHA256 60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a SHA512 223c73de1b8988d17a555a7dd56c14ddc27855b7c1d9a9b28c053161a707520c1fcef697c3d9148222dae23e1465e72821455271477ac835d5cc63498b45e005 WHIRLPOOL eebd82ff2e7b434840c1f2a451edfdf454903a28b4d9861d1c568308443bff6a05082cd73a446049c840d75bb9b107aab16c6c85fa48529b445ee3b3ac77eb24
27 DIST nx-libs-3.5.0.32-full.tar.gz 6801696 SHA256 be166390ed7c08b96bd62f1e93910d720d105c679481bc389e833003da2a226d SHA512 8b4a042993d45e1aee3e13e8b86f68cd5b2a8b52e9299de6129abd8e3bb89d73cf2b44b03d3c7fabbd8329abc06dc912ac95bbf936b6478b05fc202cc29a090f WHIRLPOOL 5d97b83ad66ee51b676e15102f0fade974a619840b1e180607062e6694e7eebddf3bceb85324bc59c976d468b283eaa4e99c0a609b707cdae03096d92fab81e5
28
29 diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
30 deleted file mode 100644
31 index ece2214..0000000
32 --- a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
33 +++ /dev/null
34 @@ -1,11 +0,0 @@
35 ---- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000
36 -+++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000
37 -@@ -974,7 +974,7 @@
38 - static void
39 - get_libc_version(FILE *inFile)
40 - {
41 -- char aout[] = "/tmp/imakeXXXXXX";
42 -+ char aout[] = "./imakeXXXXXX";
43 - FILE *fp;
44 - const char *format = "%s -o %s -x c -";
45 - char *cc;
46
47 diff --git a/net-misc/nx/files/nx-3.3.0-cflags.patch b/net-misc/nx/files/nx-3.3.0-cflags.patch
48 deleted file mode 100644
49 index 3556293..0000000
50 --- a/net-misc/nx/files/nx-3.3.0-cflags.patch
51 +++ /dev/null
52 @@ -1,54 +0,0 @@
53 ---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
54 -+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
55 -@@ -7,8 +7,7 @@
56 -
57 - dnl Set our default compilation flags.
58 -
59 --CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
60 --CFLAGS="-O3"
61 -+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
62 -
63 - dnl Reset default linking directives.
64 -
65 ---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
66 -+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
67 -@@ -5,11 +5,6 @@
68 - AC_INIT(NXlib.h)
69 - AC_PREREQ(2.13)
70 -
71 --dnl Reset default compilation flags.
72 --
73 --CXXFLAGS="-O3"
74 --CFLAGS="-O3"
75 --
76 - dnl Reset default linking directives.
77 -
78 - LIBSTATIC=""
79 ---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
80 -+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
81 -@@ -5,11 +5,6 @@
82 - AC_INIT(Shadow.h)
83 - AC_PREREQ(2.13)
84 -
85 --dnl Reset default compilation flags.
86 --
87 --CXXFLAGS="-O3"
88 --CPPFLAGS="-O3"
89 --
90 - dnl Reset default linking directives.
91 -
92 - LIBSTATIC=""
93 ---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
94 -+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
95 -@@ -5,11 +5,6 @@
96 - AC_INIT(Main.c)
97 - AC_PREREQ(2.13)
98 -
99 --dnl Reset default compilation flags.
100 --
101 --CXXFLAGS="-O3"
102 --CPPFLAGS="-O3"
103 --
104 - dnl Prefer headers and libraries from nx-X11 if present.
105 -
106 - if test -d "../nx-X11/exports/include" ; then
107
108 diff --git a/net-misc/nx/nx-3.5.0.20.ebuild b/net-misc/nx/nx-3.5.0.20.ebuild
109 deleted file mode 100644
110 index 013c10c..0000000
111 --- a/net-misc/nx/nx-3.5.0.20.ebuild
112 +++ /dev/null
113 @@ -1,96 +0,0 @@
114 -# Copyright 1999-2015 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -# $Id$
117 -
118 -EAPI=4
119 -inherit autotools eutils multilib
120 -
121 -DESCRIPTION="NX compression technology core libraries"
122 -HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
123 -
124 -SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
125 -
126 -LICENSE="GPL-2"
127 -SLOT="0"
128 -KEYWORDS="amd64 ~ppc x86"
129 -IUSE="elibc_glibc"
130 -
131 -RDEPEND=">=media-libs/libpng-1.2.8
132 - >=sys-libs/zlib-1.2.3
133 - virtual/jpeg"
134 -
135 -DEPEND="${RDEPEND}
136 - x11-misc/gccmakedep
137 - x11-misc/imake
138 - x11-proto/inputproto"
139 -
140 -S=${WORKDIR}/nx-libs-${PV}
141 -
142 -src_prepare() {
143 - # For nxcl/qtnx
144 - cd "${S}"/nxproxy
145 - epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
146 -
147 - cd "${S}"
148 - # Fix sandbox violation
149 - epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
150 - # -fPIC
151 - epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
152 - # Drop force -O3, set AR/RANLIB and
153 - # run autoreconf in all neeed folders
154 - epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
155 - for i in nxcomp nxcompext nxcompshad nxproxy; do
156 - cd "${S}"/${i}
157 - eautoreconf ${i}
158 - cd "${S}"
159 - done
160 -
161 - # From xorg-x11-6.9.0-r3.ebuild
162 - cd "${S}/nx-X11"
163 - HOSTCONF="config/cf/host.def"
164 - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
165 - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
166 - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
167 - # Respect LDFLAGS
168 - echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
169 - echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
170 -}
171 -
172 -src_configure() {
173 - cd "${S}"/nxproxy
174 - econf
175 -}
176 -
177 -src_compile() {
178 - cd "${S}/nx-X11"
179 - FAST=1 emake World WORLDOPTS="" MAKE="make" \
180 - AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
181 - CC="$(tc-getCC)" CXX="$(tc-getCXX)"
182 -
183 - cd "${S}"/nxproxy
184 - emake
185 -}
186 -
187 -src_install() {
188 - NX_ROOT=/usr/$(get_libdir)/NX
189 -
190 - for x in nxagent nxauth nxproxy; do
191 - make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
192 - die " $x wrapper creation failed"
193 - done
194 -
195 - into ${NX_ROOT}
196 - dobin "${S}"/nx-X11/programs/Xserver/nxagent
197 - dobin "${S}"/nx-X11/programs/nxauth/nxauth
198 - dobin "${S}"/nxproxy/nxproxy
199 -
200 - for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
201 - do
202 - dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
203 - done
204 - dolib.so "${S}"/nx-X11/lib/freetype2/libNX_freetype.so*
205 -
206 - dolib.so "${S}"/nxcomp/libXcomp.so*
207 - dolib.so "${S}"/nxcompext/libXcompext.so*
208 - dolib.so "${S}"/nxcompshad/libXcompshad.so*
209 -}
210
211 diff --git a/net-misc/nx/nx-3.5.0.28.ebuild b/net-misc/nx/nx-3.5.0.28.ebuild
212 deleted file mode 100644
213 index df7a2bf..0000000
214 --- a/net-misc/nx/nx-3.5.0.28.ebuild
215 +++ /dev/null
216 @@ -1,104 +0,0 @@
217 -# Copyright 1999-2015 Gentoo Foundation
218 -# Distributed under the terms of the GNU General Public License v2
219 -# $Id$
220 -
221 -EAPI=5
222 -inherit autotools eutils multilib readme.gentoo
223 -
224 -DESCRIPTION="NX compression technology core libraries"
225 -HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
226 -
227 -SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
228 -
229 -LICENSE="GPL-2"
230 -SLOT="0"
231 -KEYWORDS="~amd64 ~ppc ~x86"
232 -IUSE="elibc_glibc"
233 -
234 -RDEPEND="media-libs/freetype:2
235 - >=media-libs/libpng-1.2.8:*
236 - >=sys-libs/zlib-1.2.3
237 - virtual/jpeg:*"
238 -
239 -DEPEND="${RDEPEND}
240 - x11-libs/libfontenc
241 - x11-misc/gccmakedep
242 - x11-misc/imake
243 - x11-proto/inputproto"
244 -
245 -S=${WORKDIR}/nx-libs-${PV}
246 -
247 -DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
248 -useflag on x11-libs/cairo."
249 -
250 -src_prepare() {
251 - # For nxcl/qtnx
252 - cd "${S}"/nxproxy
253 - epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
254 -
255 - cd "${S}"
256 - # -fPIC
257 - epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
258 - # Drop force -O3, set AR/RANLIB and
259 - # run autoreconf in all neeed folders
260 - epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
261 - for i in nxcomp nxcompext nxcompshad nxproxy; do
262 - cd "${S}"/${i}
263 - eautoreconf ${i}
264 - cd "${S}"
265 - done
266 -
267 - # From xorg-x11-6.9.0-r3.ebuild
268 - cd "${S}/nx-X11"
269 - HOSTCONF="config/cf/host.def"
270 - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
271 - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
272 - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
273 - # Respect LDFLAGS
274 - echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
275 - echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
276 -}
277 -
278 -src_configure() {
279 - cd "${S}"/nxproxy
280 - econf
281 -}
282 -
283 -src_compile() {
284 - cd "${S}/nx-X11"
285 - FAST=1 emake World WORLDOPTS="" MAKE="make" \
286 - AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
287 - CC="$(tc-getCC)" CXX="$(tc-getCXX)"
288 -
289 - cd "${S}"/nxproxy
290 - emake
291 -}
292 -
293 -src_install() {
294 - NX_ROOT=/usr/$(get_libdir)/NX
295 -
296 - for x in nxagent nxauth nxproxy; do
297 - make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
298 - die " $x wrapper creation failed"
299 - done
300 -
301 - into ${NX_ROOT}
302 - dobin "${S}"/nx-X11/programs/Xserver/nxagent
303 - dobin "${S}"/nx-X11/programs/nxauth/nxauth
304 - dobin "${S}"/nxproxy/nxproxy
305 -
306 - for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
307 - do
308 - dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
309 - done
310 -
311 - dolib.so "${S}"/nxcomp/libXcomp.so*
312 - dolib.so "${S}"/nxcompext/libXcompext.so*
313 - dolib.so "${S}"/nxcompshad/libXcompshad.so*
314 -
315 - insinto /etc/nxagent
316 - newins etc/keystrokes.cfg keystroke.cfg
317 - doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
318 -
319 - readme.gentoo_create_doc
320 -}
Report Message
Find on MARC Find on Google Groups