gentoo resync : 28.04.2021

7 files changed, 259 insertions, 28 deletions

diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index f1ebcd98a68c..2ff17bf842c0 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -1,5 +1,8 @@
+AUX ted-2.23-0001-pass-MAKE-to-subdir.patch 776 BLAKE2B edf6f29cfa1dc849aa1813fecc563d7bf9cff41b5de35a3f83cb0955b2f7d4c2aa3f382804a022d6e14557599e621046cde8ce3654e0f01b3508e719567bc19b SHA512 c0b21837331b402bacac1d64ea9e0a424454788c3290c7e098f7b65f53c2c6bf4b657f697ac6cb579f963ab8588fd8b630a479730644dd93a710a03f04cc4548
+AUX ted-2.23-0002-fix-unrecognized-option-with-GTK.patch 3444 BLAKE2B c5b8c44ad1c0dd99bfa3f3e3009de209ff7327548df2c1d3f79b135c2967dd5e12167ca623874d02c5542b4f8ff18dd5bc33f02811771661a727ca4fdb08cb97 SHA512 c48952f8bc4c74a0c3656e3ab357de79be6f4e41b10aaddf89c88ad246658478c0f5028d2c1f10508904e83a5e90059231542adeeebbb076b2c6a88769d60814
+AUX ted-2.23-0003-avoid-compressing-man-page.patch 1116 BLAKE2B 861d52809598d0e97d72fa0df396e8712e7cc0d9477fa6df37668988ad2c4cd08515eb61a1fe2a3140c7a7bffe26e9b2f406a02d1a136c8000e91d1585b190d2 SHA512 4fc2599b629d87b285eac60da9da0e27a77d9d19b6dfa39c969327ec42827ac736e1211cc573711b037db2a3ac93f446284e5f189557e82983e930ecbf79eb88
 AUX ted-2.23-freetype261.patch 273 BLAKE2B 3a9b52da5de4b8d991298c438a5589b1c70e70b0733d561f0a0c259b7eb1cd39b418d6f472bfb24534b24f19bfe83623827c16a371dece16dd33171369006da7 SHA512 f8523865ad47a552d000ee14380c40ffe22cdd5287cb6fd6f79b7afe4a6ae4742aaa999c9c4d2d79e00b538f5b83106ebeb24f1aa25cabb656418759db9c0921
-AUX ted-2.23-make.patch 418 BLAKE2B 2bc3a66a99f00caa793c81b4f3beb8935deff183cc0ddba613348010547e2b715eae169309acfc286b5690550fc892b9f1ff99bcdad673779b2c23b192da22db SHA512 a1dc77b4788a71445cb30db010d1413e11c06861c692137747d2d02d1cd16b07fb3dd05e702fd37aad600432a985c86d785465a2fe6ddbe6f506b16cafb80b01
+AUX ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch 637 BLAKE2B bf905f5e5609b014256519587a7b640dfcf8fb0c45739a71df8fdbb3a269c834fa4aa96dc00bec79e63268e57faf9d5ded9568e72561e1f817cf7e630d1d1c1a SHA512 3e2c7ff378f9a537601cf3422c83deb32aa907bbaf80a6b87c68dee5b1fe44c90880230303b38eb9c6095ff5932d6e26fc764f8e69aac85241aadc4b44ee126b
 DIST ted-2.23.src.tar.gz 4672208 BLAKE2B ca5f0e0a6a1d00a50da6986455faedbb20cc1246737233c8a3a161b4f653c53b1647c7fb41c774082116ed3e4a0736f8dd35504a54a92dd8e6a6e9124e6e9850 SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
-EBUILD ted-2.23.ebuild 1551 BLAKE2B 3836f195b3c50996ad71c03996c6e645d4f5bd10c0822f9019735d9c88330a4d0facf052aeed1c7de73bd651c415fda50d5dd19fbd17f5441e23b60238adedf4 SHA512 7fa9fd2639886020f696af78fba7d0894e70e09a9b0417c17f01c637560d84ce6ef40d23db8bbc1c538f45e8ea71aea834c75c4220d814d6fa54baf1556907d5
+EBUILD ted-2.23-r1.ebuild 2081 BLAKE2B 3774e4ec51cdd60ef3f966847f68a20f298aceb49b0a14052ae0a2508048036ffc52d66d739e6381d7471718aea138b0446d98dfe9a4404b367999e431b1fc3a SHA512 7b1b2d322c7be9e1205748b00b3c94686129f75e2e9262e56cb0e8418722ede1465e4f4b5237d612f0945990a5baf2d9c9427546baf4a1d5e79074b73d86ddc3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch b/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch
new file mode 100644
index 000000000000..2075febd06b2
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0001-pass-MAKE-to-subdir.patch
@@ -0,0 +1,26 @@
+From 570129a519e2b22d900ecf06ed938b7b5d5a7b79 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:04:15 +0200
+Subject: [PATCH] pass $(MAKE) to subdir
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..19f3f49 100644
+--- a/Makefile
++++ b/Makefile
+@@ -246,7 +246,7 @@ package: compile tedPackage/makefile
+ 	: To install Ted, you can now run 'make install' AS ROOT
+ 
+ package.shared: compile.shared tedPackage/makefile
+-	cd tedPackage && make package.shared
++	cd tedPackage && $(MAKE) package.shared
+ 	:
+ 	: Dynamically linked package ready.
+ 	: To install Ted, you can now run 'make install' AS ROOT
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch b/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch
new file mode 100644
index 000000000000..26360535c141
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0002-fix-unrecognized-option-with-GTK.patch
@@ -0,0 +1,134 @@
+From 75913fec2f0b168d08c28eaa84fd69f52767802d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 10:54:08 +0200
+Subject: [PATCH] fix unrecognized option --with-GTK
+
+Closes: https://bugs.gentoo.org/470652
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..b210d8a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -128,84 +128,84 @@ lib/bitmap.a: bitmap/makefile
+ 	cd bitmap && $(MAKE)
+ 
+ bitmap/makefile: bitmap/makefile.in Makefile
+-	cd bitmap && ./configure $(CONFIGURE_OPTIONS)
++	cd bitmap && ./configure
+ 
+ ####
+ lib/docBuf.a: docBuf/makefile
+ 	cd docBuf && $(MAKE)
+ 
+ docBuf/makefile: docBuf/makefile.in Makefile
+-	cd docBuf && ./configure $(CONFIGURE_OPTIONS)
++	cd docBuf && ./configure
+ 
+ ####
+ lib/docBase.a: docBase/makefile
+ 	cd docBase && $(MAKE)
+ 
+ docBase/makefile: docBase/makefile.in Makefile
+-	cd docBase && ./configure $(CONFIGURE_OPTIONS)
++	cd docBase && ./configure
+ 
+ ####
+ lib/docHtml.a: docHtml/makefile
+ 	cd docHtml && $(MAKE)
+ 
+ docHtml/makefile: docHtml/makefile.in Makefile
+-	cd docHtml && ./configure $(CONFIGURE_OPTIONS)
++	cd docHtml && ./configure
+ 
+ ####
+ lib/docLayout.a: docLayout/makefile
+ 	cd docLayout && $(MAKE)
+ 
+ docLayout/makefile: docLayout/makefile.in Makefile
+-	cd docLayout && ./configure $(CONFIGURE_OPTIONS)
++	cd docLayout && ./configure
+ 
+ ####
+ lib/docRtf.a: docRtf/makefile
+ 	cd docRtf && $(MAKE)
+ 
+ docRtf/makefile: docRtf/makefile.in Makefile
+-	cd docRtf && ./configure $(CONFIGURE_OPTIONS)
++	cd docRtf && ./configure
+ 
+ ####
+ lib/docEdit.a: docEdit/makefile
+ 	cd docEdit && $(MAKE)
+ 
+ docEdit/makefile: docEdit/makefile.in Makefile
+-	cd docEdit && ./configure $(CONFIGURE_OPTIONS)
++	cd docEdit && ./configure
+ 
+ ####
+ lib/ind.a: ind/makefile
+ 	cd ind && $(MAKE)
+ 
+ ind/makefile: ind/makefile.in Makefile
+-	cd ind && ./configure $(CONFIGURE_OPTIONS)
++	cd ind && ./configure
+ 
+ ####
+ lib/appUtil.a: appUtil/makefile
+ 	cd appUtil && $(MAKE)
+ 
+ appUtil/makefile: appUtil/makefile.in Makefile
+-	cd appUtil && ./configure $(CONFIGURE_OPTIONS)
++	cd appUtil && ./configure
+ 
+ ####
+ lib/textEncoding.a: textEncoding/makefile
+ 	cd textEncoding && $(MAKE)
+ 
+ textEncoding/makefile: textEncoding/makefile.in Makefile
+-	cd textEncoding && ./configure $(CONFIGURE_OPTIONS)
++	cd textEncoding && ./configure
+ 
+ ####
+ lib/utilPs.a: utilPs/makefile
+ 	cd utilPs && $(MAKE)
+ 
+ utilPs/makefile: utilPs/makefile.in Makefile
+-	cd utilPs && ./configure $(CONFIGURE_OPTIONS)
++	cd utilPs && ./configure
+ 
+ ####
+ lib/docFont.a: docFont/makefile
+ 	cd docFont && $(MAKE)
+ 
+ docFont/makefile: docFont/makefile.in Makefile
+-	cd docFont && ./configure $(CONFIGURE_OPTIONS)
++	cd docFont && ./configure
+ 
+ ####
+ lib/appFrame.a: appFrame/makefile
+@@ -219,7 +219,7 @@ lib/drawMeta.a: drawMeta/makefile
+ 	cd drawMeta && $(MAKE)
+ 
+ drawMeta/makefile: drawMeta/makefile.in Makefile
+-	cd drawMeta && ./configure $(CONFIGURE_OPTIONS)
++	cd drawMeta && ./configure
+ 
+ ####
+ ####	Compile and link Ted
+@@ -252,7 +252,7 @@ package.shared: compile.shared tedPackage/makefile
+ 	: To install Ted, you can now run 'make install' AS ROOT
+ 
+ tedPackage/makefile: tedPackage/makefile.in Makefile
+-	cd tedPackage && ./configure $(CONFIGURE_OPTIONS)
++	cd tedPackage && ./configure
+ 
+ sysvpkg: compile tedPackage/makefile
+ 	cd tedPackage && $(MAKE) $@
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch b/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch
new file mode 100644
index 000000000000..d4f7b24b8924
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-0003-avoid-compressing-man-page.patch
@@ -0,0 +1,32 @@
+From 38fc26c86b07f2d9404fe80ff758a92b2a9cfc85 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:22:28 +0200
+Subject: [PATCH] avoid compressing man page
+
+Fix a QA issue
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ tedPackage/makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tedPackage/makefile.in b/tedPackage/makefile.in
+index 2b39dd2..a1040ca 100644
+--- a/tedPackage/makefile.in
++++ b/tedPackage/makefile.in
+@@ -194,9 +194,9 @@ datadir:	README		\
+ 	( cd $(PKGDATADIR)/Ted && umask 0 && tar xvf - ) < TedDatadir.tar
+ 	cp $(PKGDATADIR)/Ted/TedDocument-en_US.rtf TedDocument-en_US.rtf
+ 	( umask 022 && mkdir -p $(PKGMANDIR) )
+-	sh ./customize.sh $(CUSTOMIZE_ARGS) < $(PKGDATADIR)/Ted/doc/Ted.1 | \
+-					    gzip -9 > $(PKGMANDIR)/Ted.1.gz
+-	chmod 644 $(PKGMANDIR)/Ted.1.gz
++	sh ./customize.sh $(CUSTOMIZE_ARGS) < $(PKGDATADIR)/Ted/doc/Ted.1 \
++					    > $(PKGMANDIR)/Ted.1
++	chmod 644 $(PKGMANDIR)/Ted.1
+ 	:
+ 	cp $(PKGLSMNAME) $(PKGTEDVARIADIR)/$(PKGLSMNAME)
+ 	cp Ted.desktop $(PKGDESKTOPDIR)/Ted.desktop
+-- 
+2.31.1
+
diff --git a/app-editors/ted/files/ted-2.23-make.patch b/app-editors/ted/files/ted-2.23-make.patch
deleted file mode 100644
index f97093b47648..000000000000
--- a/app-editors/ted/files/ted-2.23-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2013-04-01 13:24:45.854051804 +0400
-+++ Makefile	2013-04-01 13:25:02.618052336 +0400
-@@ -246,7 +246,7 @@
- 	: To install Ted, you can now run 'make install' AS ROOT
- 
- package.shared: compile.shared tedPackage/makefile
--	cd tedPackage && make package.shared
-+	cd tedPackage && $(MAKE) package.shared
- 	:
- 	: Dynamically linked package ready.
- 	: To install Ted, you can now run 'make install' AS ROOT
diff --git a/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
new file mode 100644
index 000000000000..362c3b22186b
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
@@ -0,0 +1,26 @@
+From 4368f7bab3a79b4322c1c19fdb99634e10f823ad Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:36:06 +0200
+Subject: [PATCH] use Motif toolkit instead of GTK by default
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..f6ced83 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@
+ ####	P.S.	I admit that this makefile is more like a shell script.
+ ####
+ 
+-CONFIGURE_OPTIONS=--with-GTK
++CONFIGURE_OPTIONS=--with-MOTIF
+ 
+ compile:	tedlibs		\
+ 		Ted/Ted		\
+-- 
+2.31.1
+
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23-r1.ebuild
index 41d6280abf91..6ad6952c107d 100644
--- a/app-editors/ted/ted-2.23.ebuild
+++ b/app-editors/ted/ted-2.23-r1.ebuild
@@ -1,31 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs xdg-utils
+EAPI=7
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="X-based rich text editor"
 HOMEPAGE="https://www.nllgg.nl/Ted/"
 SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
+S="${WORKDIR}/Ted-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff:=
-	virtual/jpeg:=
+RDEPEND="
+	app-text/libpaper
+	dev-libs/libpcre2
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libpng:=
+	media-libs/tiff:=
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/libiconv
 	x11-libs/libXft
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Ted-${PV}"
+	x11-libs/libXpm
+	x11-libs/motif
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-pass-MAKE-to-subdir.patch
+	"${FILESDIR}"/${P}-0002-fix-unrecognized-option-with-GTK.patch
+	"${FILESDIR}"/${P}-0003-avoid-compressing-man-page.patch
+	"${FILESDIR}"/${P}-freetype261.patch
+	"${FILESDIR}"/${P}-use-Motif-toolkit-instead-of-GTK-by-default.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch \
-		"${FILESDIR}"/${P}-freetype261.patch
+	default
 
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \
@@ -50,10 +67,14 @@ src_configure() {
 	tc-export AR CC RANLIB
 
 	local dir
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
-		cd "${S}"/${dir}
+	for dir in appUtil textEncoding utilPs bitmap docFont docBase docBuf ind drawMeta docRtf docEdit docLayout docHtml; do
+		cd "${S}"/${dir} || die
 		econf --cache-file=../config.cache
 	done
+	for dir in appFrame; do
+		cd "${S}"/${dir} || die
+		econf --cache-file=../config.cache --with-MOTIF
+	done
 }
 
 src_compile() {