commit: f86680ac4918e2ef986ba518d5b78028153a3907 Author: Florian Schmaus <flo <AT> geekplace <DOT> eu> AuthorDate: Wed Jan 20 09:55:34 2021 +0000 Commit: Florian Schmaus <flo <AT> geekplace <DOT> eu> CommitDate: Wed Jan 20 09:55:34 2021 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=f86680ac
sys-apps/baselayout-java: sync -9999 ebuild This syncs the baselayout-java ebuild with the ebuild from the official Gentoo ebuild repository. Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu> .../baselayout-java/baselayout-java-9999.ebuild | 58 ++++++++++++++++------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/sys-apps/baselayout-java/baselayout-java-9999.ebuild b/sys-apps/baselayout-java/baselayout-java-9999.ebuild index 5e6d7402..1bf61d37 100644 --- a/sys-apps/baselayout-java/baselayout-java-9999.ebuild +++ b/sys-apps/baselayout-java/baselayout-java-9999.ebuild @@ -1,34 +1,64 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=7 -inherit autotools subversion fdo-mime gnome2-utils - -ESVN_REPO_URI="http://overlays.gentoo.org/svn/proj/java/projects/${PN}/trunk/"; +inherit autotools xdg-utils DESCRIPTION="Baselayout for Java" -HOMEPAGE="http://www.gentoo.org/proj/en/java/"; -SRC_URI="" +HOMEPAGE="https://www.gentoo.org/proj/en/java/"; + +if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/baselayout-java.git"; + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"; + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="" RDEPEND="!!<dev-java/java-config-2.2" +BDEPEND=" + app-crypt/p11-kit[trust] + app-misc/ca-certificates +" + +RDEPEND="${BDEPEND} + !<dev-java/java-config-2.2" + src_prepare() { - eautoreconf + default + if [[ -n "${EGIT_REPO_URI}" ]]; then + eautoreconf + fi +} + +src_install() { + default + keepdir /etc/ssl/certs/java/ + exeinto /etc/ca-certificates/update.d + newexe - java-cacerts <<-_EOF_ + #!/bin/sh + exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EPREFIX}/etc/ssl/certs/java/cacerts" + _EOF_ } pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update } pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update + # on first installation generate java cacert file + # so jdk ebuilds can create symlink to in into security directory + if [[ ! -f "${EROOT}"/etc/ssl/certs/java/cacerts ]]; then + einfo "Generating java cacerts file from system ca-certificates" + trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}/etc/ssl/certs/java/cacerts" || die + fi }
