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

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: x11-misc/xorg-cf-files/files/, x11-misc/xorg-cf-files/
Date: Mon, 11 Dec 2017 19:57:26
Message-Id: 1513022225.c3338f8d8c84c2a4680795b997558be23a4abc00.mgorny@gentoo
1 commit: c3338f8d8c84c2a4680795b997558be23a4abc00
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 11 19:55:29 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 11 19:57:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3338f8d
7
8 x11-misc/xorg-cf-files: [QA] Move big patch to a distfile
9
10 Closes: https://bugs.gentoo.org/620646
11
12 x11-misc/xorg-cf-files/Manifest | 1 +
13 .../files/xorg-cf-files-1.0.2-solaris-prefix.patch | 663 ---------------------
14 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 3 +-
15 3 files changed, 3 insertions(+), 664 deletions(-)
16
17 diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
18 index 8e03f6154fd..27f100a1a0d 100644
19 --- a/x11-misc/xorg-cf-files/Manifest
20 +++ b/x11-misc/xorg-cf-files/Manifest
21 @@ -1 +1,2 @@
22 +DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf SHA512 61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6
23 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
24
25 diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
26 deleted file mode 100644
27 index b797b2588d1..00000000000
28 --- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
29 +++ /dev/null
30 @@ -1,663 +0,0 @@
31 ---- sunLib.rules.orig 2008-12-18 13:43:19.032933408 +0100
32 -+++ sunLib.rules 2008-12-18 13:51:12.494555406 +0100
33 -@@ -7,127 +7,268 @@
34 - XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $
35 -
36 - #ifndef HasSharedLibraries
37 --#define HasSharedLibraries YES
38 -+# define HasSharedLibraries YES
39 - #endif
40 --#ifndef SharedDataSeparation
41 --#define SharedDataSeparation YES
42 -+#ifndef ForceNormalLib
43 -+# define ForceNormalLib NO
44 - #endif
45 --#ifndef SharedCodeDef
46 --#define SharedCodeDef -DSHAREDCODE
47 --#endif
48 --#ifndef SharedLibraryDef
49 --#define SharedLibraryDef -DSUNSHLIB
50 --#endif
51 --#ifndef ShLibIncludeFile
52 --#define ShLibIncludeFile <sunLib.tmpl>
53 --#endif
54 --#ifndef SharedLibraryLoadFlags
55 --#define SharedLibraryLoadFlags -assert pure-text
56 --#endif
57 --#ifndef PositionIndependentCFlags
58 --#if HasGcc2
59 --#define PositionIndependentCFlags -fPIC
60 --#else
61 --#define PositionIndependentCFlags -pic
62 -+
63 -+#ifndef UseRpath
64 -+#define UseRpath NO
65 - #endif
66 -+
67 -+#ifndef SharedOldX
68 -+# define SharedOldX NO
69 - #endif
70 --#ifndef PositionIndependentCplusplusFlags
71 --#if HasGcc2ForCplusplus
72 --#define PositionIndependentCplusplusFlags -fPIC
73 -+# ifndef SharedDataSeparation
74 -+# define SharedDataSeparation NO
75 -+# endif
76 -+# ifndef SharedCodeDef
77 -+# define SharedCodeDef /**/
78 -+# endif
79 -+# ifndef SharedLibraryDef
80 -+# define SharedLibraryDef /**/
81 -+# endif
82 -+# ifndef ShLibIncludeFile
83 -+# define ShLibIncludeFile <sunLib.tmpl>
84 -+# endif
85 -+#ifndef RpathLoadFlags
86 -+#if UseRpath
87 -+#define RpathLoadFlags -R$(USRLIBDIRPATH)
88 - #else
89 --#define PositionIndependentCplusplusFlags -pic
90 -+#define RpathLoadFlags /**/
91 - #endif
92 - #endif
93 --
94 --/*
95 -- * SharedDSLibDependencies - shared library dependencies with data separation
96 -- */
97 --#ifndef SharedDSLibDependencies
98 --#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
99 -+#ifndef LibraryRpathLoadFlags
100 -+#define LibraryRpathLoadFlags RpathLoadFlags
101 - #endif
102 -+# ifndef SharedLibraryLoadFlags
103 -+# define SharedLibraryLoadFlags -shared
104 -+# endif
105 -+# ifndef PositionIndependentCFlags
106 -+# define PositionIndependentCFlags -fPIC
107 -+# endif
108 -+# ifndef PositionIndependentCplusplusFlags
109 -+# define PositionIndependentCplusplusFlags -fPIC
110 -+# endif
111 -+# ifndef ExtraLoadFlags
112 -+# if LinuxBinUtilsMajorVersion >= 26
113 -+# ifdef UseInstalled
114 -+# if LinuxBinUtilsMajorVersion < 27
115 -+# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
116 -+# endif
117 -+# else
118 -+# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
119 -+# endif
120 -+# else
121 -+# define ExtraLoadFlags RpathLoadFlags
122 -+# endif
123 -+# endif
124 -+# ifndef HardCodeLibdirFlag
125 -+# define HardCodeLibdirFlag RpathLoadFlags
126 -+# endif
127 -+# if !defined(ShlibGlobalsFlags)
128 -+# define ShlibGlobalsFlags -Wl,-Bsymbolic
129 -+# endif
130 -
131 - /*
132 - * InstallSharedLibrary - generate rules to install the shared library.
133 -+ * NOTE: file must be executable, hence "INSTBINFLAGS"
134 - */
135 --#ifndef InstallSharedLibrary
136 --#define InstallSharedLibrary(libname,rev,dest) @@\
137 --InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
138 --#endif /* InstallSharedLibrary */
139 -+# ifndef InstallSharedLibrary
140 -+# define InstallSharedLibrary(libname,rev,dest) @@\
141 -+install:: Concat(lib,libname.so.rev) @@\
142 -+ MakeDir($(DESTDIR)dest) @@\
143 -+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
144 -+ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\
145 -+ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
146 -+ @if $(SOSYMLINK); then (set -x; \
147 -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
148 -+ $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
149 -+# endif /* InstallSharedLibrary */
150 -+
151 -+# ifndef InstallSharedLibtoolLibrary
152 -+
153 -+# define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \ @@\
154 -+ R=`expr rev : '.*:\([^:]*\):'`; \ @@\
155 -+ A=`expr rev : '.*:\([^:]*\)'`; \ @@\
156 -+ MAJ=`expr $$V - $$A`; \ @@\
157 -+ MIN=$$A.$$R
158 -+
159 -+# define InstallSharedLibtoolLibrary(libname,rev,dest) @@\
160 -+install:: Concat(lib,libname.so) @@\
161 -+ MakeDir($(DESTDIR)dest) @@\
162 -+ @set +e; SetRevisions(rev); \ @@\
163 -+ set -xe; \ @@\
164 -+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
165 -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
166 -+ $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
167 -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
168 -+ $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so)
169 -+# endif /* InstallSharedLibrary */
170 -
171 - /*
172 - * InstallSharedLibraryData - generate rules to install the shared library data
173 - */
174 --#ifndef InstallSharedLibraryData
175 --#define InstallSharedLibraryData(libname,rev,dest) @@\
176 --install:: Concat(lib,libname.sa.rev) @@\
177 -- MakeDir($(DESTDIR)dest) @@\
178 -- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
179 -- RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
180 --#endif /* InstallSharedLibraryData */
181 --
182 --#if HasPurify
183 --#define PureCleanSharedLibrary(libname,rev) @@\
184 --clean clean.pure:: @@\
185 -- $(RM) Concat3(lib,libname,_pure_*.so.rev)
186 --#else
187 --#define PureCleanSharedLibrary(libname,rev) /**/
188 --#endif
189 -+# ifndef InstallSharedLibraryData
190 -+# define InstallSharedLibraryData(libname,rev,dest)
191 -+# endif /* InstallSharedLibraryData */
192 -+
193 -
194 - /*
195 - * SharedLibraryTarget - generate rules to create a shared library;
196 - * build it into a different name so that we do not hose people by having
197 - * the library gone for long periods.
198 - */
199 --#ifndef SharedLibraryTarget
200 --#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
201 -+# ifndef SharedLibraryTarget
202 -+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
203 - AllTarget(Concat(lib,libname.so.rev)) @@\
204 - @@\
205 - Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
206 - $(RM) $@~ @@\
207 -- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
208 -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \ @@\
209 -+ cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
210 -+ (set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \ @@\
211 -+ LinkBuildSonameLibrary($$SONAME) @@\
212 - $(RM) $@ @@\
213 - $(MV) $@~ $@ @@\
214 -+ @if $(SOSYMLINK); then (set -x; \ @@\
215 -+ $(RM) Concat(lib,libname.so); \ @@\
216 -+ $(LN) $@ Concat(lib,libname.so)); fi @@\
217 - LinkBuildLibrary($@) @@\
218 -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
219 - @@\
220 - clean:: @@\
221 -- $(RM) Concat(lib,libname.so.rev) @@\
222 -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
223 -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
224 -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
225 -+
226 -+# endif /* SharedLibraryTarget */
227 -+
228 -+
229 -+# ifndef SharedLibtoolLibraryTarget
230 -+# define SharedLibtoolLibraryTarget(libname,rev,solist,down,up) @@\
231 -+AllTarget(Concat(lib,libname.so)) @@\
232 -+ @@\
233 -+Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\
234 -+ $(RM) $@~ @@\
235 -+ @set +e; SetRevisions(rev); set -e; \ @@\
236 -+ SONAME=$@.$$MAJ; \ @@\
237 -+ (set -x; \ @@\
238 -+ $(RM) $@.$$MAJ.$$MIN~; \ @@\
239 -+ cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
240 -+ (set -x; \ @@\
241 -+ $(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \ @@\
242 -+ LinkBuildSonameLibrary($$SONAME); \ @@\
243 -+ (set -x; \ @@\
244 -+ $(RM) $@.$$MAJ.$$MIN; \ @@\
245 -+ $(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \ @@\
246 -+ $(RM) $@; \ @@\
247 -+ $(LN) $@.$$MAJ.$$MIN $@); \ @@\
248 -+ LinkBuildLibraryInline($@.$$MAJ.$$MIN); \ @@\
249 -+ LinkBuildLibraryInline($@) @@\
250 - @@\
251 --PureCleanSharedLibrary(libname,rev)
252 --#endif /* SharedLibraryTarget */
253 -+clean:: @@\
254 -+ @set +e; SetRevisions(rev); \ @@\
255 -+ set -xe; \ @@\
256 -+ $(RM) Concat(lib,libname.so.$$MAJ); \ @@\
257 -+ $(RM) Concat(lib,libname.so.$$MAJ.$$MIN) @@\
258 -+ $(RM) Concat(lib,libname.so)
259 -+
260 -+# endif /* SharedLibtoolLibraryTarget */
261 -
262 - /*
263 - * SharedDepLibraryTarget - generate rules to create a shared library.
264 - */
265 --#ifndef SharedDepLibraryTarget
266 --#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
267 -+# ifndef SharedDepLibraryTarget
268 -+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
269 - AllTarget(Concat(lib,libname.so.rev)) @@\
270 - @@\
271 - Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
272 - $(RM) $@~ @@\
273 -- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
274 -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
275 -+ (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
276 -+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
277 -+ LinkBuildSonameLibrary($$SONAME) @@\
278 - $(RM) $@ @@\
279 - $(MV) $@~ $@ @@\
280 -+ @if $(SOSYMLINK); then (set -x; \ @@\
281 -+ $(RM) Concat(lib,libname.so); \ @@\
282 -+ $(LN) $@ Concat(lib,libname.so)); fi @@\
283 - LinkBuildLibrary($@) @@\
284 -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
285 - @@\
286 - clean:: @@\
287 -- $(RM) Concat(lib,libname.so.rev) @@\
288 -- @@\
289 --PureCleanSharedLibrary(libname,rev)
290 -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
291 -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
292 -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
293 -+
294 - #endif /* SharedDepLibraryTarget */
295 -
296 - /*
297 -- * SharedLibraryDataTarget - generate rules to create shlib data file;
298 -+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
299 - */
300 --#ifndef SharedLibraryDataTarget
301 --#define SharedLibraryDataTarget(libname,rev,salist) @@\
302 --AllTarget(Concat(lib,libname.sa.rev)) @@\
303 -+#ifndef SharedDepCplusplusLibraryTarget
304 -+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
305 -+AllTarget(Concat(lib,libname.so.rev)) @@\
306 - @@\
307 --Concat(lib,libname.sa.rev): salist @@\
308 -- $(RM) $@ @@\
309 -- $(AR) $@ salist @@\
310 -- RanLibrary($@) @@\
311 -+Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
312 -+ $(RM) $@~ @@\
313 -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\
314 -+ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
315 -+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
316 -+ LinkBuildSonameLibrary($$SONAME) @@\
317 -+ $(RM) $@ @@\
318 -+ $(MV) $@~ $@ @@\
319 -+ @if $(SOSYMLINK); then (set -x; \ @@\
320 -+ $(RM) Concat(lib,libname.so); \ @@\
321 -+ $(LN) $@ Concat(lib,libname.so)); fi @@\
322 - LinkBuildLibrary($@) @@\
323 -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
324 - @@\
325 - clean:: @@\
326 -- $(RM) Concat(lib,libname.sa.rev)
327 --#endif /* SharedLibraryDataTarget */
328 -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\
329 -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
330 -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
331 -+
332 -+#endif /* SharedDepCplusplusLibraryTarget */
333 -+
334 -+# ifndef SharedDepModuleTarget
335 -+# define SharedDepModuleTarget(name,deps,solist) @@\
336 -+AllTarget(name) @@\
337 -+ @@\
338 -+name: deps @@\
339 -+ $(RM) $@~ @@\
340 -+ $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
341 -+ $(RM) $@ @@\
342 -+ $(MV) $@~ $@ @@\
343 -+ @@\
344 -+clean:: @@\
345 -+ $(RM) name
346 -+
347 -+# endif /* SharedDepModuleTarget */
348 -+
349 -+# ifndef SharedDriModuleTarget
350 -+# define SharedDriModuleTarget(name,deps,solist) @@\
351 -+AllTarget(name) @@\
352 -+ @@\
353 -+name: deps @@\
354 -+ $(RM) $@~ $@.map @@\
355 -+ @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\
356 -+ $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
357 -+ $(RM) $@ $@.map @@\
358 -+ $(MV) $@~ $@ @@\
359 -+ @@\
360 -+clean:: @@\
361 -+ $(RM) name @@\
362 -+ $(RM) name.map
363 -+
364 -+# endif /* SharedDriModuleTarget */
365 -+
366 -+/*
367 -+ * SharedLibraryDataTarget - generate rules to create shlib data file;
368 -+ */
369 -+# ifndef SharedLibraryDataTarget
370 -+# define SharedLibraryDataTarget(libname,rev,salist)
371 -+# endif /* SharedLibraryTarget */
372 -+
373 ---- sunLib.tmpl.orig 2008-12-18 13:43:14.856762538 +0100
374 -+++ sunLib.tmpl 2008-12-18 13:53:25.489781023 +0100
375 -@@ -7,252 +7,71 @@
376 -
377 - XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
378 -
379 --/*
380 -- * SunOS shared library template
381 -- */
382 --
383 --#if OSMajorVersion <= 4
384 --
385 --# if SunPost411FCSLd
386 --# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
387 --# define SharedXrenderReqs $(LDPRELIB) $(XLIB)
388 --# endif
389 --
390 --#ifndef SharedX11Rev
391 --#define SharedX11Rev 4.30
392 --#endif
393 --#ifndef SharedOldXRev
394 --#define SharedOldXRev 4.20
395 --#endif
396 --#ifndef SharedXtRev
397 --#define SharedXtRev 4.20
398 --#endif
399 --#ifndef SharedXawRev
400 --#define SharedXawRev 6.10
401 --#endif
402 --#ifndef SharedXmuRev
403 --#define SharedXmuRev 4.20
404 --#endif
405 --#ifndef SharedXextRev
406 --#define SharedXextRev 4.50
407 --#endif
408 --#ifndef SharedXiRev
409 --#define SharedXiRev 4.20
410 --#endif
411 --#ifndef SharedXtstRev
412 --#define SharedXtstRev 1.20
413 --#endif
414 --
415 --#else /* else it's Solaris */
416 --
417 --/* Solaris uses single digit library versions, and versions of libraries
418 -- * defined in SVID specs should match the versions specified there.
419 -- */
420 --
421 --#ifndef SharedX11Rev
422 --# define SharedX11Rev 4
423 --#endif
424 --#ifndef SharedOldXRev
425 --# define SharedOldXRev 6
426 --#endif
427 --#ifndef SharedXextRev
428 --# define SharedXextRev 0
429 --#endif
430 --#ifndef SharedXauRev
431 --# define SharedXauRev 6
432 --#endif
433 --#ifndef SharedXdmcpRev
434 --# define SharedXdmcpRev 6
435 --#endif
436 --#ifndef SharedXmuRev
437 --# define SharedXmuRev 4
438 --#endif
439 --#ifndef SharedXmuuRev
440 --# define SharedXmuuRev 1
441 --#endif
442 --#ifndef SharedXpRev
443 --# define SharedXpRev 1
444 --#endif
445 --#ifndef SharedXpmRev
446 --# define SharedXpmRev 4
447 --#endif
448 --#ifndef SharedXtRev
449 --# define SharedXtRev 4
450 --#endif
451 --#ifndef SharedXaw6Rev
452 --# define SharedXaw6Rev 5
453 --#endif
454 --#ifndef SharedXiRev
455 --# define SharedXiRev 5
456 --#endif
457 --#ifndef SharedXtstRev
458 --# define SharedXtstRev 1
459 --#endif
460 --#ifndef SharedFSRev
461 --# define SharedFSRev 5
462 --#endif
463 --#ifndef SharedICERev
464 --# define SharedICERev 6
465 --#endif
466 --#ifndef SharedSMRev
467 --# define SharedSMRev 6
468 --#endif
469 --#ifndef SharedXcursor
470 --# define SharedXcursorRev 1
471 --#endif
472 --#ifndef SharedXdamageRev
473 --# define SharedXdamageRev 1
474 --#endif
475 --#ifndef SharedXevieRev
476 --# define SharedXevieRev 1
477 --#endif
478 --#ifndef SharedXfixesRev
479 --# define SharedXfixesRev 1
480 --#endif
481 --#ifndef SharedXftRev
482 --# define SharedXftRev 2
483 --#endif
484 --#ifndef SharedXineramaRev
485 --# define SharedXineramaRev 1
486 --#endif
487 --#ifndef SharedXrenderRev
488 --# define SharedXrenderRev 1
489 --#endif
490 --#ifndef SharedXResRev
491 --# define SharedXResRev 1
492 --#endif
493 --#ifndef SharedXvRev
494 --# define SharedXvRev 1
495 --#endif
496 --#ifndef SharedXvMCRev
497 --# define SharedXvMCRev 1
498 --#endif
499 --#ifndef SharedXrandrRev
500 --# define SharedXrandrRev 2
501 --#endif
502 --#ifndef SharedXssRev
503 --# define SharedXssRev 1
504 --#endif
505 --#ifndef SharedFontconfigRev
506 --# define SharedFontconfigRev 1
507 --#endif
508 --#ifndef SharedGlxRev
509 --# define SharedGlxRev 1
510 --#endif
511 --#ifndef SharedGluRev
512 --# define SharedGluRev 1
513 --#endif
514 --#ifndef SharedGLwRev
515 --# define SharedGLwRev 1
516 --#endif
517 --#ifndef SharedOSMesaRev
518 --# define SharedOSMesaRev 4
519 --#endif
520 --#ifndef SharedxkbfileRev
521 --# define SharedxkbfileRev 5
522 --#endif
523 --#ifndef SharedXxf86miscRev
524 --# define SharedXxf86miscRev 1
525 --#endif
526 --#ifndef SharedXxf86vmRev
527 --# define SharedXxf86vmRev 1
528 --#endif
529 --
530 --# if ThreadedX
531 --# if OSMinorVersion > 3
532 --# define SharedThreadReqs /**/
533 --# endif
534 --# endif
535 --
536 --# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
537 --# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
538 --# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
539 --# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
540 --# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
541 --# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
542 --# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
543 --# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
544 --# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
545 --# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
546 --# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
547 --# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
548 --# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
549 --# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
550 --# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
551 --# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
552 --# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
553 --# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
554 --# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
555 --# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
556 --# define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
557 --# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
558 --# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
559 --# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
560 --# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
561 --# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
562 --# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
563 --# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
564 --# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
565 --# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
566 --# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
567 --# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
568 --# define SharedPSResReqs -lc
569 --# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
570 --# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
571 --# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
572 --# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
573 --# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
574 --# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
575 --# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
576 --# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
577 --# define SharedXauReqs -lc
578 --# define SharedXdmcpReqs -lsocket -lc
579 --# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
580 --# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
581 --# define SharedXevieReqs $(LDPRELIB) $(XLIB)
582 --
583 --# define FixupLibReferences() /**/
584 --
585 --# define SharedPamReqs DlLibrary
586 --# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
587 --# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
588 --# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
589 --# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
590 --# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
591 --# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
592 --# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
593 --# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
594 --# define SharedDtSearchReqs -lm -lc
595 --# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
596 --# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
597 --# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
598 --# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
599 --# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
600 --# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
601 --# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
602 --
603 --# define DtClientExtraLibs -lintl
604 --
605 --/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
606 --ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
607 --
608 --# if HasCplusplus
609 --# if HasGcc2ForCplusplus
610 --UNSHARED_CXXLIB = -static -lC
611 --# elif HasSunCplusplus
612 --# if CplusplusCompilerMajorVersion > 3
613 --# ifdef CplusplusWhatdir
614 --UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
615 --# else
616 --UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
617 --# endif
618 --# else
619 --UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
620 --# endif
621 --# endif
622 --# endif
623 --
624 --# define IafSysLib /**/
625 --# include <sv4Lib.tmpl>
626 -+#ifndef FixupLibReferences
627 -+#define FixupLibReferences() @@\
628 -+XMULIBONLY = -lXmu @@\
629 -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
630 -+#endif
631 -+
632 -+#ifndef XawClientLibs
633 -+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
634 -+#endif
635 -+
636 -+#define SharedX11Reqs
637 -+#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
638 -+#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
639 -+#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
640 -+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
641 -+#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
642 -+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
643 -+#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
644 -+#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
645 -+#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
646 -+#define SharedXiReqs $(LDPRELIB) $(XLIB)
647 -+#define SharedXpReqs $(LDPRELIB) $(XLIB)
648 -+#define SharedXpmReqs $(LDPRELIB) $(XLIB)
649 -+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
650 -+#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
651 -+#define SharedXtstReqs $(LDPRELIB) $(XLIB)
652 -+#define SharedXvReqs $(LDPRELIB) $(XLIB)
653 -+#define SharedSMReqs $(LDPRELIB) $(ICELIB)
654 -+#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
655 -+#define SharedFontencReqs $(LDPRELIB) GzipLibrary
656 -+
657 -+#if GlxUseBuiltInDRIDriver
658 -+#define ExtraSharedGLReqs /**/
659 -+#else
660 -+#define ExtraSharedGLReqs -ldl
661 -+#endif
662 -+#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
663 -+#ifndef SharedGLUReqs
664 -+#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
665 -+#endif
666 -+#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
667 -+#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
668 -+#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
669 -+
670 -+#define SharedXResReqs $(LDPRELIB) $(XLIB)
671 -+#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
672 -+#define SharedXineramaReqs $(LDPRELIB) $(XLIB)
673 -+#define SharedXssReqs $(LDPRELIB) $(XLIB)
674 -+#define SharedXvMCReqs $(LDPRELIB) $(XLIB)
675 -+#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
676 -+#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
677 -+#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
678 -+#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
679 -+#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
680 -+
681 -+#ifndef SharedXReqs
682 -+# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
683 -+#endif
684 -+
685 -+#ifndef SharedXmReqs
686 -+# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
687 -+#endif
688 -
689 -+#ifndef SharedTtReqs
690 -+# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
691 - #endif
692 -+
693 -+#define NoMessageCatalog
694
695 diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
696 index 7b1588e9fac..d01b7a6fd29 100644
697 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
698 +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
699 @@ -6,6 +6,7 @@ EAPI=5
700 inherit xorg-2
701
702 DESCRIPTION="Old Imake-related build files"
703 +SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2"
704 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
705 IUSE=""
706
707 @@ -13,7 +14,7 @@ RDEPEND=""
708 DEPEND="${RDEPEND}"
709
710 PATCHES=(
711 - "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
712 + "${WORKDIR}"/${PN}-1.0.2-solaris-prefix.patch
713 )
714
715 src_install() {
Report Message
Find on MARC Find on Google Groups