gentoo resync : 27.03.2021

7 files changed, 3 insertions, 223 deletions

diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index d88a6c58ff98..0439fb1a56bf 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,9 +1,3 @@
-AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb9334ab88a0e271ae0890b1fd3637400ab4e9bcf63e09741072a1bf81b34ce8b62392a166596f2ad08a1bddd916415df SHA512 fe3ffc7919576c2f1fe16240ed6915431fcbe569c16b629cfbb78d082c47c44b95808c89bec7b09201902a19f780577f0dc382d4da7275f2f096c034efeeb14a
-AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
-AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
-DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-1.2a-r3.ebuild 991 BLAKE2B 0af3a62dd77252d92cd992d0388ea3db2fcc7a6ba937dd41bb9e436f15d9cea813118c28a26772c2c49d6e913d19c9ff6dd9de401ad6b44cc42ca2a3f8c684d9 SHA512 bc2b9d9a3f3f48e9e33a3cf69d8074330d8799afabdd2fff792f198be1fcde5bdd62eb1163b2db9b8398fa672da5ef72a34468a45d1b38ad02cc68e93c152b72
-EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
-EBUILD cmatrix-2.0-r2.ebuild 1034 BLAKE2B fae14e81d2d010a4e35ff92511a7dac28bd0a63767231cb95cae788e7813f1c55cebf42c70cd5286dbc37dfa3c254d151420f88875a690b51472a195e86402e6 SHA512 a2846ed4ee167404c4e3eaa78b05ab658a9402f6facb34862fcffeba3389a183ea0c5067f01e3bcc1b11334a2aeadb8f098149f70b47b71d6a55ecce203eff79
+EBUILD cmatrix-2.0-r2.ebuild 1029 BLAKE2B b647b4f710a437fdb6905875e3a3d8df95dbf8a762f54a5706740a82cc449bd79f38917835a3823ad24f8d6cf071e57c3eb34ed50b5fd149246ef63b92c47a60 SHA512 4cb93f824a360b6231dae0262f882ba6bf9aae161e3e17391e830370d2ab21e50b5bfc21d357b7cb3bf74925f8d04538fae53543f2a6cf35b8e1c854e254cbae
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
deleted file mode 100644
index c684a70c88ba..000000000000
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="X"
-
-DEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-	sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	use X && eapply "${FILESDIR}"/${P}-fontdir.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/consolefonts
-	dodir /usr/lib/kbd/consolefonts
-	use X && dodir /usr/share/fonts/misc
-
-	default
-}
-
-pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
-			mkfontdir "${ROOT}"usr/share/fonts/misc
-		fi
-	fi
-}
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
deleted file mode 100644
index 7caf29f9a2ee..000000000000
--- a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools font
-
-DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
-
-DEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-	sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	use X && eapply "${FILESDIR}"/${P}-fontdir.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/consolefonts
-	dodir /usr/lib/kbd/consolefonts
-	use X && dodir /usr/share/fonts/misc
-
-	default
-}
-
-pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}usr/share/fonts/misc"
-			mkfontdir "${ROOT}"usr/share/fonts/misc
-		fi
-		font_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	use X && font_pkg_postrm
-}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
index e25ae2c50b2a..20bbda5977bb 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="X +unicode"
 
 DEPEND="
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch b/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
deleted file mode 100644
index 6e69841b5e01..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-fontdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naru cmatrix-1.2a.orig/Makefile.am cmatrix-1.2a/Makefile.am
---- cmatrix-1.2a.orig/Makefile.am	2008-12-24 02:37:43.000000000 +0000
-+++ cmatrix-1.2a/Makefile.am	2008-12-24 02:50:08.000000000 +0000
-@@ -18,20 +18,9 @@
- 	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	fi
--	@if test -d /usr/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
--	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
-+	@if test -d /usr/share/fonts/misc; then \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/share/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
-+	    echo " If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
--	else \
--	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
--	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
--	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
--	fi \
- 	fi
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
deleted file mode 100644
index 5f88cd0fa876..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN cmatrix-1.2a.old/Makefile.am cmatrix-1.2a/Makefile.am
---- cmatrix-1.2a.old/Makefile.am	Sun Mar 31 17:17:17 2002
-+++ cmatrix-1.2a/Makefile.am	Sat Jul  6 05:32:06 2002
-@@ -9,30 +9,28 @@
- 
- install-data-local:
- 	@if test -d /usr/share/consolefonts; then \
--	    echo " Installing matrix fonts in /usr/share/consolefonts..."; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
-+	    echo " Installing matrix fonts in $(DESTDIR)/usr/share/consolefonts..."; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/share/consolefonts; \
- 	fi
- 	@if test -d /usr/lib/kbd/consolefonts; then \
--	    echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
--	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
-+	    echo " Installing matrix fonts in $(DESTDIR)/usr/lib/kbd/consolefonts..."; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
-+	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
- 	fi
- 	@if test -d /usr/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
--	    $(MKFONTDIR) /usr/lib/X11/fonts/misc; \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \
-+	    echo " Running mkfontdir $(DESTDIR)/usr/lib/X11/fonts/misc..."; \
- 	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
- 	else \
- 	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
--	    echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
--	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
--	    echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
--	    $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
-+	    echo " Installing X window matrix fonts in $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-+	    $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-+	    echo " Running mkfontdir $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc..."; \
- 	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
- 	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
- 	fi \
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
deleted file mode 100644
index 60720c7da8b9..000000000000
--- a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -8,9 +8,7 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
--dnl Checks for libraries.
--dnl Replace `main' with a function in -lncurses:
--AC_CHECK_LIB(ncurses, main)
-+PKG_PROG_PKG_CONFIG
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -26,18 +24,7 @@
- 
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 
--CURSES_LIB_NAME=""
--AC_CHECK_LIB(ncurses, tgetent, CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses)
--
--if eval "test x$CURSES_LIB_NAME = x"
--then
--    AC_CHECK_LIB(curses, tgetent, CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses)
--fi
--
--if eval "test x$CURSES_LIB_NAME = x"
--then
--    AC_CHECK_LIB(termcap, tgetent, CURSES_LIB="-ltermcap" CURSES_LIB_NAME=termcap)
--fi
-+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS";CURSES_LIB_NAME=ncurses])
- 
- if eval "test x$CURSES_LIB_NAME = x"
- then