commit:     75ae1fca0c2babcef8b0a3265ef33e7ff672a6bb
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed Mar 30 00:03:59 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 09:09:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae1fca

dev-util/idea-ultimate: version bump, 14.1.6b, 15.0.5, 2016.1.0, 2016.1.1_pre

- converted to new versioning scheme (2016.1 instead of 16.1.0)
- switched to manually erasing the bundled jre
- cleaned other old ebuilds
- reverted to "traditional" keywording

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1164

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-util/idea-ultimate/Manifest                    | 12 ++---
 .../idea-ultimate-14.1.5.141.2735.5.ebuild         | 55 ----------------------
 .../idea-ultimate-14.1.5.141.3056.5.ebuild         | 55 ----------------------
 ...uild => idea-ultimate-14.1.6.141.3057.6.ebuild} | 28 ++++-------
 ...uild => idea-ultimate-15.0.5.143.2332.3.ebuild} | 15 +++---
 ...ld => idea-ultimate-2016.1.0.145.258.11.ebuild} | 17 ++++---
 ...=> idea-ultimate-2016.1.1.145.597.3_pre.ebuild} | 15 +++---
 dev-util/idea-ultimate/metadata.xml                | 30 ++++++------
 8 files changed, 55 insertions(+), 172 deletions(-)

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 0690d60..2798fa5 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,8 +1,4 @@
-DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 
6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 
7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0
 WHIRLPOOL 
44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
-DIST idea-ultimate-14.1.5.141.3056.5.tar.gz 318054935 SHA256 
6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 
7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0
 WHIRLPOOL 
44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
-DIST ideaIU-143.1821.5.tar.gz 392844742 SHA256 
90c2a880c03bc1213c41be05e56d50a5104175e2589e492ba140987b94d8680b SHA512 
0841c3ea509500949358f826405d5c62d84f51657ce4ad621d3b33100a1966d8d85b793286cd4b85c6d2d6d0ca99c4b6a2f84cf5d596538cf530abf73fe8be21
 WHIRLPOOL 
d59367e7671121619d0f787f585a4be436027e4ff39f10849566e441b407295166131cda8af506a7ecf5c34c21231bedd1419c4ee1e2657a38fa3b70a6b424dc
-DIST ideaIU-143.2287.1.tar.gz 395915812 SHA256 
c4365098055f492483204742626b77d6005f559bba2bb46ec161aa9ce7f12610 SHA512 
ccf1191b1b94c8374f7abd3014970f6c85c0284e6bec43b0aafaa06bdb2c0e384c6681436d5b67714429fe9af9e2724123a39e674703055bd715608a91900327
 WHIRLPOOL 
7b9a7af5a380f5e6166e811f27750ea00b88e475f9e3a89421688e7cf0cf9c50dd63a66a70bf70d935aeadb66abca6308eb4da3fc287ed7aabfd9b325b6b4bad
-DIST ideaIU-144.3143.6-custom-jdk-linux.tar.gz 444026233 SHA256 
7d43fef31ec373fa700c1bcf6408429abf5549314f134e458335f52feb44772b SHA512 
86ef4f9d89184acfcbaee8fbce67be8e226ab363df9892f803bb61fe61c50972bcf1ec260c9a9652998fc3f73cc72311950df3ae23bf01ae4a45336b7830ca01
 WHIRLPOOL 
9dee3db866fa55f2ddd3fa28120def4455ff4e7bc0a3a86289c6cb46f7a8a48c5fa0c6e9f35753b52cf66848831c3de2540d41673239130529c8848dba914aa6
-DIST ideaIU-144.3143.6-no-jdk.tar.gz 399209252 SHA256 
c11de6c199c90873976958c4e319176647fb4458370a041b8611007277a057d3 SHA512 
6c4b8224901be58b0d41ca59dc6d8215510617470ed15b25c9d84074d4f660e335d6bb450062e353df3bb217a4892eb8783fc9086d2f4e4addada5aa7c5c7e85
 WHIRLPOOL 
2ea6bfc95c47fb20008c6503a2158a5a6d677e072cb9db41fba198d4dfda0df57db784b3289ecccd64849d1dc59fdb0f3b35aa3490323a7f40df383547cf940f
-DIST ideaIU-145.184.1-no-jdk.tar.gz 404208089 SHA256 
95c9e116e090050676641dab9c00bfb3e04c690ea05346c4a1fdfeb15c773315 SHA512 
32702e36f6a4b8ade2cf944dbcaf3da5031fc29c61c65a82361ad582d05ed735dbd1d1b8861e85d9ae27e758cb2e7747be0103719d0a8cf59cacaa74e12cba07
 WHIRLPOOL 
2097058d595e191bb52365a0094f2d43af1fd06c97724265d7bf0e334cb07b9de3005d269bc290d3b54aac9327f82a3d0e487371e1001c642e574ebbf2d996f3
-DIST ideaIU-145.184.1.tar.gz 449217363 SHA256 
a434ef20468f5349dc8ebb6e21cd8710bb61014c2398df6c2636d040c5bd94bf SHA512 
750b57c07b308466e9a05713e765e51b00f60213b88578c34dcec6786350a3100893fc23ca7c50b29cc90cf245ea23a5184b7371e09e63bb1f03cdf5ea5506c8
 WHIRLPOOL 
b60ab29d8a792b7c53802e3af56b884f74976caab4f83e0cf887024d729a3087b8c7f653d98a04375066bf07b9bccf4122e60a4bcd856e66512eb94f6b7b4aac
+DIST ideaIU-141.3057.6.tar.gz 327591445 SHA256 
4ffdd7e5e78526222d1a9164e8e66912e6126f32e395016e843b6fdc433203b3 SHA512 
2e8058d5f799199114bee88fec56beca97ae444f0b5447c2019da9b4030be14252a9fabb072fb6a7145d661502c9a6965690b7d4c3b3a13c7bee62f66796790d
 WHIRLPOOL 
3f6e8e3bd565ff4444cfd1b1b2c2114da7ca9dbc931a8d886928f03a62e28128ea9aa9976f4df3a9993d15f67ce299af78dac158c2ab752e3b889b4daf88cdf1
+DIST ideaIU-143.2332.3.tar.gz 396603145 SHA256 
22dbf3e541634050ce9a73159889998efff30674ce0c019ac2e05eb72a2b6cc3 SHA512 
9297c9facdf504ef922264a9ece826641880d9cc8464ba40a32e3d8549fabb11c2e03680d4215d6ef9d5e2f80d03b9a43be557604d9008986359e2b0cc28356b
 WHIRLPOOL 
429c6d92c88b8c9bd5b836027cc325d512f572839f2efea063387d027fa8335ba3865b6de19fb29b44c3fcb50635ecdfe3828721a4714cc5143604b0b6d13b1c
+DIST ideaIU-145.258.11.tar.gz 449590439 SHA256 
eb0fef2d110d99ccff34883e3b0ebd32a4c6503af3af13711c9187307cc3cb97 SHA512 
73c27b09ce1c7567241a0c55a8788a939668bd9c2f495901c3e99cce12d60636784bd26a478747650b5bb14494cd1a58dd3cf1ca9cb839c8b191208ed7592c16
 WHIRLPOOL 
dd85f425d3c34d8225153aa3c3535aa2d455e09cf0f84a9825abf9b7d722fcb1d61700e4ce916144893873a9f7cce70f8842665ef2ebc0bf89dd3b04a1f6f643
+DIST ideaIU-145.597.3.tar.gz 450241312 SHA256 
d5a7d2d657fe2ad170716054c6ccd164e509cf50ee6eee8b61fe3490071940df SHA512 
3fb9cdea46977c737d2d64b34b2fd1f9f68c06592fd0c59c1651f3aa78d057f7e0b554fd1ff5a7a1d05a439359780147f1d28bed7257ad05e98d312737cad61e
 WHIRLPOOL 
7040a10577325b6e672a50404bf95f30c9c5225a734f3bfd88e6e1dcbcec9c69ac8917b286c0e355c606546ff6e9a07b87aebbe9ecd6612683eb5ec93420d7f0

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
deleted file mode 100644
index dd67f15..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.2735.5.ebuild
+++ /dev/null
@@ -1,55 +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-${MY_PV}.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_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-14.1.5.141.3056.5.ebuild 
b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild
deleted file mode 100644
index f98f0e5..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 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_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.3.143.1821.5.ebuild 
b/dev-util/idea-ultimate/idea-ultimate-14.1.6.141.3057.6.ebuild
similarity index 61%
rename from dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1821.5.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-14.1.6.141.3057.6.ebuild
index 771e6e9..acba4e3 100644
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.3.143.1821.5.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-14.1.6.141.3057.6.ebuild
@@ -14,17 +14,15 @@ MY_PN="idea"
 if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
        # upstream EAP
-       KEYWORDS="~amd64 ~x86"
-       SRC_URI="custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz
 )
-                       !custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )"
+       KEYWORDS=""
 else
        # upstream stable
-       KEYWORDS="amd64 x86"
-       SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz 
-> ${MY_PN}IU-${PV_STRING}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea";
+HOMEPAGE="https://www.jetbrains.com/idea";
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}b.tar.gz -> 
${MY_PN}IU-${PV_STRING}.tar.gz"
 
 LICENSE="IDEA
        || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
@@ -39,21 +37,11 @@ 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
+       if ! use custom-jdk; then
+               if [[ -d jre ]]; then
+                       rm -r jre || die
+               fi
        fi
-       rm -r plugins/tfsIntegration/lib/native/solaris || die
-       rm -r plugins/tfsIntegration/lib/native/hpux || die
 }
 
 src_install() {

diff --git a/dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild 
b/dev-util/idea-ultimate/idea-ultimate-15.0.5.143.2332.3.ebuild
similarity index 85%
rename from dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-15.0.5.143.2332.3.ebuild
index b5f96c7..af33d79 100644
--- a/dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-15.0.5.143.2332.3.ebuild
@@ -14,17 +14,15 @@ MY_PN="idea"
 if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
        # upstream EAP
-       KEYWORDS="~amd64 ~x86"
-       SRC_URI="custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
-                       !custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )"
+       KEYWORDS=""
 else
        # upstream stable
-       KEYWORDS="amd64 x86"
-       SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz 
-> ${MY_PN}IU-${PV_STRING}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea";
+HOMEPAGE="https://www.jetbrains.com/idea";
+SRC_URI="https://download.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 )"
@@ -52,6 +50,11 @@ src_prepare() {
        if ! use x86; then
                rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
        fi
+       if ! use custom-jdk; then
+               if [[ -d jre ]]; then
+                       rm -r jre || die
+               fi
+       fi
        rm -r plugins/tfsIntegration/lib/native/solaris || die
        rm -r plugins/tfsIntegration/lib/native/hpux || die
 }

diff --git a/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild 
b/dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild
similarity index 82%
rename from dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild
index 771e6e9..07eeb4d 100644
--- a/dev-util/idea-ultimate/idea-ultimate-16.0.0.144.3143.6_pre.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.1.0.145.258.11.ebuild
@@ -11,20 +11,18 @@ 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" ]]
+if [[ "$(get_version_component_range 6)x" = "prex" ]]
 then
        # upstream EAP
-       KEYWORDS="~amd64 ~x86"
-       SRC_URI="custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz
 )
-                       !custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )"
+       KEYWORDS=""
 else
        # upstream stable
-       KEYWORDS="amd64 x86"
-       SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz 
-> ${MY_PN}IU-${PV_STRING}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea";
+HOMEPAGE="https://www.jetbrains.com/idea";
+SRC_URI="https://download.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 )"
@@ -52,6 +50,11 @@ src_prepare() {
        if ! use x86; then
                rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
        fi
+       if ! use custom-jdk; then
+               if [[ -d jre ]]; then
+                       rm -r jre || die
+               fi
+       fi
        rm -r plugins/tfsIntegration/lib/native/solaris || die
        rm -r plugins/tfsIntegration/lib/native/hpux || die
 }

diff --git a/dev-util/idea-ultimate/idea-ultimate-15.0.4.143.2287.1.ebuild 
b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild
similarity index 85%
rename from dev-util/idea-ultimate/idea-ultimate-15.0.4.143.2287.1.ebuild
rename to dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild
index 771e6e9..af33d79 100644
--- a/dev-util/idea-ultimate/idea-ultimate-15.0.4.143.2287.1.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2016.1.1.145.597.3_pre.ebuild
@@ -14,17 +14,15 @@ MY_PN="idea"
 if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
        # upstream EAP
-       KEYWORDS="~amd64 ~x86"
-       SRC_URI="custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-custom-jdk-linux.tar.gz
 )
-                       !custom-jdk? ( 
http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )"
+       KEYWORDS=""
 else
        # upstream stable
-       KEYWORDS="amd64 x86"
-       SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz 
-> ${MY_PN}IU-${PV_STRING}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="http://www.jetbrains.com/idea";
+HOMEPAGE="https://www.jetbrains.com/idea";
+SRC_URI="https://download.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 )"
@@ -52,6 +50,11 @@ src_prepare() {
        if ! use x86; then
                rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
        fi
+       if ! use custom-jdk; then
+               if [[ -d jre ]]; then
+                       rm -r jre || die
+               fi
+       fi
        rm -r plugins/tfsIntegration/lib/native/solaris || die
        rm -r plugins/tfsIntegration/lib/native/hpux || die
 }

diff --git a/dev-util/idea-ultimate/metadata.xml 
b/dev-util/idea-ultimate/metadata.xml
index 68d7059..5dfe302 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/metadata.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Gert Pellin</name>
-               <description>Proxy maintainer. Assign bugs to him.</description>
-       </maintainer>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <description>Proxied co-maintainer</description>
-       </maintainer>           
+       <email>[email protected]</email>
+       <name>Gert Pellin</name>
+       <description>Proxy maintainer. Assign bugs to him.</description>
+</maintainer>
+<maintainer type="person">
+       <email>[email protected]</email>
+       <description>Proxied co-maintainer</description>
+</maintainer>          
 <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>           
+       <email>[email protected]</email>
+       <name>Proxy Maintainers</name>
+</maintainer>          
 <longdescription lang="en">
-Excel at enterprise, mobile and web development with Java, Scala and Groovy, 
with all the latest modern technologies and frameworks available out of the box.
+       Excel at enterprise, mobile and web development with Java, Scala and 
Groovy, with all the latest modern technologies and frameworks available out of 
the box.
 </longdescription>
-       <use>
-               <flag name="custom-jdk">Install and use IntelliJ's custom 
JRE.</flag>
-       </use>
+<use>
+       <flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
+</use>
 </pkgmetadata>

Reply via email to