gentoo auto-resync : 09:08:2023 - 15:30:17

4 files changed, 44 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f951dcbd5ae3..231d19bb24ed 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,9 +11,11 @@ AUX xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch 891 BLAKE2B cbf7d7
 AUX xscreensaver-6.05-r2-configure-exit-codes.patch 1649 BLAKE2B 3846edb722f7b59d349d89608ca446971ec59d4179c461a28e9bb9cffd8c956c560993502d83564db49ca234cad7ce0a8dd978beae8016f07128e60db2c03746 SHA512 12e122672fbe6ee7058fb031300978a48501f21e69ad9bcd8fe745ce29f870d94524900dbc82bf8ba30f2989e1c6b8d380649ac26744b92536f1697e81fd4d90
 AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d
 AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
+AUX xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch 548 BLAKE2B bda7487c4db12d26cd8aa65bc9954553a1d7a49e22b86993d8abaa5fe0a523457ad358564df8ba11712e0b1340f1e8882edab8b7fe4d7c7f0bb31a37b21aea26 SHA512 1134298f2e3a34b1c4d770b9a3d6d8346fbb479cab27ab63503961a9bd9608d072fd033fda4ea5af5ec77c39c603486f3c6afab94b7ad43bed01d1eb6dd045c1
+AUX xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch 654 BLAKE2B d9b5d56334f16e9e59beda2599edd92c69f9a4bec6e9aba125ccebcfa09af6aeb025986fd14e77b67d5b1d961ed2b749f3bcc9655579a00438cc3d661271c5c4 SHA512 38dd0174a86b150bdfd565eb371ec2fb944f30aeb9c5d4e1b33d96ce5c47aef9e700da0e41fb75c015792361d121b570ec189ff246b5930ac427aac6fdbf4ce8
 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 6649 BLAKE2B 891003977a93c676505dcba1f38f4ee8225752cadcebd7c33c92a12a2df12c8950c86e16c2a756eb4dd9ec4b065ff061b65f993e0e71ddc06cd2b3974b45e118 SHA512 16f0aaf70d59747e0666fb3e0e3f5c4b69d672050ed2fcdcc57e90fea5530be416257245a7c1c352929522800204b436e81f97630b264afb993b571535de9c3e
 EBUILD xscreensaver-6.05-r2.ebuild 6744 BLAKE2B a7409658c267346f93d40ce61a1d186e0797f911ebf8c7700f95ef95e8b08f2e4238b9b2ff7f5d5cb6b2819b26c8d0d8c1061812d11554b14a5a33fbc8792e77 SHA512 20ccf63d1b987d9a969d121dded4bc55f6daa4a597ad3f0cb162ee4a94fa24239c17b9493d2112f42e805a89d5872d03df154865ee7d09a45f9e7dfef86dba4a
-EBUILD xscreensaver-6.06-r1.ebuild 6922 BLAKE2B 2ba95b01c68aaad2407e6f49df341367675eec7b4f74d6dbbb7e917f3f2e563a41dd303b42768e061ff92d88eba93d8fa0c9a4cb715b7e9ef7d97268e509bea0 SHA512 15d95b475d1ae74eb5130eccacaccf163247534fe9a772709322aca3a73c34126e92d734795604b8a51702f8f4a85616886a6c839cc10ff9d2406c1bd7965a95
+EBUILD xscreensaver-6.06-r2.ebuild 7068 BLAKE2B 392e40d2fac5114047a6dd52f77a528b35baad879170037eddcf09ef0fff15c090f668bf40b120ba2e452f5900ac4efa2888f09207e1054446f8c21a7b222398 SHA512 ec47f7d7d33c1d18267ca94e1b34b81e7f43f33ede55b78c469541a9a4bf974eefe2e1b9d04dec3bc170a8d230db8e73f6d3bb1c427cbd4d59b50e21a58c766e
 MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
new file mode 100644
index 000000000000..454a9a7dd6bf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
@@ -0,0 +1,18 @@
+From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:52:22 +0200
+Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver
+
+$ systemctl --user enable xscreensaver
+Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver.
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -14,5 +14,4 @@ Restart=on-failure
+ OOMScoreAdjust=-1000
+ 
+ [Install]
+-Alias=org.jwz.xscreensaver
+ WantedBy=default.target
+-- 
+2.41.0
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
new file mode 100644
index 000000000000..ec4f85d373f9
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
@@ -0,0 +1,21 @@
+From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:51:45 +0200
+Subject: xscreensaver.service: start xscreensaver with --no-splash
+
+Prevents the splash screen being shown when the user logs in.
+
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -9,7 +9,7 @@ ConditionUser=!@system
+ Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver org.xfce.ScreenSaver light-locker
+ 
+ [Service]
+-ExecStart=/usr/bin/xscreensaver
++ExecStart=/usr/bin/xscreensaver --no-splash
+ Restart=on-failure
+ OOMScoreAdjust=-1000
+ 
+-- 
+2.41.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index 48ddc842e1b5..a3b38814fc7b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
 #	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
 #	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
+	"${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch
+	"${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
 )
 
 DOCS=( README{,.hacking} )