gentoo auto-resync : 15:10:2023 - 11:27:17

11 files changed, 231 insertions, 2 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 32418c3f813f..12948820e12d 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest
new file mode 100644
index 000000000000..01f7199df723
--- /dev/null
+++ b/media-gfx/fig2dev/Manifest
@@ -0,0 +1,6 @@
+AUX transfig-3.2.5e-clang.patch 352 BLAKE2B 4fd67be2edad08f410b846bc57701d4e3eaa88eb6eda65500ed2cf530d1e8a7772f4618e83d0440c4429ebbf0c14f08f8424896057eb5ebc230e1f1c5f12e982 SHA512 72ccf2ef21f7d90e688cd0bcc7e6aa91b0a460e34b6484ae0dc1e6d059ffc0f921af9c7637bf38aecbd66116583d4a13aee16d5643f6c4f771b480fa75828511
+AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5ae11369476bbc60594da9bd766aa1d752020171b82e0d35e0d57ce1499f69e13b5a5f5274c9c530a2d7fa0f9deabda55462f0a0 SHA512 7b4b5dd4da00180f2eb34a7dcdc407e958df69ba843c371c496dc488977aa8045c31e1007f05e9dcb96765bfa83df75caabd92c99114555b252846892292e465
+DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406
+DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
+EBUILD fig2dev-3.2.9.ebuild 2527 BLAKE2B fd3d7c718caaebe859d76ec4c7ca2a5d72d630cac508acdff9784ae37275bd9de8cbb1e9ddefcc2cf041c69ed748da2565f888fe317208623a6eee1c11abb7e7 SHA512 250a19c36bd890285ebe45b5023047c2e90d8cafe764cb9d0cda43366aa15be83e7b27abe35d25d7ab37dc54ea80b7edfe80be4e703b180b055781e659e9fa7e
+MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9.ebuild
new file mode 100644
index 000000000000..5ac367a0ae18
--- /dev/null
+++ b/media-gfx/fig2dev/fig2dev-3.2.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+#MY_P="${PN}.${PV}"
+
+DESCRIPTION="Set of tools for creating TeX documents with graphics"
+HOMEPAGE="https://www.xfig.org/"
+SRC_URI="mirror://sourceforge/mcj/${P}.tar.xz
+	mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
+#S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	media-libs/libpng
+	virtual/jpeg
+	x11-apps/rgb
+	x11-libs/libXpm
+	!media-gfx/transfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	sys-devel/gcc
+"
+
+DOCS=( README CHANGES NOTES )
+HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." )
+
+sed_Imakefile() {
+	# see fig2dev/Imakefile for details
+	vars2subs="BINDIR=${EPREFIX}/usr/bin
+			MANDIR=${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)
+			XFIGLIBDIR=${EPREFIX}/usr/share/xfig
+			PNGINC=-I${EPREFIX}/usr/include/X11
+			XPMINC=-I${EPREFIX}/usr/include/X11
+			USEINLINE=-DUSE_INLINE
+			RGB=${EPREFIX}/usr/share/X11/rgb.txt
+			FIG2DEV_LIBDIR=${EPREFIX}/usr/share/fig2dev"
+
+	for variable in ${vars2subs} ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# find . -type f -exec chmod a-x '{}' \; || die
+	# find . -name Makefile -delete || die
+
+	# sed -e 's:-L$(ZLIBDIR) -lz::' \
+	# 	-e 's: -lX11::' \
+	# 		-i fig2dev/Imakefile || die
+	# sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile
+}
+
+src_configure() {
+	# export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E}
+	# CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
+	econf
+}
+
+src_compile() {
+	# emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles
+
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		CDEBUGFLAGS="${CFLAGS}"
+		LOCAL_LDFLAGS="${LDFLAGS}"
+		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		DESTDIR="${D}"
+		INSTDATFLAGS="-m 644"
+		INSTMANFLAGS="-m 644"
+	)
+	emake "${myemakeargs[@]}" install
+
+	dobin "${WORKDIR}/fig2mpdf/fig2mpdf"
+	doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
+
+	einstalldocs
+
+	rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
+}
+
+pkg_postinst() {
+	elog "Note, that defaults are changed and now if you don't want to ship"
+	elog "personal information into output files, use fig2dev with -a option."
+}
diff --git a/media-gfx/fig2dev/files/transfig-3.2.5e-clang.patch b/media-gfx/fig2dev/files/transfig-3.2.5e-clang.patch
new file mode 100644
index 000000000000..f75b649ff26f
--- /dev/null
+++ b/media-gfx/fig2dev/files/transfig-3.2.5e-clang.patch
@@ -0,0 +1,12 @@
+index 6a622f1..a14b96f 100644
+--- a/fig2dev/dev/genibmgl.c
++++ b/fig2dev/dev/genibmgl.c
+@@ -572,7 +572,7 @@ static set_width(w)
+ {
+     static int current_width=-1;
+ 
+-    if (w == current_width) return;
++    if (w == current_width) return 0;
+ 
+     /* Default line width is 0.3 mm; back off to original xfig pen
+        thickness number, and re-size.
diff --git a/media-gfx/fig2dev/files/transfig-3.2.5e-gcc10-fno-common.patch b/media-gfx/fig2dev/files/transfig-3.2.5e-gcc10-fno-common.patch
new file mode 100644
index 000000000000..e0c92161e3ff
--- /dev/null
+++ b/media-gfx/fig2dev/files/transfig-3.2.5e-gcc10-fno-common.patch
@@ -0,0 +1,30 @@
+--- a/fig2dev/dev/gensvg.c
++++ b/fig2dev/dev/gensvg.c
+@@ -230,10 +230,12 @@
+ };
+ 
+ /* arrowhead arrays */
+-Point   points[50], fillpoints[50], clippoints[50];
+-int     npoints, nfillpoints, nclippoints;
+-int     arrowx1, arrowy1;	/* first point of object */
+-int     arrowx2, arrowy2;	/* second point of object */
++Point   fillpoints[50];
++int     nfillpoints;
++extern Point   points[50], clippoints[50];
++extern int     npoints, nclippoints;
++extern int     arrowx1, arrowy1;	/* first point of object */
++extern int     arrowx2, arrowy2;	/* second point of object */
+ 
+ static int tileno=0; /* number of current tile */ 
+ 
+--- a/fig2dev/fig2dev.h
++++ b/fig2dev/fig2dev.h
+@@ -127,7 +127,7 @@
+ extern char	*prog, *from, *to;
+ extern char	*name;
+ extern double	font_size;
+-Boolean	correct_font_size;	/* use correct font size */
++extern Boolean	correct_font_size;	/* use correct font size */
+ extern double	mag, fontmag;
+ extern FILE	*tfp;
+ 
diff --git a/media-gfx/fig2dev/metadata.xml b/media-gfx/fig2dev/metadata.xml
new file mode 100644
index 000000000000..9206b593ffbc
--- /dev/null
+++ b/media-gfx/fig2dev/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!--maintainer-needed-->
+	<upstream>
+		<remote-id type="sourceforge">mcj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 8c50e444c10e..7c3388dac695 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e-r1.ebuild 3455 BLAKE2B efff828da56b4d058430b4b35688b7b3d826e6e5044b0b77f63c7921f5c6e6f8a20265c4da0433af13f0f778dc9198fd172df3895f8733169676d2e3e671329f SHA512 a9ab3301b899ad7c4299b788e9a401bcb7ffc39e3ee9cf7be984a15e9640718cb37fb38d7ae507aa5f0437f2fc63a65511bcf9a2caed48e5dde2d2d27997045d
+EBUILD transfig-3.2.5e-r1.ebuild 3476 BLAKE2B 5a3788a5a7ca45a75a53ea6b8fc98fa876ebb0e7b6af615f7a7d573982768829da9d518b838173f34efa0bf26c074e2fb29fd60ccdfa5ec6e61d02fb62b50c9f SHA512 1c54f2856a177750af53322b035b9bea6d0f44539fca467caf48461ac6812e2374f9f37e62a67f55629caaf1ad11274033b38b34d6833fb95f23a4185af17fc3
 MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 4013b7eb057f..423c8f8238f7 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -22,7 +22,9 @@ RDEPEND="
 	media-libs/libpng
 	virtual/jpeg
 	x11-apps/rgb
-	x11-libs/libXpm"
+	x11-libs/libXpm
+	!media-gfx/fig2dev
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/rman
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 8ba7f6f4df97..d206073a5073 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -2,6 +2,9 @@ AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d1
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 AUX xfig-3.2.8b-Fix-build-with-flto.patch 1577 BLAKE2B 538e4db451dab09dadb96563f23d43f420a67e59ec2e4f52aff2d274b614bd7806492270bcffebe5c8c1e10394c2dbdb05cc16f92124217fea27014a34a61caa SHA512 3a89b8aa93ae3ff13cf6478d2c85e44519560df7e18bc3f15799c31cc0248dd7c01e510a0f2b8516ba57d9dda4e37c3d0eb04fcdbf90ed402a881b516e7fbb2f
 AUX xfig-3.2.8b-app-defaults.patch 508 BLAKE2B 1d36345fd7b203a7dff8b13a73ae5abf298fc3b7ecfdfbc74068c626002c4b09d9278bafa5ed2b062757097b5fceb75e2baa4f5d6e7bc00505114b147f7bd893 SHA512 fb2e9113740dd93e25d9fbe0afea10538660059318eec0794d300a8fc5c8c9cda9a29302c2d5f285c38a5927994a96b96b68fb231f0f668ba1490fe87b888643
+AUX xfig-3.2.9-app-defaults.patch 452 BLAKE2B 7271ba9cfe0c36e708b4f7b4cb558afd6628f73eeb4954261e1587d780db3d62a29e5bbd4a68e0eb0c52ed8e3a80044286150c494d8eebf8f9c29f1295d77ccd SHA512 c64e08b69a88adf61fb4defaf757deecf66d6bb3c5b58b927907586dd271648abad0e57263a257d385c2520a6b8699054d4d8935abfed439f49c1f79d7994e63
 DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3
+DIST xfig-3.2.9.tar.xz 5368544 BLAKE2B 6fd04d7238453d304a5e9624524f1e3674fe21ea3485d0925fa430a6312b61019a54397301cd7773565035cd3aee7fa130ed2459187241a778c0d44759c57d45 SHA512 c5e797b394740761a24e6e5e83d025dd78a11ad7d12662728c708218d7131d9077d9ed0c09023134ed9d709c58f52f5c9182e5b50e540b1876be4c359d79a60e
 EBUILD xfig-3.2.8b-r1.ebuild 1299 BLAKE2B 2a470b756a0f3f847dd7708c5586f1ec908b3da8fc390640145ebc51636a86b89f43d8600c4087a486d3108b07643bd59acad6764b9a920f5aec37f28ff097ae SHA512 b296f51a07325e93d1b4109fee12278ef8982500efa5d46ea7af1875c47883ec0d926f9e5f7bc50697a06419c695e922511b432199c10df7f328dbd78053efae
+EBUILD xfig-3.2.9.ebuild 1188 BLAKE2B 8217d2dffee6ba9d7ac142a3a359b387316f342617a2852d804a4e78d77533a66917a07d5d342c3600752be28f8eedffef4913ed14a079776d1c3ba2ee57c362 SHA512 a5c5b51da90c3e9a682273299e3977be058e9a743982db5a2d0d50360b8a6d7c1c589aca250738a4584f911d998a55eb498199015e3acd310ed7e228fb62189e
 MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b
diff --git a/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch
new file mode 100644
index 000000000000..09c61453f679
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch
@@ -0,0 +1,12 @@
+diff -ruN xfig-3.2.8b.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.8b.orig/app-defaults/Fig	2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.8b/app-defaults/Fig	2017-03-24 16:22:14.702253419 +0100
+@@ -10,4 +10,8 @@
+ 
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches:	false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+ 
diff --git a/media-gfx/xfig/xfig-3.2.9.ebuild b/media-gfx/xfig/xfig-3.2.9.ebuild
new file mode 100644
index 000000000000..c264b39dadc8
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="https://mcj.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+COMMON_DEPEND="
+	app-text/ghostscript-gpl:=
+	>=media-gfx/fig2dev-${PV}
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
+	x11-libs/libX11
+	x11-libs/libXaw3d[unicode(+)]
+	x11-libs/libXpm
+	x11-libs/libXt
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+	media-fonts/urw-fonts
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+	"${FILESDIR}/${PN}-3.2.9-app-defaults.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "GIF support" media-libs/netpbm virtual/imagemagick-tools
+}