[gentoo-commits] repo/gentoo:master commit in: dev-java/junit/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     be6f9efc29a8ee9fc0483d4c3004822c46ccd258
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 09:50:08 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 09:58:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be6f9efc

dev-java/junit: Fix SRC_URI

It was outdated, lacking a name, and pointing to the zip instead of
the tar.gz. The latter avoids app-arch/unzip, which was missing
anyway.

Package-Manager: portage-2.2.28

 dev-java/junit/Manifest             | 2 +-
 dev-java/junit/junit-4.12-r1.ebuild | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index f1c65cb..204b4dc 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,4 +1,4 @@
 DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
+DIST junit4-r4.12.tar.gz 443804 SHA256 9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32 WHIRLPOOL 14eda410942900d8be21ea29096c387384634ce9f679348d5bf4dbb11d22e23e1be990486ae8a6004b95f3a9383644e4f70988f84312cf16d5e4462c64b26814
 DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
 DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
-DIST r4.12.zip 672377 SHA256 519971406171c580304fdf7b582b5d1df3ff396bb8855a70cb68592f3d53476b SHA512 773f38476cc89f352fe9518f9de27dac32afbd501b498c3a876b7d79ee45a1c567f1ee2064067bc0721dcc06081b3faffe55fe74fbe49d2ce72884b39a2b76f6 WHIRLPOOL f25480ffe47fe615fc7cd7016bf42e037a307879214e21f2b487b4e3d667bb9209f99d372774e5b8e060e0d2678f31d3e10a9b1ea2292a7734f7f26102e3f0ff

diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index 0c2cb99..6a9027f 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -4,12 +4,14 @@
 
 EAPI=5
 
+MY_PN="${PN}${PV%%.*}"
+MY_P="${MY_PN}-r${PV}"
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="https://github.com/${PN}-team/${PN}/archive/r${PV}.zip"
+SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}.tar.gz"
 HOMEPAGE="http://junit.org/"
 LICENSE="EPL-1.0"
 SLOT="4"
@@ -24,7 +26,7 @@ RDEPEND=">=virtual/jre-1.6
 DEPEND=">=virtual/jdk-1.6
 	${CDEPEND}"
 
-S="${WORKDIR}/${PN}-r${PV}"
+S="${WORKDIR}/${MY_P}"
 JAVA_SRC_DIR="src/main/java"
 JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"