gentoo resync : 10.11.2019

4 files changed, 4 insertions, 176 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index ce590f05b8e9..aac061068c33 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,8 +1,4 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-0.20.2.tar.xz 5032768 BLAKE2B 583e0b5cede279a0c0a60d4209f9be6237ff5ac070c0e82a075a242d08086e59c88c2ab29cbf3d2c6d7a455709b64086afd11e4928fcc9e81979d5296ef38b64 SHA512 231d95950ca5a7abe86175f93085ea27fae493e4f8dde3c9e086993431f9517781ceffeb4f9e761eb524523df3703d0a315fe53e32bc6daea6a684bf90589282
-DIST nim-1.0.0.tar.xz 5136624 BLAKE2B 6c87755f66ace6de44aa80d78840572d3ff96c07c97c7af73cdfe395cdbbfb614ad816b7e2c6b91519dcd341694ab48390d80ac97d82db3c1c9a111e0cbadaa4 SHA512 951bbec06a6a1059214b485c5eddfa3c1be0a4ccf6ba98ac3ee624f57d36e86ae1212ffcb6d1bb7ea0938aabbe95a8a6587b140f3219ddb24ec7c93f5672266f
 DIST nim-1.0.2.tar.xz 5139712 BLAKE2B bcb0f0fa2ed6069021a6359e453def7beccb6e767e3e1111ff27d8fb2adb7351336f219a88e2450df3d4aece1dd7f6e1a8fb891aa31581c32bb2535d2cf604a7 SHA512 5d7a45efcf656d5467554c3bbf42d0c62a760ccd107cec439d8375839d2e80baadfb3f598598748ef8e1b32d3eb931caaa273f8e41bbf6f4e16c7afbef745349
-EBUILD nim-0.20.2.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208
-EBUILD nim-1.0.0.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208
-EBUILD nim-1.0.2.ebuild 1734 BLAKE2B 00de80e0dbcf7e0b30b0884e169ea488dff8e2fcf8688b5bcedda7a37688a5bf61f4a51dfae2ad89995067bc1dc6ebefbaede3c055555d7b664d39681a822958 SHA512 c09d02c2344b3c2f391b8134426e7612fbef028264717921a0af709c430eb579bef0f5c83f075f5800c7c68816bc95d21c9eceae006c8e3634ccc2c618407208
+EBUILD nim-1.0.2.ebuild 1686 BLAKE2B c55191f274efc4282084704b68d9b63b8b70f2e21b3f75be9fc46d34af16f9c10fc8e3e26265c3badc7a27236ce9737c913c6266cc4c74aa09f8ce07ddea0b06 SHA512 175cfa46e3c68cb7679299eac3f6df1e5b99e16c704474efb86a6dcbee7269d7d366944d38e6081ac1c0d7c5c3923a22296d3a5c360284051453be40c9424c62
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/nim-0.20.2.ebuild b/dev-lang/nim/nim-0.20.2.ebuild
deleted file mode 100644
index bb41a8721feb..000000000000
--- a/dev-lang/nim/nim-0.20.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${DEPEND}
-	test? ( net-libs/nodejs )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-)
-
-_run() {
-	echo "$@"
-	"$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	export XDG_CACHE_HOME=${T}/cache #667182
-	tc-export CC LD
-
-	_run ./build.sh
-
-	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
-	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
-	# build nimble and friends
-	# --stable to avoid pulling HEAD nimble
-	PATH="./bin:$PATH" _run ./koch --stable tools
-
-	if use doc; then
-		PATH="./bin:$PATH" _run ./koch doc
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED%/}"
-	rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
-	exeinto /usr/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		[[ ${bin_exe} == bin/nim ]] && continue
-		doexe "${bin_exe}"
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/html/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-1.0.0.ebuild b/dev-lang/nim/nim-1.0.0.ebuild
deleted file mode 100644
index bb41a8721feb..000000000000
--- a/dev-lang/nim/nim-1.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${DEPEND}
-	test? ( net-libs/nodejs )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-)
-
-_run() {
-	echo "$@"
-	"$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	export XDG_CACHE_HOME=${T}/cache #667182
-	tc-export CC LD
-
-	_run ./build.sh
-
-	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
-	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
-	# build nimble and friends
-	# --stable to avoid pulling HEAD nimble
-	PATH="./bin:$PATH" _run ./koch --stable tools
-
-	if use doc; then
-		PATH="./bin:$PATH" _run ./koch doc
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED%/}"
-	rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
-	exeinto /usr/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		[[ ${bin_exe} == bin/nim ]] && continue
-		doexe "${bin_exe}"
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/html/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-1.0.2.ebuild b/dev-lang/nim/nim-1.0.2.ebuild
index bb41a8721feb..160171c5b095 100644
--- a/dev-lang/nim/nim-1.0.2.ebuild
+++ b/dev-lang/nim/nim-1.0.2.ebuild
@@ -60,8 +60,8 @@ src_test() {
 }
 
 src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED%/}"
-	rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
+	PATH="./bin:$PATH" _run ./koch install "${ED}"
+	rm -r "${ED}/usr/share/nim/doc" || die "failed to remove 'doc'"
 
 	exeinto /usr/bin
 
@@ -73,10 +73,6 @@ src_install() {
 		doexe "${bin_exe}"
 	done
 
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/html/*.html
-	fi
-
+	use doc && dodoc doc/html/*.html
 	newbashcomp tools/nim.bash-completion ${PN}
 }