idea ebuild fixes/updates

7 files changed, 181 insertions, 114 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 3158302..a220cad 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,4 +1,6 @@
+AUX config-13 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e
+AUX idea-13.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a
 DIST ideaIC-13.0.2.tar.gz 170556590 SHA256 a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53 SHA512 1d58d046143013bcb00ab5a17b9f377831e9ea5937fd618af972f41f772ae69f91dbc2aa4a04d449114822dcd1009b11cfd18c7e40e5d3ace0fca5464e627df6 WHIRLPOOL 5d7dadd1b71dc85333da5598a903f96c9b0a2fc0a7ef42175b2834b5b6eb9c98002c237166b98acc3f4a8f6586151ecf98ef3ff65b79004c1eeafbf1d2888807
 DIST ideaIC-134.1007.tar.gz 164519368 SHA256 8592285f6f52ed90cd608e12992489719c5051718ce198f252bc1ea4a31785a1 SHA512 cd888a6922de11c45be38693b8fa884b804243007aff0e0f849eacad832a10d3ff8b9d5ddfcb59854bdac0b5bc9f8c95a60b5c1adf6268da4c6b3104e8061204 WHIRLPOOL 6b27d764cb63414eab298fb54ff54ed56ff83d07ead0d93702e74147bf61a43c893b6d326f390c228366f87083e1eb6cc388b4c37a7578169a86b4ff0744211f
-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
+EBUILD idea-community-13.0.2.133.696.ebuild 2321 SHA256 3c08212699d716b5d034e08c4182aa4116c863bb124a5a740489d45f734e57d5 SHA512 6aad26cff07491f7229395a26a4bd84df3aa71a030b01edb43063981be205f4f0ab7e1262ffed73acfcae073fb13a23e322d43fa99da5180fb6fcb1da5f9b2e8 WHIRLPOOL 6fe5c48d3411103d1af80696bfe99e7151a147f4fe04054e878564fee1349651bb03ec4fc8c52f1e24d356d992f29795ae6db61c8e6768bcd6270db55226fcb9
+EBUILD idea-community-13.1.0.134.1007_pre1.ebuild 2321 SHA256 3c08212699d716b5d034e08c4182aa4116c863bb124a5a740489d45f734e57d5 SHA512 6aad26cff07491f7229395a26a4bd84df3aa71a030b01edb43063981be205f4f0ab7e1262ffed73acfcae073fb13a23e322d43fa99da5180fb6fcb1da5f9b2e8 WHIRLPOOL 6fe5c48d3411103d1af80696bfe99e7151a147f4fe04054e878564fee1349651bb03ec4fc8c52f1e24d356d992f29795ae6db61c8e6768bcd6270db55226fcb9
diff --git a/dev-util/idea-community/files/config-13 b/dev-util/idea-community/files/config-13
new file mode 100644
index 0000000..fe2cfb8
--- /dev/null
+++ b/dev-util/idea-community/files/config-13
@@ -0,0 +1,4 @@
+#_JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+#IDEA_JDK="$(java-config --select-vm=icedtea-7 -O)"
+IDEA_VM_OPTIONS="/etc/idea/idea-13.vmoptions"
+IDEA_PROPERTIES="/etc/idea/idea-13.properties"
diff --git a/dev-util/idea-community/files/idea-13.sh.patch b/dev-util/idea-community/files/idea-13.sh.patch
new file mode 100644
index 0000000..7593a51
--- /dev/null
+++ b/dev-util/idea-community/files/idea-13.sh.patch
@@ -0,0 +1,11 @@
+--- bin/idea.sh.orig    2013-12-04 21:22:26.168958134 +0700
++++ bin/idea.sh 2013-12-04 21:25:11.628945405 +0700
+@@ -38,6 +38,8 @@
+   exit 1
+ fi
+ 
++. /etc/conf.d/idea-13
++
+ OS_TYPE=`"$UNAME" -s`
+ 
+ # ---------------------------------------------------------------------
diff --git a/dev-util/idea-community/idea-community-13.0.2.133.696.ebuild b/dev-util/idea-community/idea-community-13.0.2.133.696.ebuild
new file mode 100644
index 0000000..e5167cf
--- /dev/null
+++ b/dev-util/idea-community/idea-community-13.0.2.133.696.ebuild
@@ -0,0 +1,81 @@
+# 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_PV="$(get_version_component_range 4-5)"
+MY_PRE="$(get_version_component_range 6-6)"
+MY_PRE=${MY_PRE/pre/}
+
+RESTRICT="strip mirror"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+
+DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
+HOMEPAGE="http://jetbrains.com/idea/"
+
+if [ -z $MY_PRE ]; then
+	VER=($(get_all_version_components))
+	if [[ "${VER[4]}" == "0" ]]; then
+		if [[ "${VER[2]}" == "0" ]]; then
+			SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-1).tar.gz"
+		else
+			SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-2).tar.gz"
+		fi
+	else
+		SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+	fi
+else
+	SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_PV}.tar.gz"
+fi
+
+LICENSE="IntelliJ-IDEA"
+IUSE=""
+KEYWORDS="~x86 ~amd64"
+S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}"
+
+src_prepare() {
+	epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die
+}
+
+src_install() {
+	local dir="/opt/${P}"
+	local exe="${PN}-${SLOT}"
+	newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT}
+	# config files
+	insinto "/etc/idea"
+	mv bin/idea.properties bin/idea-${SLOT}.properties
+	doins bin/idea-${SLOT}.properties
+	rm bin/idea-${SLOT}.properties
+	case $ARCH in
+		amd64|ppc64)
+			cat bin/idea64.vmoptions > bin/idea.vmoptions
+			rm bin/idea64.vmoptions
+			;;
+	esac
+	mv bin/idea.vmoptions bin/idea-${SLOT}.vmoptions
+	doins bin/idea-${SLOT}.vmoptions
+	rm bin/idea-${SLOT}.vmoptions
+	ln -s /etc/idea/idea-${SLOT}.properties bin/idea.properties
+	# idea itself
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/${PN1}.sh"
+	fperms 755 "${dir}/bin/fsnotifier"
+	fperms 755 "${dir}/bin/fsnotifier64"
+	newicon "bin/${PN1}.png" "${exe}.png"
+	make_wrapper "${exe}" "/opt/${P}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV}" "${exe}" "Development;IDE"
+	# Protect idea conf on upgrade
+	env_file="${T}/25idea-${SLOT}"
+	echo "CONFIG_PROTECT=\"\${CONFIG_PROTECT} /etc/idea/conf\"" > "${env_file}"  || die
+	doenvd "${env_file}"
+}
diff --git a/dev-util/idea-community/idea-community-13.0.2.ebuild b/dev-util/idea-community/idea-community-13.0.2.ebuild
deleted file mode 100644
index b04b675..0000000
--- a/dev-util/idea-community/idea-community-13.0.2.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-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.134.1007_pre1.ebuild b/dev-util/idea-community/idea-community-13.1.0.134.1007_pre1.ebuild
new file mode 100644
index 0000000..e5167cf
--- /dev/null
+++ b/dev-util/idea-community/idea-community-13.1.0.134.1007_pre1.ebuild
@@ -0,0 +1,81 @@
+# 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_PV="$(get_version_component_range 4-5)"
+MY_PRE="$(get_version_component_range 6-6)"
+MY_PRE=${MY_PRE/pre/}
+
+RESTRICT="strip mirror"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+
+DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE"
+HOMEPAGE="http://jetbrains.com/idea/"
+
+if [ -z $MY_PRE ]; then
+	VER=($(get_all_version_components))
+	if [[ "${VER[4]}" == "0" ]]; then
+		if [[ "${VER[2]}" == "0" ]]; then
+			SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-1).tar.gz"
+		else
+			SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-2).tar.gz"
+		fi
+	else
+		SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-$(get_version_component_range 1-3).tar.gz"
+	fi
+else
+	SRC_URI="http://download.jetbrains.com/${PN1}/${PN1}${PNS^^}-${MY_PV}.tar.gz"
+fi
+
+LICENSE="IntelliJ-IDEA"
+IUSE=""
+KEYWORDS="~x86 ~amd64"
+S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}"
+
+src_prepare() {
+	epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die
+}
+
+src_install() {
+	local dir="/opt/${P}"
+	local exe="${PN}-${SLOT}"
+	newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT}
+	# config files
+	insinto "/etc/idea"
+	mv bin/idea.properties bin/idea-${SLOT}.properties
+	doins bin/idea-${SLOT}.properties
+	rm bin/idea-${SLOT}.properties
+	case $ARCH in
+		amd64|ppc64)
+			cat bin/idea64.vmoptions > bin/idea.vmoptions
+			rm bin/idea64.vmoptions
+			;;
+	esac
+	mv bin/idea.vmoptions bin/idea-${SLOT}.vmoptions
+	doins bin/idea-${SLOT}.vmoptions
+	rm bin/idea-${SLOT}.vmoptions
+	ln -s /etc/idea/idea-${SLOT}.properties bin/idea.properties
+	# idea itself
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/${PN1}.sh"
+	fperms 755 "${dir}/bin/fsnotifier"
+	fperms 755 "${dir}/bin/fsnotifier64"
+	newicon "bin/${PN1}.png" "${exe}.png"
+	make_wrapper "${exe}" "/opt/${P}/bin/${PN1}.sh"
+	make_desktop_entry ${exe} "IntelliJ IDEA ${PV}" "${exe}" "Development;IDE"
+	# Protect idea conf on upgrade
+	env_file="${T}/25idea-${SLOT}"
+	echo "CONFIG_PROTECT=\"\${CONFIG_PROTECT} /etc/idea/conf\"" > "${env_file}"  || die
+	doenvd "${env_file}"
+}
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
deleted file mode 100644
index b04b675..0000000
--- a/dev-util/idea-community/idea-community-13.1.0_alpha134_pre1007.ebuild
+++ /dev/null
@@ -1,56 +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"
-
-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
-}