gentoo resync : 28.04.2021

5 files changed, 8 insertions, 240 deletions

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 347591fad53a..77114ba96185 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,12 +2,8 @@ AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 AUX xlockmore-5.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
-DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
 DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
-DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2 SHA512 e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a
-EBUILD xlockmore-5.50-r1.ebuild 2232 BLAKE2B f50ff6c7eec489f9431266a9c02902b9cba3de6219b76e8452e13390b59513e3820f65cd2824cbb4eb87262d110a97fd66236d62e6389fb78a0823fee50d4afa SHA512 24a893bd0cdf66cecdc52de86cf167ba9117f5f5ccf8e26ae4279b4b2f229f4f7f0c850c46bee7b4fd1aa984988dbac38a1181e3f69b364d4a47a74d2ea11ead
 EBUILD xlockmore-5.65-r1.ebuild 2332 BLAKE2B 1f07a0ebf63fb25e13ec01d5f4fd79bae60e49db9ac3eb3a99c2f917b251d9d3f10d351983217ad70add9a7c5fefd0e43ef612fd21cb14f1adb85e514fce9a9b SHA512 576c000839ecbcbae4b4cb31deaf3f864b334e7383041ed08054061de77cad5a74e98ed9943f0b80d6a9126feadc41a947be998aa736001770b4b4ebd892503e
-EBUILD xlockmore-5.66.ebuild 2493 BLAKE2B a9b8d9b8ffe060d0d5a9764fa3d09c184f0f08f8c1ec87c7c61d9309f32177abb4450383633f75beec921bd422f95e1ae3642963c08000df29e131d31e593865 SHA512 af7a90003c6a31fea53fb1494314a5ed8fc59da89738bcefca2fa6d694bb84ff72ea9779fe618ef6bdbb6332418815d7985493a06a735ba31f5da4de412fa827
-EBUILD xlockmore-5.66_alpha12-r1.ebuild 2479 BLAKE2B d96ae64ef54769762cc92171cc150b6f473ca391149291042d10b5ca12306ea541847ea8772c6dfae90b4c9bf3b334d2219855519a1906e1b35e41bf1f456056 SHA512 13f3e95593e447fa56746e875f1603fcdfc50d8dc7a7d21881e89a3c5042aea404f97c35832de4f3040a5e952db32e7cb4b4ec5db959dfe3202df31b59dac0ee
-MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
+EBUILD xlockmore-5.66.ebuild 2488 BLAKE2B ec994f139176a9f4b5aebfa992825e7e550912d79f1ff12451e6c6b595d9796d4eacf503ac73c0327726803305f244238586032d0e027378111ab1472e19c6a2 SHA512 a08870595a6e7b07014f55cf568a8fd13c34ddeaaad9e9300e965c9875d35deae9a62ee74450fb6fa1c9846876f8603152d55db7b0f570a4bc3c395aaa686701
+MISC metadata.xml 325 BLAKE2B 0e577cee138c2ec90b01d415b886a557c5e152742be204dada61a91b67053fcf8e720f17e621d2b3519d8d68808ad1842131572ef72f667e23e513c6b882ec5e SHA512 7a7f034424bf4bee2a65f0fd2e993685ee4c037666aaa91f84ecd240cc672945ecdd7573ee871c715a94c42ec87ab65edd92b979a4052847e5a50c8089110fbe
diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
index 673b683e2429..95295571b777 100644
--- a/x11-misc/xlockmore/metadata.xml
+++ b/x11-misc/xlockmore/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <use>
-    <flag name="xlockrc">Enables xlockrc for people without PAM</flag>
-    <flag name="vtlock">Enables support for virtual terminal locking</flag>
-  </use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="xlockrc">Enables xlockrc for people without PAM</flag>
+		<flag name="vtlock">Enables support for virtual terminal locking</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-misc/xlockmore/xlockmore-5.50-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.50-r1.ebuild
deleted file mode 100644
index 71363f18b99b..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.50-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	if use pam; then
-		pamd_mimic_system xlock auth
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.66.ebuild b/x11-misc/xlockmore/xlockmore-5.66.ebuild
index e701a66751bd..767c041c2b8e 100644
--- a/x11-misc/xlockmore/xlockmore-5.66.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_alpha/ALPHA}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
 
 REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha12-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha12-r1.ebuild
deleted file mode 100644
index 581e292289a9..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha12-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/XLOCKLIBPATHS="-L/d' \
-		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	if use pam; then
-		pamd_mimic_system xlock auth
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}