gentoo auto-resync : 29:05:2023 - 21:18:33

5 files changed, 4 insertions, 38 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index db8b660f0cc1..30430dcb170e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,7 +3,6 @@ AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c8
 AUX xscreensaver-6.01-configure-install_sh.patch 307 BLAKE2B 23448fd5be2ea322bd5696026d175ca9f167835e9badd3cd9f2069187571d7d2a45e6d5a73596d3291bf7739f8288c2becda5d7a8c9c95c78c74a70bea63422d SHA512 4d4169546f316902846921c05d733d2a956eaf53b700ecdd6127825576d0e6be6ec0eeb51f49a3a80bd14e7753328783448d33f1ffb1a67fca0c39c676ff9ec4
 AUX xscreensaver-6.01-configure.ac-sandbox.patch 4010 BLAKE2B 8df5adba88e04594b18e12080be0624daccdfd6e101a762e6b3ce42f8fd8405c1c02f7beaf07405f979c959d79e804daade57cd1e087cc9adb4e96aca851ca4b SHA512 2c033fed2a48a8dae46a394624f4174ebfc33ed944ad568327823290b803a2d8812767654d7bec084bf861b731dc56840fe74286473d364ee580b48708e40549
 AUX xscreensaver-6.01-gentoo.patch 1303 BLAKE2B 8ae9f4e545eed146c08f34fe9c56a9e73721c6cbcc361792c1b3b1c529da409e6f75b8727049d83a34be40747e516ab4e86efaf15bd027651dcdbdd64fe25ef5 SHA512 60f0f841e77c42f8b8afe3c94c6ec86c72e80bc2fb771979b798e7bc8428cb1d903c72a6176f60a3c5b98e850f4bb82cec01bae87eddeb42e99ba8099a1223aa
-AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e6580278bb9418bc17943422969f6571d4913f27347b088aa9404b11c14662de5b6144ef555521b1cb506b4ba8cde440aa63e78 SHA512 491e2861f2fb59b9c60f2321fd7e47f8cccaa8b2e69b5e9bb56ddb7893a6304983cefbed6ac6baf984f31ddf3b85e7354fc68ecac88058bfac79c9fac16deb44
 AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde5317c1c41c6d54a60a4abe14c98bfa3350b9b5be38141ab7b6c569eb03527ebdab577c87cbe91e1c7197b4bf49613e2a0a94f31420a018c SHA512 bd1b57143eb0a923b41c0d513649735700edd884d39bcb3f00f886d62c2bf94c1349327797008f5698cb8b44952b7517f218d03a12a7e6128c2790005752fd88
@@ -14,7 +13,7 @@ AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a
 AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
 DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5
-EBUILD xscreensaver-6.05-r1.ebuild 6689 BLAKE2B 47b8ac61a1a7d0bd241108f3880c01f21746f8e289dac08ff7a03320f5d6f477574ae4ffb2d4d0c1e0b8ebd55b6a84280e1239ca3d0ebfa8b3ff998bd5c6a854 SHA512 797f95a790c2a8aa4b216e19eb2b41b0204f953217b97c270e516dae60bda717aacdbba93b7c1f5792a46bf1295857c8c4577bc54f480dae13f7a71b7075db5a
-EBUILD xscreensaver-6.05-r2.ebuild 6784 BLAKE2B 111cfbfe4c307b27fa42a3a053fb03254f5b5aa33817b6776d05a6f43bba4fb128e644db5a4dfeb52211e11713d03fc2a393c91b58be68a21782faa23272d75f SHA512 714e33138c8d42490d72e611e76dd8f4b9fe2acefcc898e2ec795a861d3025c689d7c2aa8ba7ec3e71e1a34c47e53bea13f29d202bdc605e0e94338dd3eedd07
-EBUILD xscreensaver-6.06.ebuild 6818 BLAKE2B 2f585c121c5b1fcb1d9a782eb4798b43e41fa3bb9757e1a6c775239cf4080cd0ed7bb80cf8f2c9100a40d2027f23794ce762269270aa2fd24a963676d163ab43 SHA512 5d9c56e7c3071a0603154a4d2676a961e49d626e8bb994ea7cfb70c4013b5d60336abcc62e01bbfcf953b3007d5c1773571e0f514a74805ceb55a3a9fc6a34b9
+EBUILD xscreensaver-6.05-r1.ebuild 6649 BLAKE2B 891003977a93c676505dcba1f38f4ee8225752cadcebd7c33c92a12a2df12c8950c86e16c2a756eb4dd9ec4b065ff061b65f993e0e71ddc06cd2b3974b45e118 SHA512 16f0aaf70d59747e0666fb3e0e3f5c4b69d672050ed2fcdcc57e90fea5530be416257245a7c1c352929522800204b436e81f97630b264afb993b571535de9c3e
+EBUILD xscreensaver-6.05-r2.ebuild 6744 BLAKE2B a7409658c267346f93d40ce61a1d186e0797f911ebf8c7700f95ef95e8b08f2e4238b9b2ff7f5d5cb6b2819b26c8d0d8c1061812d11554b14a5a33fbc8792e77 SHA512 20ccf63d1b987d9a969d121dded4bc55f6daa4a597ad3f0cb162ee4a94fa24239c17b9493d2112f42e805a89d5872d03df154865ee7d09a45f9e7dfef86dba4a
+EBUILD xscreensaver-6.06.ebuild 6778 BLAKE2B 329d54c37889f1b24505c6fb39c7d09c782660234fcab89ef4036e0bb5ce7cd120b798c1475eb51462162d63948aee483489779aa290450978ef04b5fd9f6e27 SHA512 0d3da227b50e172f18a2350fd1daf7a67015f5f04da247408431ae2054d3b4c64fab4b82ed19e902690ab0214f906178c692add6d3338dad949f1008221902e1
 MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
deleted file mode 100644
index 72aa6535f139..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru a/driver/prefsw.c b/driver/prefsw.c
---- a/driver/prefsw.c	2021-02-19 02:52:32.000000000 +0100
-+++ b/driver/prefsw.c	2021-05-07 15:20:09.280321274 +0200
-@@ -798,7 +798,10 @@
- 	     sure that the bits actually land on the disk right away. */
-           /* Update 2020: Apparently here in the future, this sometimes takes
-              3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- 	  /* sync(); */
-+#endif
- 
-           status = 0;    /* wrote and renamed successfully! */
- 	}
-diff -Nru a/driver/setuid.c b/driver/setuid.c
---- a/driver/setuid.c	2021-02-05 16:16:23.000000000 +0100
-+++ b/driver/setuid.c	2021-05-07 15:21:05.987949943 +0200
-@@ -104,9 +104,12 @@
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
-+  
-+#ifndef __INTERIX
-   if (setgroups_needed_p (gid) &&
-       setgroups (1, &gid) < 0)
-     sgs_errno = errno ? errno : -1;
-+#endif
- 
-   errno = 0;
-   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index c724289feed1..8b77e00352a5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -77,7 +77,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.01-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-6.01-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 7dbfa69b04f5..53580375256b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.01-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-6.01-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
index 4b4247e5340a..02ae75c68a51 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
@@ -75,7 +75,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.01-interix.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
 	"${FILESDIR}"/${PN}-6.01-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch