From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- x11-misc/Manifest.gz | Bin 49908 -> 49935 bytes x11-misc/alock/Manifest | 2 +- x11-misc/alock/metadata.xml | 5 +- x11-misc/ktsuss/Manifest | 2 +- x11-misc/ktsuss/metadata.xml | 5 +- x11-misc/obconf-qt/Manifest | 2 +- .../obconf-qt/obconf-qt-0.9.0_p20150729.ebuild | 4 +- x11-misc/pcmanfm-qt/Manifest | 2 +- x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild | 4 +- x11-misc/spacefm/Manifest | 2 +- x11-misc/spacefm/metadata.xml | 5 +- x11-misc/xorg-cf-files/Manifest | 4 +- .../files/xorg-cf-files-1.0.2-solaris-prefix.patch | 663 --------------------- x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 3 +- 14 files changed, 16 insertions(+), 687 deletions(-) delete mode 100644 x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 0d719f7187c5..4486e05a2cb8 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest index a25a0099090a..c5e4fc0d830f 100644 --- a/x11-misc/alock/Manifest +++ b/x11-misc/alock/Manifest @@ -5,4 +5,4 @@ AUX no-xf86misc.patch 3220 BLAKE2B 1588866bdb372b5bfae031569a981e1fc0be716ec2b96 AUX tidy-printf.patch 801 BLAKE2B 3015b266465ac1da7127cbc2c871daa729c22ce97c8bf9e88dff5ec3228192bc81bbc0fc31239add4256b8a0d44a852eb543079fbdecb909db41ac57f43ec070 SHA512 253f731e5be75676ef56ab320ee52625bee17a0a8f2bbb025efb8b9ac8a49da7330e5123bb0070eaa9c01f3cd66fadb85ead65c75c9412e6503744705402e9c4 DIST alock-1.0.0.tar.gz 71497 BLAKE2B e61a5fd9fb9a5bcc23a535fcc81da7ae2006300c636a6103132125e0c84c18977690e0f44f489788bf8228f0af900638066ab8706ef731fdf32604dc013684e9 SHA512 7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5 EBUILD alock-1.0.0.ebuild 1663 BLAKE2B c80ee080735c25223bd14416dad79b8988b58484649dd253c2f586ffe2f472e9de410044c7472f131be38e1e27653aa19e13f755f736cdd0fc8fb90cf94db550 SHA512 c90b62a1d922efc2fa8d535be51efbaf6b4becb30be6eb0682e7694df0de3f432884cf3bc59886dca40e25e4939836c580902c31ea4f2b59c7a12f5d03097e07 -MISC metadata.xml 680 BLAKE2B 5cef0db22101924b251833b425f76c7cf8078879e2513ab649b41e9f614268b2fab25ef1c70799ae0f067912010bc848d2546eb8ed047a969b0f8567aaec34f2 SHA512 4fdd3dba349b9f40cd4997c516352b3f84defb4f25827c64c10044145758919b20c67403d0503939f41fd600084f6553213fc0fbf823aa24e8450abac0055928 +MISC metadata.xml 602 BLAKE2B 4afdc04e15531b1ebc4312f67e1c3afca07841f4fc0053994b95ea0e1758b6ab6e146ad1d4e67cd816ee01212f02ff6a1ca9ddb25b8085db17e128c724a72bb8 SHA512 6c78760e2037a294560a54f09469b7fd2840379c7d2cdf417c72f7953e18df437fa327e61efbff1346a0ced4eb443f2e23376a247a24e0286ea186eca636fbb6 diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml index f51dc2953b65..1a916c1e3772 100644 --- a/x11-misc/alock/metadata.xml +++ b/x11-misc/alock/metadata.xml @@ -1,10 +1,7 @@ - - zlg@gentoo.org - Daniel Campbell - + An extremely simple screen locking utility based on xtrlock. Supports multiple hash-types, shadow passwords, and PAM. diff --git a/x11-misc/ktsuss/Manifest b/x11-misc/ktsuss/Manifest index a5f87b49e722..5dd3b1a5f1c9 100644 --- a/x11-misc/ktsuss/Manifest +++ b/x11-misc/ktsuss/Manifest @@ -1,3 +1,3 @@ DIST ktsuss-2.1.tar.gz 31065 BLAKE2B 86aa1bd451880a4ed7606d4234c8f0c646286e9bcb225fc8a7f094943f8e51c3a2f93877da3403f75487f5162dcba932b262d7502987f5da4b9450cadb388b37 SHA512 980c184947ebac91f936cad9cd74050e42e57da39f13cca3b9ec0ec44a16265243a1e6f570a2027435234084c1e15ce28b3dc6389d7831237c762b1aafb99507 EBUILD ktsuss-2.1.ebuild 646 BLAKE2B 790ed4f260f1ceb01cfe4250b9618e34dfebd38709576f9d268bd102c2d1a2dbfc916a133f20c8437adb29d57a311485235cf24cf2a39ccec0941ccd7424b99d SHA512 90e9a0c881f33e4a57ffcc0e5752c101add991051181fefd2b0300829a4e8d91ad4e9d7f680e7e1b35e3c16f388ac2d2130fd35617b6c09d8480f624f2fae717 -MISC metadata.xml 456 BLAKE2B eeb097ab7ceba8db25a109b3e50a1cee647fe38d2150581892ef14bcb1b5924a2d35ec44e14a83967adf756f5a9af56519965a6517dd65cb16cf9f4c094a60dc SHA512 1a9697e391d60b03d3e6a9c2cad4b63ebaf5aa7f5036c7153942b95fe91abac43a19d26c1e29426075e027b288ec5c39798edf4d3f93fbdefedfb5d9452ad0c3 +MISC metadata.xml 378 BLAKE2B 314871c51619c14d159ab492ab3a2493ea6d0331183dfe88187902331c2542ca7cf20aee7a6cbe650c95d01d69b67a3fca850c932995ad2859d43483a8b026e1 SHA512 d6428982a8476b8da3dda53a35d714aaf14e4b6dae3388c32c7c869bbff8d027428639105a96d256b0387290cf5e8a64249cdb2d014d0bd5a8424bd9a26b813a diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml index 3ddb97c08bb6..d08a10d01810 100644 --- a/x11-misc/ktsuss/metadata.xml +++ b/x11-misc/ktsuss/metadata.xml @@ -1,10 +1,7 @@ - - zlg@gentoo.org - Daniel Campbell - + Use the sudo backend instead the su one diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest index 1fb3edd3bd87..e815b620badb 100644 --- a/x11-misc/obconf-qt/Manifest +++ b/x11-misc/obconf-qt/Manifest @@ -1,3 +1,3 @@ DIST obconf-qt-0.9.0_p20150729.tar.gz 96660 BLAKE2B dea66b2bd4084ecd5936612bb52cee1395866d7b4b3b3f211abfa60bd5b4318cc6e31b04867dd600caec5347cb38bad5be854be1e1051bd232b4f4328a8d3121 SHA512 cb4318608fb49926212130de368b059af34c9731d5edf19fca4b05f583ec0d37ce7568f95a5a3f1533642503fd3c7f03fee65ca96796cbc0bb16e92f9890efe3 -EBUILD obconf-qt-0.9.0_p20150729.ebuild 814 BLAKE2B 37e57a3d44b3fb51ca797d20caee66baed1ea29cfb8b41cc3826239530f6b9b921382383eb2aa3c7cbf276ee5eea167dc87f4c4cd6abcab196dc96e7440eb731 SHA512 a4e6c705ff74865a18c6436ac5b1ffeb99818bc891058e2a93a5b9a4295b3eb4ace3534575b8cdb7372016d985c6e2cd357e3c771438ea75fde540785cfb497e +EBUILD obconf-qt-0.9.0_p20150729.ebuild 812 BLAKE2B f2dfa93bbc976f126c821f0398e4dc1a1e59478037fff2fa8f21a0c05e83d3ed08308551e5fc99d29bdf8057948c0606b6de558f5227ab7998f5617fc4cb8e16 SHA512 72182e71fee5fa7742ebcc435e15c6426b163b703bb7183d9afaead0c7c8611ed49ceabef961b2041e14ff5dc59e810dd2074791dbb8a963034830d87145c687 MISC metadata.xml 240 BLAKE2B 8dd1dd10c1b3297bf08ebf11d2e047de07700e5233e26788943af60613a3faa71ff392f77a33f0065917eedc487b2f9be91bdc58635c3c51957e5be2738282c0 SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652 diff --git a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild index 80423a3721a8..ab76cac51eb1 100644 --- a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" else SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="GPL-2 LGPL-2.1+" diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest index 7e403474ed89..50015015a5e8 100644 --- a/x11-misc/pcmanfm-qt/Manifest +++ b/x11-misc/pcmanfm-qt/Manifest @@ -1,5 +1,5 @@ DIST pcmanfm-qt-0.10.0.tar.xz 228540 BLAKE2B 08691b9a4851bea0490242bf76919bc3ea064b7ed85dcd3ddd3a0672acd28801ade245a85bc39361da62aaad2fb8c26df27d5e985165ebca9ee30c390f6e0ee3 SHA512 1b4ec2a746767e28a851f702a6a0897327cefe08b06cb25d63a1c9dddaed4aeefdbe25ee7d6431c94266e0071d5d25e3591c588c484ad097b10ce601e9a18201 DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450 EBUILD pcmanfm-qt-0.10.0.ebuild 1208 BLAKE2B e6731a8204350802617999856eb6c90b33855c16c93b9b6b86279a70b1b13adcd7f0a718b8a30ac5a2652d2edb3d6f67dc8cbd8c905fb46f919a1eb753528877 SHA512 48f4ae63e76eb8dfae42dcacd86a7d3c3a3f0092e087871278ebee01f43d3d95d31196fb416b967a51fa709fe9a83bea8b597f72297d1426693fae1747a0ce65 -EBUILD pcmanfm-qt-0.11.1.ebuild 973 BLAKE2B 73fcb5fa2622d7435c581e16c3bf3c37b87e6d35da7191fe4719419c9bd64eae801e783766602f49ffe3e0b963dc13010b57956ab1b7cd5b8081d42a8b012e17 SHA512 97ab62dccf39d7ed714c71de41a164ca745f2d7c75b2ed47facf4af48ed7ad23140dca89a09901bd4e891295e45c6f8f77f2e2c39b823da6e1600689ce82dddf +EBUILD pcmanfm-qt-0.11.1.ebuild 971 BLAKE2B abf90ee3fc542f479584b1913f313d45367e0bad429fc9d74af656605a108db21f8857088f75402a7daeed29dc42b88f5ad66d26aa05b08a2d94af97a5c933b2 SHA512 5325a8d82694d47c020cbae995b45fd0d4380cf1e2be0a026381a1dbfea37b418627911b22392cf474c03a1700ae824f56c194b634dee2962121fd405d1214a7 MISC metadata.xml 380 BLAKE2B a792f445534940d13fd5ee89806df73aaa1cc14898d842760ea14bf0c42b30937984232a5e3647971b639bc19f1da31247fef82db6953228448f3452a06b4810 SHA512 2e8cb06bf3dd84a80a12c072f3493b4cfd5a0f0d92a7809da89d059d71a012b536996e0a3ce6732e131f423fead8b93d413c090ce9cc439f812df5b3b32f77fd diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild index e8cf21ba1580..8cea8b82021c 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}" else SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)" diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest index eafac7cc6e61..8a0dac025011 100644 --- a/x11-misc/spacefm/Manifest +++ b/x11-misc/spacefm/Manifest @@ -5,4 +5,4 @@ EBUILD spacefm-1.0.4-r1.ebuild 2553 BLAKE2B 57ee3b44e4cacd1bdec69dc226aa3ed1b46f EBUILD spacefm-1.0.4.ebuild 2456 BLAKE2B e7a80963463f101034ab888302cd718bbedc4a5eb9b712a00e8105d9c354226831ef4651df7cee3173dd976ef6f762a2ec5f528167310e138671a7aacb0e84f9 SHA512 b6466744c58725327cfb47e317d809851bb5fa34e82eb9fe7ec472a7f9a9084f68f612f85e5a0dab2e60c3f7837692416c4728d36234cb7976ece256286fd27a EBUILD spacefm-1.0.5-r2.ebuild 2521 BLAKE2B 69db2b9942505cee39890b05f9c1edf8418cfb2f44f8306f98da52d896473fd2c346fb4eae1a4cacee1f20fdb2f6a637f3e89c8761eca37b90e91e5e04937659 SHA512 8f8a9605b90b82fab3e250cddb9f974eac48061b6819d778984a9fba79db4191dc8b32810545d64df86621bbdb6f1bef093aeec316b9a80f1301877d8feb309e EBUILD spacefm-9999.ebuild 2454 BLAKE2B fad9f063f5adf173dfc72f7d507d9e8745d43e646e2a08df931a2cc67398b121bd8de0922655c17e0704c1910befd8cb885ec95ff6f9cc82c902035903358375 SHA512 5da5de98185ba9fc9e6eb74ae37c56c6442b5a25483de205563b285dd36c2c6b3dd6407b891a95d6b4d348883522f4936880c5bed7327845a887e864c25f58ae -MISC metadata.xml 1279 BLAKE2B f361cf9da17f84f4121801d8e5e17d4907b7cfd5a36f1abaf61e2288500d76e89a84803b4c96519edadb52f81614e0efb55398af1830bb31ea96a999e23e4e10 SHA512 7b74021bb9f1876846c030892524b1c18a203142d11ed8da97821656cc8b37dd95cba0f1e220eac6e1ef6a36222a8cf2798dd2682de18b0261b49c9634045c9a +MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml index 21d53fa354ba..35fc0bff16f7 100644 --- a/x11-misc/spacefm/metadata.xml +++ b/x11-misc/spacefm/metadata.xml @@ -1,10 +1,7 @@ - - zlg@gentoo.org - Daniel Campbell - + ignorantguru@users.sourceforge.net diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index a165b62cd648..4f624d94b93f 100644 --- a/x11-misc/xorg-cf-files/Manifest +++ b/x11-misc/xorg-cf-files/Manifest @@ -1,4 +1,4 @@ -AUX xorg-cf-files-1.0.2-solaris-prefix.patch 23137 BLAKE2B dae8f3f59f724818c4280de64d825863aff4d7018bc721b910487bc09dd21540c76dd19a8d1e0b0133fbf63cf46608a24ca2b4f906e70dcc2a16f435a9f071a8 SHA512 96c01caab1cc77a16e4e103e57a625df3fa6dea399a6ac7df64f821b20edec8025d8d7bd6f1e15a5e2509d3032726eee15710ca5f354e2fd7f0a33a569fa336f +DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf SHA512 61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa -EBUILD xorg-cf-files-1.0.6.ebuild 1728 BLAKE2B 25a02005b3e1b9113707b30d0cd23a79a6cbf6472084be4227a0576a808a921c3f164d79dce18f5b2d924070f7edf785a0ac1178838a0104ff3ba36f1f55f7e5 SHA512 f12986c415dc4cf118bb4ca49d73fdf9d66cb995bdc03ab49d7754652f304e9504927e99ce575dc6dc948f6a921e8e0d3b07f50cd3748e8f007c2ab0f01c969e +EBUILD xorg-cf-files-1.0.6.ebuild 1812 BLAKE2B 1dca6edb8006a8185d0784b50568d3a71c7d855df5e80336bebb7be0fceeae6dd35c94ae2d746e5221a84fe6d22dc55116bda5a939f4f88bfe80e096e6ed0874 SHA512 9cb0a2b2ff02111cd5537e13d92e035f7e58b96ff43a5158090ff3ac02a84b6e39d4da6952e01a155e1d9fb8ad3f4373bf6fc11af95b1447948e52b0f9d560ab MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 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 deleted file mode 100644 index b797b2588d1d..000000000000 --- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch +++ /dev/null @@ -1,663 +0,0 @@ ---- sunLib.rules.orig 2008-12-18 13:43:19.032933408 +0100 -+++ sunLib.rules 2008-12-18 13:51:12.494555406 +0100 -@@ -7,127 +7,268 @@ - XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $ - - #ifndef HasSharedLibraries --#define HasSharedLibraries YES -+# define HasSharedLibraries YES - #endif --#ifndef SharedDataSeparation --#define SharedDataSeparation YES -+#ifndef ForceNormalLib -+# define ForceNormalLib NO - #endif --#ifndef SharedCodeDef --#define SharedCodeDef -DSHAREDCODE --#endif --#ifndef SharedLibraryDef --#define SharedLibraryDef -DSUNSHLIB --#endif --#ifndef ShLibIncludeFile --#define ShLibIncludeFile --#endif --#ifndef SharedLibraryLoadFlags --#define SharedLibraryLoadFlags -assert pure-text --#endif --#ifndef PositionIndependentCFlags --#if HasGcc2 --#define PositionIndependentCFlags -fPIC --#else --#define PositionIndependentCFlags -pic -+ -+#ifndef UseRpath -+#define UseRpath NO - #endif -+ -+#ifndef SharedOldX -+# define SharedOldX NO - #endif --#ifndef PositionIndependentCplusplusFlags --#if HasGcc2ForCplusplus --#define PositionIndependentCplusplusFlags -fPIC -+# ifndef SharedDataSeparation -+# define SharedDataSeparation NO -+# endif -+# ifndef SharedCodeDef -+# define SharedCodeDef /**/ -+# endif -+# ifndef SharedLibraryDef -+# define SharedLibraryDef /**/ -+# endif -+# ifndef ShLibIncludeFile -+# define ShLibIncludeFile -+# endif -+#ifndef RpathLoadFlags -+#if UseRpath -+#define RpathLoadFlags -R$(USRLIBDIRPATH) - #else --#define PositionIndependentCplusplusFlags -pic -+#define RpathLoadFlags /**/ - #endif - #endif -- --/* -- * SharedDSLibDependencies - shared library dependencies with data separation -- */ --#ifndef SharedDSLibDependencies --#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname)) -+#ifndef LibraryRpathLoadFlags -+#define LibraryRpathLoadFlags RpathLoadFlags - #endif -+# ifndef SharedLibraryLoadFlags -+# define SharedLibraryLoadFlags -shared -+# endif -+# ifndef PositionIndependentCFlags -+# define PositionIndependentCFlags -fPIC -+# endif -+# ifndef PositionIndependentCplusplusFlags -+# define PositionIndependentCplusplusFlags -fPIC -+# endif -+# ifndef ExtraLoadFlags -+# if LinuxBinUtilsMajorVersion >= 26 -+# ifdef UseInstalled -+# if LinuxBinUtilsMajorVersion < 27 -+# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) -+# endif -+# else -+# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) -+# endif -+# else -+# define ExtraLoadFlags RpathLoadFlags -+# endif -+# endif -+# ifndef HardCodeLibdirFlag -+# define HardCodeLibdirFlag RpathLoadFlags -+# endif -+# if !defined(ShlibGlobalsFlags) -+# define ShlibGlobalsFlags -Wl,-Bsymbolic -+# endif - - /* - * InstallSharedLibrary - generate rules to install the shared library. -+ * NOTE: file must be executable, hence "INSTBINFLAGS" - */ --#ifndef InstallSharedLibrary --#define InstallSharedLibrary(libname,rev,dest) @@\ --InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest) --#endif /* InstallSharedLibrary */ -+# ifndef InstallSharedLibrary -+# define InstallSharedLibrary(libname,rev,dest) @@\ -+install:: Concat(lib,libname.so.rev) @@\ -+ MakeDir($(DESTDIR)dest) @@\ -+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ -+ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\ -+ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\ -+ @if $(SOSYMLINK); then (set -x; \ -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\ -+ $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi -+# endif /* InstallSharedLibrary */ -+ -+# ifndef InstallSharedLibtoolLibrary -+ -+# define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \ @@\ -+ R=`expr rev : '.*:\([^:]*\):'`; \ @@\ -+ A=`expr rev : '.*:\([^:]*\)'`; \ @@\ -+ MAJ=`expr $$V - $$A`; \ @@\ -+ MIN=$$A.$$R -+ -+# define InstallSharedLibtoolLibrary(libname,rev,dest) @@\ -+install:: Concat(lib,libname.so) @@\ -+ MakeDir($(DESTDIR)dest) @@\ -+ @set +e; SetRevisions(rev); \ @@\ -+ set -xe; \ @@\ -+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\ -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ -+ $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ -+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\ -+ $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so) -+# endif /* InstallSharedLibrary */ - - /* - * InstallSharedLibraryData - generate rules to install the shared library data - */ --#ifndef InstallSharedLibraryData --#define InstallSharedLibraryData(libname,rev,dest) @@\ --install:: Concat(lib,libname.sa.rev) @@\ -- MakeDir($(DESTDIR)dest) @@\ -- $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\ -- RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev)) --#endif /* InstallSharedLibraryData */ -- --#if HasPurify --#define PureCleanSharedLibrary(libname,rev) @@\ --clean clean.pure:: @@\ -- $(RM) Concat3(lib,libname,_pure_*.so.rev) --#else --#define PureCleanSharedLibrary(libname,rev) /**/ --#endif -+# ifndef InstallSharedLibraryData -+# define InstallSharedLibraryData(libname,rev,dest) -+# endif /* InstallSharedLibraryData */ -+ - - /* - * SharedLibraryTarget - generate rules to create a shared library; - * build it into a different name so that we do not hose people by having - * the library gone for long periods. - */ --#ifndef SharedLibraryTarget --#define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -+# ifndef SharedLibraryTarget -+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ - AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ - Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ -- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \ @@\ -+ cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\ -+ (set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \ @@\ -+ LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ -+ @if $(SOSYMLINK); then (set -x; \ @@\ -+ $(RM) Concat(lib,libname.so); \ @@\ -+ $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ - clean:: @@\ -- $(RM) Concat(lib,libname.so.rev) @@\ -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) -+ -+# endif /* SharedLibraryTarget */ -+ -+ -+# ifndef SharedLibtoolLibraryTarget -+# define SharedLibtoolLibraryTarget(libname,rev,solist,down,up) @@\ -+AllTarget(Concat(lib,libname.so)) @@\ -+ @@\ -+Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\ -+ $(RM) $@~ @@\ -+ @set +e; SetRevisions(rev); set -e; \ @@\ -+ SONAME=$@.$$MAJ; \ @@\ -+ (set -x; \ @@\ -+ $(RM) $@.$$MAJ.$$MIN~; \ @@\ -+ cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\ -+ (set -x; \ @@\ -+ $(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \ @@\ -+ LinkBuildSonameLibrary($$SONAME); \ @@\ -+ (set -x; \ @@\ -+ $(RM) $@.$$MAJ.$$MIN; \ @@\ -+ $(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \ @@\ -+ $(RM) $@; \ @@\ -+ $(LN) $@.$$MAJ.$$MIN $@); \ @@\ -+ LinkBuildLibraryInline($@.$$MAJ.$$MIN); \ @@\ -+ LinkBuildLibraryInline($@) @@\ - @@\ --PureCleanSharedLibrary(libname,rev) --#endif /* SharedLibraryTarget */ -+clean:: @@\ -+ @set +e; SetRevisions(rev); \ @@\ -+ set -xe; \ @@\ -+ $(RM) Concat(lib,libname.so.$$MAJ); \ @@\ -+ $(RM) Concat(lib,libname.so.$$MAJ.$$MIN) @@\ -+ $(RM) Concat(lib,libname.so) -+ -+# endif /* SharedLibtoolLibraryTarget */ - - /* - * SharedDepLibraryTarget - generate rules to create a shared library. - */ --#ifndef SharedDepLibraryTarget --#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -+# ifndef SharedDepLibraryTarget -+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ - AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ - Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ - $(RM) $@~ @@\ -- (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\ -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ -+ (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\ -+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ -+ LinkBuildSonameLibrary($$SONAME) @@\ - $(RM) $@ @@\ - $(MV) $@~ $@ @@\ -+ @if $(SOSYMLINK); then (set -x; \ @@\ -+ $(RM) Concat(lib,libname.so); \ @@\ -+ $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ - clean:: @@\ -- $(RM) Concat(lib,libname.so.rev) @@\ -- @@\ --PureCleanSharedLibrary(libname,rev) -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) -+ - #endif /* SharedDepLibraryTarget */ - - /* -- * SharedLibraryDataTarget - generate rules to create shlib data file; -+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library. - */ --#ifndef SharedLibraryDataTarget --#define SharedLibraryDataTarget(libname,rev,salist) @@\ --AllTarget(Concat(lib,libname.sa.rev)) @@\ -+#ifndef SharedDepCplusplusLibraryTarget -+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -+AllTarget(Concat(lib,libname.so.rev)) @@\ - @@\ --Concat(lib,libname.sa.rev): salist @@\ -- $(RM) $@ @@\ -- $(AR) $@ salist @@\ -- RanLibrary($@) @@\ -+Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ -+ $(RM) $@~ @@\ -+ @SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \ @@\ -+ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\ -+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ -+ LinkBuildSonameLibrary($$SONAME) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @if $(SOSYMLINK); then (set -x; \ @@\ -+ $(RM) Concat(lib,libname.so); \ @@\ -+ $(LN) $@ Concat(lib,libname.so)); fi @@\ - LinkBuildLibrary($@) @@\ -+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ - @@\ - clean:: @@\ -- $(RM) Concat(lib,libname.sa.rev) --#endif /* SharedLibraryDataTarget */ -+ @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ -+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) -+ -+#endif /* SharedDepCplusplusLibraryTarget */ -+ -+# ifndef SharedDepModuleTarget -+# define SharedDepModuleTarget(name,deps,solist) @@\ -+AllTarget(name) @@\ -+ @@\ -+name: deps @@\ -+ $(RM) $@~ @@\ -+ $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @@\ -+clean:: @@\ -+ $(RM) name -+ -+# endif /* SharedDepModuleTarget */ -+ -+# ifndef SharedDriModuleTarget -+# define SharedDriModuleTarget(name,deps,solist) @@\ -+AllTarget(name) @@\ -+ @@\ -+name: deps @@\ -+ $(RM) $@~ $@.map @@\ -+ @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ -+ $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ -+ $(RM) $@ $@.map @@\ -+ $(MV) $@~ $@ @@\ -+ @@\ -+clean:: @@\ -+ $(RM) name @@\ -+ $(RM) name.map -+ -+# endif /* SharedDriModuleTarget */ -+ -+/* -+ * SharedLibraryDataTarget - generate rules to create shlib data file; -+ */ -+# ifndef SharedLibraryDataTarget -+# define SharedLibraryDataTarget(libname,rev,salist) -+# endif /* SharedLibraryTarget */ -+ ---- sunLib.tmpl.orig 2008-12-18 13:43:14.856762538 +0100 -+++ sunLib.tmpl 2008-12-18 13:53:25.489781023 +0100 -@@ -7,252 +7,71 @@ - - XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $ - --/* -- * SunOS shared library template -- */ -- --#if OSMajorVersion <= 4 -- --# if SunPost411FCSLd --# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) --# define SharedXrenderReqs $(LDPRELIB) $(XLIB) --# endif -- --#ifndef SharedX11Rev --#define SharedX11Rev 4.30 --#endif --#ifndef SharedOldXRev --#define SharedOldXRev 4.20 --#endif --#ifndef SharedXtRev --#define SharedXtRev 4.20 --#endif --#ifndef SharedXawRev --#define SharedXawRev 6.10 --#endif --#ifndef SharedXmuRev --#define SharedXmuRev 4.20 --#endif --#ifndef SharedXextRev --#define SharedXextRev 4.50 --#endif --#ifndef SharedXiRev --#define SharedXiRev 4.20 --#endif --#ifndef SharedXtstRev --#define SharedXtstRev 1.20 --#endif -- --#else /* else it's Solaris */ -- --/* Solaris uses single digit library versions, and versions of libraries -- * defined in SVID specs should match the versions specified there. -- */ -- --#ifndef SharedX11Rev --# define SharedX11Rev 4 --#endif --#ifndef SharedOldXRev --# define SharedOldXRev 6 --#endif --#ifndef SharedXextRev --# define SharedXextRev 0 --#endif --#ifndef SharedXauRev --# define SharedXauRev 6 --#endif --#ifndef SharedXdmcpRev --# define SharedXdmcpRev 6 --#endif --#ifndef SharedXmuRev --# define SharedXmuRev 4 --#endif --#ifndef SharedXmuuRev --# define SharedXmuuRev 1 --#endif --#ifndef SharedXpRev --# define SharedXpRev 1 --#endif --#ifndef SharedXpmRev --# define SharedXpmRev 4 --#endif --#ifndef SharedXtRev --# define SharedXtRev 4 --#endif --#ifndef SharedXaw6Rev --# define SharedXaw6Rev 5 --#endif --#ifndef SharedXiRev --# define SharedXiRev 5 --#endif --#ifndef SharedXtstRev --# define SharedXtstRev 1 --#endif --#ifndef SharedFSRev --# define SharedFSRev 5 --#endif --#ifndef SharedICERev --# define SharedICERev 6 --#endif --#ifndef SharedSMRev --# define SharedSMRev 6 --#endif --#ifndef SharedXcursor --# define SharedXcursorRev 1 --#endif --#ifndef SharedXdamageRev --# define SharedXdamageRev 1 --#endif --#ifndef SharedXevieRev --# define SharedXevieRev 1 --#endif --#ifndef SharedXfixesRev --# define SharedXfixesRev 1 --#endif --#ifndef SharedXftRev --# define SharedXftRev 2 --#endif --#ifndef SharedXineramaRev --# define SharedXineramaRev 1 --#endif --#ifndef SharedXrenderRev --# define SharedXrenderRev 1 --#endif --#ifndef SharedXResRev --# define SharedXResRev 1 --#endif --#ifndef SharedXvRev --# define SharedXvRev 1 --#endif --#ifndef SharedXvMCRev --# define SharedXvMCRev 1 --#endif --#ifndef SharedXrandrRev --# define SharedXrandrRev 2 --#endif --#ifndef SharedXssRev --# define SharedXssRev 1 --#endif --#ifndef SharedFontconfigRev --# define SharedFontconfigRev 1 --#endif --#ifndef SharedGlxRev --# define SharedGlxRev 1 --#endif --#ifndef SharedGluRev --# define SharedGluRev 1 --#endif --#ifndef SharedGLwRev --# define SharedGLwRev 1 --#endif --#ifndef SharedOSMesaRev --# define SharedOSMesaRev 4 --#endif --#ifndef SharedxkbfileRev --# define SharedxkbfileRev 5 --#endif --#ifndef SharedXxf86miscRev --# define SharedXxf86miscRev 1 --#endif --#ifndef SharedXxf86vmRev --# define SharedXxf86vmRev 1 --#endif -- --# if ThreadedX --# if OSMinorVersion > 3 --# define SharedThreadReqs /**/ --# endif --# endif -- --# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary --# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc --# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc --# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc --# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc --# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc --# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc --# define SharedFSReqs $(EXTRA_LIBRARIES) -lc --# define SharedICEReqs $(EXTRA_LIBRARIES) -lc --# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc --# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc --# define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc --# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc --# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB) --# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc --# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc --# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc --# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc --# define SharedPSResReqs -lc --# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc --# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc --# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB) --# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc --# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc --# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc --# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc --# define SharedXauReqs -lc --# define SharedXdmcpReqs -lsocket -lc --# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc --# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc --# define SharedXevieReqs $(LDPRELIB) $(XLIB) -- --# define FixupLibReferences() /**/ -- --# define SharedPamReqs DlLibrary --# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs --# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs --# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs --# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs --# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs --# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw --# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary --# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary --# define SharedDtSearchReqs -lm -lc --# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc --# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc --# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc --# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen --# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc --# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary --# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs -- --# define DtClientExtraLibs -lintl -- --/* The inbuf paramter to iconv(3) is "const char**", not "char **" */ --ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const -- --# if HasCplusplus --# if HasGcc2ForCplusplus --UNSHARED_CXXLIB = -static -lC --# elif HasSunCplusplus --# if CplusplusCompilerMajorVersion > 3 --# ifdef CplusplusWhatdir --UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic --# else --UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic --# endif --# else --UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic --# endif --# endif --# endif -- --# define IafSysLib /**/ --# include -+#ifndef FixupLibReferences -+#define FixupLibReferences() @@\ -+XMULIBONLY = -lXmu @@\ -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) -+#endif -+ -+#ifndef XawClientLibs -+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) -+#endif -+ -+#define SharedX11Reqs -+#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) -+#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) -+#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -+#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -+#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -+#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) -+#define SharedXextReqs $(LDPRELIB) $(XONLYLIB) -+#define SharedXiReqs $(LDPRELIB) $(XLIB) -+#define SharedXpReqs $(LDPRELIB) $(XLIB) -+#define SharedXpmReqs $(LDPRELIB) $(XLIB) -+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -+#define SharedXrenderReqs $(LDPRELIB) $(XLIB) -+#define SharedXtstReqs $(LDPRELIB) $(XLIB) -+#define SharedXvReqs $(LDPRELIB) $(XLIB) -+#define SharedSMReqs $(LDPRELIB) $(ICELIB) -+#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -+#define SharedFontencReqs $(LDPRELIB) GzipLibrary -+ -+#if GlxUseBuiltInDRIDriver -+#define ExtraSharedGLReqs /**/ -+#else -+#define ExtraSharedGLReqs -ldl -+#endif -+#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs -+#ifndef SharedGLUReqs -+#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -+#endif -+#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) -+#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB) -+#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) -+ -+#define SharedXResReqs $(LDPRELIB) $(XLIB) -+#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB) -+#define SharedXineramaReqs $(LDPRELIB) $(XLIB) -+#define SharedXssReqs $(LDPRELIB) $(XLIB) -+#define SharedXvMCReqs $(LDPRELIB) $(XLIB) -+#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -+#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -+#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -+#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -+#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) -+ -+#ifndef SharedXReqs -+# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -+#endif -+ -+#ifndef SharedXmReqs -+# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc -+#endif - -+#ifndef SharedTtReqs -+# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) - #endif -+ -+#define NoMessageCatalog 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 index 7b1588e9fac4..d01b7a6fd293 100644 --- 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 @@ -6,6 +6,7 @@ EAPI=5 inherit xorg-2 DESCRIPTION="Old Imake-related build files" +SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2" 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" IUSE="" @@ -13,7 +14,7 @@ RDEPEND="" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch + "${WORKDIR}"/${PN}-1.0.2-solaris-prefix.patch ) src_install() { -- cgit v1.2.3