Merge updates from master

13 files changed, 244 insertions, 35 deletions

diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
index fe20e3435d2a..fe20e3435d2a 100644
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68.patch
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
new file mode 100644
index 000000000000..bd7dc04cffe5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
@@ -0,0 +1,28 @@
+From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 6 Nov 2020 02:43:07 +0100
+Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing
+ from 0b14b9ec)
+
+Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ svx/source/dialog/fntctrl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
+index d312d7ad5f49..10c84ca95222 100644
+--- a/svx/source/dialog/fntctrl.cxx
++++ b/svx/source/dialog/fntctrl.cxx
+@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
+          rCTLFont.SetFillColor( rColor );
+     }
+     else
+-        bTransparent = TRUE;
++        bTransparent = true;
+ 
+     rFont.SetTransparent( bTransparent );
+     rCJKFont.SetTransparent( bTransparent );
+-- 
+2.29.2
+
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index e1f48dbe39fe..e632c848c589 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -274,7 +274,7 @@ PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
 	"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-	"${FILESDIR}/${P}-icu-68.patch" # bug 752021
+	"${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index f3131c5f6cb6..519ecdd36aee 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1 +1,2 @@
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
+DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
index a145530abb4f..0c8486d07164 100644
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
-HOMEPAGE="http://www.cs.wisc.edu/~ghost/gsview/epstool.htm"
+HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
 SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
new file mode 100644
index 000000000000..80be2e478d44
--- /dev/null
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
+HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
+SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-use-gnu.patch
+	"${FILESDIR}"/${P}-no-gcc-linker.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+
+	# parallel make issue (bug #506978)
+	mkdir bin || die
+	mkdir epsobj || die
+}
+
+src_compile() {
+	emake epstool
+}
+
+src_install() {
+	dobin bin/epstool
+	doman doc/epstool.1
+	local HTML_DOCS=( doc/epstool.htm doc/gsview.css )
+	einstalldocs
+}
diff --git a/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
new file mode 100644
index 000000000000..cf3e03dfa609
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
@@ -0,0 +1,27 @@
+From cbd73f2bb7dd3a55d0d35b0638e84b8f17e56b52 Mon Sep 17 00:00:00 2001
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] Make epstool cross buildable by not hardcoding gcc as linker
+
+---
+ src/unixcom.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/unixcom.mak b/src/unixcom.mak
+index 1063b65..ca0b031 100755
+--- a/src/unixcom.mak
++++ b/src/unixcom.mak
+@@ -22,8 +22,8 @@ GSCFLAGS= $(CDEFS) -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-pr
+ CCAUX=gcc

+ CC=gcc

+ LFLAGS=$(PLINK) $(LIBPNGLIBS) $(GTKLIBS)

+-CLINK=gcc $(LDFLAGS)

+-LINK=gcc $(LDFLAGS)

++CLINK=$(CC) $(LDFLAGS)

++LINK=$(CC) $(LDFLAGS)

+ 

+ 

+ COMP=$(CC) -I$(SRCDIR) -I$(OBJDIR) $(CFLAGS) $(GSCFLAGS)

+-- 
+2.29.2
+
diff --git a/app-text/epstool/files/epstool-3.09-no-use-gnu.patch b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
new file mode 100644
index 000000000000..cb42381138e2
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
@@ -0,0 +1,31 @@
+From 706546a4921b98834ebf241ea751e0db5d0d192f Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] src/cplat.h: Don't define __USE_GNU
+
+There were two things wrong with it:
+- __USE_GNU is glibc-internal, the external define is _GNU_SOURCE
+- defining such macros after the first include is wrong, in this case
+it caused FTBFS on ia64.
+
+An option would be to pass -D_GNU_SOURCE when building, but as far
+as I can see the define was not (anymore?) needed at all.
+---
+ src/cplat.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cplat.h b/src/cplat.h
+index 8bbd9c5..ad5cee4 100755
+--- a/src/cplat.h
++++ b/src/cplat.h
+@@ -109,7 +109,6 @@ typedef struct POINT_s {
+ typedef struct _GdkRgbCmap GdkRgbCmap;

+ # endif

+ # include <unistd.h>

+-# define __USE_GNU	/* we might need recursive mutex */

+ # include <semaphore.h>

+ # include <pthread.h>

+ # define ZLIBNAME "libz.so"

+-- 
+2.29.2
+
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index be1b2ed42a5b..b1b5f5552a52 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1 +1,2 @@
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
+DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
diff --git a/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch
new file mode 100644
index 000000000000..33d559164cfe
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9aac694..de0f367 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -143,7 +143,7 @@ libpstoedit_la_SOURCES =			\
+ 	psfront.h				\
+ 	genericints.h
+ 
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -ldl -lm
+ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
new file mode 100644
index 000000000000..da2b4e71c73b
--- /dev/null
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
+HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="emf imagemagick plotutils pptx"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=app-text/ghostscript-gpl-8.71-r1
+	>=media-libs/gd-2.0.35-r1:=
+	emf? ( >=media-libs/libemf-1.0.3 )
+	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] )
+	plotutils? ( media-libs/plotutils )
+	pptx? ( dev-libs/libzip:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/readme.txt )
+HTML_DOCS=( doc/{changelog,pstoedit}.htm )
+
+PATCHES=( "${FILESDIR}"/${P}-libdl.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CXXFLAGS="-g"/d' \
+		-e 's:-pedantic::' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-swf
+		$(use_with emf)
+		$(use_with imagemagick magick)
+		$(use_with plotutils libplot)
+		$(use_with pptx)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	doman doc/pstoedit.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
index b86d9f457421..431c638a553e 100644
--- a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
+++ b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
@@ -1,7 +1,7 @@
 fix building with libpng-1.5
 
---- libplot/z_write.c
-+++ libplot/z_write.c
+--- a/libplot/z_write.c
++++ b/libplot/z_write.c
 @@ -164,7 +164,7 @@
      }
  
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index d3c6f4302a93..3b254ce0cae6 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit libtool eutils autotools
+inherit libtool autotools
 
 DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
 HOMEPAGE="https://www.gnu.org/software/plotutils/"
@@ -12,47 +12,50 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+png static-libs X"
+IUSE="+png X"
 
 DEPEND="
-	!<media-libs/plotutils-${PV}
 	media-libs/libxmi
 	png? (
 		media-libs/libpng:0=
-		sys-libs/zlib )
-	X? ( x11-libs/libXaw )"
-RDEPEND="${DEPEND}"
+		sys-libs/zlib
+	)
+	X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/plotutils-${PV}
+"
 
-DOCS="AUTHORS COMPAT ChangeLog INSTALL.* KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
+DOCS=( AUTHORS COMPAT ChangeLog INSTALL.{fonts,pkg} KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-libxmi.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_prepare() {
-	rm -rf libxmi/* || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	epatch \
-		"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-libpng-1.5.patch \
-		"${FILESDIR}"/${P}-libxmi.patch \
-		"${FILESDIR}"/${P}-format-security.patch
+	default
+
+	rm -r libxmi/* || die
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
 	eautoreconf
 	elibtoolize
 }
 
 src_configure() {
-	local myconf
-	if use X ; then
-		myconf="--with-x --enable-libxmi"
-	else
-		myconf="--without-x"
-	fi
-
-	econf \
-		--enable-shared \
-		--enable-libplotter \
-		--disable-libxmi \
-		$(use_enable static-libs static) \
-		$(use_with png libpng) \
-		${myconf}
+	local myeconfargs=(
+		--enable-shared
+		--enable-libplotter
+		--disable-libxmi
+		--disable-static
+		$(use_with png libpng)
+		$(usex X "--with-x --enable-libxmi" "--without-x")
+	)
+	econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
@@ -60,7 +63,7 @@ pkg_postinst() {
 		elog "There are extra fonts available in the plotutils package."
 		elog "The current ebuild does not install them for you since most"
 		elog "of them can be installed via the media-fonts/urw-fonts"
-		elog "package. See /usr/share/doc/${P}/INSTALL.fonts for"
+		elog "package. See /usr/share/doc/${PF}/INSTALL.fonts for"
 		elog "information on installing the remaining Tektronix fonts."
 		elog ""
 		elog "If you manually install the extra fonts and use the"