Merge remote-tracking branch 'github/pr/396'.

4 files changed, 98 insertions, 99 deletions

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index daf68bd1de19..8e18d74fde8f 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,3 +1,3 @@
 DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
-DIST idea-ultimate-15.0.0.142.5239.7_pre.tar.gz 383822428 SHA256 6f3d963e05e241c04d7bf71530dd71b45f398a5fb906545b4d8a5c432beca59a SHA512 ef7788329b486c569cdf11ba4a9531463272e19b69f460f24d12c522cd7dd8bcd3465dc21a3ead70077adbb2af4e4adbdbf8ecedbe630c945c93667da2b5bb0e WHIRLPOOL 3b81c379a8ab5d5610794af0295eecb110c9933833522eea5befeda5977b5001956da421c2383780434b6edfbb19fbd7cf95ff89ae86f83c7fe8df707b4ae481
-DIST idea-ultimate-15.0.0.143.116.4_pre.tar.gz 384442119 SHA256 d26cba9242b70f68eb8b9f76320e3e23a0573207bf89a93718a9c688426b518b SHA512 02b93c372ad1b35b74d59fba04984c0fb99399f670662c4fdac07e793b3e872830e1b0d56b505753343dd00483a14f551314e92c6bfb0e2d5ad0f5ef295fe8b9 WHIRLPOOL c8d3b3900694721e3bc90950739a713881c2f11f5d0f0dc22158510afc8b7a61eb28e91944b6ec1d9f516a1b95faf1788adb8f576171c571223e51a205dbb794
+DIST ideaIU-143.382.35.tar.gz 379524583 SHA256 1f4c6f55eeb0ce08f697008935c5b7356e74a85dfaad00f6521670b8f5c6862f SHA512 cd3fe075be726695144a70b8f6477a7d547ca6c67bfacdf91d64f352066305d18ad0696608ac54d316adb95b3ae7d4d1218d34b28875a084de35dc03da77b91f WHIRLPOOL 99ba3fb796f40bd8cf22c42302fec7e279dc749b681952066d49f6a079ca06e532cc10274bc19a6b12a81cb6f15ebcde8450f774109a6d21a9a8c9b9ea235710
+DIST ideaIU-143.870.1.tar.gz 390127689 SHA256 2055f6f43c98836c44023372d4dade1a2e4085b5c807298f13bdf4c50690b7cc SHA512 c3dc326021ab86ce09b05e207f399f5b1738e0ae41c94d64261f42ddbcbf5b43290b50ed02c5aa36df6bc982f9a890f9a8c67a285c712e9b911f1db5053fc860 WHIRLPOOL 4a23e74f4913279e8d01698d31a6b1c44cbb85f685af5966dc03fd409b2ddcaf8c300243480238cb412ec92740d249eab3b57568d3e8c093251eb7bf4bfe5447
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild
deleted file mode 100644
index bed2a52192f3..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.0.143.116.4_pre.ebuild
+++ /dev/null
@@ -1,73 +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="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 -> ${P}.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_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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5239.7_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35.ebuild
index 47ecfb451222..1d30c4a74cf5 100644
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.0.142.5239.7_pre.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35.ebuild
@@ -6,22 +6,23 @@ EAPI=5
 inherit eutils versionator
 
 SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+PV_STRING="$(get_version_component_range 4-6)"
 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-15-PublicPreview.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
 
-LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
 IUSE=""
-KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+KEYWORDS="amd64 x86"
 
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
 RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.7:*"
 S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
 
 QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
@@ -49,20 +50,20 @@ QA_WX_LOAD="
 
 src_prepare() {
 	if ! use amd64; then
-		rm -rf plugins/tfsIntegration/lib/native/linux/x86_64
+		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
 	fi
 	if ! use arm; then
-		rm bin/fsnotifier-arm
-		rm -rf plugins/tfsIntegration/lib/native/linux/arm
+		rm bin/fsnotifier-arm || die
+		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
 	fi
 	if ! use ppc; then
-		rm -rf plugins/tfsIntegration/lib/native/linux/ppc
+		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
 	fi
 	if ! use x86; then
-		rm -rf plugins/tfsIntegration/lib/native/linux/x86
+		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
 	fi
-	rm -rf plugins/tfsIntegration/lib/native/solaris
-	rm -rf plugins/tfsIntegration/lib/native/hpux
+	rm -r plugins/tfsIntegration/lib/native/solaris || die
+	rm -r plugins/tfsIntegration/lib/native/hpux || die
 }
 
 src_install() {
@@ -75,16 +76,6 @@ src_install() {
 	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
+	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/idea-ultimate/idea-ultimate-15.0.2.143.870.1_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.870.1_pre.ebuild
new file mode 100644
index 000000000000..dc8152b7eda0
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.870.1_pre.ebuild
@@ -0,0 +1,81 @@
+# 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)"
+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="http://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+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 -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 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/{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/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}