From 969240c9b57af98ad99ba0bbb3bbdec6914a976f Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 16 Mar 2021 12:14:36 +0100 Subject: [PATCH 1/4] media-libs/libbpg: add iuse flag descriptions copied from https://github.com/mirrorer/libbpg/blob/master/Makefile Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mathieu Tortuyaux --- media-libs/libbpg/metadata.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/media-libs/libbpg/metadata.xml b/media-libs/libbpg/metadata.xml index 37fa48cf0f..2be5a7ee04 100644 --- a/media-libs/libbpg/metadata.xml +++ b/media-libs/libbpg/metadata.xml @@ -16,9 +16,10 @@ - - - - + + Enable x265 for the encoder + Compile bpgview (media-libs/libsdl and media-libs/sdl-image needed) + Enable the JCTVC code (best quality but slow) for the encoder + Enable compilation of Javascript decoder with Emscripten From d1a3877e8b0fca03e7c146acd75f63a8bc148632 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 16 Mar 2021 13:26:11 +0100 Subject: [PATCH 2/4] dev-java/openjdk-sts-bin: version bump 15.0.2 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- dev-java/openjdk-sts-bin/Manifest | 8 ++++---- ...15.0.1_p9.ebuild => openjdk-sts-bin-15.0.2_p7.ebuild} | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) rename dev-java/openjdk-sts-bin/{openjdk-sts-bin-15.0.1_p9.ebuild => openjdk-sts-bin-15.0.2_p7.ebuild} (94%) diff --git a/dev-java/openjdk-sts-bin/Manifest b/dev-java/openjdk-sts-bin/Manifest index e88cd932b7..7042a57504 100644 --- a/dev-java/openjdk-sts-bin/Manifest +++ b/dev-java/openjdk-sts-bin/Manifest @@ -1,4 +1,4 @@ -DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz 204293353 BLAKE2B e9ed5f52a4a493aa84ac7f236e07963bea0d9b6ec15f8a5e5ce1cfbd509f2f3ce02b3e072a8db5bea510057031cca7141349c9f39731128fcc284ad549ca164c SHA512 3c55e212b2ee35718345fce8fc3d2bfac94a673eea6ffd0f019bc099eb62c61b90ece3b69bf9abad5c5c119340969f701c664e7d8fa1f7e363e83c2d84241dce -DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz 190092254 BLAKE2B aec9c3548424b7baba06e575cfafe0ab2ec2bf5ad140a8540d8998c60fb0fcbd324fa9f6d25ccc57130e27ecf22699dea411510b81ff5230759373915c862a7b SHA512 4bf975c57e45aca5e72b4edc14bccd32cc8f1429a7544cddabb0c470b71fc91695a7e3df8a7c94fceb0ba1b1005ab875a80e15e9e64c689321045a6f8ba4e0ea -DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.1_9.tar.gz 188859845 BLAKE2B 9e401a97172416a7b069b67da07c10c1943a475957ee7987aa398f3fe76f36a53a6e698e4207ea4a48d59ea192e4fc25af265ca31401eea11e435939c7244f9c SHA512 0b3460692ba1222fe5ca6491b76318a69dc97f2a601011085c4ed060e969ad6660fb76e816db18f9c60bbd5b6a3b5b1ed6c1cead9b2c73c26d49fd69aaec80dc -DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz 206689671 BLAKE2B b8292b630c6f114cfae3567191735eedc32def974f551fb3edce795ea16eb2c6a8d6c02da4fd7a8c669ec10e09675d2169dbda74f5de6243164d9dbc4fc1329b SHA512 d538aac5f9b4521350587e0148e1bb67af7a69505a6b74061d05caf4552f89e0d4d701c22cd6c2259e0a8b88f92bce9005e74b81707beab5c76cfa865ba30646 +DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz 203662871 BLAKE2B 898073b773eec5c93c02cf234d1c4cc8ca6862756cab191e7cb4455a0fef507516bc8e7f9e8a2793a15c35e5f3f38e2f5456272a827b78a94604fce67eaada25 SHA512 3a8d7d9ef106592a9374e687697d6b934d4372f821c35b4cc94e1b3ceb425094a4e289b118319f60f73d307083090de68b3a8e9a8a04fef32db03df64a9ebf70 +DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz 189527214 BLAKE2B 83284aa6df5a99ad3c64cf7986be49458892448b190ed081136f71af64ea8bcdfb7a2ae29d8f6ba42fd55746df977f66c7315027e1010932d3473721b34258d8 SHA512 8de110a836766bb36fa3d41b95f941ca7f85d4e94f3e3a115cb2b845d6f6efa548e077bcc60d98cc4d84a56a90adf7b98f2ca6bb2ce541253138dd6dd8a7844b +DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz 188162894 BLAKE2B 7059aced12eea5783c40dd26d2ecd27d0e5999fe9761e6457a82609449b8e58920699d17525ff6d34c327162ec72d2e502ef77ab8b0b721b328fa42bc6c92154 SHA512 e39d870cd3563e3ab60cadf252e5e621be520e6eb49782b39c03ea1d4f750dfbf2857bb636ff274c52235f1c6410d4bfbe5a0aa6231348118d958e104fc6afd5 +DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz 206039221 BLAKE2B a3ed4a2f823556a0a79668a6e68716eb0e08eb57fc0b6000e1e0c016d72f563c576b461829aa80fb5aa69b28b1a61eb8d64dd75f5082c773319d0002eba7ac04 SHA512 4b82e3199e9a6eddadb3cdf3209ca7635dd4664c423a22a404bb69ae43af09cdd2e284246f0c50093ff128ed4a8a89c24c20a0e1d47fa64e0d79b3b5f2234409 diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.1_p9.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild similarity index 94% rename from dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.1_p9.ebuild rename to dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild index 989e88c542..1b782a2ad8 100644 --- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.1_p9.ebuild +++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# java-vm not yet ported to EAPI 7 EAPI=6 inherit java-vm-2 toolchain-funcs eapi7-ver @@ -12,8 +13,7 @@ abi_uri() { } MY_PV=${PV/_p/+} -SLOT=15 -#Some people like AndrewAmmerlaan reports that SLOT="$(ver_cut 1)" is not detected correctly. So I had to hardcode that. +SLOT=${MY_PV%%[.+]*} SRC_URI=" $(abi_uri arm) @@ -21,11 +21,12 @@ SRC_URI=" $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) " - DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK. Short Term Supported" HOMEPAGE="https://adoptopenjdk.net" + LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + IUSE="alsa cups -gentoo-vm headless-awt source" RDEPEND=" From 64ae89dede3d0fdfce28a45dd2c18ec8169c7d77 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 16 Mar 2021 14:03:12 +0100 Subject: [PATCH 3/4] media-gfx/glimpse: EAPI bump could not get this to configure (neither before or after these changes). Same error when running it on a freshly cloned upstream git repo. ./configure: line 33540: syntax error near unexpected token `)' ./configure: line 33540: `fi)' Fixing this one, just reveals a new syntax error Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- media-gfx/glimpse/glimpse-0.2.0.ebuild | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/media-gfx/glimpse/glimpse-0.2.0.ebuild b/media-gfx/glimpse/glimpse-0.2.0.ebuild index 4fa67cce89..0057314ee0 100644 --- a/media-gfx/glimpse/glimpse-0.2.0.ebuild +++ b/media-gfx/glimpse/glimpse-0.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Based on media-gfx/gimp-2.10.18-r2.ebuild -EAPI=6 # gnome2.eclass doesn't work with EAPI 7. +EAPI=7 GNOME2_EAUTORECONF=yes WANT_AUTOMAKE= @@ -77,17 +77,17 @@ DEPEND=" ${COMMON_DEPEND} >=dev-lang/perl-5.10.0 dev-libs/appstream-glib - dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 - >=sys-devel/libtool-2.2 - virtual/pkgconfig doc? ( dev-util/gtk-doc ) test? ( x11-base/xorg-server[xvfb] ) " - -# TODO: Add BDEPEND after switch to EAPI 7. +BDEPEND=" + dev-util/gtk-update-icon-cache + >=sys-devel/libtool-2.2 + virtual/pkgconfig +" DOCS=( "AUTHORS" "HACKING.md" "NEWS" "README.md" ) @@ -118,6 +118,7 @@ src_prepare() { sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' \ -i configure || die # bug #615144 fgrep -q GIMP_DISABLE_DEPRECATED configure || die # bug #615144, self-test + } _adjust_sandbox() { @@ -197,11 +198,3 @@ src_install() { | sed -E 's/.*\[([2-9]\.[0-9]+)\].*/\1/') mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die } - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} From 3063643f762535c2451bd2bc9728726e06bea6fb Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 16 Mar 2021 14:07:54 +0100 Subject: [PATCH 4/4] metadata/layout.conf: deprecate EAPI 6 so we can easily see which ebuilds still use this EAPI in pkgcheck/repoman output Signed-off-by: Andrew Ammerlaan --- metadata/layout.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/layout.conf b/metadata/layout.conf index 474114e707..928bfabc49 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -11,6 +11,7 @@ sign-manifests = false # Let's start with new EAPIs if possible eapis-banned = 0 1 2 3 4 5 +eapis-deprecated = 6 # Part of ability to mask features in overlays # https://trofi.github.io/posts/201-masking-a-package-in-gentoo-overlay.html