Merge updates from master

8 files changed, 0 insertions, 246 deletions

diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index bb8987d2ab7f..c0368113e3f3 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,4 +1,2 @@
-DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
 DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
-DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
deleted file mode 100644
index f7f3ff682a4c..000000000000
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_/-}"
-MY_P="util-linux-${MY_PV}"
-LOOPAES_P="loop-AES-v3.7j"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Loop-AES losetup utility"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-	http://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-PATCHES=(
-	"${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		--disable-all-programs \
-		--disable-pylibmount \
-		--enable-libsmartcols \
-		--enable-losetup \
-		--without-ncurses \
-		--without-udev \
-		$(use_enable nls) \
-		$(use_with selinux) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use static && echo --enable-static-programs=losetup)
-}
-
-src_install() {
-	emake install DESTDIR="${T}/root"
-	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
-	newman "${T}/root/usr/share/man/man8/losetup.8" loop-aes-losetup.8
-	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
-}
diff --git a/app-emacs/edb/Manifest b/app-emacs/edb/Manifest
index 0272ba185b5b..79c2aff2990e 100644
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@@ -1,2 +1 @@
-DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
 DIST edb-1.34.tar.gz 616310 BLAKE2B 02867f79ddd5501ede476c3f3cd5420633e836c7c123eaa553aefec4bb72c7df5c1aba76044d61c34f1ae6d020b740af7df0348239f0736b0cadde939cad08a6 SHA512 c5da27454d19cce8fb493a7f2fca150f06069947fa1e8b0ae4f11cd49e95ed1797f07a97eeb7843290c27efe2ef00d04483e7f45bb666d3f39bdd401d9f40a0a
diff --git a/app-emacs/edb/edb-1.32.ebuild b/app-emacs/edb/edb-1.32.ebuild
deleted file mode 100644
index 48f3028985d7..000000000000
--- a/app-emacs/edb/edb-1.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="EDB, The Emacs Database"
-HOMEPAGE="http://www.gnuvola.org/software/edb/
-	https://www.emacswiki.org/emacs/EmacsDataBase"
-SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
-
-LICENSE="GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 \
-		sitelisp="${ED}${SITELISP}" \
-		infodir="${ED}/usr/share/info" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
-	dodoc -r examples
-}
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 80783aecafbe..a54ac9118f5b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,4 +1,3 @@
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
-DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0
diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild b/dev-games/clanlib/clanlib-4.0.0.ebuild
deleted file mode 100644
index 26eea39ba088..000000000000
--- a/dev-games/clanlib/clanlib-4.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_PN=ClanLib
-
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="https://github.com/sphair/ClanLib"
-SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="4.0"
-KEYWORDS="~amd64 ~x86" #not big endian safe #82779
-IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
-REQUIRED_USE="opengl? ( X )"
-
-RDEPEND="
-	sys-libs/zlib
-	X? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-		x11-libs/libX11
-		opengl? (
-			virtual/opengl
-			x11-libs/libXrender
-		)
-	)
-	sound? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-lang/perl
-		media-gfx/graphviz
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
-	"${FILESDIR}"/${PN}-4.0.0-freetype_pkgconfig.patch #658424
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable opengl clanGL)
-		$(use_enable opengl clanUI)
-		$(use_enable X clanDisplay)
-		$(use_enable sound clanSound)
-		$(use_enable ipv6 getaddr)
-		$(use_enable static-libs static)
-	)
-
-	tc-export PKG_CONFIG
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake html
-}
-
-src_install() {
-	default
-
-	use doc && emake DESTDIR="${D}" install-html
-	use examples && dodoc -r Examples Resources
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch b/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
deleted file mode 100644
index a3500e22f7e1..000000000000
--- a/dev-games/clanlib/files/clanlib-4.0.0-fix-build-system.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* Fix AM_CONDITIONAL to always be invoked
-* Install html files in proper --htmldir
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -437,8 +437,8 @@
- 	fi
- 	
- 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
--	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
- fi
-+AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
- 
- if test "$enable_clanNetwork" != "no"; then
- 	echo "Checking for clanNetwork stuff"
---- a/Documentation/Makefile.am
-+++ b/Documentation/Makefile.am
-@@ -1,6 +1,6 @@
- EXTRA_DIST = $(wildcart images/*.png)
- 
--HTML_PREFIX = $(datadir)/doc/@PACKAGE@-@LT_RELEASE@
-+HTML_PREFIX = $(htmldir)
- 
- all-local:
- 
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index 1dbb11d07c1d..000000000000
--- a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From af16d8a344b9bafc9131508fecfcdbfdc53cf100 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 25 Jun 2018 15:14:31 +0200
-Subject: [PATCH] Use pkg-config to find freetype.
-
-As of freetype-2.9.1 the freetype-config file no longer gets installed
-by default.
---- a/configure.ac
-+++ b/configure.ac
-@@ -307,7 +307,7 @@ echo ""
- if test "$enable_clanDisplay" != "no"; then
- 	echo "Checking for clanDisplay stuff"
- 	echo "=============================="
--	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`])
-+	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`${PKG_CONFIG} --libs freetype2` ], [ `${PKG_CONFIG} --cflags freetype2`])
- 
- 	dnl  Optional linux/joystick.h
- 	AC_CHECK_HEADERS(linux/joystick.h, has_linux_joystick=yes)
--- 
-2.18.0
-