From 4e995247a9a9d45f0b265ab9120c6d31c0a1f0d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Apr 2025 08:45:05 +0100 Subject: gentoo auto-resync : 14:04:2025 - 08:45:05 --- x11-apps/Manifest.gz | Bin 13838 -> 13834 bytes x11-apps/xauth/Manifest | 4 +- x11-apps/xauth/xauth-1.1.3.ebuild | 21 ------ x11-apps/xauth/xauth-1.1.4.ebuild | 2 +- x11-apps/xdm/Manifest | 2 - x11-apps/xdm/xdm-1.1.16.ebuild | 78 --------------------- x11-apps/xinit/Manifest | 11 +-- .../files/xinit-1.3.3-gentoo-customizations.patch | 61 ---------------- .../xinit-1.4.2-move-serverauthfile-into-tmp.patch | 23 ------ .../files/xinit-1.4.2-startx-current-vt.patch | 25 ------- .../files/xinit-1.4.3-gentoo-customizations.patch | 60 ---------------- .../files/xinit-1.4.3-startx-current-vt.patch | 34 --------- x11-apps/xinit/xinit-1.4.2.ebuild | 75 -------------------- x11-apps/xinit/xinit-1.4.3.ebuild | 71 ------------------- x11-apps/xinit/xinit-1.4.4.ebuild | 2 +- 15 files changed, 4 insertions(+), 465 deletions(-) delete mode 100644 x11-apps/xauth/xauth-1.1.3.ebuild delete mode 100644 x11-apps/xdm/xdm-1.1.16.ebuild delete mode 100644 x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch delete mode 100644 x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch delete mode 100644 x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch delete mode 100644 x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch delete mode 100644 x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch delete mode 100644 x11-apps/xinit/xinit-1.4.2.ebuild delete mode 100644 x11-apps/xinit/xinit-1.4.3.ebuild (limited to 'x11-apps') diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz index 17dc52cfd3a1..b5f7c256fba6 100644 Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest index 485345f92668..85a4029485a6 100644 --- a/x11-apps/xauth/Manifest +++ b/x11-apps/xauth/Manifest @@ -1,5 +1,3 @@ -DIST xauth-1.1.3.tar.xz 159500 BLAKE2B 6acc6f360b7ed947d5dbc0b197b7ed0a87916f38cd8a0c74215b96ca44e98ead45987614e88833b0d2a957776b6e6a1d69d1a3dc4563774e451c2d5f5c55394d SHA512 536434f6c607673c00b9658ea591bf32419cc151d138f991ea38167220563519a6a84a5504003da15820f2a7ed50ea2449c6ce9c991d1446ee9a7305c647d694 DIST xauth-1.1.4.tar.xz 163696 BLAKE2B 60f693118531058e5114a80e0e34eb8a429c3ce0d8ef168fea21924afa21139abb58b63e64c745c69df7f7e2a0540636f9d5ab32ed6d0019f9bc7cfa92724a7e SHA512 6f08b92acec08fe426da0bcf7f68b0c6d21777bed76c5c316717bf15df0654809a97b6c4d3d570d861c49b85857191a5c5be3b4b84049b2459688af2c7b0a74d -EBUILD xauth-1.1.3.ebuild 448 BLAKE2B 90a01e4f7ee9f91ce15dbd022804ae559f3153ae25fc8df40d1e298f557a28fbe72fabb5454234d3d21b61b334f85d9ba87c748d1695839ad6132d555f9330c1 SHA512 368a2287ae3f8d844c637de3f1329809d362482a28cad96725b6a1b4e27d9ff78032adcc372d6abe0eac2a3fce13870eeeee67b0de74c8ce19b13abefd285c23 -EBUILD xauth-1.1.4.ebuild 449 BLAKE2B a93b1f3fa5dc540937ad5fbd8f0a7280ee1d42d09ee66622b278826ef41d974f9102ca8ea82d434544a514e64483cb77cf20e67afcdb18ba6ceb05977ff1849b SHA512 ec88cf15cb007552dba2a05d3159601e9fc3a7c5489b96a8e4e3167ede50111618dd297ec082381937fe0dfaaf0463ebd8a521dedbb038de8f684f8ad2ded246 +EBUILD xauth-1.1.4.ebuild 448 BLAKE2B f820c4330613f582dda17bf9a900f800d3df39457425ca214bf8f61929cae47fce8bb8947aab07e2276133692076707b56678ace0e308e95ff4f3a440080dff7 SHA512 b3ec0b9d4400ff0c2208bb85e61be4737a57b90b50cfe8384068eaa93964c993f25839500f9e6b4fb9b16aac9a14c72949130f0eeefb6805765d25e447bf9655 MISC metadata.xml 336 BLAKE2B e7efb568e90d3de70da870d88a12988c62c876085291bd426de3a6b3123e3f989eea78d4dc36e2e47cdd68b2f62c2f7c912c1f0e9ed8e92f4eecc017c63676ea SHA512 f210a30ab5f02fc443a1ba611bf07e72815d3089015ba5509dff6b62ee177cc50b6729157eff68633fe6163b7cd5d0d4a0b1a75f739984a50724639d043a2d58 diff --git a/x11-apps/xauth/xauth-1.1.3.ebuild b/x11-apps/xauth/xauth-1.1.3.ebuild deleted file mode 100644 index 02eff66c4527..000000000000 --- a/x11-apps/xauth/xauth-1.1.3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xorg-3 - -DESCRIPTION="X authority file utility" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXext - x11-libs/libXmu" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -XORG_CONFIGURE_OPTIONS=( - --enable-ipv6 -) diff --git a/x11-apps/xauth/xauth-1.1.4.ebuild b/x11-apps/xauth/xauth-1.1.4.ebuild index 2486da866646..529bb99c7dc9 100644 --- a/x11-apps/xauth/xauth-1.1.4.ebuild +++ b/x11-apps/xauth/xauth-1.1.4.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit xorg-3 DESCRIPTION="X authority file utility" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" x11-libs/libX11 diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index d442137a312b..909424edfb94 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,6 +1,4 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 -DIST xdm-1.1.16.tar.xz 420072 BLAKE2B 1a970b99a0848b0bcb55870c1665281afc355685b4e08148cefd953456fbed5dc71a9a66fa670e80f07de3502615e3c2e81293e9476f04ce965d73be5365bd9e SHA512 a7e0aca67b770b3939aee2c12feac3c0f5efa531ec4a6045ab8b53d9c35b701ab5533447feb39b7cbe0df74ff8483ee1637314b847b37a6c3f7e9c8fdf5e172d DIST xdm-1.1.17.tar.xz 425804 BLAKE2B 795a7fbfb78da298631dd42990220c74f19e58233d20fda6c42517a1bd0d24ff97e74e1aed2d6acc9f81ca0b19194a2b6b2f13b656582e6ec3f23a3b23754cc2 SHA512 68499cdf73c9b6b48b974a724e5d045bb8333cfd17f1d7e36132e7aec51922c22260b361517c4f0d9fb7d28ce4909e0638e00180e93544bc7200d9bef55e822b -EBUILD xdm-1.1.16.ebuild 1773 BLAKE2B fc02db6c9c7ea6284129c56d1c7fe865ff0d8d8162d1b7a2a82a188210c00865cb14b55a965f89a4c85e6adb3a340e3244fb91b3a1da41027328090a9a8a35b3 SHA512 267da6060b02faa3d0f5855346486b5a24cf18842f37681fd0fa6661604c93380c783a4ab65242680e15442a3e9186513b57846382e2816a7b33102e4bcb3ee1 EBUILD xdm-1.1.17.ebuild 1773 BLAKE2B 455db516d25761047f906af6181bca33e908d0f35bf8e3d79793d73d8645590bd24edcafb68c56ee564022c3bc394142a8aa15fc61ad322070f6efdc90139fda SHA512 e2c4b8531070c1a275a8fa2e759ff743ea92fc495ec8216424f267a984e6e177d5c9a375822efee254c68b65274f1f2cc173a25e852ba52d578192f48a287b6e MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25 diff --git a/x11-apps/xdm/xdm-1.1.16.ebuild b/x11-apps/xdm/xdm-1.1.16.ebuild deleted file mode 100644 index 82460cae2d6f..000000000000 --- a/x11-apps/xdm/xdm-1.1.16.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xorg-3 pam systemd - -DEFAULTVT=vt7 - -DESCRIPTION="X.Org xdm application" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="pam systemd truetype xinerama xpm" - -RDEPEND=" - x11-apps/sessreg - x11-apps/xconsole - x11-apps/xinit - x11-apps/xrdb - x11-apps/xsm - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXaw - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - virtual/libcrypt:= - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-209:= ) - truetype? ( - x11-libs/libXrender - x11-libs/libXft - ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm ) - elibc_glibc? ( dev-libs/libbsd )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_prepare() { - sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ - xdm.service.in || die - - # Disable XDM-AUTHORIZATION-1 (bug #445662). - # it causes issue with libreoffice and SDL games (bug #306223). - sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ - config/xdm-config.in || die - - xorg-3_src_prepare -} - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - --enable-ipv6 - $(use_with pam) - $(use_with systemd systemd-daemon) - $(use_with truetype xft) - $(use_with xinerama) - $(use_enable xpm xpm-logos) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-default-vt=${DEFAULTVT} - --with-xdmconfigdir=/etc/X11/xdm - ) - xorg-3_src_configure -} - -src_install() { - xorg-3_src_install - - exeinto /usr/$(get_libdir)/X11/xdm - doexe "${FILESDIR}"/Xsession - - use pam && pamd_mimic system-local-login xdm auth account session - - # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. - keepdir /var/lib/xdm -} diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 8615d9753247..070c8bd4829a 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -2,19 +2,10 @@ AUX 00-xhost 255 BLAKE2B 78ccf786ceae797177342b77fb675068786815818796a04087a8f52 AUX Xsession 2187 BLAKE2B d6df80e9d0faecd9286be70b2639b7bb993d363a7834cd63b108be2ed35457faf8d5069803fb80275cd7f0afc155ffbc359bb7e3184c5468b2e00e63b4605a99 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e5d2000c60b74cb729a962270ff342e29088e9e928a163732c7b1f7aafc1c056e85d73b6ca8ba9e96c SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 -AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b -AUX xinit-1.4.2-move-serverauthfile-into-tmp.patch 738 BLAKE2B 5639a4e5ff3b1d695871acb69d98a001bb3289efff7b0b95e3f1844bf54c48211ccbd14150a3d598832a322661304403ffda3b4b408975898a7b91e9601eba5c SHA512 16be1614af549252c4e82e956b3216b5d63005874bde31e8aabd4f0fd23a0294c903289bbc70e3cb07bacffdc5a07a6e9ea0396f3f9d01841a3db680cef4aac0 -AUX xinit-1.4.2-startx-current-vt.patch 799 BLAKE2B d87a479c3a30daec7606cacabdc4724dad4a5bd4051faee22a620333d2e1adc0f4590ace50914cc3edbd958c037beb4356acfd2863ca976627370843d566b339 SHA512 de219bad36a6200531599750601572df4812c6007baa48ab28f7a9210edbb148f270c13c891afaf6ae53f6798b99e055f3b5fd5ca797241b037c83be6b83e4fb -AUX xinit-1.4.3-gentoo-customizations.patch 1418 BLAKE2B 4f07b017e2a40be04ec49c9b48d1778a6ce9cefb335adc97e333afc2bf83e80d3982da64aff9d27de3c7c4b39c4a2108209630fd7a96f004184e026cf494abf2 SHA512 1cebb1f54270af23b82043a8a82aede5b9a29a0d735a9a4845ed7f8ca2bd227b1a97394eb8812bd1934584cb04e54b68dc88afb60950b401e76339fe16eb2b24 -AUX xinit-1.4.3-startx-current-vt.patch 1094 BLAKE2B aab3771d592f66aca9504da66b251ec8b700e2cbe9ddd7970a8b363a57454690288d1888a64efdb3ee13a1029f77121a9b7eedf635518d1f01a51dc1d3c5cd6c SHA512 f88f1572fa85c03d47e1257d5d8375f9d1f5fa526424fedd557391b4c004ffe4100bd241f4a6c270055bfb038d88111b9bbdb9e5f86e2ce17eab39ecb38332cc AUX xinit-1.4.4-gentoo-customizations.patch 1451 BLAKE2B 5781a7f25b3ac2469fd6c7f4ce80979ff648679ad0a4d1aa1813f325e08bcb77616e218b62ea089d4090be91e693f1fbac83a056b0a3f7627a7061b9ffe8629c SHA512 e18fe2bcbf4e66c8fb796a8a672c5c8b0dee1de4ec5d16117e4fafbd1c04ea79596d4e9737e8171d309c15a27b8a1c16d63ca2b8bfb2e1fa39ede5f277e48de4 AUX xinit-1.4.4-move-serverauthfile-into-tmp.patch 730 BLAKE2B 637229724b68772ef7d431d0ebab8e42f1a881d3f32727339f9c72cf252573564a20a5cd798636badc6524e905e2b89a331a187a0ef1c87705aae72601e5fa68 SHA512 9dbd5b82ff7005e91f53dadde3ebdabbd9c5859ade859a1b3420ae44d80678279cd7f6a34282b19adcc79f5ba8ad7321fd3007bdde51d5419c51431f3030e120 AUX xinit-1.4.4-startx-current-vt.patch 1062 BLAKE2B 6f82128cf4ee13cbb9cf0103cfbb35a6956abf0175d41db5221cb4a57d378f730911ed655d88a1837cc029d186b09ba3ae36d5718c9949749338c6c569a15def SHA512 00a9e5ac0a2e1f1e26e0dc6933be3fdd0a76d60b88bbf78c0d803a349dd2a51a8a97a781bb1c67386b0c414f52e80adf9ba8d2488bd9e2bc151d0f6d9c655296 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5 -DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 8f5c16d5ec9cc16c734b1661def4f7e68321259f24e7aac2b039b8e142fb4a324d2471a0f04d3b4448ae713082ad9ec7018083b00ed1a93aac90fa7db172247d SHA512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 -DIST xinit-1.4.3.tar.xz 158348 BLAKE2B 321400aa6572a7309ece961c1f053382825de5c12a235eb7f4345d5da4f95a199a9e1987e21baa5c3a472d2638e8c18a1610e4f0d617f3205f58cd66415efb6a SHA512 ff754567d2224d1ff5023b302cae3a435950a6f24a773e214ea108b96d18b722d4cc86d0e25a7d92edea1307e3037248b4da004c1b392f73ba7bc1e04a94b77b DIST xinit-1.4.4.tar.xz 162496 BLAKE2B 54da6f5d31658a228987d4e3a17636bb5f3a36bc7067dfc8bcbe35c2944831e320edd7a92b172a55b2db41d6d757b22cfa2b712beb9d17c8f39d539a4294ba23 SHA512 387285c952bbe074d2ed2dbbf745d1634763bb71f7f7edb22b3306b9e96ae4e28e59ecd6c48cc646b12dbdbcc68d42036bd127da75ef3c16fabdae87794ad6d1 -EBUILD xinit-1.4.2.ebuild 2229 BLAKE2B e4a75c2c6afb45f43f4eb987c1b42dcf37ec24d61ff83ae09b92903faf9912f4fb5511e4a53006d09db98277a86223fbab2e12b01a7e5eefb6af53f64b447c1f SHA512 86f54780baf5cbb5157e5d4a394a8af2ebc613e8aab5def17def7537305075f9f22469df11eb6306a51a5346028b27b1dc795fc6dcc1717859388b16240e947d -EBUILD xinit-1.4.3.ebuild 2187 BLAKE2B a1666ba7ca39cfac7fe7ed752927c3c3d82c18a0f7dddd05b2256908b9ae9d6c20f275c1f9a866594520c4e6dd098e2c3bf1042112a9aae2bf59bd071c5d7a2f SHA512 146017bf7e1484239146169b2fe0baaf582a5c46f80f23139a15a21e6c08ec80d5d3a28934fc26497d45036d4961b8f496c11928e0377fb0510d06cdeb204c0d -EBUILD xinit-1.4.4.ebuild 2188 BLAKE2B 342fa356cd4f6322dcdee9dfbe422896cf6f35d91faa8a04cec8eb4007ab78afccfb5862d1381eeaafad2bc6c0d9dc6fc278cba5a3bd59e5ffce3a3dca35dbaf SHA512 efe2502f7408658bc9ffa6804bb26c666a59b6f4edfc1a4ec835526797e189072432e86c76b4d5e1f232677e818e49dd3cd77f6c782c41412b47d342df2827ba +EBUILD xinit-1.4.4.ebuild 2187 BLAKE2B 64bbc1732fb1f6f4a6947179b83bbceb58f892d04264e5aa9d5590b1a094d5e22b7e2af03554eb7ce9d2ae017af566ce18936bf085b1f85a339c3a695ad76b84 SHA512 1c179b3ded3b56b4cfa3d687557987643a0df73e4d3b17bf7ba79bdf471f0f9f3307378b0d7f8b216e5ec183255371b7e9316b6e9bef653b97a9b990e4e3fc95 MISC metadata.xml 550 BLAKE2B 3c7e6936cc7db503b1f4e654e6cc42edfa82524403d8de329e058cb4a8e084075f1c7047e494952847ef137c0d411b4ab20e1f54e4264448040e4d62af0f1ee2 SHA512 d903eb4c148009926f925d6f20ee29316d98adf4ee3431fd47f098d907fc9e777bfa33d34d90163fdc69e6ac7c895f67852269cc938deb2c22102ccb1ca5393b diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch deleted file mode 100644 index 48dceabc500e..000000000000 --- a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal -Date: Mon, 1 Nov 2010 16:46:36 +0100 -Subject: [PATCH] Gentoo customizations. - - -Signed-off-by: Tomas Chvatal ---- - xinitrc.cpp | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) - -diff --git a/xinitrc.cpp b/xinitrc.cpp -index 049a8e4..80c3ad9 100644 ---- a/xinitrc.cpp -+++ b/xinitrc.cpp -@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD - - userresources=$HOME/.Xresources - usermodmap=$HOME/.Xmodmap --sysresources=XINITDIR/.Xresources --sysmodmap=XINITDIR/.Xmodmap -+sysresources=XINITDIR/Xresources -+sysmodmap=XINITDIR/Xmodmap - - XCOMM merge in defaults and keymaps - -@@ -84,15 +84,25 @@ fi - XCOMM This is the fallback case if nothing else is executed above - #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ - -+if [ -n "`/etc/X11/chooser.sh`" ]; then -+ command="`/etc/X11/chooser.sh`" -+else -+ failsafe="yes" -+fi -+ - if [ -d XINITDIR/xinitrc.d ] ; then -- for f in XINITDIR/xinitrc.d/?*.sh ; do -+ for f in XINITDIR/xinitrc.d/?* ; do - [ -x "$f" ] && . "$f" - done - unset f - fi - --TWM & --XCLOCK -geometry 50x50-1+1 & --XTERM -geometry 80x50+494+51 & --XTERM -geometry 80x20+494-0 & --exec XTERM -geometry 80x66+0+0 -name login -+if [ -n "$failsafe" ]; then -+ TWM & -+ XCLOCK -geometry 50x50-1+1 & -+ XTERM -geometry 80x50+494+51 & -+ XTERM -geometry 80x20+494-0 & -+ exec XTERM -geometry 80x66+0+0 -name login -+else -+ exec $command -+fi --- -1.7.3.1 - diff --git a/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch b/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch deleted file mode 100644 index 22b733fbdbba..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.2-move-serverauthfile-into-tmp.patch +++ /dev/null @@ -1,23 +0,0 @@ -Move startx auth files in /tmp so they are removed on reboot. -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 -The trap patch didn't seem to work on reboot. ---- - startx.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/startx.cpp b/startx.cpp -index 082f780..9f9ff00 100644 ---- a/startx.cpp -+++ b/startx.cpp -@@ -261,7 +261,7 @@ if [ x"$enable_xauth" = x1 ] ; then - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=`mktemp --tmpdir serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie --- -2.37.4 - diff --git a/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch deleted file mode 100644 index 979d5260a13f..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.2-startx-current-vt.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/startx.cpp b/startx.cpp -index dfbebe1..082f780 100644 ---- a/startx.cpp -+++ b/startx.cpp -@@ -202,17 +202,6 @@ XCOMM process server arguments - if [ x"$server" = x ]; then - server=$defaultserver - --#ifdef __linux__ -- XCOMM When starting the defaultserver start X on the current tty to avoid -- XCOMM the startx session being seen as inactive: -- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" -- tty=$(tty) -- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then -- tty_num=${tty#/dev/tty} -- vtarg="vt$tty_num -keeptty" -- fi --#endif -- - XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ x"$serverargs" = x -a x"$display" = x ]; then - if [ -f "$userserverrc" ]; then --- -2.37.4 - diff --git a/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch deleted file mode 100644 index bdbde8614105..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.3-gentoo-customizations.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 51b59e76c26da000de8a3d3f32d440d4213c2964 Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal -Date: Mon, 1 Nov 2010 16:46:36 +0100 -Subject: [PATCH] Gentoo customizations. - -Signed-off-by: Tomas Chvatal ---- - xinitrc.cpp | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git ./xinitrc.cpp ./xinitrc.cpp -index fa1675c..7cff166 100644 ---- ./xinitrc.cpp -+++ ./xinitrc.cpp -@@ -9,8 +9,8 @@ xmodmap=XMODMAP - - userresources=$HOME/.Xresources - usermodmap=$HOME/.Xmodmap --sysresources=$xinitdir/.Xresources --sysmodmap=$xinitdir/.Xmodmap -+sysresources=$xinitdir/Xresources -+sysmodmap=$xinitdir/Xmodmap - - XCOMM merge in defaults and keymaps - -@@ -40,15 +40,25 @@ fi - - XCOMM start some nice programs - -+if [ -n "`/etc/X11/chooser.sh`" ]; then -+ command="`/etc/X11/chooser.sh`" -+else -+ failsafe="yes" -+fi -+ - if [ -d $xinitdir/xinitrc.d ] ; then -- for f in "$xinitdir/xinitrc.d"/?*.sh ; do -+ for f in "$xinitdir/xinitrc.d"/?* ; do - [ -x "$f" ] && . "$f" - done - unset f - fi - --$twm & --$xclock -geometry 50x50-1+1 & --$xterm -geometry 80x50+494+51 & --$xterm -geometry 80x20+494-0 & --exec $xterm -geometry 80x66+0+0 -name login -+if [ -n "$failsafe" ]; then -+ $twm & -+ $xclock -geometry 50x50-1+1 & -+ $xterm -geometry 80x50+494+51 & -+ $xterm -geometry 80x20+494-0 & -+ exec $xterm -geometry 80x66+0+0 -name login -+else -+ exec $command -+fi --- -2.45.2 - diff --git a/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch deleted file mode 100644 index 2feaedca6c2f..000000000000 --- a/x11-apps/xinit/files/xinit-1.4.3-startx-current-vt.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14903751c4d53bb69c3ee241524888cf746784c6 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Sat, 3 Dec 2022 18:21:50 -0500 -Subject: [PATCH] files/xinit-1.4.0-startx-current-vt.patch - ---- - startx.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git ./startx.cpp ./startx.cpp -index 645566f..aa1dd7a 100644 ---- ./startx.cpp -+++ ./startx.cpp -@@ -211,17 +211,6 @@ XCOMM process server arguments - if [ "$server" = "" ]; then - server=$defaultserver - --if [ "$(uname -s)" = "Linux" ] ; then -- XCOMM When starting the defaultserver start X on the current tty to avoid -- XCOMM the startx session being seen as inactive: -- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" -- tty=$(tty) -- if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then -- tty_num=${tty#/dev/tty} -- vtarg="vt$tty_num -keeptty" -- fi --fi -- - XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments - if [ "$serverargs" = "" ] && [ "$display" = "" ]; then - if [ -f "$userserverrc" ]; then --- -2.45.2 - diff --git a/x11-apps/xinit/xinit-1.4.2.ebuild b/x11-apps/xinit/xinit-1.4.2.ebuild deleted file mode 100644 index 71f779aca2e0..000000000000 --- a/x11-apps/xinit/xinit-1.4.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xorg-3 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux" -IUSE="twm" - -RDEPEND=" - x11-apps/xauth - x11-libs/libX11 -" -DEPEND="${RDEPEND}" -PDEPEND="x11-apps/xrdb - twm? ( - x11-apps/xclock - x11-apps/xsm - x11-terms/xterm - x11-wm/twm - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.4.2-startx-current-vt.patch" - "${FILESDIR}/${PN}-1.4.2-move-serverauthfile-into-tmp.patch" -) - -XORG_CONFIGURE_OPTIONS=( - --with-xinitdir="${EPREFIX}"/etc/X11/xinit -) - -src_install() { - xorg-3_src_install - - exeinto /etc/X11 - doexe "${FILESDIR}"/chooser.sh - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/Xsession - exeinto /etc/X11/xinit - newexe "${FILESDIR}"/xserverrc.2 xserverrc - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}"/00-xhost - - insinto /usr/share/xsessions - doins "${FILESDIR}"/Xsession.desktop -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - ewarn "If you use startx to start X instead of a login manager like gdm/kdm," - ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" - ewarn "any executable. When you run startx, it will run this as the login session." - ewarn "You can set this in a file in /etc/env.d/ for the entire system," - ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." - ewarn "Here's an example of setting it for the whole system:" - ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-lt" "1.4.1"; then - ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the" - ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change" - ewarn "is transparent for most of users, however those that use runtime temporary" - ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them" - ewarn "not to remove the 'serverauth.*' files." - fi - done -} diff --git a/x11-apps/xinit/xinit-1.4.3.ebuild b/x11-apps/xinit/xinit-1.4.3.ebuild deleted file mode 100644 index f7a74a59be0d..000000000000 --- a/x11-apps/xinit/xinit-1.4.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit eapi9-ver xorg-3 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux" -IUSE="twm" - -RDEPEND=" - x11-apps/xauth - x11-libs/libX11 -" -DEPEND="${RDEPEND}" -PDEPEND="x11-apps/xrdb - twm? ( - x11-apps/xclock - x11-apps/xsm - x11-terms/xterm - x11-wm/twm - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.3-gentoo-customizations.patch" - "${FILESDIR}/${PN}-1.4.3-startx-current-vt.patch" - "${FILESDIR}/${PN}-1.4.2-move-serverauthfile-into-tmp.patch" -) - -XORG_CONFIGURE_OPTIONS=( - --with-xinitdir="${EPREFIX}"/etc/X11/xinit -) - -src_install() { - xorg-3_src_install - - exeinto /etc/X11 - doexe "${FILESDIR}"/chooser.sh - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/Xsession - exeinto /etc/X11/xinit - newexe "${FILESDIR}"/xserverrc.2 xserverrc - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}"/00-xhost - - insinto /usr/share/xsessions - doins "${FILESDIR}"/Xsession.desktop -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - ewarn "If you use startx to start X instead of a login manager like gdm/kdm," - ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" - ewarn "any executable. When you run startx, it will run this as the login session." - ewarn "You can set this in a file in /etc/env.d/ for the entire system," - ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." - ewarn "Here's an example of setting it for the whole system:" - ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" - elif ver_replacing "-lt" "1.4.1"; then - ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the" - ewarn "home directory but rather are created in \$TMPDIR (typically /tmp). The change" - ewarn "is transparent for most of users, however those that use runtime temporary" - ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them" - ewarn "not to remove the 'serverauth.*' files." - fi -} diff --git a/x11-apps/xinit/xinit-1.4.4.ebuild b/x11-apps/xinit/xinit-1.4.4.ebuild index 3b04d855ce59..536582aa66ba 100644 --- a/x11-apps/xinit/xinit-1.4.4.ebuild +++ b/x11-apps/xinit/xinit-1.4.4.ebuild @@ -8,7 +8,7 @@ inherit eapi9-ver xorg-3 DESCRIPTION="X Window System initializer" LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux" IUSE="twm" RDEPEND=" -- cgit v1.2.3