gentoo resync : 03.11.2018

3 files changed, 4 insertions, 69 deletions

diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 5047b7dc5ae2..071cf282bbbb 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,8 +1,5 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
-DIST leiningen-2.7.0-standalone.jar 15366772 BLAKE2B f8156298f0b0fc2dc87b7534796c81864ccbff350b69d9d1f303120ae2c24efbeefd874cc132dd37a25f08e5cafa5ebe3bf23168f466ebd4da9ae1535a9ed3a3 SHA512 d42288c696d5b4d86c41a0ca9b8e748cdb9200c3adc23161b9b97b8c2f3da9c5bd811e2ddae265bf11d323b1449291e9914bf1e222aaf403e73ceef4084ed082
-DIST leiningen-2.7.0.sh 4301 BLAKE2B f08d161c1c45c994ec361636891f72cf560248e33aacebacd821d3af96d7d5215d9cfdf17a4dd62e10d7dde34abaa42578956a0a38fa33e5226a44052426d155 SHA512 241357de3f19dfe1c729c14d1540140fccdd6a6c7bae76d6ccfe7a28cdff95b01f52a671ccd2d6712e11ff33115c720906e34a5118ff6bb6d232520d77125f5d
-DIST leiningen-2.7.1-standalone.jar 15370238 BLAKE2B 8b33bb04fc8d9c9d45a557833e2a7febf1cf1130081a39e9d22cdf6df23677f1b2bf4578a1b7e2f44635ceb5178f343584b8104acbb3f94ae8af9a60613af4ca SHA512 6f0ac01917b273c063dd16d8a5e98cba0265ba19766ce6a2c1e160367e3514e637c969f831384845e752cde015e1357eecac7141259e279584577f4f527bc08a
-DIST leiningen-2.7.1.sh 4581 BLAKE2B 966db930da0d4855dc4ee84d1035fce5d05f6938032db31302489e9a729e4516bb1adfd3fb8e49d39c1fe031ee9d725c8f36112ddb678120f96aded332b20742 SHA512 88e52f843a9b3cc4ebe2d8ffef1bec5e52a9e1e492d69b75c1482f7a97f6bcb766360502a5f1270ced1f4c1419af8b0cccd79219dc333a7305d3e4b58082d1e6
-EBUILD leiningen-bin-2.7.0.ebuild 1525 BLAKE2B 7c249a7d3cc79fd6bd42b0604272c9bafcd29109541490f710852fe29e7928ea5448521916ef191d803dcb4424d7bb93af188370652d4a7b87151f038e90f57f SHA512 0eb203650b4d4f98188ee7e6f66cece8757f39155a26f17c16041d027c90785eccca5fa9535c99f20a55e471f46baad3bf0f4de11bdaf4b6311b7d722ed43ce3
-EBUILD leiningen-bin-2.7.1-r1.ebuild 1549 BLAKE2B 7ced587689ba587f317b08d3b0f3a4456f4f736fcc8a97f5ea9b8ca131113a459cd09bdfe827631c3a0b60908cd10162eb85aab45638578fd4a8a167710d7b67 SHA512 cd6b352eaf5fb136622075031a2f1033f86db1393c3ab31e0fb5395e69aa758ed7fe357227fbfccd8db07f056dd0a259dea4451356a974453f32438355192b4f
+DIST leiningen-2.8.0-standalone.jar 13541842 BLAKE2B 79697751b9da90a3f61bd4b8722436d1af1ce9f8db5c0e3a68d15d006f2afcb9518ab2034554b9b8a8e5f8bb991b304d51b8f45fb9a77d7337718035dc271e7d SHA512 e16359b2d211f9a72eeb9b672a94155f49531cbb731df11451b76ec30ad83be4a22e0b2ecc582bb01fdadd6822f56f27d42fa214df222f6c95e0fde64cb305ed
+DIST leiningen-2.8.0.sh 4335 BLAKE2B 951cc9b69e726bbb84c88b8b6407386c878cb1521c5cd79c7ce39ed48805cd24e9af0102f21cd7e852a024830b151751d42e7524f729bcca40f0e7de013ceb8b SHA512 08a5e2fc68ac3bd34dc32558088bd2ff79c9d72c54a610cfcd8c79fa5dcb98ad28d6950cb91b88081d024d5be881a168c2f9235c7888aa36c0f0e7e1f124169f
+EBUILD leiningen-bin-2.8.0.ebuild 1549 BLAKE2B 121745ac21ffc2a35bc7fcf9faf3cc60a94125445f426b6cbcc96dad0be74f0a94060ecf5f1490239c1cfc5e1eaff8e597a4f2823474c9c82ea201280f7e9912 SHA512 538011051c64acaf051b4b7b97e23e8a32655fe038520e4585d5d90d071ae6241c61e366b71e5b8d5178d2c1acd573d4b51796cfc2e1513cfb296232e9eee2af
 MISC metadata.xml 408 BLAKE2B 5c7a156b3dce1942e988302fb75ffbb3fc3738bb4aeb21203804b61a46f313fcbe2b8314702b9361afe21d33db68d9643217eaa3db3f08b7f001f29100e06eca SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
deleted file mode 100644
index 4f07d80fc893..000000000000
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_PNV="${MY_PN}-${PV}"
-
-DESCRIPTION="Automate Clojure projects without setting your hair on fire"
-HOMEPAGE="https://leiningen.org/"
-SRC_URI="
-	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
-	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
-"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-RESTRICT="test"
-
-src_unpack() {
-	mkdir -p "${S}" || die "Can't mkdir ${S}"
-	cd "${S}"	|| die "Can't enter ${S}"
-	for file in ${A}; do
-		einfo "Copying ${file}"
-		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
-	done
-}
-
-src_prepare() {
-	einfo "Copying leinrc"
-	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
-	einfo "Patching leinrc"
-	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
-
-	einfo "Renaming lein-pkg"
-	# Rename generically to help user patching
-	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
-
-	einfo "Patching lein"
-	java-pkg_init_paths_
-	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${JAVA_PKG_JARDEST}/${PN}.jar|" "${S}/lein" \
-		|| die "Can't patch LEIN_JAR in lein"
-
-	default
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin "${S}/lein"
-	java-pkg_newjar "${MY_PNV}-standalone.jar"
-	insinto /etc
-	doins "${S}/leinrc"
-	fperms 0644 "/etc/leinrc"
-}
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
index a6174af9f139..dd80a3d2fd2f 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.7.1-r1.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"