diff options
| author |   Lukas Elsner <open@mindrunner.de> | 2014-05-07 20:18:22 +0200 |
|---|---|---|
| committer | Lukas Elsner <open@mindrunner.de> | 2014-05-07 20:18:22 +0200 |
| commit | 58e92063c337294a12aa51223b7c79223d47cfa5 (patch) | |
| tree | dc88ffdaead7aeefc216d89e93062debca38e878 | |
| parent | idea version bump (diff) | |
| download | luman-58e92063c337294a12aa51223b7c79223d47cfa5.tar.gz luman-58e92063c337294a12aa51223b7c79223d47cfa5.tar.bz2 luman-58e92063c337294a12aa51223b7c79223d47cfa5.zip | |
fixed idea slot/config problem
14 files changed, 52 insertions, 52 deletions
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index 7e00a2c..34943f9 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,8 +1,8 @@ -AUX config-13 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e -AUX config-eap 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e -AUX idea-13.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a -AUX idea-eap.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a +AUX config-community-13 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e +AUX config-community-eap 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e +AUX idea-community-13.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a +AUX idea-community-eap.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a DIST ideaIC-13.1.2.tar.gz 169383212 SHA256 59fde67bf23e4638edd4b5ada133ac1c61c3132dea936eb7de7ee5ea259cc102 SHA512 dae9beda8f7d5b898d911f0b712cd7185c66108408d4af4695a21402ddfe30b264988649e87a6b5feadbe8d6bd98d9c7269bbf1da69b5a2ade5f1ead565d1ee0 WHIRLPOOL 24481b65b4aae4b146f0335bd49f270bedef328013eaa89a40921a2a99ca46f12809d5b781e0c9b31f838736d9b069f6e6684d62a32397ba0a9ec6f662d8a4c1 DIST ideaIC-135.815.tar.gz 169912854 SHA256 15299667284b97039ed6943a03065b25d1be2fdf84e7cddf9c419c014338ef15 SHA512 9a579cda8f9c31b3316f667968a361c8724c568c15d666a16c86fc65a60744c9e6315355bcb9a0461252ec8622d7d1f150ca465425b41bba0f3f2ffe9783b414 WHIRLPOOL 6bfc024b8c898314f0c419f4c3123a57dbe57ba07c8a21b0882671a07096ad211260139cd66a82d8671c24497835b02908231011041fdf3e8b5382a7c0666d46 -EBUILD idea-community-13.1.2.135.690.ebuild 2322 SHA256 913427f62575c351bbd02902df79eba32414c6ced8877a18006c906ce4883d1c SHA512 134cb10d77eedce264bc6011953e3443ba5638c5b6dc9a112b913d56fd73ed38d81f76a33e91065c671af7690e291f7d85eb6f2a26a109903cd9125751b337de WHIRLPOOL 4371fa8ac0726bf7881d3be15a775a8e3872615bfbf4735f4e97a7b9516342fb3d00b4b40fc3446903de255056e205a697b805f50caf584149e447891478f060 -EBUILD idea-community-13.1.3.135.815_pre1.ebuild 2305 SHA256 c483e9d2569ec9d62063ca42035065eb40c3033ed4d36ff535986b29a9bc62b6 SHA512 1d35d33def768bbf21b257a3bbf2282bc84bd7486942a38bd2ddce36bd0125a0cb19d24b98c6a47da618baa5ca710c28d8cc2528774d272f7de3fd16089b4ffd WHIRLPOOL 706bcdd402e3b5912851cd0fdcb98f4ebf0ebb5a8a6d597f03fec477de47935f707f60a5b9978f4496e63f9707066c41a0127fb5adcf7f3d2f624714847f12ab +EBUILD idea-community-13.1.2.135.690.ebuild 2338 SHA256 8ab28a69fdfac6253b485e5078ce23b5b440648bf1ec9f03b1fc6f601e66affe SHA512 cb431f0154bafa85fddc6d7e8c560264ab5f25c293dc0e9c20162ddc0786163ee4795045854772875744c2652adfc1522f0e995f9fb115e25268fedbe63bc598 WHIRLPOOL 490f64b80d5e032d433600bb069cdd852a3dbc68de6c7c56ab2bf4b9108e20cd9e2b32b6ccb24b851a9cbcba43594cca9cf799138eab064fc8d603d136cdcb31 +EBUILD idea-community-13.1.3.135.815_pre1.ebuild 2338 SHA256 8ab28a69fdfac6253b485e5078ce23b5b440648bf1ec9f03b1fc6f601e66affe SHA512 cb431f0154bafa85fddc6d7e8c560264ab5f25c293dc0e9c20162ddc0786163ee4795045854772875744c2652adfc1522f0e995f9fb115e25268fedbe63bc598 WHIRLPOOL 490f64b80d5e032d433600bb069cdd852a3dbc68de6c7c56ab2bf4b9108e20cd9e2b32b6ccb24b851a9cbcba43594cca9cf799138eab064fc8d603d136cdcb31 diff --git a/dev-util/idea-community/files/config-13 b/dev-util/idea-community/files/config-community-13 index fe2cfb8..fe2cfb8 100644 --- a/dev-util/idea-community/files/config-13 +++ b/dev-util/idea-community/files/config-community-13 diff --git a/dev-util/idea-community/files/config-eap b/dev-util/idea-community/files/config-community-eap index fe2cfb8..fe2cfb8 100644 --- a/dev-util/idea-community/files/config-eap +++ b/dev-util/idea-community/files/config-community-eap diff --git a/dev-util/idea-community/files/idea-13.sh.patch b/dev-util/idea-community/files/idea-community-13.sh.patch index 7593a51..7593a51 100644 --- a/dev-util/idea-community/files/idea-13.sh.patch +++ b/dev-util/idea-community/files/idea-community-13.sh.patch diff --git a/dev-util/idea-community/files/idea-eap.sh.patch b/dev-util/idea-community/files/idea-community-eap.sh.patch index 7593a51..7593a51 100644 --- a/dev-util/idea-community/files/idea-eap.sh.patch +++ b/dev-util/idea-community/files/idea-community-eap.sh.patch diff --git a/dev-util/idea-community/idea-community-13.1.2.135.690.ebuild b/dev-util/idea-community/idea-community-13.1.2.135.690.ebuild index bcf936a..2229976 100644 --- a/dev-util/idea-community/idea-community-13.1.2.135.690.ebuild +++ b/dev-util/idea-community/idea-community-13.1.2.135.690.ebuild @@ -43,28 +43,28 @@ KEYWORDS="~x86 ~amd64" S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}" src_prepare() { - epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die + epatch ${FILESDIR}/${PN}-${SLOT}.sh.patch || die } src_install() { local dir="/opt/${P}" local exe="${PN}-${SLOT}" - newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT} + newconfd "${FILESDIR}/config-${PN2}-${SLOT}" ${PN}-${SLOT} # config files insinto "/etc/idea" - mv bin/idea.properties bin/idea-${SLOT}.properties - doins bin/idea-${SLOT}.properties - rm bin/idea-${SLOT}.properties + mv bin/idea.properties bin/${PN}-${SLOT}.properties + doins bin/${PN}-${SLOT}.properties + rm bin/${PN}-${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 + mv bin/idea.vmoptions bin/${PN}-${SLOT}.vmoptions + doins bin/${PN}-${SLOT}.vmoptions + rm bin/${PN}-${SLOT}.vmoptions + ln -s /etc/idea/${PN}-${SLOT}.properties bin/idea.properties # idea itself insinto "${dir}" doins -r * diff --git a/dev-util/idea-community/idea-community-13.1.3.135.815_pre1.ebuild b/dev-util/idea-community/idea-community-13.1.3.135.815_pre1.ebuild index 892703f..2229976 100644 --- a/dev-util/idea-community/idea-community-13.1.3.135.815_pre1.ebuild +++ b/dev-util/idea-community/idea-community-13.1.3.135.815_pre1.ebuild @@ -5,7 +5,7 @@ EAPI=4 inherit eutils versionator -SLOT="eap" +SLOT="$(get_major_version)" RDEPEND=">=virtual/jdk-1.6" PN1=${PN%-*} @@ -43,28 +43,28 @@ KEYWORDS="~x86 ~amd64" S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}" src_prepare() { - epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die + epatch ${FILESDIR}/${PN}-${SLOT}.sh.patch || die } src_install() { local dir="/opt/${P}" local exe="${PN}-${SLOT}" - newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT} + newconfd "${FILESDIR}/config-${PN2}-${SLOT}" ${PN}-${SLOT} # config files insinto "/etc/idea" - mv bin/idea.properties bin/idea-${SLOT}.properties - doins bin/idea-${SLOT}.properties - rm bin/idea-${SLOT}.properties + mv bin/idea.properties bin/${PN}-${SLOT}.properties + doins bin/${PN}-${SLOT}.properties + rm bin/${PN}-${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 + mv bin/idea.vmoptions bin/${PN}-${SLOT}.vmoptions + doins bin/${PN}-${SLOT}.vmoptions + rm bin/${PN}-${SLOT}.vmoptions + ln -s /etc/idea/${PN}-${SLOT}.properties bin/idea.properties # idea itself insinto "${dir}" doins -r * diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest index f2769e7..122ce43 100644 --- a/dev-util/idea-ultimate/Manifest +++ b/dev-util/idea-ultimate/Manifest @@ -1,8 +1,8 @@ -AUX config-13 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e -AUX config-eap 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e -AUX idea-13.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a -AUX idea-eap.sh.patch 269 SHA256 f021bcc9de7cb0d1d560baca9415c77b10ed3be9de29d9d6d6fc5e09be064bf5 SHA512 3d8c28a63a3865710891d100f1e72f036130ce1226a7b36abb32a9218b95d1026bced77abff43132b19e734f9ae8584353a61d7f3974264ec3a59ac464ad37ee WHIRLPOOL e76322e5fa1c6af064dc16acced1aa98400318ab93df1771ad3d9181f2f6d43c944c75037a7e3e91d6e80e2a2fa45d9d1363759a06494b2d01d8344af4daa72a +AUX config-ultimate-13 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e +AUX config-ultimate-eap 277 SHA256 eb5b6c8b4b2a4d7ce9ee88c38f4d72a9825f75ce5d748f6d5f03cefcf530f44c SHA512 82cf6430aa582f6106e28b98862dc518e45722761206b95817f675944b7a5373bfdf124440877dfb827ce552d81f69919be84704f0809d113d7f89a507c4709e WHIRLPOOL badd20b6e830d67f07b496bbd0310701721860af4830a7c6355100471bbc7a85da94de0ff0d39924de7c1224578cfab9c9b495ba4ae2dbc3a125c457517a934e +AUX idea-ultimate-13.sh.patch 278 SHA256 4fe375e9ef2d3cca17ebd8945429711ab10197057fb5603d8812debdf24b5cf3 SHA512 b76e1b23a00d725246a02ea7fac7ebdfa3b3d5660506072bb704b28ff6b6936c0b02444eaed0d925080f9fe352e23804e885dedb62da084f2705d0725fc7c4ef WHIRLPOOL 867dab73748604f2abdb90f499ba48ab148728ed1a1cd0e5a6dd5fc3c0b12a0e19c45f8ede7f3b2009ead66e89e1bee5f4a9fe0cb883062db97669d9bc42adad +AUX idea-ultimate-eap.sh.patch 279 SHA256 9392e8ffba3b41dc4d76188922ffa6d34cac5e06ab96efa7550e8d1d30b0edc3 SHA512 2430d197ca3cb35e2fe25b0d7dec13be8fe093ee7cdbb044effd40d574a537eb3b3ab988a285be62af9713f38383205174e87da90b67015eb1a9583f4984b021 WHIRLPOOL abf5a543036fca9b9cc5c8acc15c88051a096a0bcc9688851a021354052b56864f92ab61a01e1345df099fc190a2d59ae85058ed63436e33fa532731ba4eebeb DIST ideaIU-13.1.2.tar.gz 280167863 SHA256 ccbaed495e2f099c92d1f747a59d7af9f9d41d75cf10e8a299d11825d78685ad SHA512 1d8ffbc16de5a1fa3dd1750b6f9450ba6136040d9deb7cda850da09019790ce9402558bc7ad7b6e5cb00d4e3b670a672771e73082e6a18a66cd71bfe07123ba7 WHIRLPOOL 12283f09d4b0bee19e40393062bc6c5716db85f687e320cfbc2086bf59888eecdb4e8129a5db744832c2a4c0c099c96a37bfa43362ba522db7ad523b5b0e5bd2 DIST ideaIU-135.815.tar.gz 280656433 SHA256 bb987dbd43587be25d2f9da44dd688e7e38dcde90d69dde1193adeb08e0b1b49 SHA512 516613d757c04e3a26a2e1cd6fd412b8f10c25d065ca1de3a135ad85f0952981ab0e2f5c8579cecae0dd37dd5f92074565b1d60505376db8aae59cde46cac37f WHIRLPOOL 38b90acdabe110abdd55d8abe9e73a937e3678e5e7a29fa48ca766d06e7524035c911456867fe60e202e355cd636875ba602568b7f15a65c0cb5d2e302db8e46 -EBUILD idea-ultimate-13.1.2.135.690.ebuild 2322 SHA256 913427f62575c351bbd02902df79eba32414c6ced8877a18006c906ce4883d1c SHA512 134cb10d77eedce264bc6011953e3443ba5638c5b6dc9a112b913d56fd73ed38d81f76a33e91065c671af7690e291f7d85eb6f2a26a109903cd9125751b337de WHIRLPOOL 4371fa8ac0726bf7881d3be15a775a8e3872615bfbf4735f4e97a7b9516342fb3d00b4b40fc3446903de255056e205a697b805f50caf584149e447891478f060 -EBUILD idea-ultimate-13.1.3.135.815_pre1.ebuild 2305 SHA256 c483e9d2569ec9d62063ca42035065eb40c3033ed4d36ff535986b29a9bc62b6 SHA512 1d35d33def768bbf21b257a3bbf2282bc84bd7486942a38bd2ddce36bd0125a0cb19d24b98c6a47da618baa5ca710c28d8cc2528774d272f7de3fd16089b4ffd WHIRLPOOL 706bcdd402e3b5912851cd0fdcb98f4ebf0ebb5a8a6d597f03fec477de47935f707f60a5b9978f4496e63f9707066c41a0127fb5adcf7f3d2f624714847f12ab +EBUILD idea-ultimate-13.1.2.135.690.ebuild 2338 SHA256 8ab28a69fdfac6253b485e5078ce23b5b440648bf1ec9f03b1fc6f601e66affe SHA512 cb431f0154bafa85fddc6d7e8c560264ab5f25c293dc0e9c20162ddc0786163ee4795045854772875744c2652adfc1522f0e995f9fb115e25268fedbe63bc598 WHIRLPOOL 490f64b80d5e032d433600bb069cdd852a3dbc68de6c7c56ab2bf4b9108e20cd9e2b32b6ccb24b851a9cbcba43594cca9cf799138eab064fc8d603d136cdcb31 +EBUILD idea-ultimate-13.1.3.135.815_pre1.ebuild 2338 SHA256 8ab28a69fdfac6253b485e5078ce23b5b440648bf1ec9f03b1fc6f601e66affe SHA512 cb431f0154bafa85fddc6d7e8c560264ab5f25c293dc0e9c20162ddc0786163ee4795045854772875744c2652adfc1522f0e995f9fb115e25268fedbe63bc598 WHIRLPOOL 490f64b80d5e032d433600bb069cdd852a3dbc68de6c7c56ab2bf4b9108e20cd9e2b32b6ccb24b851a9cbcba43594cca9cf799138eab064fc8d603d136cdcb31 diff --git a/dev-util/idea-ultimate/files/config-13 b/dev-util/idea-ultimate/files/config-ultimate-13 index fe2cfb8..fe2cfb8 100644 --- a/dev-util/idea-ultimate/files/config-13 +++ b/dev-util/idea-ultimate/files/config-ultimate-13 diff --git a/dev-util/idea-ultimate/files/config-eap b/dev-util/idea-ultimate/files/config-ultimate-eap index fe2cfb8..fe2cfb8 100644 --- a/dev-util/idea-ultimate/files/config-eap +++ b/dev-util/idea-ultimate/files/config-ultimate-eap diff --git a/dev-util/idea-ultimate/files/idea-13.sh.patch b/dev-util/idea-ultimate/files/idea-ultimate-13.sh.patch index 7593a51..0177b69 100644 --- a/dev-util/idea-ultimate/files/idea-13.sh.patch +++ b/dev-util/idea-ultimate/files/idea-ultimate-13.sh.patch @@ -4,7 +4,7 @@ exit 1 fi -+. /etc/conf.d/idea-13 ++. /etc/conf.d/idea-ultimate-13 + OS_TYPE=`"$UNAME" -s` diff --git a/dev-util/idea-ultimate/files/idea-eap.sh.patch b/dev-util/idea-ultimate/files/idea-ultimate-eap.sh.patch index 7593a51..89cbc7f 100644 --- a/dev-util/idea-ultimate/files/idea-eap.sh.patch +++ b/dev-util/idea-ultimate/files/idea-ultimate-eap.sh.patch @@ -4,7 +4,7 @@ exit 1 fi -+. /etc/conf.d/idea-13 ++. /etc/conf.d/idea-ultimate-eap + OS_TYPE=`"$UNAME" -s` diff --git a/dev-util/idea-ultimate/idea-ultimate-13.1.2.135.690.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.1.2.135.690.ebuild index bcf936a..2229976 100644 --- a/dev-util/idea-ultimate/idea-ultimate-13.1.2.135.690.ebuild +++ b/dev-util/idea-ultimate/idea-ultimate-13.1.2.135.690.ebuild @@ -43,28 +43,28 @@ KEYWORDS="~x86 ~amd64" S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}" src_prepare() { - epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die + epatch ${FILESDIR}/${PN}-${SLOT}.sh.patch || die } src_install() { local dir="/opt/${P}" local exe="${PN}-${SLOT}" - newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT} + newconfd "${FILESDIR}/config-${PN2}-${SLOT}" ${PN}-${SLOT} # config files insinto "/etc/idea" - mv bin/idea.properties bin/idea-${SLOT}.properties - doins bin/idea-${SLOT}.properties - rm bin/idea-${SLOT}.properties + mv bin/idea.properties bin/${PN}-${SLOT}.properties + doins bin/${PN}-${SLOT}.properties + rm bin/${PN}-${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 + mv bin/idea.vmoptions bin/${PN}-${SLOT}.vmoptions + doins bin/${PN}-${SLOT}.vmoptions + rm bin/${PN}-${SLOT}.vmoptions + ln -s /etc/idea/${PN}-${SLOT}.properties bin/idea.properties # idea itself insinto "${dir}" doins -r * diff --git a/dev-util/idea-ultimate/idea-ultimate-13.1.3.135.815_pre1.ebuild b/dev-util/idea-ultimate/idea-ultimate-13.1.3.135.815_pre1.ebuild index 892703f..2229976 100644 --- a/dev-util/idea-ultimate/idea-ultimate-13.1.3.135.815_pre1.ebuild +++ b/dev-util/idea-ultimate/idea-ultimate-13.1.3.135.815_pre1.ebuild @@ -5,7 +5,7 @@ EAPI=4 inherit eutils versionator -SLOT="eap" +SLOT="$(get_major_version)" RDEPEND=">=virtual/jdk-1.6" PN1=${PN%-*} @@ -43,28 +43,28 @@ KEYWORDS="~x86 ~amd64" S="${WORKDIR}/${PN1}-${PNS^^}-${MY_PV}" src_prepare() { - epatch ${FILESDIR}/idea-${SLOT}.sh.patch || die + epatch ${FILESDIR}/${PN}-${SLOT}.sh.patch || die } src_install() { local dir="/opt/${P}" local exe="${PN}-${SLOT}" - newconfd "${FILESDIR}/config-${SLOT}" idea-${SLOT} + newconfd "${FILESDIR}/config-${PN2}-${SLOT}" ${PN}-${SLOT} # config files insinto "/etc/idea" - mv bin/idea.properties bin/idea-${SLOT}.properties - doins bin/idea-${SLOT}.properties - rm bin/idea-${SLOT}.properties + mv bin/idea.properties bin/${PN}-${SLOT}.properties + doins bin/${PN}-${SLOT}.properties + rm bin/${PN}-${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 + mv bin/idea.vmoptions bin/${PN}-${SLOT}.vmoptions + doins bin/${PN}-${SLOT}.vmoptions + rm bin/${PN}-${SLOT}.vmoptions + ln -s /etc/idea/${PN}-${SLOT}.properties bin/idea.properties # idea itself insinto "${dir}" doins -r * |