gentoo resync : 20.03.2021

3 files changed, 149 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f26408f7dad2..52625ad72633 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,6 +3,7 @@ AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b
 AUX xscreensaver-5.44-blurb-hndl-test-passwd.patch 247 BLAKE2B fb88708de900b90fdb846608cc0a08706c339792e10099e7873aef00b7c66a408dba71489d0938b59e619345c739e4f6a35a9c97b1ae83cfa040035df3499434 SHA512 bd7f0e3f670e99ad1297306c88e30ac9cc381adf2a54cfd52192c1f562293ebdfcf3e956990cd2f3d877a2ca0d2f5b13332de726304ef93510c5bd08ae39a819
 AUX xscreensaver-5.44-gcc.patch 549 BLAKE2B 9e8b626fd7a9f3778c1bc62a3f161cd2d94b70769fc4adc06c64dd2c7515fbc5054257560326a7d15c124fa90e93b907bb5f3c5954bbe11c123540625b0f2e57 SHA512 d55908911b738e3fc5245627ca79f9c2880402921d38f80247e2143422543396399f5529fd70f4f473935d2606f10dbe3501d2e64af158b38fc03d995345ff10
 AUX xscreensaver-5.44-gentoo.patch 1368 BLAKE2B d74cbe8effe8feb4c682f8df537a2a1897defa31c0838bfb34967642ab2e66e8058b3306c98e360e3c5f81ff4649b759d5386e6e2613c59fb945f439c3b0cc02 SHA512 bba16c093a2a16e57e3bbe77ed7a54201e7e9e1c9a3c5a65065f275a4faa6898327865b62a56be0c538dabde1fb4571ccfd567035911b85688f31ac1cba128b1
+AUX xscreensaver-5.45-configure.ac-sandbox.patch 4763 BLAKE2B ce28548f02c5e8c769d1c02329a15422bf172b8a4feaff09c2c36e706139949c1f9e21b797378bc492226d077e8f2679b8afb32c0e078c0a6acf98ca01d36cd4 SHA512 18bde1dd95775d8afbc6636900844cfd5b317e1e56aa42014c9a988815c1b544458d88e27018d53abfa9354ca816fc7b3a086a59ad61bf561a35fc2605ace109
 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
@@ -10,5 +11,5 @@ AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
 EBUILD xscreensaver-5.44-r4.ebuild 3809 BLAKE2B 92f6ea9bc641d75c47dab18a4e0339f68f8ae9c3f621efb306a874155b5aefdd7a08f09edcd4c047972ed982df6ca432647c934d9ae2baf3d488e1c678c9cbd6 SHA512 c076b5263170f3ce709971a1a65468a475d9b5d511c28e41ec47c7b3fe8cec179cc4c0ed8f78a132ade7e23afcd08d685220adf78a3abc2321e4209f0de5a9c0
-EBUILD xscreensaver-5.45.ebuild 4045 BLAKE2B 1938ca789b249fd263bab0bd12475278bb2bbc9d573b0c917f73c81ab881b379d76c712e7829fe96b8eab2dd539b7aae3c5d26ec54d81801fc13c96f93e42ff2 SHA512 7126d2ed23fbd2d663a25d3f72bef297f059d672aeb63d67b0fd8468164da8e41ea73d69a01b859e0146560cda6cf9536483492989fe3c8af307e6dc03c7a85c
+EBUILD xscreensaver-5.45.ebuild 4098 BLAKE2B c314eae7be06b1b74159802c3319bda9556082054b6a7f034f8626110d066a77a119a8af22d4fc3c03f4a682e8a07efd8bebec4ab544c7280c81c5ecc1090cd5 SHA512 24bb4d979ba1c62aee12aa5551b668ebe288fdfde5a3d7d0d11171d0395bb65685baea9bc5437832afc8babdc768a97afbb00587a5370ef9a4eb60e0affbd82d
 MISC metadata.xml 789 BLAKE2B 9f4d6ec06c763d685b8c6006747fd6482ae5199c4eeeac8ba1bc13f34eaeb8d1dfd67ee0762edd0d4d0199759b26bddd077c07bafa7373f4e6c4069c893757ed SHA512 5f839da92e2f2564d22a93d14ae62b0fecb70be706b89ba2829196859cebd11cfe2d4745e34a33a767d5efe92135fc0fc9686c175dc2774278a3dc944ffa515a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
new file mode 100644
index 000000000000..cee3a30897f6
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
@@ -0,0 +1,146 @@
+From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 16 Mar 2021 00:55:54 +0100
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 115 ---------------------------------------------------
+ 1 file changed, 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 603b993..6ef2631 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
+ done
+ AC_MSG_RESULT($have_bitmap_fonts)
+ 
+-# In case we didn't guess the font directory properly, check RPMs and DEBs too.
+-if test $have_bitmap_fonts != yes ; then
+-  for r in 100dpi 75dpi ; do
+-    for f in xfonts-$r \
+-             xorg-x11-fonts-$r \
+-             xorg-x11-fonts-ISO8859-1-$r \
+-      ; do
+-      if test $have_bitmap_fonts != yes ; then
+-        AC_MSG_CHECKING(for $f)
+-        if ( rpm -q "$f"  2>&- >&- ) ||
+-           ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
+-          have_bitmap_fonts=yes
+-        fi
+-        AC_MSG_RESULT($have_bitmap_fonts)
+-      fi
+-    done
+-  done
+-fi
+-
+ 
+ ###############################################################################
+ #
+@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
+   fi
+ done
+ 
+-
+-# Now let's warn if there's a previous RPM version already installed.
+-# But don't bother with this test if we are currently *building* an RPM.
+-
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-        head -1`
+-  changequote([,])
+-
+-  if test \! -z "$rpmv" ; then
+-
+-    # M4 sucks!!
+-    changequote(A,B)
+-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-    rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-    rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-    changequote([,])
+-
+-    err=" (DIFFERS)"
+-    if test -z "$rpmbdir" ; then rpmbdir='???'
+-    elif test "$rpmbdir" != "${bindir}/"       ; then rpmbdir="$rpmbdir$err";fi
+-
+-    if test -z "$rpmhdir" ; then rpmhdir='???'
+-    elif test "$rpmhdir" != "${HACKDIR}/"      ; then rpmhdir="$rpmhdir$err";fi
+-
+-    if test -z "$rpmcdir" ; then rpmcdir='???'
+-    elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
+-
+-    if test -z "$rpmadir" ; then rpmadir='???'
+-    elif test "$rpmadir" != "${APPDEFAULTS}/"  ; then rpmadir="$rpmadir$err";fi
+-
+-    warning=no
+-    warnL "There is already an installed RPM of xscreensaver"
+-    warn2 "version \"$rpmv\" on this system."
+-    echo ""
+-    warn2 "It is currently installed in these directories:"
+-    echo ""
+-    warn2 "User programs: $rpmbdir$berr"
+-    warn2 "Screen savers: $rpmhdir$herr"
+-    warn2 "Configuration: $rpmcdir$cerr"
+-    warn2 "App Defaults:  $rpmadir$aerr"
+-  fi
+-fi
+-
+-# Also warn if there's a Debian package installed.
+-#
+-debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-debv=''
+-for dpkg in $debnames ; do
+-  if test -z "$debv"; then
+-    debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+-  fi
+-done
+-
+-if test \! -z "$debv" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
+-  debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+-  changequote([,])
+-
+-  err=" (DIFFERS)"
+-  if test -z "$debbdir" ; then debbdir='???'
+-  elif test "$debbdir" != "${bindir}/"        ; then debbdir="$debbdir$err"; fi
+-
+-  if test -z "$debhdir" ; then debhdir='???'
+-  elif test "$debhdir" != "${HACKDIR}/"       ; then debhdir="$debhdir$err"; fi
+-
+-  if test -z "$debcdir" ; then debcdir='???'
+-  elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
+-
+-  if test -z "$debadir" ; then debadir='???'
+-  elif test "$debadir" != "${APPDEFAULTS}/"   ; then debadir="$debadir$err"; fi
+-
+-  warning=no
+-  warnL "There is already an installed dpkg of xscreensaver"
+-  warn2 "version \"$debv\" on this system."
+-  echo ""
+-  warn2 "It is currently installed in these directories:"
+-  echo ""
+-  warn2 "User programs: $debbdir$berr"
+-  warn2 "Screen savers: $debhdir$herr"
+-  warn2 "Configuration: $debcdir$cerr"
+-  warn2 "App Defaults:  $debadir$aerr"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+-- 
+2.30.2
+
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
index 0cb931ea7de0..f54eda2fff69 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.44-gentoo.patch
 	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
 )
 
 src_prepare() {