Merge pull request #355 from flatcar-linux/krnowak/polkit

dev-lang/duktape: Sync with Gentoo

sdk_container/src/third_party/portage-stable/dev-lang/duktape/Manifest

@@ -1,2 +1 @@
-DIST duktape-2.6.0.tar.xz 1035160 BLAKE2B 98155e1bf7e76aab37f5ccdb951d9d456df3d984ebed5058d8931e25317ffd94b4d95f08e102eb6eb2fa36ab6d2d60be6072b4101b7754e1c1440f7d6fb2c91b SHA512 d72a2aaa05391fa243861aca6ca6082f91a08b9c5d60c7b246d35d7161532b0048bb67bd8fec7996c700ee317ac2bb52e528582682e5425b0431757d8b1c5be4
 DIST duktape-2.7.0.tar.xz 1026524 BLAKE2B da5eea88758201177f32c5611a3757433ef1b0173d6430eff1f067abd7535f3e4b9c3717290fbd8475827a53f7a2a74818287a65e563f14e91761f5cd0fe30d5 SHA512 8ff5465c9c335ea08ebb0d4a06569c991b9dc4661b63e10da6b123b882e7375e82291d6b883c2644902d68071a29ccc880dae8229447cebe710c910b54496c1d

sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.6.0.ebuild

@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Embeddable Javascript engine"
-HOMEPAGE="https://duktape.org"
-SRC_URI="https://duktape.org/${P}.tar.xz"
-
-LICENSE="MIT"
-# Upstream don't maintain binary compatibility
-# https://github.com/svaarala/duktape/issues/1524
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-respect-tc-env.patch"
-)
-
-src_prepare() {
-	default
-
-	# Set install path
-	sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${ED}/usr#" \
-			Makefile.sharedlibrary || die "failed to set install path"
-
-	# Edit pkgconfig
-	sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
-	sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
-
-	# Set lib folder
-	sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
-		Makefile.sharedlibrary || die
-
-	mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/include
-	emake install
-
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "${S}/${PN}.pc"
-}

sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r1.ebuild

@@ -13,7 +13,7 @@ LICENSE="MIT"
 # Upstream don't maintain binary compatibility
 # https://github.com/svaarala/duktape/issues/1524
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.0-respect-tc-env.patch

sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch

@@ -1,33 +0,0 @@
-diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary
-index 156ea96..a0997b1 100644
---- a/Makefile.sharedlibrary
-+++ b/Makefile.sharedlibrary
-@@ -52,7 +52,7 @@ INSTALL_PREFIX = /usr/local
- DUKTAPE_SRCDIR = ./src
- #DUKTAPE_SRCDIR = ./src-noline
- 
--CC = gcc
-+CC ?= gcc
- 
- .PHONY: all
- all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
-@@ -62,11 +62,11 @@ all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
- # to $INSTALL_PREFIX/include on installation.
- 
- libduktape.$(SO_REALNAME_SUFFIX):
--	$(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \
-+	$(CC) -shared -fPIC ${CFLAGS} ${LDFLAGS} -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) -lm \
- 		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
- 
- libduktaped.$(SO_REALNAME_SUFFIX):
--	$(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \
-+	$(CC) -shared -fPIC ${CFLAGS} ${LDFLAGS}  -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) -lm \
- 		-o $@ $(DUKTAPE_SRCDIR)/duktape.c
- 
- # Symlinks depend on platform conventions.
-@@ -85,4 +85,4 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX)
- 
- CCOPTS = -I./examples/cmdline
- duk:
--	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm
-+	$(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm

sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape.pc

@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
-
-Name: duktape
-Description: Embeddable Javascript engine
-Version: VERSION
-Libs: -L${libdir} -lduktape
-Cflags: -I${includedir}