gentoo christmass resync : 25.12.2020

8 files changed, 2 insertions, 195 deletions

diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index a7b048991d05..5b03c9a9aaf4 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,11 +1,3 @@
-AUX indent-2.2.11-ac_config_headers.patch 228 BLAKE2B 2a55287753ba50c9ad48a3a1b7ccb2cd95f309a5a861cb9a2492a30c5c400f0e73d062497b570f1d1093623847d1258727ffd9119d8e325221eac4211324a3e6 SHA512 9efd632d596e7b768f56c757fcb15ee49f287542d00e75c2a2f2a5c915b76cb8fd4e07836a85e0b1fefd8658e147454ace3d73dd6555b5a42d1399baf4a2c542
-AUX indent-2.2.11-linguas.patch 185 BLAKE2B cb63a2846640ad4b5801481ceef537024135607f729b6bfff49c2e7013f91db0378b59d278e69ab9cb04a3b68da25a52669f2f1cba9cc0ff85f3da97baa89f35 SHA512 66a29effc9ec5a3a4ade4a5b6a527ac1fe48624d1e92170ee930867ea106ce9397b5aa82822e734949b79609b6255a656af0e491a07df5db769c974d9d096f91
-AUX indent-2.2.11-segfault.patch 369 BLAKE2B 210e2b5b1b46aa15418d6a30ae79ab423a68d8a6e7c528905afe48b2bd72fb013ce6dcade1d9580e7a38b2df2da2f6932b380bc96d0913ecbd7fced3db5686a5 SHA512 342600d476849d936d022e54ea0b6b244a956b11b99cc94dc9084f224d42ea2829640cde7a98e43efd0ee1fd88eb7147ba960af8075d290cd14a9d549abec022
-AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c0228ccd6b37c6c6682325a1445296a6d5593a357ed51050fe2cb2d04a76b1665ed199b0ffd6d07c45b0774805452078c83cd SHA512 0356443bf7f9fd066113ddb7f59b8126f4b32f7dd8be9fa661ecfd4436ed0652d9229ac867365486f04bc7cb3623e3e8792549de4678f03e4f2bd582e4ee2d67
-DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
-DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
-EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
-EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
-EBUILD indent-2.2.12.ebuild 1116 BLAKE2B 8a06875a4d6ef730ff939c11f16b7b6d7c500fb2859028dbc4bdf35c2e38955397bf233448d4e6f75d7a1fa752251cdc429a9c12e70592453ee3f682b5196bc8 SHA512 1a03c1c440cdf5642b7982ffb9d1b9b6f4754b60f4930d7ba237a4e385d1a021f145aa38c4ce3952850bc42f747d7bca9de12f77caef0b6a5c8237e813f0d78c
+EBUILD indent-2.2.12.ebuild 1115 BLAKE2B 43b5323a79ba3aeccea9268f4a7f98cb821da986d7b98fb451f0d0f17f6a21c5065f9fff2e0248999d95a8fd6536169638d6ec4e324c90cc28f9e7730bbad5f6 SHA512 e3fb4a26f6ee896471b10edfbfae600d36c16e05c4ed45a9a3e43365a0e03a78b227e97d8cd053173b2d9fc25a7668aba18d126678013f54be791666de0bc0ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
deleted file mode 100644
index 8728a26a8254..000000000000
--- a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@
- AC_CONFIG_SRCDIR(src/indent.c)
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE(indent, 2.2.11)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AM_MAINTAINER_MODE
- 
diff --git a/dev-util/indent/files/indent-2.2.11-linguas.patch b/dev-util/indent/files/indent-2.2.11-linguas.patch
deleted file mode 100644
index d540219b7cd2..000000000000
--- a/dev-util/indent/files/indent-2.2.11-linguas.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1 +1 @@
--ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
-+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
diff --git a/dev-util/indent/files/indent-2.2.11-segfault.patch b/dev-util/indent/files/indent-2.2.11-segfault.patch
deleted file mode 100644
index e91922480951..000000000000
--- a/dev-util/indent/files/indent-2.2.11-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/man/texinfo2man.c
-+++ b/man/texinfo2man.c
-@@ -287,6 +287,13 @@
-    char buf[1024];
-    int line_no = 0;
- 
-+   if (argc != 3)
-+   {
-+      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
-+      fprintf(stderr, "  The man page will be written to stdout.\n");
-+      return -1;
-+   }
-+
-    texinfoname = argv[2];
- 
-    in = fopen (argv[2], "r");
diff --git a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
deleted file mode 100644
index 5bad3da2867b..000000000000
--- a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -34,14 +34,14 @@
- html-split: @PACKAGE@_toc.html
- 
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
--	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
- 
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- 	case "$(TEXI2HTML)" in \
- 	  *"/missing texi2html") \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- 	  *) $(RM) @PACKAGE@_*.html ; \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- 	esac
- 
- install-html-monolithic: @PACKAGE@.html
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -663,14 +663,14 @@
- html-split: @PACKAGE@_toc.html
- 
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
--	$(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+	$(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
- 
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- 	case "$(TEXI2HTML)" in \
- 	  *"/missing texi2html") \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- 	  *) $(RM) @PACKAGE@_*.html ; \
--	     $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+	     $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- 	esac
- 
- install-html-monolithic: @PACKAGE@.html
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
deleted file mode 100644
index c9f84d2ad06b..000000000000
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	app-text/texi2html
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-
-src_prepare() {
-	# Fix bug #94837
-	local pofile
-	for pofile in po/zh_TW*; do
-		mv ${pofile} ${pofile/.Big5} || die
-	done
-	sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
-
-	epatch \
-		"${FILESDIR}"/${P}-segfault.patch \
-		"${FILESDIR}"/${P}-texi2html-5.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_test() {
-	emake -C regression/
-}
-
-src_install() {
-	# htmldir as set in configure is ignored in doc/Makefile*
-	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
deleted file mode 100644
index 4b76c2fb0708..000000000000
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
-	http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	app-text/texi2html
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*/}-segfault.patch
-	"${FILESDIR}"/${P/_p*/}-texi2html-5.patch
-	"${FILESDIR}"/${P/_p*/}-ac_config_headers.patch
-	"${FILESDIR}"/${P/_p*/}-linguas.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/debian/patches/*.patch
-
-	local pofile
-	for pofile in po/zh_TW*; do
-		mv ${pofile} ${pofile/.Big5} || die
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	strip-linguas -i po/
-
-	econf $(use_enable nls)
-}
-
-src_test() {
-	emake -C regression/
-}
-
-src_install() {
-	# htmldir as set in configure is ignored in doc/Makefile*
-	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index f147dca41c81..d24c91e8ac8a 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="