From 575bcb9220287a6f0d2577db1fd9fe55d9d8b745 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Feb 2025 19:24:10 +0000 Subject: gentoo auto-resync : 23:02:2025 - 19:24:09 --- dev-libs/bglibs/Manifest | 4 +- dev-libs/bglibs/bglibs-2.04-r3.ebuild | 97 ------------------------- dev-libs/bglibs/bglibs-2.04-r4.ebuild | 98 ++++++++++++++++++++++++++ dev-libs/bglibs/files/bglibs-2.04-gcc14.patch | 81 +++++++++++++++++++++ dev-libs/bglibs/files/bglibs-2.04-prefix.patch | 14 ++++ 5 files changed, 196 insertions(+), 98 deletions(-) delete mode 100644 dev-libs/bglibs/bglibs-2.04-r3.ebuild create mode 100644 dev-libs/bglibs/bglibs-2.04-r4.ebuild create mode 100644 dev-libs/bglibs/files/bglibs-2.04-gcc14.patch create mode 100644 dev-libs/bglibs/files/bglibs-2.04-prefix.patch (limited to 'dev-libs/bglibs') diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest index 1e80c9470ca0..69a17ade9dff 100644 --- a/dev-libs/bglibs/Manifest +++ b/dev-libs/bglibs/Manifest @@ -1,8 +1,10 @@ AUX bglibs-2.04-feature-tests.patch 4117 BLAKE2B 2f59dece7a4d9965750eebc78488873ad9264f5270ffe8376cdf9a733cff5d6d00933558588fc7a687d964223cffe43b45b819a3ec2944a9a60ebfd8a5af7ef6 SHA512 7661fae03afea5e555affc1e8958972fa94d821b12c2ee3f24f8af424f7b7609364ac6ef2fbe886d0c04068572f745776148caa14d172eeb80bed561a8b74878 +AUX bglibs-2.04-gcc14.patch 2176 BLAKE2B 4a611f4f3be2fe9da7e1f05d0ffceab4484be6ee492e96444538b1f46a310c68791e38955cc1d8576a773ceb0826a1a404364858577669639238c22145dd7611 SHA512 bbe86e3b8531248f619105ad227b413cb344e590d0241bdc33a285f5b60d0e5d76ce6d59ba17fd4a96db424448fdebab4c12a04e528561cee6cb190089f142a2 AUX bglibs-2.04-musl.patch 2878 BLAKE2B 915d4d702b3df63fd5c0b9656b450026619384241bafa40dc98bf8f81edb4df08b1a77c300a430189fe93d5c67aeb7503d195db1805da88caa929936c61363d1 SHA512 dbe18aebefbb2813008357487dd0437fa70494274d98b6d0de81f7dcb81da4d63586a929587f42387507a5f12fb28187e9070c95a31291254206c09ee00e769e +AUX bglibs-2.04-prefix.patch 440 BLAKE2B 24b0c1878c1ca6aae12eaa291860cd7ef57ffc01d72ef423b98e0f2eb4dd58333c0e13b9bf649226d5168003b1a9b001c44a5ecb149cb32a352a8014b1bd1bcb SHA512 95736f38491117f8dee35caec3b4296d6a580f934d4ff86dd165c95a58ee71b7d080251fb444f79b9b3a0bea4f14417fdaad2783995ceb76dbd02e19dc786969 AUX bglibs-2.04-stack-buffers.patch 1676 BLAKE2B 356ef239c23178b5f07d80776279c0e91a35af07623c977d051217317496e796a337dd81df5bffa828296e78a007bdb043d73d195a3bfb74116b7751b1c2f42d SHA512 0000b26a5c781b3e68253b6aa8642f1b8d0fe99d4c6cef4a776a33b83272c1ea218ae91845ccd7ba291be6a17b719513317dba32fbeedcba42f469ea65b85b85 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f EBUILD bglibs-2.04-r1.ebuild 1685 BLAKE2B eb3335d918ca5dda4e53d114d0afcae126877d05d5bcb54f9d71d3e083de3ca1333ba2973a5186e5ef4a9a69903d74904f383b7f86059a518d48d1b79bfc1c95 SHA512 da66f5c3bce7f52213e487e1372134f064bfc490b579507d02c3b05aa3ac9fcad3a694947a9fd22707a695f204b555cee3fc4bd23f4c303b0184cea5924e8497 EBUILD bglibs-2.04-r2.ebuild 1814 BLAKE2B 855e4de296b025900c4796be3c4efd1bcbcbab28fb5a7075884415477a1c86fde3ccad3fb1275b55a1cca92a9b98fe87be83ab81c8c59dc89631623aa3fda249 SHA512 22f8374b34e2c431582e467af0ef5166ae3a03454710f96b097ccded548e573cee90fd0c12c176ef64de244f3a59d63f7b19d0b1596fcb140d5773ea70653368 -EBUILD bglibs-2.04-r3.ebuild 2526 BLAKE2B dc4e42d4f9601a1a3e197113096f75f8f7979fa84c5f59f45c8442e18f80ddc5e335a6c1cf8ae99e4eea3957bab28b20dbfaed11d37b9a7fd4538ff2b563f46e SHA512 4c8f4bf6849931a000544491bb9f158f5c1d9bf092358808436ba793eda698f7c04a49303ffe4c0fc3a13b4f22f30c5aa802fa033b155821f2e683443cd4d323 +EBUILD bglibs-2.04-r4.ebuild 2589 BLAKE2B 2f9805c7e013f40d24248d66806722c7db36a012839ace82ac4a316c1bd2a80cbab1d56c59450cfa8d967ea8e1fda22638b71d17b14c2e82557b33d2a4ccd533 SHA512 85a0465d9abce997f8383656da943e300ce4be2487e999b226a71683d6403839472d77b934d3f8cf07ab9517a4a51d297381b62ce6c274f9afb531145e5902a5 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/dev-libs/bglibs/bglibs-2.04-r3.ebuild b/dev-libs/bglibs/bglibs-2.04-r3.ebuild deleted file mode 100644 index 1327b6161114..000000000000 --- a/dev-libs/bglibs/bglibs-2.04-r3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Bruce Guenter's Libraries Collection" -HOMEPAGE="https://untroubled.org/bglibs/" -SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="doc" - -BDEPEND=" - sys-apps/which - dev-build/libtool - doc? ( - app-text/doxygen - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - virtual/latex-base - ) -" - -PATCHES=( - "${FILESDIR}"/bglibs-2.04-stack-buffers.patch - "${FILESDIR}"/bglibs-2.04-feature-tests.patch - "${FILESDIR}"/bglibs-2.04-musl.patch -) - -src_prepare() { - default - - # Remove the tests from the default target so that we can run - # them only when the user has enabled them. - sed -i '/^all:/s|selftests||' Makefile || die - sed -i '/selftests/d' TARGETS || die - - # The selftests.sh script collects the list of tests to run by - # grepping for "#ifdef SELFTEST_MAIN", which is defined in each *.c - # file to be tested. We can therefore disable individual tests by - # clobbering that line. (This should be safe; the contents of that - # ifdef are the test program, which we are disabling anyway.) - # - # This test requires network access, and currently fails even - # if you have it (https://github.com/bruceg/bglibs/issues/5). - sed -e 's/#ifdef SELFTEST_MAIN/#ifdef UNDEFINED/' \ - -i net/resolve_ipv4addr.c || die -} - -src_configure() { - echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die -} - -src_compile() { - # Parallel build fails, bug #343617 - MAKEOPTS+=" -j1" default - - if use doc; then - emake -C doc/latex pdf - fi -} - -src_test() { - einfo "Running selftests" - emake selftests -} - -src_install() { - echo "${ED}/usr/bin" > conf-bin || die - echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die - echo "${ED}/usr/include" > conf-include || die - echo "${ED}/usr/share/man" > conf-man || die - - default - - # Install .so into LDPATH - mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.2.0.0 \ - "${ED}"/usr/$(get_libdir)/ \ - || die - dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so.2 - dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so - dosym ../libbg.so.2.0.0 /usr/$(get_libdir)/bglibs/libbg.so.2.0.0 - - rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die - - dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION - dodoc -r doc/html/ - if use doc; then - dodoc doc/latex/refman.pdf - fi -} diff --git a/dev-libs/bglibs/bglibs-2.04-r4.ebuild b/dev-libs/bglibs/bglibs-2.04-r4.ebuild new file mode 100644 index 000000000000..8f63793fcb29 --- /dev/null +++ b/dev-libs/bglibs/bglibs-2.04-r4.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Bruce Guenter's Libraries Collection" +HOMEPAGE="https://untroubled.org/bglibs/" +SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc" + +BDEPEND=" + dev-build/libtool + doc? ( + app-text/doxygen + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/bglibs-2.04-stack-buffers.patch + "${FILESDIR}"/bglibs-2.04-feature-tests.patch + "${FILESDIR}"/bglibs-2.04-musl.patch + "${FILESDIR}"/bglibs-2.04-gcc14.patch + "${FILESDIR}"/bglibs-2.04-prefix.patch +) + +src_prepare() { + default + + # Remove the tests from the default target so that we can run + # them only when the user has enabled them. + sed -i '/^all:/s|selftests||' Makefile || die + sed -i '/selftests/d' TARGETS || die + + # The selftests.sh script collects the list of tests to run by + # grepping for "#ifdef SELFTEST_MAIN", which is defined in each *.c + # file to be tested. We can therefore disable individual tests by + # clobbering that line. (This should be safe; the contents of that + # ifdef are the test program, which we are disabling anyway.) + # + # This test requires network access, and currently fails even + # if you have it (https://github.com/bruceg/bglibs/issues/5). + sed -e 's/#ifdef SELFTEST_MAIN/#ifdef UNDEFINED/' \ + -i net/resolve_ipv4addr.c || die +} + +src_configure() { + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} + +src_compile() { + # Parallel build fails, bug #343617 + MAKEOPTS+=" -j1" default + + if use doc; then + emake -C doc/latex pdf + fi +} + +src_test() { + einfo "Running selftests" + emake selftests +} + +src_install() { + echo "${ED}/usr/bin" > conf-bin || die + echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die + echo "${ED}/usr/include" > conf-include || die + echo "${ED}/usr/share/man" > conf-man || die + + default + + # Install .so into LDPATH + mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.2.0.0 \ + "${ED}"/usr/$(get_libdir)/ \ + || die + dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so.2 + dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so + dosym ../libbg.so.2.0.0 /usr/$(get_libdir)/bglibs/libbg.so.2.0.0 + + rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die + + dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION + dodoc -r doc/html/ + if use doc; then + dodoc doc/latex/refman.pdf + fi +} diff --git a/dev-libs/bglibs/files/bglibs-2.04-gcc14.patch b/dev-libs/bglibs/files/bglibs-2.04-gcc14.patch new file mode 100644 index 000000000000..467a2dcb6b2c --- /dev/null +++ b/dev-libs/bglibs/files/bglibs-2.04-gcc14.patch @@ -0,0 +1,81 @@ +https://github.com/bruceg/bglibs/pull/10 + +--- a/include/resolve.h ++++ b/include/resolve.h +@@ -26,7 +26,7 @@ extern int __resolve_error; + #define resolve_error() (__resolve_error) + + struct dns_result; +-extern int resolve_calldns(int (*dnsfn)(), struct dns_result* out, const void* param); ++extern int resolve_calldns(int (*dnsfn)(struct dns_result*, const void*), struct dns_result* out, const void* param); + extern int resolve_qualdns(int (*dnsfn)(struct dns_transmit*, struct dns_result* out, const char*), + struct dns_result* out, const char* name); + +--- a/net/resolve_calldns.c ++++ b/net/resolve_calldns.c +@@ -5,7 +5,7 @@ + int __resolve_error = 0; + + /** Call a dns_* function and save an error code if necessary. */ +-int resolve_calldns(int (*dnsfn)(), struct dns_result* out, const void* param) ++int resolve_calldns(int (*dnsfn)(struct dns_result*, const void*), struct dns_result* out, const void* param) + { + if (dnsfn(out, param) < 0) { + __resolve_error = RESOLVE_TEMPFAIL; +--- a/net/resolve_ipv4addr.c ++++ b/net/resolve_ipv4addr.c +@@ -1,11 +1,15 @@ + #include "dns.h" + #include "resolve.h" + ++static int dns_name4_wrapper(struct dns_result *res, const void *ptr) { ++ return dns_name4(res, (const ipv4addr*)ptr); ++} ++ + /** Look up the domain name corresponding to an IPv4 address. */ + const char* resolve_ipv4addr(const ipv4addr* addr) + { + static struct dns_result out = {0}; +- if (!resolve_calldns(dns_name4, &out, addr)) ++ if (!resolve_calldns(dns_name4_wrapper, &out, addr)) + return 0; + return out.rr.name[0]; + } +--- a/sys/hassysselect.h0 ++++ b/sys/hassysselect.h0 +@@ -4,6 +4,5 @@ + /* sysdep: -sysselect */ + + #include +-extern int select(); + + #endif +--- a/sys/hassysselect.h1 ++++ b/sys/hassysselect.h1 +@@ -5,6 +5,5 @@ + + #include + #include +-extern int select(); + + #endif +--- a/sys/hasvfork.h0 ++++ b/sys/hasvfork.h0 +@@ -2,7 +2,6 @@ + #define FORK_H + + /* sysdep: -vfork */ +-extern pid_t fork(); + #define vfork fork + + #endif +--- a/sys/hasvfork.h1 ++++ b/sys/hasvfork.h1 +@@ -2,7 +2,5 @@ + #define FORK_H + + /* sysdep: +vfork */ +-extern pid_t fork(); +-extern pid_t vfork(); + + #endif diff --git a/dev-libs/bglibs/files/bglibs-2.04-prefix.patch b/dev-libs/bglibs/files/bglibs-2.04-prefix.patch new file mode 100644 index 000000000000..c0fa1b8c27d2 --- /dev/null +++ b/dev-libs/bglibs/files/bglibs-2.04-prefix.patch @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -863,9 +863,8 @@ path/mktemp.lo path/mktemp.o: ltcompile path/mktemp.c systime.h include/bglibs/p + ./ltcompile path/mktemp.c + + perl-head.pl: +- ( set -e; PATH="/bin:/usr/bin:/usr/local/bin:$$PATH"; export PATH; \ +- perl=`which perl`; \ +- echo "#! $$perl"; \ ++ ( set -e; \ ++ echo "#!/usr/bin/env perl"; \ + echo "# WARNING: This file was auto-generated. Do not edit!"; \ + echo ) >perl-head.pl + -- cgit v1.2.3