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

5 files changed, 89 insertions, 85 deletions

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 2d525f6d48fd..f2ffc4d4a259 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,3 +1,4 @@
 DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
-DIST ideaIU-143.1183.10.tar.gz 390461334 SHA256 64b9435e79f0a6e2e08214e1c55617630a5cf2265b5904eeeacee880b55eafa0 SHA512 0aafce6461d93a158bd69360461630292f758818eaec46ab24644b0ae03e11511553ce157c0ee456c64ae1efdecdd7a535d61312d57a9cb8b98027e2b139e56f WHIRLPOOL e223ab18338d199d5e6c2847a0814695266e213704f4b1552c7864f1820801ec4bbce7f78099d98fc045f683994687cc0ba7358b142587c715f344e4543ad61c
+DIST ideaIU-143.1184.17.tar.gz 390459277 SHA256 5a3f6d8ba6d5ce8c505f13564c04cf2f674f1c022b9a33871013acb0ebe10fe5 SHA512 bc42244554ed0e533c95b65b1518ffb20ad1407fab22afff0ff3711245d15d97456599bebfcf654553b91a24dcf9042ac769041be3bfc14af76fa48b70f29d94 WHIRLPOOL 48ba83f0254e027a8f78d070dd55a63d97225ae763107149db8820d22ceb4dc72d080704bb6ea2ccf0673af77ec9cda9fa13b226c0c885f7336f2e7d50b52ae2
+DIST ideaIU-143.1453.5.tar.gz 391976664 SHA256 44cec195e78e65e79c8b609a6cb3ada75ef632fe3a73b8d0ad40610a5e95dfbf SHA512 77e229f08b840ee0b572f5d8036d508ea609f0355a84c64e2bca4dcb8bbe9a2262a1ed46cdd966e9cfd7c8a24a48a3ba3578e229860b27e34a82af57712811a6 WHIRLPOOL 90cc48a9a6bbef67a1c607e73f80aacb70a1f290acfa684775da44eb50e6ec9d6dfed1cf55ce76762afe96e5046cc9cb74d392ce6f3eb644944a2b9e06d14917
 DIST ideaIU-143.382.35.tar.gz 379524583 SHA256 1f4c6f55eeb0ce08f697008935c5b7356e74a85dfaad00f6521670b8f5c6862f SHA512 cd3fe075be726695144a70b8f6477a7d547ca6c67bfacdf91d64f352066305d18ad0696608ac54d316adb95b3ae7d4d1218d34b28875a084de35dc03da77b91f WHIRLPOOL 99ba3fb796f40bd8cf22c42302fec7e279dc749b681952066d49f6a079ca06e532cc10274bc19a6b12a81cb6f15ebcde8450f774109a6d21a9a8c9b9ea235710
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35.ebuild
deleted file mode 100644
index 1d30c4a74cf5..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.1.143.382.35.ebuild
+++ /dev/null
@@ -1,81 +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)"
-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-${MY_PV}.tar.gz -> ${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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1183.10_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1184.17.ebuild
index 1ad13a04d1f2..ef380e48bb22 100644
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1183.10_pre.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.2.143.1184.17.ebuild
@@ -10,14 +10,25 @@ PV_STRING="$(get_version_component_range 4-6)"
 MY_PV="$(get_version_component_range 1-3)"
 MY_PN="idea"
 
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~amd64 ~x86"
+	MY_FILENAME="${MY_PN}IU-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="amd64 x86"
+	MY_FILENAME="${MY_PN}IU-${MY_PV}.tar.gz"
+fi
+
 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"
+SRC_URI="http://download-cf.jetbrains.com/idea/${MY_FILENAME} -> ${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"
diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1453.5_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1453.5_pre.ebuild
new file mode 100644
index 000000000000..ef380e48bb22
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1453.5_pre.ebuild
@@ -0,0 +1,73 @@
+# 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"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~amd64 ~x86"
+	MY_FILENAME="${MY_PN}IU-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="amd64 x86"
+	MY_FILENAME="${MY_PN}IU-${MY_PV}.tar.gz"
+fi
+
+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_FILENAME} -> ${MY_PN}IU-${PV_STRING}.tar.gz"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE=""
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+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 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"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${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/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
index aebf828921d9..78f55507260f 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/metadata.xml
@@ -8,7 +8,7 @@
 		<description>Proxy maintainer. Assign bugs to him.</description>
 	</maintainer>
 	<maintainer>
-        	<email>tomboy64@sina.cn</email>
+		<email>tomboy64@sina.cn</email>
 		<description>Proxied co-maintainer</description>
 	</maintainer>		
 <longdescription lang="en">