[gentoo-commits] repo/gentoo:master commit in: dev-util/clion/

[Michał Górny]

commit:     e3244a5dd7ae2c0c10a9ccf24da3af6211bef648
Author:     Christian Strahl <c.a.strahl <AT> gmail <DOT> com>
AuthorDate: Sun Apr 23 22:29:43 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 14:04:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3244a5d

dev-util/clion: Version bump to 2017.1.1

Closes: https://github.com/gentoo/gentoo/pull/4483
Package-Manager: Portage-2.3.3

 dev-util/clion/Manifest                            |  2 +-
 ...lion-2017.1-r1.ebuild => clion-2017.1.1.ebuild} |  6 +-
 dev-util/clion/clion-2017.1.ebuild                 | 72 ----------------------
 3 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index e09a576d29a..d847bffddc4 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
 DIST clion-143.1186.tar.gz 220702330 SHA256 a2d6960afbfae77f59481c5ad30bc7c5afe9451bdf9d12cd9435f605b57b522b SHA512 d4ea1bad5f3da3bab569380114011798c29e633009867c8020363c9af72326ebaa3232dff9c931a67dd0a0195bf4903647e250963c7aeebe9ad83340c988cbad WHIRLPOOL 2a0855b6a32a5e23a1c7266d7a3dc00ad3ba905c5a8fa6d1e9959d6d4f67c73d35c94bfbe0837fde0d1736bd48dcb9212a219cfa81732cb169abdb1fb5dc4dd7
 DIST clion-2016.2.1.tar.gz 287103613 SHA256 444f760740811d0bb135cdd7d1d3a559b4d3247cdabf4eb9f77a21eea8c74805 SHA512 a4734c1b5d544cb7f6bd4752f5853d3c44e123e8ad8584b76098ef51a00261350d49bdd628d08c171f7c04b77862e8f28b5d8f16813c282542f83a16100c7415 WHIRLPOOL 83737f1677fff6870fd4dd717d54126f6680ec7c4966bc4b89f300e1fd327a431a13ceb6b04a52287c89813a7bb0e86ebaddf5c98f0330d595314c465d4a9534
-DIST clion-2017.1.tar.gz 294380925 SHA256 00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5 SHA512 7a52247a6dbf60c64c53dc5c20340ccf789415a941b6306388d849d83ce9e1712255db153cfff5134308e4d7bd862c1d0108fdfe1c5620699b7bffbb1a814cc1 WHIRLPOOL 641d956e12434b198a532ce75eefe3f8edf7c98100aaf99d8e5550becbfdfe6ffa93ae70e88bc14c2f50dd7da8db45132e2092ef7eb429f631189af04c48d536
+DIST clion-2017.1.1.tar.gz 294574159 SHA256 9abd6bd38801ae6cf29db2cd133c700e8da11841093de872312fe33ed51309ae SHA512 a8304dd101a4d069209870086fee13b91ea57667509e3267744670e13c1c1a7e7bf296c93f24a1cffe44d6d02c87524236a17e2c40aa22d3fc8c46e462fbbc35 WHIRLPOOL f262a5998b4be35333c636f746c6facd181f84d4c360198a94b53e89cabf559714ddcf2397c6d11bc655f1b22b433933e483063832cc1f4d8c0b45b66dccf0d8

diff --git a/dev-util/clion/clion-2017.1-r1.ebuild b/dev-util/clion/clion-2017.1.1.ebuild
similarity index 96%
rename from dev-util/clion/clion-2017.1-r1.ebuild
rename to dev-util/clion/clion-2017.1.1.ebuild
index 476a15ca93e..27dd8130724 100644
--- a/dev-util/clion/clion-2017.1-r1.ebuild
+++ b/dev-util/clion/clion-2017.1.1.ebuild
@@ -31,9 +31,9 @@ src_prepare() {
 
 	local remove_me=(
 		bin/gdb
-	    bin/cmake
-	    license/GDB*
-	    license/CMake*
+		bin/cmake
+		license/GDB*
+		license/CMake*
 		plugins/tfsIntegration/lib/native/hpux
 		plugins/tfsIntegration/lib/native/solaris
 	)

diff --git a/dev-util/clion/clion-2017.1.ebuild b/dev-util/clion/clion-2017.1.ebuild
deleted file mode 100644
index 681b703af64..00000000000
--- a/dev-util/clion/clion-2017.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-IUSE=""
-
-RDEPEND="
-	${DEPEND}
-	sys-devel/gdb
-	dev-util/cmake"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use amd64; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
-	fi
-	if ! use ppc; then
-		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
-	fi
-	if ! use x86; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
-	fi
-
-	local REMOVE_ME=(
-		bin/gdb
-	    bin/cmake
-	    license/GDB*
-	    license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
-	)
-
-	rm -r "${REMOVE_ME[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}