gentoo auto-resync : 13:12:2024 - 02:01:50

8 files changed, 7 insertions, 361 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 96d9337f69f4..24ef2d030653 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index e3895189983c..9ac9160e890a 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -11,6 +11,6 @@ DIST ghostscript-gpl-10.04.0-patches.tar.xz 3088 BLAKE2B 4bac1ebfc5f4be7e5174add
 EBUILD ghostscript-gpl-10.02.1-r1.ebuild 5557 BLAKE2B e01a38acf3a9f8a1f964451381a65fefacedfaacbbbf9580d5392264dc5cd9627193855ecc3a9318b37b30328beb1a994fd2ff724744678f8ddea643c6cd9c67 SHA512 75a1b1fbf0b97b91b606a2586a4b99e6342eb94aa219c4e648b0e0f279295cad8a3d59db517e65abf17cac3eaccce6c5ec89439a6b904c95bf61c2cc139647cb
 EBUILD ghostscript-gpl-10.02.1.ebuild 5508 BLAKE2B 033bea6de3043f151dc2cb9d36c1dd7aa2fe408ead7eb2105362b8650a5506ceb41d7f610147f80b9c9f3160cc2f4112e8e7e69b08074b687d98d38f99c94a17 SHA512 570a62fb19e670d54b32562bfc8362793bf44f69e1394dcecc8d85f479cacbcb0665d2e7016df0a9af66e8f1879c0a0aeeef076dec771925cff29b3744ee02ca
 EBUILD ghostscript-gpl-10.03.0-r1.ebuild 5533 BLAKE2B 2d36792340870c0a19b1ff3ae8814580ea6841cd9ccd3e8da43ec408543e54ebebf7d67538ee1d2aa565d8da3d58a97e944fc7e6623b6a7f21702d9d6955c869 SHA512 194731943a8db22bdb65a8de90cb08f662627fedd9409fd574c2d22c12306eb380393b55efeb8ac82b62338e87500704c98cd098eda2c4a31c1c1dde28748a91
-EBUILD ghostscript-gpl-10.03.1.ebuild 5650 BLAKE2B 1dc6d9577f16a282e5550f56feafca77f83c362e0b40c2b769d90f5e2848af8d58279e5366ffc659bc79c78d9b7caf5703f930106bbd99446361ee76e325018e SHA512 745795782b26fe7e7637573f4d5c074c013b8827949a11ededec02cafbafa245558ba4f5628b964a89a2d2e291b4577dfffe9aefebe5c4146078f267a3b63f06
-EBUILD ghostscript-gpl-10.04.0.ebuild 5663 BLAKE2B 63b8694ca8bdf751407d2752712bffc28c1c6d7e064e270e19256c3499b914fe67dffb3f8a8d42410f91ddecb4608005c1c922a083db08dbc12159918463c1ca SHA512 c093545b74ce8202bca3682d5f82e2221b1714a078a1c88f4696ddbea5832c8f3947f513dacb0653e9fc096334b01c023f2706dad5f68bbbd29b951efedd3b04
+EBUILD ghostscript-gpl-10.03.1.ebuild 5649 BLAKE2B 5ceede37a5f0d9d1a4bf22cd1eba0a18070e9614c6ba0b2496d9c28bdca4998adb840b0579be781b8af564088aecd5e3a14bdbb12f5e2bfa0123e5f1b3217b84 SHA512 db49b64c438fb6b5848533f7bc7dd6585bb6a2ac921269cad81c05ed22c678eff4d9e409e19aa01a565cc2adabde2345394c44e4371b9d894328e744f5b3ecfd
+EBUILD ghostscript-gpl-10.04.0.ebuild 5725 BLAKE2B 9b7efe954c5e439da7d36bb237b2bd6435f78f6462ffa533e86b12ed71cf141a66bc230dc741ad5700285db405960e14bfe2d6984040eb17b0f3acd06382be44 SHA512 fe18a42a5254b8f27c2c64bd625edf85fdf7f06f67eb6de533f1af2fe0cae0f62178b4e4da7aea652f430ae3573a3a48ce363c675a761e98c75c54066e64f030
 MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
index 056679d53cdb..607f63d6efe2 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild
index c4d10ec5f128..60f9783b6b77 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.04.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="cups cpu_flags_arm_neon dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -127,7 +127,9 @@ src_configure() {
 	filter-lto
 
 	# bug #943857
-	append-cflags -std=gnu17
+	# Build system passes CFLAGS to C++ compiler (bug #945826)
+	tc-export CC
+	CC+=" -std=gnu17"
 
 	# bug #899952
 	append-lfs-flags
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 847dd9247908..25f65d35fae2 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,6 +1,3 @@
-AUX texlive-core-2021-cairo-strings.patch 1629 BLAKE2B 447a277f4e50fc62a7f48804680b59133277a5c05f7705bc6545656e4bc139f3172000bc782483792d1219bfbcecd89bf1891f4fb08b447b76d0cabc8b278dfd SHA512 f1b487b2a3c3294c960e1bef9d5f37284439b2befdcb3b31e13af6df7ed54c2cc74b8212009887e14e6d505261d1691f05ed7335de6f66181ab49666fca93d85
-AUX texlive-core-2021-clang-16.patch 6900 BLAKE2B 8d2cdbb11e2376e8b51647fda3b1ff2ce225217e1e34b32c031ec9113b69b96864fce6ddf7edd4a67a6828519678dea5f5216f26f5df6ed7ccab6f7a128b1ad7 SHA512 cbf05bef786a89f0142ca95d4f1a41864cbaa9c72737c708f01acbae87f1c7218528606d2937eb3e50b0840da71a6c657c8aca40c9114e4032fdda541f99a027
-AUX texlive-core-2021-slibtool.patch 2776 BLAKE2B 6c0c0a89abba948f809c6003f494dd56cb0715e4aea22c0e0c744240fa0aa9f50c8afb911a1d7e325afc8fbf053bc591d8837439c412bf0fe5f1bf2a962d7664 SHA512 e7f0582c90876a1823a602413ddbb26cf9eff37f5478eca2968fc412fdbfc2b5bdf522e8b36ebd3fde7e3d3f874518dfe94e600ddf9aaa62e6c4a1eaefb5ca5c
 DIST autosp.doc.r58211.tar.xz 282136 BLAKE2B 2e82f41d20f8883cf277527e6e0fdcb9b402520109d94bf76668ad603d15e192970c576fffa17bde092d8f2a6d92db021fbd408e3df2e282bbad738edfed7136 SHA512 2905669b9e2b61749cb7b1eaa02be889c4e8d8adbd78b126e7ee6d894f24f623c888a24abac1d163f3332c5cfa9cd1f64d0de95200350b88a7f47faeacb841a6
 DIST autosp.doc.r69814.tar.xz 288724 BLAKE2B 3cbf6b0756cfc08fad0d15020b64206c3aaf1a4b2ce05e50b1f788b53614f8a95c82b5e7ebb9449a2c356eabde758124dc3e2577a43c8c80e7e110902c357cb4 SHA512 b345d9f1779d87ca901235b8f5601aec11e5cc6eefab3646510a62bc73f81c99afb36d8a86edc099baa90882e86e8f6427a37e9c8d65a456e849253d2374f994
 DIST autosp.r58211.tar.xz 696 BLAKE2B 4a533789fc9572e48da68d7fb284df4461e42a717edd0f4578ab83c7e58841bbc1d3c2821e41840a531077ec887203752f5c40f51849129aed8e6f8971c728cf SHA512 67587e8b456257be9b924a5bb8c8f4def22fa9aa9678663975ef74e346dc186ae7848a9dc043733cf1244f254750ef4f34204575f62195d4b966ed8336781bce
diff --git a/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch b/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch
deleted file mode 100644
index 07ca8933facf..000000000000
--- a/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/853121
-https://bugs.gentoo.org/726200
---- a/libs/cairo/m4/float.m4
-+++ b/libs/cairo/m4/float.m4
-@@ -22,23 +22,24 @@ AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
- # file, the target platform stores float words in big-endian order. If grep
- # finds "seesnoon", float words are in little-endian order. If neither value
- # is found, the user is instructed to specify the ordering.
- 
- ax_cv_c_float_words_bigendian=unknown
--AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-+AC_LINK_IFELSE([AC_LANG_SOURCE([[
- 
--double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
-+double d __attribute__((used)) = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
-+int main() { return 0; }
- 
- ]])], [
- 
- # allow users to override default 'strings' with 'llvm-strings'
- # or ${CHOST}-strings.
- AC_CHECK_TOOL([STRINGS], [strings])
--if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then
-+if $STRINGS - conftest | grep noonsees >/dev/null ; then
-   ax_cv_c_float_words_bigendian=yes
- fi
--if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then
-+if $STRINGS - conftest | grep seesnoon >/dev/null ; then
-   if test "$ax_cv_c_float_words_bigendian" = unknown; then
-     ax_cv_c_float_words_bigendian=no
-   else
-     ax_cv_c_float_words_bigendian=unknown
-   fi
-
diff --git a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
deleted file mode 100644
index 8d5f421544f8..000000000000
--- a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-https://bugs.gentoo.org/874546
-https://bugs.gentoo.org/882245
-
-https://github.com/TeX-Live/texlive-source/commit/3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a
-https://github.com/TeX-Live/texlive-source/commit/60b60503b21ea43c68d1ffbe214141a79a36190b
-https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7
-
-From 3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a Mon Sep 17 00:00:00 2001
-From: Karl Berry <karl@freefriends.org>
-Date: Sat, 5 Nov 2022 15:43:53 +0000
-Subject: [PATCH] stdlib.h to placate clang16
-
-git-svn-id: svn://tug.org/texlive/trunk/Build/source@64941 c570f23f-e606-0410-a88d-b1316a301751
---- a/texk/dvisvgm/configure
-+++ b/texk/dvisvgm/configure
-@@ -23415,6 +23415,7 @@ else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdio.h>
-+		#include <stdlib.h>
- 		#include <ghostscript/iapi.h>
- 		int main () {
- 			gsapi_revision_t r;
---- a/texk/dvisvgm/configure.ac
-+++ b/texk/dvisvgm/configure.ac
-@@ -94,6 +94,7 @@ else
- 	# query Ghostscript version
- 	AC_MSG_CHECKING([Ghostscript version])
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
-+		#include <stdlib.h>
- 		#include <ghostscript/iapi.h>
- 		int main () {
- 			gsapi_revision_t r;
---- a/texk/kpathsea/configure
-+++ b/texk/kpathsea/configure
-@@ -14633,7 +14633,8 @@ then :
- else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--int fork() { exit(1); }
-+#include <stdlib.h>
-+                                                 int fork() { exit(1); }
-                                                  int vfork() { exit(1); }
-                                                  extern char *getcwd();
-                                                  char path[100];
---- a/texk/kpathsea/configure.ac
-+++ b/texk/kpathsea/configure.ac
-@@ -45,7 +45,8 @@ if test "x$ac_cv_func_getcwd" = xyes; then
- # We only need to run this if we have getcwd.
- AC_CACHE_CHECK([whether getcwd uses fork or vfork],
-                [kb_cv_func_getcwd_forks],
--               [AC_RUN_IFELSE([AC_LANG_PROGRAM([[int fork() { exit(1); }
-+               [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-+                                                 int fork() { exit(1); }
-                                                  int vfork() { exit(1); }
-                                                  extern char *getcwd();
-                                                  char path[100];]],
-
-From 60b60503b21ea43c68d1ffbe214141a79a36190b Mon Sep 17 00:00:00 2001
-From: Karl Berry <karl@freefriends.org>
-Date: Sun, 6 Nov 2022 22:15:26 +0000
-Subject: [PATCH] void main, void args, more clang16 from sam
-
-git-svn-id: svn://tug.org/texlive/trunk/Build/source@64953 c570f23f-e606-0410-a88d-b1316a301751
---- /dev/null
-+++ b/libs/freetype2/TLpatches/patch-04-void-main
-@@ -0,0 +1,13 @@
-+diff --git a/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
-+index 0cafc8e8c..51843f5fa 100644
-+--- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4
-++++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
-+@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
-+ #include <stdlib.h>
-+ 
-+ int
-+-main()
-++main(void)
-+ {
-+   FT_Library library;
-+   FT_Error  error;
---- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4
-+++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
-@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
- #include <stdlib.h>
- 
- int
--main()
-+main(void)
- {
-   FT_Library library;
-   FT_Error  error;
---- /dev/null
-+++ b/libs/gd/TLpatches/patch-03-void-main
-@@ -0,0 +1,13 @@
-+diff --git a/libs/gd/libgd-src/tests/xpm/bug00185.c b/libs/gd/libgd-src/tests/xpm/bug00185.c
-+index 3056ed950..37659d6a4 100644
-+--- a/libs/gd/libgd-src/tests/xpm/bug00185.c
-++++ b/libs/gd/libgd-src/tests/xpm/bug00185.c
-+@@ -5,7 +5,7 @@
-+ 
-+ /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */
-+ int
-+-main()
-++main(void)
-+ {
-+ 	gdImagePtr im;
-+ 	char *path;
---- a/libs/gd/libgd-src/tests/xpm/bug00185.c
-+++ b/libs/gd/libgd-src/tests/xpm/bug00185.c
-@@ -5,7 +5,7 @@
- 
- /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */
- int
--main()
-+main(void)
- {
- 	gdImagePtr im;
- 	char *path;
---- a/texk/ps2pk/basename.c
-+++ b/texk/ps2pk/basename.c
-@@ -6,11 +6,12 @@
-  * AUTHOR:  Piet Tutelaers
-  * VERSION: 1.0 (Sept. 1995)
-  */
-+#include <stdlib.h>     /* exit() */
- #include <stdio.h>	/* printf() */
- #include "basics.h"	/* fatal() */
- #include "filenames.h"	/* basename() */
- 
--main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
-    if (argc < 2 || argc > 3) 
-       fatal("Usage: basename string [suffix]\n");
---- a/utils/m-tx/mtx-src/prepmx.c
-+++ b/utils/m-tx/mtx-src/prepmx.c
-@@ -769,7 +769,7 @@ Static void topOfPMXfile(void)
- }
- 
- 
--main(int argc, Char *argv[])
-+int main(int argc, Char *argv[])
- {  /* ---- Main program ------------------------ */
-   PASCAL_MAIN(argc, argv);
-   strcpy(this_version, version);
---- /dev/null
-+++ b/utils/pmx/TLpatches/patch-01-main-ret
-@@ -0,0 +1,13 @@
-+diff --git a/utils/pmx/pmx-src/libf2c/main.c b/utils/pmx/pmx-src/libf2c/main.c
-+index 453974904..f485a0cd0 100644
-+--- a/utils/pmx/pmx-src/libf2c/main.c
-++++ b/utils/pmx/pmx-src/libf2c/main.c
-+@@ -106,7 +106,7 @@ char **xargv;
-+ #ifdef KR_headers
-+ main(argc, argv) int argc; char **argv;
-+ #else
-+-main(int argc, char **argv)
-++int main(int argc, char **argv)
-+ #endif
-+ {
-+ xargc = argc;
---- a/utils/pmx/pmx-src/libf2c/main.c
-+++ b/utils/pmx/pmx-src/libf2c/main.c
-@@ -106,7 +106,7 @@ char **xargv;
- #ifdef KR_headers
- main(argc, argv) int argc; char **argv;
- #else
--main(int argc, char **argv)
-+int main(int argc, char **argv)
- #endif
- {
- xargc = argc;
-
-From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001
-From: Karl Berry <karl@freefriends.org>
-Date: Thu, 2 Feb 2023 22:57:47 +0000
-Subject: [PATCH] avoid implicit wait and exit declarations for C99
-
-git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751
---- a/texk/xdvik/configure
-+++ b/texk/xdvik/configure
-@@ -15455,6 +15455,9 @@ else
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_SYS_WAIT_H
-+#include <sys/wait.h>
-+#endif
- #ifdef HAVE_VFORK_H
- #include <vfork.h>
- #endif
-@@ -15476,7 +15479,7 @@ main ()
- 
-     while (wait(&status) != child)
-       ;
--    exit(
-+    _exit(
- 	 /* Was there some problem with vforking?  */
- 	 child < 0
- 
---- a/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
-+++ b/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
-@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_SYS_WAIT_H
-+#include <sys/wait.h>
-+#endif
- #ifdef HAVE_VFORK_H
- #include <vfork.h>
- #endif]],
-@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
- 
-     while (wait(&status) != child)
-       ;
--    exit(
-+    _exit(
- 	 /* Was there some problem with vforking?  */
- 	 child < 0
- 
diff --git a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
deleted file mode 100644
index 4b026177b686..000000000000
--- a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-https://bugs.gentoo.org/775170
-https://tug.org/svn/texlive?view=revision&revision=61639
---- a/texk/web2c/web2c/Makefile.in
-+++ b/texk/web2c/web2c/Makefile.in
-@@ -127,8 +127,7 @@
- libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
- am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
- fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
--am__DEPENDENCIES_1 =
--fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+fixwrites_DEPENDENCIES = $(web2c_LDADD)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -138,11 +137,11 @@
- makecpool_LDADD = $(LDADD)
- am_splitup_OBJECTS = splitup.$(OBJEXT)
- splitup_OBJECTS = $(am_splitup_OBJECTS)
--splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+splitup_DEPENDENCIES = $(web2c_LDADD)
- am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
- 	main.$(OBJEXT)
- web2c_OBJECTS = $(am_web2c_OBJECTS)
--web2c_DEPENDENCIES =
-+web2c_DEPENDENCIES = libweb2c.a
- SCRIPTS = $(dist_noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -416,7 +415,7 @@
- 	main.c \
- 	web2c.h
- 
--web2c_LDADD = -L. -lweb2c
-+web2c_LDADD = libweb2c.a
- fixwrites_SOURCES = \
- 	fixwrites.c
- 
---- a/texk/web2c/web2c/Makefile.in
-+++ b/texk/web2c/web2c/Makefile.in
-@@ -127,7 +127,6 @@
- libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
- am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
- fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
--fixwrites_DEPENDENCIES = $(web2c_LDADD)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -137,11 +136,9 @@
- makecpool_LDADD = $(LDADD)
- am_splitup_OBJECTS = splitup.$(OBJEXT)
- splitup_OBJECTS = $(am_splitup_OBJECTS)
--splitup_DEPENDENCIES = $(web2c_LDADD)
- am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
- 	main.$(OBJEXT)
- web2c_OBJECTS = $(am_web2c_OBJECTS)
--web2c_DEPENDENCIES = libweb2c.a
- SCRIPTS = $(dist_noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -395,6 +392,7 @@
- AM_CFLAGS = $(WARNING_CFLAGS)
- EXTRA_LIBRARIES = libweb2c.a
- BUILT_SOURCES = w2c/config.h
-+#
- DISTCLEANFILES = w2c/config.h web2c-parser.output
- noinst_HEADERS = coerce.h
- dist_noinst_SCRIPTS = convert
-@@ -415,14 +413,17 @@
- 	main.c \
- 	web2c.h
- 
-+web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
- web2c_LDADD = libweb2c.a
- fixwrites_SOURCES = \
- 	fixwrites.c
- 
-+fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
- fixwrites_LDADD = $(web2c_LDADD)
- splitup_SOURCES = \
- 	splitup.c
- 
-+splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
- splitup_LDADD = $(web2c_LDADD)
- makecpool_SOURCES = \
- 	makecpool.c
-@@ -973,11 +974,8 @@
- 	fi
- 
- $(libweb2c_a_OBJECTS): w2c/config.h
--
- $(web2c_OBJECTS): web2c-parser.h stamp-lib
--
- $(fixwrites_OBJECTS): stamp-lib
--
- $(splitup_OBJECTS): stamp-lib
- 
- stamp-lib:
-