From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- dev-java/java-config/Manifest | 2 +- dev-java/java-config/java-config-2.2.0-r3.ebuild | 39 -------------------- dev-java/java-config/java-config-2.2.0-r4.ebuild | 47 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 40 deletions(-) delete mode 100644 dev-java/java-config/java-config-2.2.0-r3.ebuild create mode 100644 dev-java/java-config/java-config-2.2.0-r4.ebuild (limited to 'dev-java/java-config') diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 05f5178b6920..702491bd50be 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,4 +1,4 @@ AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a -EBUILD java-config-2.2.0-r3.ebuild 976 BLAKE2B ee79892df5bed49e30ce894fe39be3188376243a921e4c105efafc24db797032461ba8e702669ec03af15811e2ea14ed4027700930fdd0af81ccdf1bef6f7434 SHA512 ab20a3da89b55a79dd960a7468316def7433b5927094be6f26a008ea02fa6071e0b2ebdafc11f0eab0ef53cc722f3ed55feae0a4e8a15da5b3120982b6cf2b9d +EBUILD java-config-2.2.0-r4.ebuild 1090 BLAKE2B 70acd02e5f352e21994971306284950949791531f979751daef89e270d7f7709e3e119d39adf0ab0e1673b17b23f38171a897c8baf197ed56118ce2fb51b2f77 SHA512 046161fcc2afe66dcd832e86f37fc44fcb268410d3b01cf0f424214142df1dbd4a9ca8c83bf94c3468c33a60c68b53e862a3c3c3fc56c7d8469f8a264a5f51c0 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild deleted file mode 100644 index 62b5da6dd713..000000000000 --- a/dev-java/java-config/java-config-2.2.0-r3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# jython depends on java-config, so don't add it or things will break -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 - -DESCRIPTION="Java environment configuration query tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" -SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" -IUSE="test" - -DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )" - -# baselayout-java is added as a dep till it can be added to eclass. -RDEPEND=" - !dev-java/java-config-wrapper - sys-apps/baselayout-java - sys-apps/portage[${PYTHON_USEDEP}]" - -PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch ) - -python_install_all() { - distutils-r1_python_install_all - - # This replaces the file installed by java-config-wrapper. - dosym java-config-2 /usr/bin/java-config -} - -python_test() { - esetup.py test -} diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild new file mode 100644 index 000000000000..2d0a08658067 --- /dev/null +++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# jython depends on java-config, so don't add it or things will break +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit distutils-r1 + +DESCRIPTION="Java environment configuration query tool" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" +SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" +IUSE="test" + +DEPEND="test? ( + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + ) + )" + +# baselayout-java is added as a dep till it can be added to eclass. +RDEPEND=" + !dev-java/java-config-wrapper + sys-apps/baselayout-java + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch ) + +python_install_all() { + distutils-r1_python_install_all + + # This replaces the file installed by java-config-wrapper. + dosym java-config-2 /usr/bin/java-config +} + +python_test() { + esetup.py test +} -- cgit v1.2.3