gentoo resync : 31.03.2018

4 files changed, 62 insertions, 141 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index e88fd4b91d30..044314cdf4b9 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,5 @@
-DIST clion-143.1186.tar.gz 220702330 BLAKE2B 05799e66aff500adbb66f553f6fc00c58d1ea5e352b0f3d2e50897fbaa48c0977438027ec6282133502c0ce29d2392c49b2c000eae35407d8c3947b7e2d5ebe7 SHA512 d4ea1bad5f3da3bab569380114011798c29e633009867c8020363c9af72326ebaa3232dff9c931a67dd0a0195bf4903647e250963c7aeebe9ad83340c988cbad
-DIST clion-2016.2.1.tar.gz 287103613 BLAKE2B a3b31d5a5de5a9640cc7298ee6431030ed3e5954455a34845ee525b0edd73a265d0ac38df50094564f68f9f7c17883571c61c2e5dadcdfe504f7320492d7380c SHA512 a4734c1b5d544cb7f6bd4752f5853d3c44e123e8ad8584b76098ef51a00261350d49bdd628d08c171f7c04b77862e8f28b5d8f16813c282542f83a16100c7415
 DIST clion-2017.3.4.tar.gz 331195446 BLAKE2B 5d868de5b1d97a80dd2d63977dfda8d3ab56840c95e4cdba5b8e55cf626dbd68e1015fd8dae664dbdf8161853a96a492ce43a78e0e6bd13138144d28e1146f78 SHA512 044e713e2ab3724b891b48a1d75936dce1580be0fded174101f768f6976f76f2557768128fd596cc8855c15f27dbd9a1e9d4299b947ad00ca458c537d81fd0b8
-EBUILD clion-1.2.4.143.1186.ebuild 1777 BLAKE2B 5343a168bac0f2e2b84c6eff58711debab6a6e0ee1f6f8f3eab9d60694a4090d33200a496c54c4de0c31a44dd66fb7ceede10f6018b8c4f11ca2c1f6cf4117f2 SHA512 60327f78d5189ca3bbfd892d3d5c760d563ca4026acd1fc38bcd0d21dfee2bea8a22b2bebf91c2529a8bd100e05b218d2409e2a19b1b50c411ba2f4d18d7ad72
-EBUILD clion-2016.2.1.ebuild 1775 BLAKE2B 301d7f82b5d8275d205553b51076eb6d06906e51e50f0b6a0cf21c9dec2be61954b63a87e007ffcd8c44fb5072bfb2afecef21c17c9feaa083cc88dfb65a3dda SHA512 8370b3ca5696952e2d25da79e0b9715ab901d5eedeb93753d343582108f33a76535fb7187c2f3d291b04578a201c0b912e667132a48bf3bdf32f4f586151d37e
+DIST clion-2018.1.tar.gz 333789580 BLAKE2B 026ebe63049f3b80c2924079092707379d07fa838b532b7e191ee5fbc66dfa50dbc97ad78cbafd6794f99bc29ce66f4d54882d0bbc1339e08a2f35bd5f195bc5 SHA512 ac95b5d346f077ab26882ff4c0f71420c6fcd0a929aa33c60b427d0a10839bec3a2e5363d8cd18d9e2d6988da17dd0deacd9fd3b3c5f0619c9925acf263f56bd
 EBUILD clion-2017.3.4.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
+EBUILD clion-2018.1.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
 MISC metadata.xml 470 BLAKE2B 839c416b941a14b2025a68ad5bf7cb1ea2d1be8b5f7cff2cd87cb5eff6ef73d37a462b868ee56ec70d9270d9ed15fc01533fb3a217fd1273de9b839c6dc8af82 SHA512 9aa5a4724a19a45cbd03c4d71005265509546d8e3134dbf634ed19ae4d7d3d56f2cf17edd9d7e3d2882e57c2f07a1229f0b76af11f2c95a3cfd56dd0db3b6757
diff --git a/dev-util/clion/clion-1.2.4.143.1186.ebuild b/dev-util/clion/clion-1.2.4.143.1186.ebuild
deleted file mode 100644
index 220bd4a563d8..000000000000
--- a/dev-util/clion/clion-1.2.4.143.1186.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 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)"
-
-KEYWORDS="~amd64 ~x86"
-SRC_URI="http://download.jetbrains.com/cpp/${PN}-${MY_PV}.tar.gz -> ${PN}-${PV_STRING}.tar.gz"
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-
-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
-
-	rm -r bin/cmake || die
-	rm license/CMake* || die
-	rm -r bin/gdb || die
-	rm license/GDB* || die
-
-	rm -r plugins/tfsIntegration/lib/native/solaris || die
-	rm -r plugins/tfsIntegration/lib/native/hpux || 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
-}
diff --git a/dev-util/clion/clion-2016.2.1.ebuild b/dev-util/clion/clion-2016.2.1.ebuild
deleted file mode 100644
index 98f5b2ec620c..000000000000
--- a/dev-util/clion/clion-2016.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 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
-}
diff --git a/dev-util/clion/clion-2018.1.ebuild b/dev-util/clion/clion-2018.1.ebuild
new file mode 100644
index 000000000000..376319ea602b
--- /dev/null
+++ b/dev-util/clion/clion-2018.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="http://www.jetbrains.com/clion"
+SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	sys-devel/gdb
+	dev-util/cmake"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/gdb/bin
+		bin/gdb/lib
+		bin/gdb/share
+		bin/cmake
+		license/CMake*
+		plugins/tfsIntegration/lib/native/hpux
+		plugins/tfsIntegration/lib/native/solaris
+	)
+
+	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
+	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
+	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
+	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
+
+	rm -rv "${remove_me[@]}" || die
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	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
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}