unified idea ebuild

15 files changed, 158 insertions, 488 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index c954f8f..3158302 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,11 +1,4 @@
-AUX idea-run.patch 858 SHA256 c548bf48b900b8603b32e49dc6434d581736bef901eca0300d5cbae21f5e0669 SHA512 3ac0243a55f26bc9be5c7c4339a04e1f31d094aa4b8aff1f1160d72524db107eb8e05d47b70d9f30438287be19682c5b01f8477d45ccdc18a9e77d233c8b1a13 WHIRLPOOL 8377f8d9a4a3af4994bf784238260b1839f4ea5c439670650f902532cf7dca9023c18b76aa6d9c2da5204194d110021e4a317094693d1708d0722c1d205aa414
-DIST ideaIC-12.1.6.tar.gz 121863978 SHA256 8113e0c13ce92859c69bb0d2fd055049c8b702c2c237362c151dc8f638d79e33 SHA512 1b6df4127c15385f8ea7d364fc8dc0c9be4e7bf31e2ec561ac2fdf853f40a8ab698dfd7d8a5622da45f7d0d0600a90c1243081b44609a0320ef8bbc66598e4bd WHIRLPOOL dbb97bf934b61a42a3bc382119313172630c1f9b5b7bab52c79d7dbb8add4cad0b9e6cd5794106d5d358d30cdf2b3d8b7a44957506f0c3e14d38002f1eea77dc
 DIST ideaIC-13.0.2.tar.gz 170556590 SHA256 a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53 SHA512 1d58d046143013bcb00ab5a17b9f377831e9ea5937fd618af972f41f772ae69f91dbc2aa4a04d449114822dcd1009b11cfd18c7e40e5d3ace0fca5464e627df6 WHIRLPOOL 5d7dadd1b71dc85333da5598a903f96c9b0a2fc0a7ef42175b2834b5b6eb9c98002c237166b98acc3f4a8f6586151ecf98ef3ff65b79004c1eeafbf1d2888807
-DIST ideaIC-13.tar.gz 164640124 SHA256 5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a SHA512 e0cd779489144777fb452b921d9bce146f6e8e4c317436db0d2dde34fcbd55086094810de938676a4906a43670e27d4fb0dfcb477330fc1f679c17dc50f13242 WHIRLPOOL cb595894cb176b27f23567bf912657eb91c9cbbe5b8d69ecefecb355e281e036518104b4d11d47c8b5b5e0e862a32ec8b845735637ced451e5e1ebeda8a7cfda
-DIST ideaIC-133.818.tar.gz 170556849 SHA256 783aaeac7ec8b39a97836c694425ef113be9126f99548f8add7fc5ffbd9e7466 SHA512 71c0ce011b4e1de9be57d45ebf08ffec4668f8eb45217be1f5051c45965be147350d4e7f7f79eab042287182b458d209185b76295154ad1501fa0f2bb677c6f8 WHIRLPOOL 25142001047acabf8c12f34b288ccd97256f1d8e05c360d194d3d3e0e8ee995a766821f8a94c72a96e185cf25f9c8dd40d57264401c3980e0300667a168be370
 DIST ideaIC-134.1007.tar.gz 164519368 SHA256 8592285f6f52ed90cd608e12992489719c5051718ce198f252bc1ea4a31785a1 SHA512 cd888a6922de11c45be38693b8fa884b804243007aff0e0f849eacad832a10d3ff8b9d5ddfcb59854bdac0b5bc9f8c95a60b5c1adf6268da4c6b3104e8061204 WHIRLPOOL 6b27d764cb63414eab298fb54ff54ed56ff83d07ead0d93702e74147bf61a43c893b6d326f390c228366f87083e1eb6cc388b4c37a7578169a86b4ff0744211f
-EBUILD idea-community-12.1.6.ebuild 1382 SHA256 25bcda66538c24958ae71de2cda7dea9f3ecd63539d0694321d79d13f70b03b3 SHA512 d03c7acd02ab066a0b1ddbf5a5326984586a81f48f9f61cfdbd2ee83f6a36c853fd105b5645d5441e63018e12d4271b72ee3799063bf9a5d3ab8602e64ea0d93 WHIRLPOOL 291fc6797c9aece6bf8d082200f0e661785c1356166de65aaa7e7f77359d2da8ee82b62b271e733b2f8e2221cf71c75f79625cc066e27d5ca5e29f02997a9fff
-EBUILD idea-community-13.0.0.ebuild 1522 SHA256 ca94f770e6aaa1539550d8a2b2b52cac296cd1599811e331c92b933175333ec0 SHA512 0286867baea86c7d0b8901190db35cd688a0d297918ce34c43b23332dc728c12ffbc468328fef1c39638b33e2898e7e1101f3a92d6576714d98d20c16f757c08 WHIRLPOOL ee40ea13d99eb2bb891a573d8cb251b7c5878c6e58465d8902141f5656c339fd72b88a0542aea0ac0500c1a3009f1d5b97f71413bcffdf223f24d4d9f275efd7
-EBUILD idea-community-13.0.2.ebuild 1522 SHA256 0923a5024daeabbba6f5829986f16c6396dc224fefdee2ace347fa1664460cf7 SHA512 18ccb208db90e19203c248cf5be3fc85b55dbb2c95a6280b9640d3fd1d3f2a43f39dd32f7fcb0ecd8afd70253f8f8eefc1197d911d1bed2827c0371b659b51de WHIRLPOOL 6a269a0a6c987ff40df52f7b1ce0f6eb9c0c6d9aa633a2408a151e0ca587618b5d898128788f3eb55ce475bf770788ba35189ca3a2ad30c1307f0d51f957db3a
-EBUILD idea-community-13.0.3_pre818.ebuild 1522 SHA256 3a9d67b2f6e08ff0a0e934bcb59570127a50abda8061d6aa8ded92ee6f8d358a SHA512 2335c3eefa2163de81b6132f15faa51e0563170ceaa971d857588367831dfe77eb6b7e1a59d0f9b2b71c8849ed9fb6f961f4c79c66b3440e7e85480d382634b8 WHIRLPOOL 3953ba1d4f942f743ef8a8da898f18b30777ef023b38638b8c61260e24c901fdbecce6d6e12bed97136e63427ecccdb785709bca347af39f9ec7bbc6ec0cf652
-EBUILD idea-community-13.1.0_pre1007.ebuild 1523 SHA256 758b75b7d413f1ae81f2eb0801847b36c9324f0a5bd522c7301d7ebd91823f6f SHA512 4c0fc1fcfde84f73097c0c9ecb176c7bd4cbb2f85b1e7adc0f34918270318575cc41d7ed7549e679d0fa4e39747fe24e7da782411ce9b8ffc297aab53575c379 WHIRLPOOL 8acd52c9bc0d4fc000ff74a2f09457181a32adf5e941000c6d685051c76b8845e9c6bf3cef3ae3edab6e82e006869e2857c51da5027951c8b451eef8bbdc07fc
+EBUILD idea-community-13.0.2.ebuild 1480 SHA256 c7e7205a93449cf92add38ef6979da66c5f97414547d8d36b380daf7247ad206 SHA512 be75592e5006b70a508f956fcf64674f5951bdb80c4161f91d319295f7cc28dd2f9f40a6966de3bcbe1a94d2ad9cca5c59a6a9e497d57fd3954d9b813f4630e3 WHIRLPOOL df64aa3590a17d2d0a9690908d56806203013fec60b4522eb15c0313ef950e95708114072c7221ea7a476cfe1b2b3074b673e11024be824b2b146da5db9e0669
+EBUILD idea-community-13.1.0_alpha134_pre1007.ebuild 1480 SHA256 c7e7205a93449cf92add38ef6979da66c5f97414547d8d36b380daf7247ad206 SHA512 be75592e5006b70a508f956fcf64674f5951bdb80c4161f91d319295f7cc28dd2f9f40a6966de3bcbe1a94d2ad9cca5c59a6a9e497d57fd3954d9b813f4630e3 WHIRLPOOL df64aa3590a17d2d0a9690908d56806203013fec60b4522eb15c0313ef950e95708114072c7221ea7a476cfe1b2b3074b673e11024be824b2b146da5db9e0669
diff --git a/dev-util/idea-community/files/idea-run.patch b/dev-util/idea-community/files/idea-run.patch
deleted file mode 100644
index 8b0343d..0000000
--- a/dev-util/idea-community/files/idea-run.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-*** bin/idea.sh.orig	Thu Dec 15 15:01:44 2011
---- bin/idea.sh	Thu Dec 15 15:00:24 2011
-***************
-*** 5,10 ****
---- 5,28 ----
-  # ------------------------------------------------------
-  #
-  
-+ # ------------------------------------------------------
-+ # set vm options from /etc ode user home
-+ 
-+ if [ -z "$IDEA_VM_OPTIONS" ]
-+ then
-+   if [ -r "$HOME/.idea.vmoptions" ]
-+   then
-+     IDEA_VM_OPTIONS="$HOME/.idea.vmoptions"
-+     export IDEA_VM_OPTIONS
-+   else
-+     if [ -r "/etc/intellij-idea/idea.vmoptions" ]
-+     then
-+       IDEA_VM_OPTIONS="/etc/intellij-idea/idea.vmoptions"
-+       export IDEA_VM_OPTIONS
-+     fi
-+   fi
-+ fi
-+ 
-  # ---------------------------------------------------------------------
-  #   Before you run IntelliJ IDEA specify the location of the
-  #   JDK 1.6 installation directory which will be used for running it.
diff --git a/dev-util/idea-community/idea-community-12.1.6.ebuild b/dev-util/idea-community/idea-community-12.1.6.ebuild
deleted file mode 100644
index 4dea687..0000000
--- a/dev-util/idea-community/idea-community-12.1.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="community"
-MY_PAS="IC"
-MY_BUILD="129.1359"
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-community/idea-community-13.0.0.ebuild b/dev-util/idea-community/idea-community-13.0.0.ebuild
deleted file mode 100644
index f9db06d..0000000
--- a/dev-util/idea-community/idea-community-13.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="community"
-MY_PAS="IC"
-MY_BUILD="133.193"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIC-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-community/idea-community-13.0.2.ebuild b/dev-util/idea-community/idea-community-13.0.2.ebuild
index ef4216c..b04b675 100644
--- a/dev-util/idea-community/idea-community-13.0.2.ebuild
+++ b/dev-util/idea-community/idea-community-13.0.2.ebuild
@@ -8,45 +8,49 @@ inherit eutils versionator
 SLOT="$(get_major_version)"
 RDEPEND=">=virtual/jdk-1.6"
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="community"
-MY_PAS="IC"
-MY_BUILD="133.696"
+PN1=${PN%-*}
+PN2=${PN#*-}
+PNS=${PN1:0:1}${PN2:0:1}
 
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
+MY_ALPHA="$(get_version_component_range 4-4)"
+MY_ALPHA=${MY_ALPHA/alpha/}
+MY_PRE="$(get_version_component_range 5-5)"
+MY_PRE=${MY_PRE/pre/}
 
 RESTRICT="strip"
 QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
 
 DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
 HOMEPAGE="http://jetbrains.com/idea/"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIC-13.tar.gz"
+
+if [ -z $MY_ALPHA  ]; then
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+else
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_ALPHA}.${MY_PRE}.tar.gz"
+fi
+
 LICENSE="IntelliJ-IDEA"
 IUSE=""
 KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
+S="${WORKDIR}/${PN1}-${PNS}-${MY_BUILD}"
 
 src_prepare() {
     epatch "${FILESDIR}"/idea-run.patch
 }
 
 src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
+	local dir="/opt/${PN1}${PNS}${SLOT}"
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
+	fperms 755 "${dir}/bin/${PN1}.sh"
 	fperms 755 "${dir}/bin/fsnotifier"
 	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
+	local exe=${PN1}${PNS}-${SLOT}
 	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
+	newicon "${S}/bin/${PN1}.png" ${icon}
 	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
+	make_wrapper "$exe" "/opt/${PN1}${PNS}${SLOT}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${PN2}" /usr/share/pixmaps/${icon} "Development;IDE"
 	insinto /etc/intellij-idea
 	doins bin/idea.vmoptions || die
 }
diff --git a/dev-util/idea-community/idea-community-13.0.3_pre818.ebuild b/dev-util/idea-community/idea-community-13.0.3_pre818.ebuild
deleted file mode 100644
index ebb6b1b..0000000
--- a/dev-util/idea-community/idea-community-13.0.3_pre818.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="community"
-MY_PAS="IC"
-MY_BUILD="133.818"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIC-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-community/idea-community-13.1.0_alpha134_pre1007.ebuild b/dev-util/idea-community/idea-community-13.1.0_alpha134_pre1007.ebuild
new file mode 100644
index 0000000..b04b675
--- /dev/null
+++ b/dev-util/idea-community/idea-community-13.1.0_alpha134_pre1007.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils versionator
+
+SLOT="$(get_major_version)"
+RDEPEND=">=virtual/jdk-1.6"
+
+PN1=${PN%-*}
+PN2=${PN#*-}
+PNS=${PN1:0:1}${PN2:0:1}
+
+MY_ALPHA="$(get_version_component_range 4-4)"
+MY_ALPHA=${MY_ALPHA/alpha/}
+MY_PRE="$(get_version_component_range 5-5)"
+MY_PRE=${MY_PRE/pre/}
+
+RESTRICT="strip"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+
+DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
+HOMEPAGE="http://jetbrains.com/idea/"
+
+if [ -z $MY_ALPHA  ]; then
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+else
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_ALPHA}.${MY_PRE}.tar.gz"
+fi
+
+LICENSE="IntelliJ-IDEA"
+IUSE=""
+KEYWORDS="~x86 ~amd64"
+S="${WORKDIR}/${PN1}-${PNS}-${MY_BUILD}"
+
+src_prepare() {
+    epatch "${FILESDIR}"/idea-run.patch
+}
+
+src_install() {
+	local dir="/opt/${PN1}${PNS}${SLOT}"
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/${PN1}.sh"
+	fperms 755 "${dir}/bin/fsnotifier"
+	fperms 755 "${dir}/bin/fsnotifier64"
+	local exe=${PN1}${PNS}-${SLOT}
+	local icon=${exe}.png
+	newicon "${S}/bin/${PN1}.png" ${icon}
+	dodir /usr/bin
+	make_wrapper "$exe" "/opt/${PN1}${PNS}${SLOT}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${PN2}" /usr/share/pixmaps/${icon} "Development;IDE"
+	insinto /etc/intellij-idea
+	doins bin/idea.vmoptions || die
+}
diff --git a/dev-util/idea-community/idea-community-13.1.0_pre1007.ebuild b/dev-util/idea-community/idea-community-13.1.0_pre1007.ebuild
deleted file mode 100644
index 2e9b066..0000000
--- a/dev-util/idea-community/idea-community-13.1.0_pre1007.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="community"
-MY_PAS="IC"
-MY_BUILD="134.1007"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIC-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index bb8c204..b7c78a0 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,11 +1,5 @@
 AUX idea-run.patch 858 SHA256 c548bf48b900b8603b32e49dc6434d581736bef901eca0300d5cbae21f5e0669 SHA512 3ac0243a55f26bc9be5c7c4339a04e1f31d094aa4b8aff1f1160d72524db107eb8e05d47b70d9f30438287be19682c5b01f8477d45ccdc18a9e77d233c8b1a13 WHIRLPOOL 8377f8d9a4a3af4994bf784238260b1839f4ea5c439670650f902532cf7dca9023c18b76aa6d9c2da5204194d110021e4a317094693d1708d0722c1d205aa414
-DIST ideaIU-12.1.6.tar.gz 222935894 SHA256 7ad031383b3a1b9599f51bcfef6288972b3c13b785f9dcda2351a582156fd807 SHA512 adc6884b283af9d9b52d5343f8277464fbacfb0c1300bdcacfc701b87ef3f2eb865ad64b622f0b7987377a887f30db11e2ca99d04154a4755e0105747a6ce695 WHIRLPOOL f703e26a541fb291496d7b1d7db532af945d84f6b300a54439377479517d46bf9f14c888ccf9ce98c39f5f3f272d1e1a13398dd220806fd631ce6b1a1059c940
 DIST ideaIU-13.0.2.tar.gz 274928645 SHA256 7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0 SHA512 dc6d1cff8b788ae5710a0c4012154921ec06b86a448dd19178d6c77bfb57efa92d62b934fa13328c3c3b10fab11c717d6ab28696cae8fdce8201148b9792599d WHIRLPOOL 451025bc2613e67790294a5ed731684270fcf9b8521b0b40d08a1ec496885c76b0d7d0e6baec7d6f05628fef442378204454469b81d1a22783f753d62e43c3a8
-DIST ideaIU-13.tar.gz 268656232 SHA256 211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654 SHA512 a725385ec75e2e659250a0d37cd6744a62ba58c1266579221599f27cbd1d6226e558b9354e357582d609c227f3a026923de1083495f69aff6f4ab6cb4277f67d WHIRLPOOL fb07ad1ff8ce41dbc2629cb82e185c4cf15174b799fe441bd5201b6ee3fe7085f9445fa40518cf049134f540e0de1d1afd7b9a4d29e2eca8cc6a65a4b8b62ada
-DIST ideaIU-133.818.tar.gz 274915556 SHA256 983bb27af022dc20bf2a7e1165aaf373c7d6dc023f3280fad20daf910c183987 SHA512 94f0ebad4709915f5803bab35cecb0653b6218e3ff34ee98210aba3c9b5382ca7fd1d0800a8ca55a1c8bf09b2399a2491726b31a724cb350a526eeeefa39f3eb WHIRLPOOL fa5844eb3ba068cbc743a2596403543e6f0be2d9d600f8ec2c157e1544e1632c1c3120bf4501a22c8ec1ad381d0cccb080dc3e579740d60b85cada483c2adbd5
 DIST ideaIU-134.1007.tar.gz 270671324 SHA256 05267327f2bc0f1b0db56e3dd549a631b6c50fbffccc4ffff6f7d069d64e9046 SHA512 190bc43ce46f9240d7a5c2e79a1f36210b42284ff42da54b53e4253dbac910faf8b0746fe08d32f7c53bb78c04a90a49054a4ce4bed18308355075d4228b5f36 WHIRLPOOL ea0b64ead13bdb6c0eb3d9607049d283a563fe16d654ade20cf7b04a9852cc6029f1d421421de9360579a0f34fe72640f2be6b3b913ae7fc8d81d2caaa542c0f
-EBUILD idea-ultimate-12.1.6.ebuild 1381 SHA256 a2acf007297cac3a67616bdcf9d614547bb5ea873b580f80ffd85aeef4aa491f SHA512 4d2da5f8fad3240c54a992944dccc6ea92f08665d4b0e7c040cdab85edc89b238231fb5435b764960c2ab42a9c60a8e92ba7744366f7f0adab73531985d7f575 WHIRLPOOL f4be9b3d77f144b78ac941590156db4eb16cc1bd64183aa898e212ad1ce03f72bcad1b4b80a1ceb83690b9a15f40be81f6219d0bd98064954b34190f6b7c7a15
-EBUILD idea-ultimate-13.0.0.ebuild 1521 SHA256 d763a656c9147a19704db1bc6f701661b06141c8ffd317836b10b8dfadaa0b21 SHA512 b70e8ea5c356482483b2ed25068e02341add702eb8dc645f4c91312450c713bdd1d542a1ba1b223da9b8c9a9dd27abbcba5e3e35836d489555799e85afa045b1 WHIRLPOOL 418ede40ee6199e128e54862039416375353d2bd9e011af9eb3e03a584bfd653739a2c390a9f395e72249d5d258443f94f3c2d1ca0b7cbc30f6c627a4d5d5418
-EBUILD idea-ultimate-13.0.2.ebuild 1521 SHA256 d3a64851dad2276615d126b4af5c79e413241a8aa6cd3fbb076680b202750a6b SHA512 1de76e2e930136b30238d31ff4c3ae3ae9681d7f995c022d969b95c7cbc20b79f25ef2536c33b8eba08376d1ff8513fc9f2ca9827d00014824ddcefed25e5a06 WHIRLPOOL 2547fe73025906a752fe475848a8f71bab9e1ff714c60217cac4eefe4cbb80c163837c07447ae48667ed53e842d54ec6198005b6de7ea297cd8daa4ae94a7a57
-EBUILD idea-ultimate-13.0.3_pre818.ebuild 1521 SHA256 7155be3a925044f01d77e36b4cc67c12a955c0725f22f6244289a5f07ddaa17b SHA512 863a7be271bf92be4af8419f8d831fe6bfcddbd5549570d02f8cf087ae5b34cdf3f61086a59ec95ea6f0bd7a4e54a54ae1b57403ad4a14f48bdacd77a48acc32 WHIRLPOOL 706a02779d0651d29f7c656861100570337fba83a88a35f4144b989c92505758365f7af588b55bb366e0e668d3c383399df4c2554b8437895016ad5e339ea5b0
-EBUILD idea-ultimate-13.1.0_pre1007.ebuild 1522 SHA256 36e68ba5259a6b5569c8681ab9a285b0af04ff19bf1f0d84b9fbca77fe5b3acc SHA512 e730ad306857e55326f53e1af60c93a181d5de20e5009d426b7bd7dd52e3c22caf3f4fbb972e50548912f6cf6f699304e4bd4b84d25ed22a4850e1c42f777b43 WHIRLPOOL 975e7a467735cd781f5758e189088b473d7667e2048d65ec3a061aed8d2cbd37b65ae0a773d9845c55f148fb10915598c7b65135cb6032538645f032b349f10e
+EBUILD idea-ultimate-13.0.2.ebuild 1480 SHA256 c7e7205a93449cf92add38ef6979da66c5f97414547d8d36b380daf7247ad206 SHA512 be75592e5006b70a508f956fcf64674f5951bdb80c4161f91d319295f7cc28dd2f9f40a6966de3bcbe1a94d2ad9cca5c59a6a9e497d57fd3954d9b813f4630e3 WHIRLPOOL df64aa3590a17d2d0a9690908d56806203013fec60b4522eb15c0313ef950e95708114072c7221ea7a476cfe1b2b3074b673e11024be824b2b146da5db9e0669
+EBUILD idea-ultimate-13.1.0_alpha134_pre1007.ebuild 1480 SHA256 c7e7205a93449cf92add38ef6979da66c5f97414547d8d36b380daf7247ad206 SHA512 be75592e5006b70a508f956fcf64674f5951bdb80c4161f91d319295f7cc28dd2f9f40a6966de3bcbe1a94d2ad9cca5c59a6a9e497d57fd3954d9b813f4630e3 WHIRLPOOL df64aa3590a17d2d0a9690908d56806203013fec60b4522eb15c0313ef950e95708114072c7221ea7a476cfe1b2b3074b673e11024be824b2b146da5db9e0669
diff --git a/dev-util/idea-ultimate/idea-ultimate-12.1.6.ebuild b/dev-util/idea-ultimate/idea-ultimate-12.1.6.ebuild
deleted file mode 100644
index 64500f5..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-12.1.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="ultimate"
-MY_PAS="IU"
-MY_BUILD="129.1359"
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-13.0.0.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.0.0.ebuild
deleted file mode 100644
index 7107602..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-13.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="ultimate"
-MY_PAS="IU"
-MY_BUILD="133.193"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIU-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-13.0.2.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.0.2.ebuild
index 801ea07..b04b675 100644
--- a/dev-util/idea-ultimate/idea-ultimate-13.0.2.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-13.0.2.ebuild
@@ -8,45 +8,49 @@ inherit eutils versionator
 SLOT="$(get_major_version)"
 RDEPEND=">=virtual/jdk-1.6"
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="ultimate"
-MY_PAS="IU"
-MY_BUILD="133.696"
+PN1=${PN%-*}
+PN2=${PN#*-}
+PNS=${PN1:0:1}${PN2:0:1}
 
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
+MY_ALPHA="$(get_version_component_range 4-4)"
+MY_ALPHA=${MY_ALPHA/alpha/}
+MY_PRE="$(get_version_component_range 5-5)"
+MY_PRE=${MY_PRE/pre/}
 
 RESTRICT="strip"
 QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
 
 DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
 HOMEPAGE="http://jetbrains.com/idea/"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIU-13.tar.gz"
+
+if [ -z $MY_ALPHA  ]; then
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+else
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_ALPHA}.${MY_PRE}.tar.gz"
+fi
+
 LICENSE="IntelliJ-IDEA"
 IUSE=""
 KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
+S="${WORKDIR}/${PN1}-${PNS}-${MY_BUILD}"
 
 src_prepare() {
     epatch "${FILESDIR}"/idea-run.patch
 }
 
 src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
+	local dir="/opt/${PN1}${PNS}${SLOT}"
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
+	fperms 755 "${dir}/bin/${PN1}.sh"
 	fperms 755 "${dir}/bin/fsnotifier"
 	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
+	local exe=${PN1}${PNS}-${SLOT}
 	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
+	newicon "${S}/bin/${PN1}.png" ${icon}
 	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
+	make_wrapper "$exe" "/opt/${PN1}${PNS}${SLOT}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${PN2}" /usr/share/pixmaps/${icon} "Development;IDE"
 	insinto /etc/intellij-idea
 	doins bin/idea.vmoptions || die
 }
diff --git a/dev-util/idea-ultimate/idea-ultimate-13.0.3_pre818.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.0.3_pre818.ebuild
deleted file mode 100644
index 4899dc5..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-13.0.3_pre818.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="ultimate"
-MY_PAS="IU"
-MY_BUILD="133.818"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIU-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-13.1.0_alpha134_pre1007.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.1.0_alpha134_pre1007.ebuild
new file mode 100644
index 0000000..b04b675
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-13.1.0_alpha134_pre1007.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils versionator
+
+SLOT="$(get_major_version)"
+RDEPEND=">=virtual/jdk-1.6"
+
+PN1=${PN%-*}
+PN2=${PN#*-}
+PNS=${PN1:0:1}${PN2:0:1}
+
+MY_ALPHA="$(get_version_component_range 4-4)"
+MY_ALPHA=${MY_ALPHA/alpha/}
+MY_PRE="$(get_version_component_range 5-5)"
+MY_PRE=${MY_PRE/pre/}
+
+RESTRICT="strip"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+
+DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
+HOMEPAGE="http://jetbrains.com/idea/"
+
+if [ -z $MY_ALPHA  ]; then
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+else
+  SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_ALPHA}.${MY_PRE}.tar.gz"
+fi
+
+LICENSE="IntelliJ-IDEA"
+IUSE=""
+KEYWORDS="~x86 ~amd64"
+S="${WORKDIR}/${PN1}-${PNS}-${MY_BUILD}"
+
+src_prepare() {
+    epatch "${FILESDIR}"/idea-run.patch
+}
+
+src_install() {
+	local dir="/opt/${PN1}${PNS}${SLOT}"
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/${PN1}.sh"
+	fperms 755 "${dir}/bin/fsnotifier"
+	fperms 755 "${dir}/bin/fsnotifier64"
+	local exe=${PN1}${PNS}-${SLOT}
+	local icon=${exe}.png
+	newicon "${S}/bin/${PN1}.png" ${icon}
+	dodir /usr/bin
+	make_wrapper "$exe" "/opt/${PN1}${PNS}${SLOT}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${PN2}" /usr/share/pixmaps/${icon} "Development;IDE"
+	insinto /etc/intellij-idea
+	doins bin/idea.vmoptions || die
+}
diff --git a/dev-util/idea-ultimate/idea-ultimate-13.1.0_pre1007.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.1.0_pre1007.ebuild
deleted file mode 100644
index 7d37d65..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-13.1.0_pre1007.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-MY_PA="ultimate"
-MY_PAS="IU"
-MY_BUILD="134.1007"
-
-#MY_BUILD="$(delete_all_version_separators)"
-#MY_BUILD=${MY_BUILD/pre/.}
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
-HOMEPAGE="http://jetbrains.com/idea/"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-$(get_version_component_range 1-3).tar.gz"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}${MY_PAS}-${MY_BUILD}.tar.gz"
-#SRC_URI="http://download.jetbrains.com/${MY_PN}/ideaIU-13.tar.gz"
-LICENSE="IntelliJ-IDEA"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-S="${WORKDIR}/${MY_PN}-${MY_PAS}-${MY_BUILD}"
-
-src_prepare() {
-    epatch "${FILESDIR}"/idea-run.patch
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}${MY_PAS}${SLOT}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh"
-	fperms 755 "${dir}/bin/fsnotifier"
-	fperms 755 "${dir}/bin/fsnotifier64"
-	local exe=${MY_PN}${MY_PAS}-${SLOT}
-	local icon=${exe}.png
-	newicon "${S}/bin/${MY_PN}.png" ${icon}
-	dodir /usr/bin
-	make_wrapper "$exe" "/opt/${MY_PN}${MY_PAS}${SLOT}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA ${PV} ${MY_PA}" /usr/share/pixmaps/${icon} "Development;IDE"
-	insinto /etc/intellij-idea
-	doins bin/idea.vmoptions || die
-}