From d9709fb88b29bbee0d4b2b0f99e5eeb7e47a7f0e Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Tue, 16 Apr 2024 08:30:30 +0100 Subject: [PATCH 1/3] dev-java/corretto-bin: new revision 8.402.08.1-r3 Fix QA missue of unresolved dependency when [headless-awt]. Fixes: https://bugs.gentoo.org/928915 Signed-off-by: Robert Greener --- .../corretto-bin-8.402.08.1-r3.ebuild | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild diff --git a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild b/dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild new file mode 100644 index 0000000000..388a3d9679 --- /dev/null +++ b/dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +MY_PV=${PV/_p/+} +SLOT=$(ver_cut 1) + +SRC_URI=" + https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz +" + +DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services" +HOMEPAGE="https://aws.amazon.com/corretto" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + media-libs/alsa-lib + media-libs/libglvnd + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + app-accessibility/at-spi2-core + x11-libs/gtk+ + x11-libs/gdk-pixbuf + x11-libs/libXxf86vm + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + if use headless-awt ; then + rm -v lib/amd64/libjawt.so || die + rm -v lib/amd64/libglassgtk.so || die + rm -v lib/amd64/libjavafx_font_pango.so || die + rm -v jre/lib/amd64/libglassgtk2.so || die + rm -v jre/lib/amd64/libprism_es2.so || die + fi + + if ! use source ; then + rm -v src.zip || die + fi + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}-8.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} \ No newline at end of file From c3ad4f64eda56663f2519dc07ff1511299315e12 Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Tue, 16 Apr 2024 08:31:32 +0100 Subject: [PATCH 2/3] dev-java/corretto-bin: Drop obsolete revision 8.402.08.1-r2 Signed-off-by: Robert Greener --- .../corretto-bin-8.402.08.1-r2.ebuild | 83 ------------------- 1 file changed, 83 deletions(-) delete mode 100644 dev-java/corretto-bin/corretto-bin-8.402.08.1-r2.ebuild diff --git a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r2.ebuild b/dev-java/corretto-bin/corretto-bin-8.402.08.1-r2.ebuild deleted file mode 100644 index 762138ee9e..0000000000 --- a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 toolchain-funcs - -MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) - -SRC_URI=" - https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services" -HOMEPAGE="https://aws.amazon.com/corretto" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" -IUSE="cups headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/harfbuzz - media-libs/alsa-lib - media-libs/libglvnd - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - ) - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - - if use headless-awt ; then - rm -v lib/amd64/libjawt.so || die - rm -v lib/amd64/libglassgtk.so || die - rm -v lib/amd64/libjavafx_font_pango.so || die - fi - - if ! use source ; then - rm -v src.zip || die - fi - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - java-vm_install-env "${FILESDIR}"/${PN}-8.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} \ No newline at end of file From 9381134439967ab68c274b7f14a18c3e805a1ff6 Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Tue, 16 Apr 2024 06:37:41 -0400 Subject: [PATCH 3/3] net-nntp/pan: drop 0.155, add 0.158, 0.158-r1 cmake testing, fixups 0.158-r1 is unkeyworded as not building, tracked bug in comment. 0.159 will drop autotools, so it's a priority to get working. Signed-off-by: Joe Kappus --- net-nntp/pan/Manifest | 2 +- net-nntp/pan/pan-0.157.ebuild | 5 +- net-nntp/pan/pan-0.158-r1.ebuild | 59 +++++++++++++++++++ .../{pan-0.155.ebuild => pan-0.158.ebuild} | 5 +- 4 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 net-nntp/pan/pan-0.158-r1.ebuild rename net-nntp/pan/{pan-0.155.ebuild => pan-0.158.ebuild} (96%) diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest index 99eeb702dd..c8ff025cf9 100644 --- a/net-nntp/pan/Manifest +++ b/net-nntp/pan/Manifest @@ -1,2 +1,2 @@ -DIST pan-v0.155.tar.bz2 1797355 BLAKE2B 262123f73a79677640c7a98f4917d037fad27a644a5f9f4d63b7460d31f8a68c346da9d5521a3b54ac13df53c99fd97864f7cb2795135f6e675fb74cd8321d47 SHA512 85605a76dad1868926cc021a4642c40dca737b0fb77410c4e82981bf02e8157f8347518fccc82157804e89bd0786863a00bd1cc963637da3a54b82043e9c15f0 DIST pan-v0.157.tar.bz2 1819034 BLAKE2B 0e28184050ce4e2a62ef6f273ce06ccb25a61bd380a7790a9236aab63b3f4e381fd4d4881c922d0fef4f228cc92a72c868a1ad19fe684a0ab2f02af65ff0e57d SHA512 f15c139756467c4a9b241ad4efab8df611d8a2533597a9b3d275410a7cb6ed4575430ff200be442792fc2170b4580898aed269a26e3d63c109bae62ea2d41978 +DIST pan-v0.158.tar.bz2 1819095 BLAKE2B 4adb51f99f795e23a7f6d67d59c9e120a913e54c38b6dfd200859f1655657076dfd57f400fb221923b5c0d2d1a376faba13102e494f1a8515b289fe115d23647 SHA512 d2c12d92c5715ac585a8da340cb5ca03783a116ae64d2fc0dda7f7603ccb11783a78e4bbb5a4daf90605d401b78c2b3b80ddd8d0106ae8e60c38b0d2f4ab389d diff --git a/net-nntp/pan/pan-0.157.ebuild b/net-nntp/pan/pan-0.157.ebuild index f1e8285fee..28162dc66f 100644 --- a/net-nntp/pan/pan-0.157.ebuild +++ b/net-nntp/pan/pan-0.157.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 @@ -7,6 +7,7 @@ inherit autotools gnome2 DESCRIPTION="A newsreader for GNOME" HOMEPAGE="https://gitlab.gnome.org/GNOME/pan/" SRC_URI="https://gitlab.gnome.org/GNOME/pan/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S="${WORKDIR}/pan-v${PV}" LICENSE="GPL-2" SLOT="0" @@ -35,8 +36,6 @@ BDEPEND=" virtual/pkgconfig " -S="${WORKDIR}/pan-v${PV}" - src_prepare() { default eautoreconf diff --git a/net-nntp/pan/pan-0.158-r1.ebuild b/net-nntp/pan/pan-0.158-r1.ebuild new file mode 100644 index 0000000000..ac04f8371e --- /dev/null +++ b/net-nntp/pan/pan-0.158-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake gnome2 + +DESCRIPTION="A newsreader for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/pan/" +SRC_URI="https://gitlab.gnome.org/GNOME/pan/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S="${WORKDIR}/pan-v${PV}" + +LICENSE="GPL-2" +SLOT="0" + +#cmake broken https://gitlab.gnome.org/GNOME/pan/-/issues/184 +KEYWORDS="" +IUSE="dbus gnome-keyring libnotify spell ssl" + +DEPEND=" + >=dev-libs/glib-2.26:2 + dev-libs/gmime:3.0 + >=x11-libs/gtk+-3.00:3 + gnome-keyring? ( + >=app-crypt/gcr-3.20 + >=app-crypt/libsecret-0.20 + ) + libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) + spell? ( + >=app-text/enchant-2.2.3:2 + >=app-text/gtkspell-3.0.10:3 ) + ssl? ( >=net-libs/gnutls-3:0= ) + >=sys-libs/zlib-1.2.0 +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-text/yelp-tools + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWANT_DBUS=$(usex dbus) \ + -DWANT_GKR=$(usex gnome-keyring) \ + -DWANT_GTKSPELL=$(usex spell) \ + -DWANT_NOTIFY=$(usex libnotify) \ + -DWANT_GNUTLS=$(usex ssl) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install +} diff --git a/net-nntp/pan/pan-0.155.ebuild b/net-nntp/pan/pan-0.158.ebuild similarity index 96% rename from net-nntp/pan/pan-0.155.ebuild rename to net-nntp/pan/pan-0.158.ebuild index f1e8285fee..28162dc66f 100644 --- a/net-nntp/pan/pan-0.155.ebuild +++ b/net-nntp/pan/pan-0.158.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 @@ -7,6 +7,7 @@ inherit autotools gnome2 DESCRIPTION="A newsreader for GNOME" HOMEPAGE="https://gitlab.gnome.org/GNOME/pan/" SRC_URI="https://gitlab.gnome.org/GNOME/pan/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S="${WORKDIR}/pan-v${PV}" LICENSE="GPL-2" SLOT="0" @@ -35,8 +36,6 @@ BDEPEND=" virtual/pkgconfig " -S="${WORKDIR}/pan-v${PV}" - src_prepare() { default eautoreconf