From 3ac7d30591d021810d5c46cc48f4fa91e64b4009 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 17 Jan 2024 16:06:01 +0100 Subject: Move {dev-util → dev-build}/netsurf-buildsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-build/netsurf-buildsystem/Manifest | 1 + .../netsurf-buildsystem/files/gentoo-helpers-r2.sh | 22 +++++++ ...buildsystem-1.9-parallel-pre-post-targets.patch | 74 ++++++++++++++++++++++ dev-build/netsurf-buildsystem/metadata.xml | 8 +++ .../netsurf-buildsystem-1.9-r2.ebuild | 28 ++++++++ dev-libs/libcss/libcss-0.9.1-r1.ebuild | 4 +- dev-libs/libcss/libcss-9999.ebuild | 4 +- dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild | 4 +- dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild | 4 +- dev-libs/libnsutils/libnsutils-9999.ebuild | 4 +- .../libparserutils/libparserutils-0.2.4-r3.ebuild | 4 +- dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild | 4 +- dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild | 4 +- dev-util/netsurf-buildsystem/Manifest | 1 - .../netsurf-buildsystem/files/gentoo-helpers-r2.sh | 22 ------- ...buildsystem-1.9-parallel-pre-post-targets.patch | 74 ---------------------- dev-util/netsurf-buildsystem/metadata.xml | 8 --- .../netsurf-buildsystem-1.9-r2.ebuild | 28 -------- media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild | 4 +- media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild | 4 +- media-libs/libnsgif/libnsgif-9999.ebuild | 4 +- media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild | 4 +- media-libs/librosprite/librosprite-0.1.3-r2.ebuild | 4 +- media-libs/libsvgtiny/libsvgtiny-0.1.7-r3.ebuild | 4 +- media-libs/libsvgtiny/libsvgtiny-9999.ebuild | 4 +- net-libs/libdom/libdom-0.4.1-r1.ebuild | 4 +- net-libs/libdom/libdom-9999.ebuild | 4 +- net-libs/libhubbub/libhubbub-0.3.7.ebuild | 2 +- profiles/updates/1Q-2024 | 1 + www-client/netsurf/netsurf-3.10-r7.ebuild | 4 +- www-client/netsurf/netsurf-9999.ebuild | 4 +- 31 files changed, 173 insertions(+), 172 deletions(-) create mode 100644 dev-build/netsurf-buildsystem/Manifest create mode 100644 dev-build/netsurf-buildsystem/files/gentoo-helpers-r2.sh create mode 100644 dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch create mode 100644 dev-build/netsurf-buildsystem/metadata.xml create mode 100644 dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild delete mode 100644 dev-util/netsurf-buildsystem/Manifest delete mode 100644 dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh delete mode 100644 dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch delete mode 100644 dev-util/netsurf-buildsystem/metadata.xml delete mode 100644 dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild diff --git a/dev-build/netsurf-buildsystem/Manifest b/dev-build/netsurf-buildsystem/Manifest new file mode 100644 index 000000000000..1e6a45d6ddc2 --- /dev/null +++ b/dev-build/netsurf-buildsystem/Manifest @@ -0,0 +1 @@ +DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d diff --git a/dev-build/netsurf-buildsystem/files/gentoo-helpers-r2.sh b/dev-build/netsurf-buildsystem/files/gentoo-helpers-r2.sh new file mode 100644 index 000000000000..403279ecc5f6 --- /dev/null +++ b/dev-build/netsurf-buildsystem/files/gentoo-helpers-r2.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +netsurf_define_makeconf() { + NETSURF_MAKECONF=( + PREFIX="${EPREFIX}/usr" + NSSHARED="${EPREFIX}/usr/share/netsurf-buildsystem" + LIBDIR="$(get_libdir)" + Q= + CC="$(tc-getCC)" + LD="$(tc-getLD)" + HOST_CC="\$(CC)" + BUILD_CC="$(tc-getBUILD_CC)" + CXX="$(tc-getCXX)" + BUILD_CXX="$(tc-getBUILD_CXX)" + CCOPT= + CCNOOPT= + CCDBG= + LDDBG= + AR="$(tc-getAR)" + WARNFLAGS= + ) +} diff --git a/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch b/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch new file mode 100644 index 000000000000..f1e51e7c5251 --- /dev/null +++ b/dev-build/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch @@ -0,0 +1,74 @@ +From 067a5105a76e51eebcdf7e7786d1f91040442d47 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 14 Aug 2023 13:23:09 -0400 +Subject: makefiles/Makefile.top: dependencies for PRE_ and POST_TARGETS + +The PRE_TARGETS and POST_TARGETS are supposed to be built before and +after $(OBJECTS), respectively -- at least according to the comments +in Makefile.top: + + # List of targets to run before building $(OBJECT) + PRE_TARGETS := + # List of targets to run after building $(OBJECT) + POST_TARGETS := + +The default target however builds them at the same time as $(OUTPUT), + + # Default target + all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS) + +where $(OUTPUT) basically just builds $(OBJECTS): + + $(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS) + ... + +As a result, there is a race condition when $(OBJECTS) truly requires +$(PRE_TARGETS), because they may be built at the same time. The same +problem arises the other way around with $(POST_TARGETS). As a +demonstration, one can try to build the libsvgtiny shared library +directly (note: the details are platform-dependent), + + $ BD=build-x86_64-pc-linux-gnu-x86_64-pc-linux-gnu-release-lib-shared + $ make COMPONENT_TYPE=lib-shared "${BD}/libsvgtiny.so.0.1.7" + COMPILE: src/svgtiny.c + ... + src/svgtiny.c:24:10: fatal error: autogenerated_colors.c: No such file or directory + 24 | #include "autogenerated_colors.c" + | ^~~~~~~~~~~~~~~~~~~~~~~~ + compilation terminated. + +This is because $(PRE_TARGETS) is not satisfied. In practice, this +condition seems hard to hit unintentionally, but it can happen if you +are building in parallel and extemely unlucky. A user discovered it in +Gentoo bug 711200. + +The fix simply adds the stated dependencies on $(OBJECTS) and +$(POST_TARGETS) to guarantee the correct order. +--- + makefiles/Makefile.top | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top +index 0b0fe22..2a41697 100644 +--- a/makefiles/Makefile.top ++++ b/makefiles/Makefile.top +@@ -422,6 +422,16 @@ else + endif + endif + ++ifneq ($(PRE_TARGETS),) ++# Ensure that PRE_TARGETS are built before OBJECTS. ++$(OBJECTS): $(PRE_TARGETS) ++endif ++ ++ifneq ($(POST_TARGETS),) ++# Ensure that POST_TARGETS are built after OBJECTS. ++$(POST_TARGETS): $(OBJECTS) ++endif ++ + ############################################################################### + # Autogenerated, implied rules + ############################################################################### +-- +cgit v1.2.1 + diff --git a/dev-build/netsurf-buildsystem/metadata.xml b/dev-build/netsurf-buildsystem/metadata.xml new file mode 100644 index 000000000000..f2908ee10b59 --- /dev/null +++ b/dev-build/netsurf-buildsystem/metadata.xml @@ -0,0 +1,8 @@ + + + + + mjo@gentoo.org + Michael Orlitzky + + diff --git a/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild b/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild new file mode 100644 index 000000000000..b284e33d542c --- /dev/null +++ b/dev-build/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="buildsystem-${PV}" +DESCRIPTION="Build system used for netsurf and its libs" +HOMEPAGE="https://www.netsurf-browser.org" +SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${P}-parallel-pre-post-targets.patch" ) + +src_prepare() { + default + sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + insinto /usr/share/netsurf-buildsystem + newins "${FILESDIR}/gentoo-helpers-r2.sh" gentoo-helpers.sh +} diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild index dd714b5212c8..0e0d3af75729 100644 --- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild +++ b/dev-libs/libcss/libcss-0.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-lang/perl )" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.7-r1 + >=dev-build/netsurf-buildsystem-1.7-r1 virtual/pkgconfig" src_prepare() { diff --git a/dev-libs/libcss/libcss-9999.ebuild b/dev-libs/libcss/libcss-9999.ebuild index ec34203d945b..eeb2ace24755 100644 --- a/dev-libs/libcss/libcss-9999.ebuild +++ b/dev-libs/libcss/libcss-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-lang/perl )" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" src_prepare() { diff --git a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild index 054cc665c4a5..70610ce353f6 100644 --- a/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 ) >=x11-libs/xcb-util-image-0.3.9-r1 >=x11-libs/xcb-util-keysyms-0.3.9-r1 )" -BDEPEND="dev-util/netsurf-buildsystem" +BDEPEND="dev-build/netsurf-buildsystem" PATCHES=( "${FILESDIR}/${PN}-0.1.0-autodetect.patch" ) diff --git a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild index 38f54257b76b..9c9ea4e7eb1f 100644 --- a/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild +++ b/dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="" -BDEPEND="dev-util/netsurf-buildsystem" +BDEPEND="dev-build/netsurf-buildsystem" _emake() { netsurf_define_makeconf diff --git a/dev-libs/libnsutils/libnsutils-9999.ebuild b/dev-libs/libnsutils/libnsutils-9999.ebuild index 6a87e0aecff0..41ec4fbcf4f6 100644 --- a/dev-libs/libnsutils/libnsutils-9999.ebuild +++ b/dev-libs/libnsutils/libnsutils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SLOT="0/${PV}" KEYWORDS="" IUSE="" -BDEPEND="dev-util/netsurf-buildsystem" +BDEPEND="dev-build/netsurf-buildsystem" _emake() { netsurf_define_makeconf diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild index 5f78d9e4177c..46ce4711efb8 100644 --- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ IUSE="iconv test" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.7-r1 + >=dev-build/netsurf-buildsystem-1.7-r1 test? ( dev-lang/perl ) " diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild index 62fc2b8c9a4f..11c9965eaa23 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild +++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )" DEPEND=" test? ( >=dev-libs/check-0.9.11 )" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.7-r1" + >=dev-build/netsurf-buildsystem-1.7-r1" _emake() { netsurf_define_makeconf diff --git a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild index 3bd8f993ec54..95b169dcf20b 100644 --- a/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild +++ b/dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem app-alternatives/yacc" _emake() { diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest deleted file mode 100644 index 1e6a45d6ddc2..000000000000 --- a/dev-util/netsurf-buildsystem/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh deleted file mode 100644 index 403279ecc5f6..000000000000 --- a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -netsurf_define_makeconf() { - NETSURF_MAKECONF=( - PREFIX="${EPREFIX}/usr" - NSSHARED="${EPREFIX}/usr/share/netsurf-buildsystem" - LIBDIR="$(get_libdir)" - Q= - CC="$(tc-getCC)" - LD="$(tc-getLD)" - HOST_CC="\$(CC)" - BUILD_CC="$(tc-getBUILD_CC)" - CXX="$(tc-getCXX)" - BUILD_CXX="$(tc-getBUILD_CXX)" - CCOPT= - CCNOOPT= - CCDBG= - LDDBG= - AR="$(tc-getAR)" - WARNFLAGS= - ) -} diff --git a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch b/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch deleted file mode 100644 index f1e51e7c5251..000000000000 --- a/dev-util/netsurf-buildsystem/files/netsurf-buildsystem-1.9-parallel-pre-post-targets.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 067a5105a76e51eebcdf7e7786d1f91040442d47 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Mon, 14 Aug 2023 13:23:09 -0400 -Subject: makefiles/Makefile.top: dependencies for PRE_ and POST_TARGETS - -The PRE_TARGETS and POST_TARGETS are supposed to be built before and -after $(OBJECTS), respectively -- at least according to the comments -in Makefile.top: - - # List of targets to run before building $(OBJECT) - PRE_TARGETS := - # List of targets to run after building $(OBJECT) - POST_TARGETS := - -The default target however builds them at the same time as $(OUTPUT), - - # Default target - all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS) - -where $(OUTPUT) basically just builds $(OBJECTS): - - $(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS) - ... - -As a result, there is a race condition when $(OBJECTS) truly requires -$(PRE_TARGETS), because they may be built at the same time. The same -problem arises the other way around with $(POST_TARGETS). As a -demonstration, one can try to build the libsvgtiny shared library -directly (note: the details are platform-dependent), - - $ BD=build-x86_64-pc-linux-gnu-x86_64-pc-linux-gnu-release-lib-shared - $ make COMPONENT_TYPE=lib-shared "${BD}/libsvgtiny.so.0.1.7" - COMPILE: src/svgtiny.c - ... - src/svgtiny.c:24:10: fatal error: autogenerated_colors.c: No such file or directory - 24 | #include "autogenerated_colors.c" - | ^~~~~~~~~~~~~~~~~~~~~~~~ - compilation terminated. - -This is because $(PRE_TARGETS) is not satisfied. In practice, this -condition seems hard to hit unintentionally, but it can happen if you -are building in parallel and extemely unlucky. A user discovered it in -Gentoo bug 711200. - -The fix simply adds the stated dependencies on $(OBJECTS) and -$(POST_TARGETS) to guarantee the correct order. ---- - makefiles/Makefile.top | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top -index 0b0fe22..2a41697 100644 ---- a/makefiles/Makefile.top -+++ b/makefiles/Makefile.top -@@ -422,6 +422,16 @@ else - endif - endif - -+ifneq ($(PRE_TARGETS),) -+# Ensure that PRE_TARGETS are built before OBJECTS. -+$(OBJECTS): $(PRE_TARGETS) -+endif -+ -+ifneq ($(POST_TARGETS),) -+# Ensure that POST_TARGETS are built after OBJECTS. -+$(POST_TARGETS): $(OBJECTS) -+endif -+ - ############################################################################### - # Autogenerated, implied rules - ############################################################################### --- -cgit v1.2.1 - diff --git a/dev-util/netsurf-buildsystem/metadata.xml b/dev-util/netsurf-buildsystem/metadata.xml deleted file mode 100644 index f2908ee10b59..000000000000 --- a/dev-util/netsurf-buildsystem/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - mjo@gentoo.org - Michael Orlitzky - - diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild deleted file mode 100644 index 91e46348d838..000000000000 --- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="buildsystem-${PV}" -DESCRIPTION="Build system used for netsurf and its libs" -HOMEPAGE="https://www.netsurf-browser.org" -SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-parallel-pre-post-targets.patch" ) - -src_prepare() { - default - sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - insinto /usr/share/netsurf-buildsystem - newins "${FILESDIR}/gentoo-helpers-r2.sh" gentoo-helpers.sh -} diff --git a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild index d700b8c37951..5090f47851c9 100644 --- a/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild +++ b/media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" _emake() { diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild index 51cbbd90d784..d87d243909de 100644 --- a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild +++ b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" IUSE="" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.7-r1 + >=dev-build/netsurf-buildsystem-1.7-r1 virtual/pkgconfig " diff --git a/media-libs/libnsgif/libnsgif-9999.ebuild b/media-libs/libnsgif/libnsgif-9999.ebuild index e1f51bd184e2..ae9d3917b794 100644 --- a/media-libs/libnsgif/libnsgif-9999.ebuild +++ b/media-libs/libnsgif/libnsgif-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="" IUSE="" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig " diff --git a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild index c4edd4e29e29..d129bb463a4c 100644 --- a/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild +++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" _emake() { diff --git a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild index b293a83495f6..ba4653aa4267 100644 --- a/media-libs/librosprite/librosprite-0.1.3-r2.ebuild +++ b/media-libs/librosprite/librosprite-0.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="" -DEPEND="dev-util/netsurf-buildsystem" +DEPEND="dev-build/netsurf-buildsystem" PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch ) diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r3.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r3.ebuild index 7841c8c5ad42..b3f7c741629e 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r3.ebuild +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/gperf" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.9-r2 + >=dev-build/netsurf-buildsystem-1.9-r2 virtual/pkgconfig" _emake() { diff --git a/media-libs/libsvgtiny/libsvgtiny-9999.ebuild b/media-libs/libsvgtiny/libsvgtiny-9999.ebuild index 406dc1ba60c3..dcd51b69c985 100644 --- a/media-libs/libsvgtiny/libsvgtiny-9999.ebuild +++ b/media-libs/libsvgtiny/libsvgtiny-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/gperf" BDEPEND=" - >=dev-util/netsurf-buildsystem-1.9-r2 + >=dev-build/netsurf-buildsystem-1.9-r2 virtual/pkgconfig" _emake() { diff --git a/net-libs/libdom/libdom-0.4.1-r1.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild index 4d56bfc61deb..9b519a8f8a7e 100644 --- a/net-libs/libdom/libdom-0.4.1-r1.ebuild +++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} dev-perl/Switch )" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" REQUIRED_USE="test? ( xml )" diff --git a/net-libs/libdom/libdom-9999.ebuild b/net-libs/libdom/libdom-9999.ebuild index c535b97c75b2..2860f710a089 100644 --- a/net-libs/libdom/libdom-9999.ebuild +++ b/net-libs/libdom/libdom-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} dev-perl/Switch )" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig" REQUIRED_USE="test? ( xml )" diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild index 5dec0136be01..1244680bb622 100644 --- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild +++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86" IUSE="doc test" BDEPEND=" - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig doc? ( app-text/doxygen ) test? ( dev-lang/perl ) diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index dd4744c4f318..4a3c46092018 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -43,3 +43,4 @@ move dev-util/gtk-doc-am dev-build/gtk-doc-am move dev-util/bazel dev-build/bazel move dev-util/gn dev-build/gn move dev-util/gyp dev-build/gyp +move dev-util/netsurf-buildsystem dev-build/netsurf-buildsystem diff --git a/www-client/netsurf/netsurf-3.10-r7.ebuild b/www-client/netsurf/netsurf-3.10-r7.ebuild index d1b77be87dfa..608f2ffaadd7 100644 --- a/www-client/netsurf/netsurf-3.10-r7.ebuild +++ b/www-client/netsurf/netsurf-3.10-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,7 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-libs/check dev-perl/HTML-Parser - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig javascript? ( app-editors/vim-core ) " diff --git a/www-client/netsurf/netsurf-9999.ebuild b/www-client/netsurf/netsurf-9999.ebuild index edcde3ccb632..41bdc78e2ca1 100644 --- a/www-client/netsurf/netsurf-9999.ebuild +++ b/www-client/netsurf/netsurf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,7 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-libs/check dev-perl/HTML-Parser - dev-util/netsurf-buildsystem + dev-build/netsurf-buildsystem virtual/pkgconfig " -- cgit v1.2.3-65-gdbad