gentoo auto-resync : 20:02:2025 - 00:15:26

4 files changed, 198 insertions, 3 deletions

diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest
index 017ba8b2943b..d36a11840b70 100644
--- a/media-gfx/fig2dev/Manifest
+++ b/media-gfx/fig2dev/Manifest
@@ -1,5 +1,8 @@
+AUX fig2dev-3.2.9a-prototypes.patch 1920 BLAKE2B 4298ca7d048633540bfc194ac60acc216de8ab8116f3426bc408e4cd92b98486ba85fc2e8a7aa8ec46810be4b3b57c23ee87a8779484e723ad15cc4dcbbf5f72 SHA512 1d804d194cb49dfcaa2dc811d78e82785e2332c6dc3333851275447c7a865dc1e39d7fa096f56ac5da44ec594f6d49b43372cd9ddd898ca369d539241d366c70
 DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406
+DIST fig2dev-3.2.9a.tar.xz 536560 BLAKE2B 5648972433ed359f64da233748b556925e8efc7a87a5e49c1ce42f91b093c98846e588ea03c4655d393ba91f14714370cdfe7fca62627a2f69edcf3ce453ee5e SHA512 ffc56ef0bb3313d6650819c5a5bbf3c532c01a9649a1c424ade977411765cb413ef032d162695e14207918bbb535cb0a98e69df9060dd706c0c9d19d4f9435cc
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
-EBUILD fig2dev-3.2.9-r2.ebuild 2293 BLAKE2B a04ef4523e3381f84ed89030e2b3e8e4d1b9a1e881705737dcb1b202d769350126caa5a8233b07a9bc9136a12b56d4d76d7252693bb53b00a7884761f69b0ece SHA512 395af4038ec057d080e49453e54c80cbc34c720b6f691456c068390f4029be86548fde26cbe6fdbe6fd25de7c2109c52d3947d40885b69c2d381c4b4dc2ec5c0
 EBUILD fig2dev-3.2.9-r5.ebuild 2414 BLAKE2B b782b79dc1f5f1ca6a769b00959a77dbd12d2263d01231326920be167392227c045411697513fc1cfe6df0158fc68761e4841e9d55e6f1d913dd4db3b553566d SHA512 c0d7560409fb556a5ef2c919b009d7d9a4471473c9fdbe8a0284c6707fc0ed9c4d49bbb3eb81df0a83a61342b9989c6a8db38bbcf924b42689475f949f20e561
+EBUILD fig2dev-3.2.9a.ebuild 2471 BLAKE2B e11e7ffdb23a922959fadcb697d20e921f499f7576d7d96ef2fefad719444ed2d1f63d25a17839e120dba34c99e104bffe98292608207d2da17fa39e8e729e4d SHA512 7013f5b7b47cc06f27d03484659e1d0e696071deb3f7e0e2510a00303680bd80ca4ef045dcbe8a9a4b173c3f64597c3678c1f4465b8b2be050e489a47c0998f6
+EBUILD fig2dev-9999.ebuild 2748 BLAKE2B 0a86c85ff5176adec021d74db7c6ec57bd491fdd3de95b2536178d0c1bb656d1a58882ea095845c4cc4c7d464d7b2994f31c2e1d7e6a861bea39f62cae597447 SHA512 27ce05ae05d481d68ba8270c26a1fd996d9c0ffd2e9047080d02de8637a2de6c86e4151dea3425df654f81b9055a30ecf2ac94ceac275f53a6b85337e37ba7f9
 MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b
diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
index 5ba39f14e9c8..ad7e2fde03f6 100644
--- a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild
+++ b/media-gfx/fig2dev/fig2dev-3.2.9a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,8 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+ghostscript"
 
 RDEPEND="
 	media-libs/libpng
@@ -23,6 +24,11 @@ RDEPEND="
 	x11-apps/rgb
 	x11-libs/libXpm
 	!media-gfx/transfig
+	ghostscript?
+	(
+		app-text/ghostscript-gpl
+		virtual/imagemagick-tools[jpeg,png,postscript,tiff]
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -33,6 +39,10 @@ BDEPEND="
 DOCS=( README CHANGES NOTES )
 HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." )
 
+PATCHES=(
+	"${FILESDIR}/${P}-prototypes.patch"
+)
+
 sed_Imakefile() {
 	# see fig2dev/Imakefile for details
 	vars2subs="BINDIR=${EPREFIX}/usr/bin
diff --git a/media-gfx/fig2dev/fig2dev-9999.ebuild b/media-gfx/fig2dev/fig2dev-9999.ebuild
new file mode 100644
index 000000000000..f43717cd1e15
--- /dev/null
+++ b/media-gfx/fig2dev/fig2dev-9999.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tools for creating TeX documents with graphics"
+HOMEPAGE="https://www.xfig.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI="mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/mcj/fig2dev"
+else
+	SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz
+		mirror://gentoo/fig2mpdf-1.1.2.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+ghostscript"
+
+RDEPEND="
+	media-libs/libpng
+	media-libs/libjpeg-turbo:=
+	x11-apps/rgb
+	x11-libs/libXpm
+	!media-gfx/transfig
+	ghostscript?
+	(
+		app-text/ghostscript-gpl
+		virtual/imagemagick-tools[jpeg,png,postscript,tiff]
+	)
+"
+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_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+
+	# Unpack fig2mpdf for live ebuilds also
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E}
+	# CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
+	econf --enable-transfig
+}
+
+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/fig2dev-3.2.9a-prototypes.patch b/media-gfx/fig2dev/files/fig2dev-3.2.9a-prototypes.patch
new file mode 100644
index 000000000000..f2e8ca6831d8
--- /dev/null
+++ b/media-gfx/fig2dev/files/fig2dev-3.2.9a-prototypes.patch
@@ -0,0 +1,62 @@
+commit ab4eee3cf0d0c1d861d64b9569a5d1497800cae2
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date:   Thu Jan 30 22:36:48 2025 +0100
+
+    Specify argument types in function prototypes
+    
+    Modern C standards require full prototypes. This commit fixes the bug
+    reported in https://bugs.gentoo.org/944153.
+
+Upstream: https://sourceforge.net/p/mcj/fig2dev/merge-requests/1/
+Bug: https://bugs.gentoo.org/944153
+--- a/transfig/mkfile.c
++++ b/transfig/mkfile.c
+@@ -17,10 +17,12 @@
+ #include <stdio.h>
+ #include "transfig.h"
+ 
+-void puttarget();
+-void putfig();
+-void putoptions();
+-void putclean();
++void puttarget(FILE *mk, char *i, char *suf1, char *suf2);
++void putfig(FILE *mk, enum language to, int altfonts,
++	char *f, char *s, char *m, char *o, char *i, char *suf);
++void putoptions(FILE *mk, int altfonts, char *f, char *s, char *m, char *o,
++	char *i, char *suf);
++void putclean(FILE *mk, char *i, char *suf);
+ 
+ /*
+  * create an appropriate makefile
+--- a/transfig/transfig.c
++++ b/transfig/transfig.c
+@@ -33,8 +33,10 @@ extern void texfile(FILE *tx, char *in);	/* txfile.c */
+ extern void makefile(FILE *mk, int altfonts); /* mkfile.c */
+ 
+ 
+-argument *parse_arg(), *arglist = NULL, *lastarg = NULL;
+-char *strip();
++argument *parse_arg(enum language tolang, char *arg_f, char *arg_s,
++	char *arg_m, char *arg_o, char *arg);
++argument *arglist = NULL, *lastarg = NULL;
++char *strip(char *str, char *suf);
+ 
+ char *mkfile = "Makefile";
+ char *txfile = "transfig.tex";
+--- a/transfig/transfig.h
++++ b/transfig/transfig.h
+@@ -60,11 +60,12 @@ typedef struct argument{
+ 	struct argument *next;
+ } argument ;
+ 
+-extern enum language str2lang();
++extern enum language str2lang(char *s);
+ extern char *lname[];
+ extern char *iname[];
+ 
+-extern char *sysls(), *mksuff();
++extern char *sysls(void);
++extern char *mksuff(char *name, char *suff);
+ extern argument *arglist;
+ extern char *txfile, *mkfile;
+