gentoo resync : 28.07.2021

3 files changed, 19 insertions, 3 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index e3669d071f64..de6c89c94a8a 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,6 +6,7 @@ AUX xscreensaver-5.45-cve-2021-34557.patch 1567 BLAKE2B 1ee8105b3f4d9f1772b29138
 AUX xscreensaver-5.45-gcc.patch 549 BLAKE2B c762b7792d2e597893b7156e1b12e52a03c84a40344b408d3261b60a9b6f4357070644ae5c2d6cf1f4f93229cbf5e66d0f893d71e5c6baa13d77b96d17d09d33 SHA512 6549885e1bf7515845c1e2f47ec211e2c948b22531e14a5cab0cf700863450d6bfff8b1cd385a8a083771c73591a5f65fbd9f1b4d0280cb08edeea31236aeca6
 AUX xscreensaver-5.45-interix.patch 950 BLAKE2B 6bbebbc4ff8eb2dc0a3179441c2813559bfb2ad1727db1295fb847dff0b4510a31b32b7982fa83f059e99f1c58f5cd12f84600e2183273417cb1e0e17843929a SHA512 94937b43f1f0ea1b72fa0ae95b967481702362b2b6f9aa4acbc7dfd2919c69d1cc302cbb9bb8a953da22b7eb29b3874a160cf741c7ff8f4c9b9942b8af7ba6d4
 AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf32302bef97f846edf1585659340d1212710654dc1162d3be0e2ecfc8846a04732976c40b0167630fca0d12f64a6cc0d04fabbe0b323dabae83 SHA512 552a9674d2954168af666a0e61bbe8b7302fab8630116196482507c595b3a9a902eceb58387973a23ad931e54c8f3f35953dd86357e25492f03a552a168ef88f
+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-gtk-detection.patch 792 BLAKE2B c941ea71b795af827034196150732848f2c63dde71fef3c87a090da5b652336c4b3220ad4ddeaf50ad80b54ead12632515495acc9ffea31897cd03dc68684aed SHA512 0de9b48fe74964ecd9ceb9421c1a48b15e168e4b89d412162f625d3423a12b20ed8662c6893226aeaeadfc455611e1856049086b9a84625c1b38559e6e2af056
@@ -19,5 +20,5 @@ EBUILD xscreensaver-5.45-r5.ebuild 4159 BLAKE2B 479874f5e3823dbf1b8570d8285a868d
 EBUILD xscreensaver-5.45-r6.ebuild 4264 BLAKE2B 2b8226f3b3695ded5884327e557a8bc9741a78ead7a526a5d7a2bea3fd2ac157f9c741802f1352ea6cdf130d5a3c3a147ecf6c934cd74099f336b92eea75c5ef SHA512 b670776352e96fc33ca2223e2f5d164e179015abc52afdd303c2f5782ac983ed60d12f7e1582e3d9bef05d4ce508a2e3ccf2fb586b7435873510c2b3e1cf8d21
 EBUILD xscreensaver-6.01-r1.ebuild 5084 BLAKE2B 3d62384d1c574228b0237effd608229d4b2d740a0d886320eb49226857372a60781f44a84e547cdabaf90863501ea6f10994b5e19b8837c54373d7fa9ff1c670 SHA512 92cd7a2adbf50dbdc474e10201ee04e699261d29759edf25c22e987608578df7916562c872b48384f579accd7bd0ba4d6eed1840ef6b09eaabfc34cee40d0b43
 EBUILD xscreensaver-6.01-r2.ebuild 5178 BLAKE2B 980f127f3238072282a7441308f9814860bd613bc5e530c8aeb7a378d2b0f6b983003e5667b5416542402359cfd37b0aadcd0b6b21e2b3ad3f21364c52909842 SHA512 fb7a433a13ec93c90f59dca6fa4bec80227a7c7e284f2d70c181bb8f50e24439ab5c3fddadad49c0edea51e853c475cff7a023552294993866aae27ee67f52d0
-EBUILD xscreensaver-6.01-r3.ebuild 5692 BLAKE2B b1189fd5bd80acb5b7c346fccf0842b4b826e9e5fc9229adc033bb41f798cee49fbf7a3456a43bb4e92276a9edb6757c6ffa36b33965f4c1e80bab0990e55555 SHA512 af8ef285717215b82e286e8d8609ea0ab052d488269be32adee903c86444075bfc14ccc59b74f407ee1b72caecb0bd907f80c910faaa8441ab6767405b041ee5
+EBUILD xscreensaver-6.01-r3.ebuild 5847 BLAKE2B 9675cdf7ec5644fed780c848d2e3e36ca237b3f376979288f480b928b2d0ede9833169f74103d53616ea729570aa3c0af6d88b718e318673a1dfab7fcca0efb7 SHA512 88997efcb4840c76671a7ef4d715a8a85cd41ecd2185d6326a8493f9f835ec5e641dc50672281cb3290d9c2c784bc7216da7c71dabc4c149908533dbf70d3617
 MISC metadata.xml 887 BLAKE2B c24cdade56b44dad279fd6353c3e42f5c9992d2328a3aa29e003eee4d4051fc2505b35c01031041cc87cd033a93796e05aec9bf9379329f5c1a315b2702d295c SHA512 5b62ff9b4fae658f906a040ccea03f9df0fca1b5b6b5a5c5a47c7649de814f0ec443c81baa80d7d089b295ffb9bf15665ff47374e2be166d02fbbee57dba55b1
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
new file mode 100644
index 000000000000..490e32f68177
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/803479
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1062,6 +1062,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_INSTALL_DIRS
+ AC_PROG_MAKE_SET
++AM_PROG_INSTALL_SH
+ 
+ # By default, autoconf sets INSTALL_SCRIPT to '${INSTALL_PROGRAM}'.
+ # That's wrong: it should be set to '${INSTALL}', so that one can
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
index 10eae1bbfe28..609e6c132c7f 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic font multilib optfeature pam
 
 DESCRIPTION="modular screen saver and locker for the X Window System"
@@ -87,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
 	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
 	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
 )
 
 src_prepare() {
@@ -126,7 +128,6 @@ src_prepare() {
 
 	# Must be eauto*re*conf, to force the rebuild
 	eautoreconf
-	eautoheader
 }
 
 src_configure() {
@@ -183,7 +184,8 @@ src_compile() {
 }
 
 src_install() {
-	emake install_prefix="${D}" install
+	use pam && dodir /etc/pam.d/
+	emake install_prefix="${D}" DESTDIR="${D}" install
 
 	if use fonts; then
 		# Do not install fonts with unclear licensing
@@ -200,6 +202,7 @@ src_install() {
 	dodoc README{,.hacking}
 
 	if use pam; then
+		rm -f "${ED}/etc/pam.d/xscreensaver" # install our version instead
 		fperms 755 /usr/bin/${PN}
 		pamd_mimic_system ${PN} auth
 	fi