gentoo resync : 20.03.2022

2 files changed, 28 insertions, 17 deletions

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 866dc5551682..aff8042d4e77 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,8 +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.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
 DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
-EBUILD xlockmore-5.65-r1.ebuild 2332 BLAKE2B 1f07a0ebf63fb25e13ec01d5f4fd79bae60e49db9ac3eb3a99c2f917b251d9d3f10d351983217ad70add9a7c5fefd0e43ef612fd21cb14f1adb85e514fce9a9b SHA512 576c000839ecbcbae4b4cb31deaf3f864b334e7383041ed08054061de77cad5a74e98ed9943f0b80d6a9126feadc41a947be998aa736001770b4b4ebd892503e
+DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
 EBUILD xlockmore-5.66.ebuild 2488 BLAKE2B ec994f139176a9f4b5aebfa992825e7e550912d79f1ff12451e6c6b595d9796d4eacf503ac73c0327726803305f244238586032d0e027378111ab1472e19c6a2 SHA512 a08870595a6e7b07014f55cf568a8fd13c34ddeaaad9e9300e965c9875d35deae9a62ee74450fb6fa1c9846876f8603152d55db7b0f570a4bc3c395aaa686701
+EBUILD xlockmore-5.69.ebuild 2491 BLAKE2B 396cd1349bdd4a05b5808ab61660b45f3d1e960aecfd357a25f8a4a22084afcaaeed213b86d75b589004903b4e25e7eed1426ff558e1334144a1a6fe6e81a4ad SHA512 eb671ac6cf850051724fb8e17f439303cd02e97979b8bc121497969674b7b4d126f1019bfbc2264479b90b914b18ec955b9fcca092a2fcf3c226f4c2100c73be
 MISC metadata.xml 326 BLAKE2B 933c62f987014fd25320e5b9d231747e4fe9ddcf24109f34b1d5df2a186695305b4d3778d4f0b1132e73e79dc483f62bce3b08338ef69f4829998339d29d10fc SHA512 cea9a5ef5e3bbc00c784c65877a67dc10cfb2e97d6280f87defba6f3bea2afec972f1e761aac9b55acaa7e8cc8930e81ab9182d2b2b07fec01ad0ad1525c2c41
diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild
index d620594421d0..642e24bb7e56 100644
--- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
@@ -10,10 +11,11 @@ SRC_URI="
 	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
 	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
 "
+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="
@@ -21,7 +23,14 @@ REQUIRED_USE="
 	pam? ( !xlockrc )
 	xlockrc? ( !pam )
 "
+
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
 	gtk? ( x11-libs/gtk+:2 )
 	imagemagick? ( media-gfx/imagemagick:= )
 	motif? ( >=x11-libs/motif-2.3:0 )
@@ -33,16 +42,10 @@ RDEPEND="
 	)
 	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
 "
 
@@ -50,12 +53,18 @@ 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
+	#"${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
 }
 
@@ -63,10 +72,11 @@ src_configure() {
 	local myconf=()
 
 	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
+		append-cppflags -DFTGL213
+
+		myconf=( --with-ftgl )
+	else
+		myconf=( --without-ftgl )
 	fi
 
 	myconf+=(
@@ -91,6 +101,7 @@ src_configure() {
 		--without-esound
 		--without-gtk
 	)
+
 	econf "${myconf[@]}"
 }