commit: 0ff52f6fc836df9b19eb4f182879edab324c18ad Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jan 20 12:35:45 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Jan 21 16:38:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff52f6f
dev-java/java-sdk-docs: Bring Java 8 ebuild in line with Java 9 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild index d060fa7fcc6..49c3f8aaeb7 100644 --- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild +++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 inherit versionator @@ -11,11 +11,10 @@ DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-d || MY_PV_EXT="u$(get_version_component_range 4)" MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" -ORIG_NAME="jdk-${MY_PV}-docs-all.zip" DESCRIPTION="Oracle's documentation bundle (including API) for Java SE" HOMEPAGE="http://download.oracle.com/javase/8/docs/"; -SRC_URI="${ORIG_NAME}" +SRC_URI="jdk-${MY_PV}-docs-all.zip" LICENSE="oracle-java-documentation-8" SLOT="1.8" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" @@ -26,19 +25,20 @@ DEPEND="app-arch/unzip" S="${WORKDIR}/docs" pkg_nofetch() { - einfo "Please download ${ORIG_NAME} from " + einfo "Please download ${SRC_URI} from" einfo "${DOWNLOAD_URL}" - einfo "(agree to the license) and place it in ${DISTDIR}" - + einfo "by agreeing to the license and place it in ${DISTDIR}" + einfo "" einfo "If you find the file on the download page replaced with a higher" - einfo "version, please report to the bug 67266 (link below)." - einfo "If emerge fails because of a checksum error it is possible that" + einfo "version, please report it in bug #67266 (link below)." + einfo "" + einfo "If emerge fails because of a checksum error, it is possible that" einfo "the upstream release changed without renaming. Try downloading the file" einfo "again (or a newer revision if available). Otherwise report this to" einfo "https://bugs.gentoo.org/67266 and we will make a new revision." } -src_install(){ - insinto /usr/share/doc/${P}/html +src_install() { + insinto /usr/share/doc/${PN}-${SLOT}/html doins -r index.html */ }
