commit: d0936855c44c82d812cc90fe390189cb112a6a93 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed May 8 09:46:44 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed May 8 09:47:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0936855
dev-java/icedtea-bin: Remove last-rited pkg Bug: https://bugs.gentoo.org/848804 Bug: https://bugs.gentoo.org/830248 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-java/icedtea-bin/Manifest | 14 --- dev-java/icedtea-bin/files/icedtea-bin.env.sh | 17 --- dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild | 135 ---------------------- dev-java/icedtea-bin/metadata.xml | 11 -- profiles/arch/arm/23.0-armv7a_hf/package.mask | 4 - profiles/arch/arm/23.0-armv7a_sf/package.mask | 4 - profiles/arch/arm/armv7a/package.mask | 4 - profiles/arch/arm/package.mask | 4 - profiles/package.mask | 5 - 9 files changed, 198 deletions(-) diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest deleted file mode 100644 index 21af4ba8ba10..000000000000 --- a/dev-java/icedtea-bin/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -DIST icedtea-bin-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b -DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549 -DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2 -DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d -DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da -DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077 -DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6 -DIST icedtea-bin-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b -DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151 -DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662 -DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679 -DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e -DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637 -DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548 diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh deleted file mode 100644 index 9734e8a604c0..000000000000 --- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')" -JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})" -JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin" -LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/" -MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.${SLOT}" -# Taken from sun.boot.class.path property -BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild deleted file mode 100644 index d81265453bcb..000000000000 --- a/dev-java/icedtea-bin/icedtea-bin-3.16.0-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# pkgcheck reports that multilib-build is not used but in fact it is used -# from files/icedtea-bin.env.sh so DO NOT REMOVE THAT CLASS even if pkgcheck -# says it's unused -inherit java-vm-2 multilib-build toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - ${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz - examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz ) - )" -} - -BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"; -SRC_URI=" - doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) - source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz ) - big-endian? ( $(abi_uri ppc64) ) - !big-endian? ( $(abi_uri ppc64le ppc64) ) - $(abi_uri amd64) - $(abi_uri arm) - $(abi_uri arm64) - $(abi_uri x86) -" - -DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" -HOMEPAGE="http://icedtea.classpath.org"; - -LICENSE="GPL-2-with-classpath-exception" -SLOT="8" -KEYWORDS="-* amd64 ~arm arm64 ppc64 x86" -IUSE="+alsa big-endian cups doc examples +gtk headless-awt pulseaudio selinux source" - -REQUIRED_USE="gtk? ( !headless-awt )" - -RESTRICT="preserve-libs strip" -QA_PREBUILT="opt/.*" - -DEPEND="app-arch/xz-utils" - -RDEPEND=" - >=dev-libs/glib-2.60.7:2 - >=media-libs/fontconfig-2.13:1.0 - >=media-libs/freetype-2.9.1:2 - >=media-libs/lcms-2.9:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/zlib-1.2.11-r2 - virtual/jpeg-compat:62 - alsa? ( >=media-libs/alsa-lib-1.2 ) - cups? ( >=net-print/cups-2.0 ) - gtk? ( - >=dev-libs/atk-2.32.0 - >=x11-libs/cairo-1.16.0 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.24:2 - >=x11-libs/pango-1.42 - ) - selinux? ( sec-policy/selinux-java ) - virtual/ttf-fonts - !headless-awt? ( - media-libs/giflib:0/7 - =media-libs/libpng-1.6* - >=x11-libs/libX11-1.6 - >=x11-libs/libXcomposite-0.4 - >=x11-libs/libXext-1.3 - >=x11-libs/libXi-1.7 - >=x11-libs/libXrender-0.9.10 - >=x11-libs/libXtst-1.2 - ) -" - -PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_prepare() { - default - - # I wouldn't normally use -f below but symlinks in the arm files - # make this fail otherwise and any other approach would be tedious. - - if ! use alsa; then - rm -fv */jre/lib/*/libjsoundalsa.* || die - fi - - if use headless-awt; then - rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ - */{,jre/}bin/policytool */bin/appletviewer || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - dodir "${dest}" - - dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} - use doc && dodoc -r ${P}/doc/html - - # doins doesn't preserve executable bits. - cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die - - if use examples; then - cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die - fi - - if use source; then - cp ${P}/src.zip "${ddest}" || die - fi - - # use system-wide cacert store - rm "${ddest}"/jre/lib/security/cacerts || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" - - # Both icedtea itself and the icedtea ebuild set PAX markings but we - # disable them for the icedtea-bin build because the line below will - # respect end-user settings when icedtea-bin is actually installed. - java-vm_set-pax-markings "${ddest}" - - # Each invocation appends to the config. - java-vm_revdep-mask "${EPREFIX}${dest}" - java-vm_sandbox-predict /proc/self/coredump_filter -} diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml deleted file mode 100644 index ba41cd79150b..000000000000 --- a/dev-java/icedtea-bin/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>j...@gentoo.org</email> - <name>Java</name> - </maintainer> - <use> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - </use> -</pkgmetadata> diff --git a/profiles/arch/arm/23.0-armv7a_hf/package.mask b/profiles/arch/arm/23.0-armv7a_hf/package.mask index 30e86d72cc26..6ce998c440b2 100644 --- a/profiles/arch/arm/23.0-armv7a_hf/package.mask +++ b/profiles/arch/arm/23.0-armv7a_hf/package.mask @@ -5,10 +5,6 @@ # Valgrind works on ARMv7 -dev-debug/valgrind -# James Le Cuirot <ch...@gentoo.org> (2015-05-24) -# This is built for armv7a so unmask against the wider arm mask. --dev-java/icedtea-bin - # Georgy Yakovlev <gyakov...@gentoo.org> (2019-06-22) # This is built for armv7a so unmask here. -dev-java/openjdk-bin:11 diff --git a/profiles/arch/arm/23.0-armv7a_sf/package.mask b/profiles/arch/arm/23.0-armv7a_sf/package.mask index 30e86d72cc26..6ce998c440b2 100644 --- a/profiles/arch/arm/23.0-armv7a_sf/package.mask +++ b/profiles/arch/arm/23.0-armv7a_sf/package.mask @@ -5,10 +5,6 @@ # Valgrind works on ARMv7 -dev-debug/valgrind -# James Le Cuirot <ch...@gentoo.org> (2015-05-24) -# This is built for armv7a so unmask against the wider arm mask. --dev-java/icedtea-bin - # Georgy Yakovlev <gyakov...@gentoo.org> (2019-06-22) # This is built for armv7a so unmask here. -dev-java/openjdk-bin:11 diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask index 30e86d72cc26..6ce998c440b2 100644 --- a/profiles/arch/arm/armv7a/package.mask +++ b/profiles/arch/arm/armv7a/package.mask @@ -5,10 +5,6 @@ # Valgrind works on ARMv7 -dev-debug/valgrind -# James Le Cuirot <ch...@gentoo.org> (2015-05-24) -# This is built for armv7a so unmask against the wider arm mask. --dev-java/icedtea-bin - # Georgy Yakovlev <gyakov...@gentoo.org> (2019-06-22) # This is built for armv7a so unmask here. -dev-java/openjdk-bin:11 diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask index 17e581e17f2c..84f43bbcff74 100644 --- a/profiles/arch/arm/package.mask +++ b/profiles/arch/arm/package.mask @@ -10,10 +10,6 @@ # https://valgrind.org/info/platforms.html dev-debug/valgrind -# James Le Cuirot <ch...@gentoo.org> (2015-05-24) -# This is built for armv7a and will not work on earlier generations. -dev-java/icedtea-bin - # Georgy Yakovlev <gyakov...@gentoo.org> (2019-06-22) # This is built for armv7a and will not work on earlier generations. dev-java/openjdk-bin:11 diff --git a/profiles/package.mask b/profiles/package.mask index 3747365ae8b0..fd2ebd79a6f1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -302,11 +302,6 @@ app-emulation/runv =sys-kernel/vanilla-kernel-6.6.26 =sys-kernel/vanilla-kernel-6.8.5 -# Volkmar W. Pogatzki <gen...@pogatzki.net> (2024-04-08) -# Obsolete java-vm, bugs #848804 #830248. -# Removal on 2024-05-08 -dev-java/icedtea-bin - # Sam James <s...@gentoo.org> (2024-03-28) # Newer 5.4.x releases were signed by a potentially compromised upstream maintainer. # There is no evidence that these releases contain malicious code, but masked
