gentoo auto-resync : 09:09:2024 - 12:30:03

5 files changed, 185 insertions, 0 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 52c251558850..4fa28331293a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index bab31cbee572..7fa4074709b2 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,8 +1,11 @@
 AUX plotutils-2.5.1-rangecheck.patch 792 BLAKE2B e855deee019d6c73ea442ec91f01c799120178cacd750fab01e29ea9770e5fa91ff8bfe4398ed00932036243c34b3d670afa3c333f2f011d42a33c45c842676c SHA512 b514a9502cd64f39c4a8b7e63761ecf4a82f1565a8f44abff60ee6f46d4b1ba1ed514c1094582521ed63b9f21ebafd4dcf18e482f030bd51b5ed7b59607cf07e
+AUX plotutils-2.6-configure-c99.patch 1688 BLAKE2B 206a9ae6817bc4f21484f5c65da8934759b3fbfda46507e674ab232baa78f400e91f523a36b4e6b686f056991ebabf4d36ca33e3abd87381c62d0e01012db5b2 SHA512 fd65dd02700fb6062f8b9fa5ed5c35c50e4fad6b357016a5d212dbf649d77c61317f82ad7c04876eb36470ccf73c1182255c6d3b3834b5516bd1e335cd78cc4e
+AUX plotutils-2.6-cxx17-fix.patch 1170 BLAKE2B 19d66289babce59afe064cfe084727f1baf590661cbc904a5adb60129efdd1ecbdfb48f884193b8822d62ab696d184181477e4d7a9e04478fe4ca592857b7fe3 SHA512 0f65fb2fbc12ceb5ac7df34838c155d1730c6e63dd28f8e177a2f47192de21c6488dabbaf1eefad9749faf912e653af0cabea70fcaccdc126aa94dbde3eb5ca5
 AUX plotutils-2.6-format-security.patch 660 BLAKE2B 16f5ad83fcc73f6c7640b3608de8148b38b1ebd9c105c099a8606906f7ed2b2c02b5a014a283bfdad69d9c2ce80f992af198481acc7b18bdbb4f14146721f002 SHA512 2e53074f21d781e6081f8e7e0b365fed848f4447fba292be94b5a421aa26eedc98024f7bad83ef5dc24c1896f571fc1726c5afa1313cbadf558162249b3fe12e
 AUX plotutils-2.6-libpng-1.5.patch 579 BLAKE2B b2c4b5f2fcae4a44f6817f61d92ba04624e02a6c756aef403f4a4f1631622a4f72e0ac48c6a5459b3eb474e710ba166f96495a1168d165e745f210aea3684fe1 SHA512 46080acf7154f8d63e9c340fd78df6967e820bd61617fc436eef98f62c8c3fff8b4401d0ba5877f537e1d6c40000910bd3d153d3bf7ceebcb447cc65ac2029ac
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
 EBUILD plotutils-2.6-r2.ebuild 1957 BLAKE2B c76c403b877579c40ce8205fcc4e64a6e92592dbf56e13f5f27df4c7c1741a0bc6bbfb9312a5f8b0dfffee1e085d44f19aec623035559264b56edc0a7d18032f SHA512 5cacb7740dd74e55de2fefee7e959d20d454f07a188de0d97f49b4b73c0faac5cbe13b705bef38d5f8263bfd21b6213ede74a361c781410ef7b6b5e1f2329d9f
+EBUILD plotutils-2.6-r3.ebuild 2058 BLAKE2B 5ee6c3b753f883988250c310ce30f7372fd4501e2082fae7f2ff4d70b1ec44561cf9d8a6dddfeabe22750d11129e62d0e53aca35cdfb990b13b91e76502ca709 SHA512 92659dd544ed2f9815a791f05925ab0fb7c9190dcdaf43472a86b3ce0193b952abed72661f091ab0f12ba89cf78765e28d64ca92b447d874271a87c80a5f2444
 MISC metadata.xml 266 BLAKE2B 8dc7c8e41cf8c2190d095f43854e0572b406aafcddb65f5edd577a97f2d1c83174e6eb3552785d95a4a2d064f22794427cbbec5809e25409aa3ada141284ba7c SHA512 6cc6a0d81ad8a450f5fea7ed8977424c16376dd2026223c98c77847785418a7401a4c755ee16fb1a8629fd985957afd57194e8e6a99a8dbe46d50ca16806e5db
diff --git a/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
new file mode 100644
index 000000000000..282596049953
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
@@ -0,0 +1,54 @@
+Do not call the undeclared exit function.  This avoids build problems
+with future compilers which do not support implicit function
+declarations.
+
+diff --git a/configure b/configure
+index 229ccd453ae4487f..fdf3785ad4c5175f 100755
+--- a/configure
++++ b/configure
+@@ -19537,9 +19537,9 @@ int main()
+       || fflush ((FILE *)0) < 0
+       || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+       || fread (test_array, 1, 7, fpr) != 7)
+-    exit (1);
++    return 1;
+   else
+-    exit(0); }
++    return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (ac_try="$ac_link"
+@@ -24022,7 +24022,7 @@ int main()
+   int i;
+   for (i=0; i < B; i++)
+     Array[i] = i - 3;
+-  exit (Array[1] != -2);
++  return Array[1] != -2;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+diff --git a/configure.ac b/configure.ac
+index 8fb7b640864eb4a8..d1f6d7e08c6946d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,9 +88,9 @@ int main()
+       || fflush ((FILE *)0) < 0
+       || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+       || fread (test_array, 1, 7, fpr) != 7)
+-    exit (1);
++    return 1;
+   else
+-    exit(0); }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
++    return 0; }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
+ 
+ # Checks for header files: ANSI C, POSIX, and nonstandard Unix headers.
+ AC_HEADER_STDC
+@@ -383,7 +383,7 @@ int main()
+   int i;
+   for (i=0; i < B; i++)
+     Array[[i]] = i - 3;
+-  exit (Array[[1]] != -2);
++  return Array[[1]] != -2;
+ }]])],
+ [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+   if test "$ac_cv_c_gcc_strength_bug" = "yes"
diff --git a/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
new file mode 100644
index 000000000000..a14336a580d7
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
@@ -0,0 +1,46 @@
+https://github.com/NixOS/nixpkgs/commit/92d99c521b2c02fa645b3b993ac4bbaf49e43ddd
+
+diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc
+--- a/pic2plot/gram.cc	2000-06-28 00:23:21.000000000 -0400
++++ b/pic2plot/gram.cc	2023-09-07 22:59:47.004460065 -0400
+@@ -1229,9 +1229,9 @@
+      char *from;
+      unsigned int count;
+ {
+-  register char *f = from;
+-  register char *t = to;
+-  register int i = count;
++  char *f = from;
++  char *t = to;
++  int i = count;
+
+   while (i-- > 0)
+     *t++ = *f++;
+@@ -1244,9 +1244,9 @@
+ static void
+ __yy_memcpy (char *to, char *from, unsigned int count)
+ {
+-  register char *t = to;
+-  register char *f = from;
+-  register int i = count;
++  char *t = to;
++  char *f = from;
++  int i = count;
+
+   while (i-- > 0)
+     *t++ = *f++;
+@@ -1289,10 +1289,10 @@
+ yyparse(YYPARSE_PARAM_ARG)
+      YYPARSE_PARAM_DECL
+ {
+-  register int yystate;
+-  register int yyn;
+-  register short *yyssp;
+-  register YYSTYPE *yyvsp;
++  int yystate;
++  int yyn;
++  short *yyssp;
++  YYSTYPE *yyvsp;
+   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+   int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+ 
diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild
new file mode 100644
index 000000000000..9b4fdd74264e
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool autotools greadme
+
+DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="https://www.gnu.org/software/plotutils/"
+SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+png X"
+
+DEPEND="
+	media-libs/libxmi
+	png? (
+		media-libs/libpng:0=
+		sys-libs/zlib
+	)
+	X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/plotutils-${PV}
+"
+
+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
+	"${FILESDIR}"/${P}-configure-c99.patch
+	"${FILESDIR}"/${P}-cxx17-fix.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r libxmi/* || die
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-libplotter
+		--disable-libxmi
+		--disable-static
+		$(use_with png libpng)
+		$(usex X "--with-x --enable-libxmi" "--without-x")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use X ; then
+		greadme_stdin <<-EOF
+			There are extra fonts available in the plotutils package.
+			The current ebuild does not install them for you since most
+			of them can be installed via the media-fonts/urw-fonts
+			package. See /usr/share/doc/${PF}/INSTALL.fonts for
+			information on installing the remaining Tektronix fonts.
+
+			If you manually install the extra fonts and use the
+			program xfig, you might want to recompile to take
+			advantage of the additional ps fonts.
+			Also, it is possible to enable ghostscript and your
+			printer to use the HP fonts.
+		EOF
+	fi
+}