Merge remote-tracking branch 'remotes/github/pr/118'.

5 files changed, 147 insertions, 64 deletions

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 2c0c1101e9fb..67929acf3635 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,2 +1,2 @@
-DIST ideaIU-14.1.4.tar.gz 311885918 SHA256 5c6dfb5ba9f2c3294ee125e96e96e50287a460784287181a8e83e4326005bac3 SHA512 a8d86a3d2a32ba956158d798bff30408d8574a070ee5da313ce08738bddff84f9e703bcf5dd5a3b38212dfdd85625e5bb508800822795d8d77dde24f1fa8f952 WHIRLPOOL e9622a2523983acf27200528056560dcc7c9fee1df1bd26b8129d1576dc77c96d0cd8bdde7e73c0964bc6ed23433efc962534f512a54eea024632f9cb0d3467f
-DIST ideaIU-142.3926.4.tar.gz 354968506 SHA256 c66bf272faa0039145e80efdd59934e3425a5f0bc25726ed5681433dc55e101c SHA512 8228dbde5b00350d5b21880681d19750b5cbd57c842a6a5bcd7ab06d0c97dddfcab8a02e0639a4c9208f8e4ee73bd20fb17918c3c66c68c042b8d62e1b442815 WHIRLPOOL 1d3e449f2ade558b92525c4ba44678d553f15a9d9688c4ce899d7b2497c98280471a85c35efcbb929d4ae0b73d2bc1e3fbebbdf72d35f7d15b310b53d8f364a7
+DIST ideaIU-14.1.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
+DIST ideaIU-142.5047.6.tar.gz 382135319 SHA256 ef69f6892a45129eb1b4daa901f4b3efaf80633056453bbccce5dfa7b362685f SHA512 1984bfb9c1b67ee995b45609b4ebd85a56ad92f9c78cc0a1f2d833704f7f00bf3a814785751f8c2c9e04c77a4feb90352d536d60d47477b5c2c396ec918df546 WHIRLPOOL 25e21c39d9fbea194f941d047142361a4c52f4f3182062d9d95a2289dade27b9056d36a2d64a891e058cc1a190924c7dc209b72e22f89e851186c869d4be364d
diff --git a/dev-util/idea-ultimate/idea-ultimate-14.1.4.141.1532.4.ebuild b/dev-util/idea-ultimate/idea-ultimate-14.1.4.141.1532.4.ebuild
deleted file mode 100644
index 83fae9f7516b..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-14.1.4.141.1532.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-6)"
-MY_PN="idea"
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S=${WORKDIR}/${MY_PN}-IU-${MY_PV}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 ${dir}/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
new file mode 100644
index 000000000000..cbd9429b669f
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
+
+LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
+QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
+	opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/"
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
+}
+
+pkg_postinst() {
+	if [[ "$(get_version_component_range 7)x" = "prex" ]]
+	then
+		ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
+		ewarn "quality of such releases may be considerably below of what you might usually"
+		ewarn "be used to from beta releases."
+		ewarn "Don't use it for critical tasks. You have been warned."
+	fi
+}
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.3926.4_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.3926.4_pre.ebuild
deleted file mode 100644
index a2eca2293295..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.3926.4_pre.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-6)"
-MY_PN="idea"
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea"
-SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
-
-LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S=${WORKDIR}/${MY_PN}-IU-${MY_PV}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 ${dir}/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild
new file mode 100644
index 000000000000..f4a3b2eeb5ff
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5047.6_pre.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
+
+LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
+QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
+	opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
+	opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
+QA_WX_LOAD="
+	opt/${PN}-${MY_PV}/bin/fsnotifier-arm
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_auth.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_console.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_filesystem.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_misc.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/linux/ppc/libnative_synchronization.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_auth.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_console.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_filesystem.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_misc.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/sparc/libnative_synchronization.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_auth.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_console.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_filesystem.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_misc.so
+	opt/${PN}-${MY_PV}/plugins/tfsIntegration/lib/native/solaris/x86/libnative_synchronization.so"
+
+src_prepare() {
+	if ! use amd64; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/x86_64
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm
+		rm -rf plugins/tfsIntegration/lib/native/linux/arm
+	fi
+	if ! use ppc; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/ppc
+	fi
+	if ! use x86; then
+		rm -rf plugins/tfsIntegration/lib/native/linux/x86
+	fi
+	rm -rf plugins/tfsIntegration/lib/native/solaris
+	rm -rf plugins/tfsIntegration/lib/native/hpux
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/"
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
+}
+
+pkg_postinst() {
+	if [[ "$(get_version_component_range 7)x" = "prex" ]]
+	then
+		ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
+		ewarn "quality of such releases may be considerably below of what you might usually"
+		ewarn "be used to from beta releases."
+		ewarn "Don't use it for critical tasks. You have been warned."
+	fi
+}