* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/
@ 2011-08-15 7:55 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-08-15 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 63df8a586aca6478eee736ecde420dd1930f0f31
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 07:55:32 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 07:55:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=63df8a58
dev-java/netbeans-nb: fixed configuration path and icon path
---
dev-java/netbeans-nb/ChangeLog | 4 ++++
dev-java/netbeans-nb/Manifest | 6 +++---
.../netbeans-nb/netbeans-nb-9999_p20110807.ebuild | 6 +++---
.../netbeans-nb/netbeans-nb-9999_p20110813.ebuild | 6 +++---
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 3adeb1b..819ffbe 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ netbeans-nb-9999_p20110807.ebuild, netbeans-nb-9999_p20110813.ebuild:
+ Fixed configuration path and icon path
+
*netbeans-nb-9999_p20110813 (13 Aug 2011)
13 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 0fd1cf0..40b4e41 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -9,7 +9,7 @@ DIST netbeans-trunk-nightly-201108070600-src.zip 174718325 RMD160 da1c5058a2c2c9
DIST netbeans-trunk-nightly-201108130601-src.zip 174990648 RMD160 70059abf57f088ee2ef526ecc6a214395ae99c03 SHA1 acc48ad4865e288d081ca8e7fa8502de9f93a6c6 SHA256 399e7176d3e86a6fba7733ecb4892f1d4e2e09110aa0debfc1e3d9a478b46d1e
EBUILD netbeans-nb-7.0.1.ebuild 5041 RMD160 75ccbe9e9f50d6b1ab5fb02f6c71db1e30219ac4 SHA1 47513a3e18b1c38cdd8384bce3029d5d7fbdea06 SHA256 db801f1817811daa0336752deb14953aa8ffb147f0fb2b747ecf1154f87af142
EBUILD netbeans-nb-7.0.ebuild 5037 RMD160 3802011d7c4d6b89129d3d442f0198c50ad71432 SHA1 c6cdc29caaf7e51dab159cbdabb56f80369aad29 SHA256 416a2c810e7f17e113ed9b5026062ee6471c7e652f40f08a9d410ec18cca70d7
-EBUILD netbeans-nb-9999_p20110807.ebuild 5060 RMD160 983d599546aaba22f40b39b5de91746076942ce0 SHA1 8af512e12731fc8b42150dc417da91f0b9eb5572 SHA256 d3a3a02223c14a2284d344ef63c3481b995e98cc52ee0b3ec7ecb5a7bfbcf10e
-EBUILD netbeans-nb-9999_p20110813.ebuild 5060 RMD160 e84fadf8c1c7c4bcea7baac2f91a7ed703c4fce8 SHA1 7c8df3e0b8194b745de721060af8d369ae030413 SHA256 50a470f631a9447dd3ee7de7237eaef784eb4ae51e6a54dd96c2aee67d74927a
-MISC ChangeLog 11923 RMD160 91cd2a5697a32e983d07a75d5bd42b693d3e230d SHA1 0c4a2813fee56d0e74341ee0f730f204df07e4a6 SHA256 a2f73fa20b05985d167a744272badc0097712381cf97234bfc01f06931fe0d25
+EBUILD netbeans-nb-9999_p20110807.ebuild 5065 RMD160 69a72bc90d21b728766ff68eb392015bb32d80df SHA1 6e611079d2ca6226dc17e4c12be7ae9b08d1dbc7 SHA256 c5330a19902f239f682fb533875bf9936a792382b39a253a4cfce48e9d5ec1df
+EBUILD netbeans-nb-9999_p20110813.ebuild 5065 RMD160 c32a4f59aa053dc33fd6d0a45c3d3df58f982336 SHA1 32fa4acf586ced5251e2d920864b47a7d5d7292c SHA256 fdc45f063560e4dd1182a4732292dbaa23ece6c7fe6ad71051d91570a345a321
+MISC ChangeLog 12089 RMD160 edc22f365356cda74aafdda0e4c94fa39cbc5f56 SHA1 6cf41f23c7fb63bf53412722065459fec03c99af SHA256 0971a537a38d5b31ae5e631b0f9939e728e298be7e963f8f2bb475334be1b76e
MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110807.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110807.ebuild
index 65d8314..ac71f72 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110807.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110807.ebuild
@@ -115,14 +115,14 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
dodir /usr/share/icons/hicolor/128x128/apps
- cp "${DISTDIR}"/netbeans-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
+ cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
popd >/dev/null || die
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
index f594c52..9ae918e 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
@@ -115,14 +115,14 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
dodir /usr/share/icons/hicolor/128x128/apps
- cp "${DISTDIR}"/netbeans-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
+ cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
popd >/dev/null || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/
@ 2011-08-18 10:51 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-08-18 10:51 UTC (permalink / raw
To: gentoo-commits
commit: 5f8371e26cbb08876179ac4b78a9b14bd25845dd
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 10:51:16 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 10:51:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=5f8371e2
dev-java/netbeans-nb: improved code for setting path to config files
---
dev-java/netbeans-nb/ChangeLog | 5 +++++
dev-java/netbeans-nb/Manifest | 12 ++++++------
dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild | 4 ++--
dev-java/netbeans-nb/netbeans-nb-7.0.ebuild | 4 ++--
.../netbeans-nb/netbeans-nb-9999_p20110813.ebuild | 4 ++--
.../netbeans-nb/netbeans-nb-9999_p20110814.ebuild | 4 ++--
.../netbeans-nb/netbeans-nb-9999_p20110817.ebuild | 4 ++--
7 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 4fa553f..88f4bd4 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org> netbeans-nb-7.0.ebuild,
+ netbeans-nb-7.0.1.ebuild, netbeans-nb-9999_p20110813.ebuild,
+ netbeans-nb-9999_p20110814.ebuild, netbeans-nb-9999_p20110817.ebuild:
+ Improved code for setting path to config files
+
*netbeans-nb-9999_p20110817 (18 Aug 2011)
18 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index a8dd10d..f7b47cc 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -8,10 +8,10 @@ DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243
DIST netbeans-trunk-nightly-201108130601-src.zip 174990648 RMD160 70059abf57f088ee2ef526ecc6a214395ae99c03 SHA1 acc48ad4865e288d081ca8e7fa8502de9f93a6c6 SHA256 399e7176d3e86a6fba7733ecb4892f1d4e2e09110aa0debfc1e3d9a478b46d1e
DIST netbeans-trunk-nightly-201108140601-src.zip 174990648 RMD160 f387f2d7070169fcf34bae3b9b22f9379de7b7b1 SHA1 5b0f8e83fc6f80e7cddc8918b12952ec7a6b5949 SHA256 a276e34d1864b06cb1937791f8492bf47f4fbad11a6ec32e185d23587e1927ff
DIST netbeans-trunk-nightly-201108170601-src.zip 174158613 RMD160 05f5a8911bc3ee1c47d64c975660b205cc09e7d6 SHA1 5fedf1cd49a17d31465e29e69464de6d5fd30d49 SHA256 386a6f1320aa4602fcb0f59dc736dec6157c154d60ab698da6c7967c4b3cef86
-EBUILD netbeans-nb-7.0.1.ebuild 5041 RMD160 75ccbe9e9f50d6b1ab5fb02f6c71db1e30219ac4 SHA1 47513a3e18b1c38cdd8384bce3029d5d7fbdea06 SHA256 db801f1817811daa0336752deb14953aa8ffb147f0fb2b747ecf1154f87af142
-EBUILD netbeans-nb-7.0.ebuild 5037 RMD160 3802011d7c4d6b89129d3d442f0198c50ad71432 SHA1 c6cdc29caaf7e51dab159cbdabb56f80369aad29 SHA256 416a2c810e7f17e113ed9b5026062ee6471c7e652f40f08a9d410ec18cca70d7
-EBUILD netbeans-nb-9999_p20110813.ebuild 5065 RMD160 c32a4f59aa053dc33fd6d0a45c3d3df58f982336 SHA1 32fa4acf586ced5251e2d920864b47a7d5d7292c SHA256 fdc45f063560e4dd1182a4732292dbaa23ece6c7fe6ad71051d91570a345a321
-EBUILD netbeans-nb-9999_p20110814.ebuild 5065 RMD160 150e3fded30684a7a9c25784d4625cd602fc1d00 SHA1 f9a869ee958bb03877fdea36051baa45716e5ff6 SHA256 7fb521ff2e19c0a176c31ba848ddff9f5a9f9ccda7791a38bbc3b5c97c0b6d15
-EBUILD netbeans-nb-9999_p20110817.ebuild 5065 RMD160 b45913b30de06ab23e3b06192beff13ab590ed12 SHA1 d7c775ee59db44a6b612e1956265aeac37290dc7 SHA256 538db2516c7af7a0ebbb088bdca4718f7216b79af227b625c246b3c54cbf9eeb
-MISC ChangeLog 12545 RMD160 d0693b6c516bf7d69c961580a10201a05b6f2080 SHA1 7bf3fa4a0b02d1eb8f8080870f44ac4d357299ab SHA256 14f3b77a884cebc45887346298ccf6dd0440c29ed9ebc4eea91292312ff951fa
+EBUILD netbeans-nb-7.0.1.ebuild 5055 RMD160 aee62cea6ae4dfa281f92984d064cd8dd99f6901 SHA1 c11d15fe0ef900d0ead4fb2f5d041cad55668983 SHA256 3afe558c3bbccca15e315f26fe854bee8bcf47560d534d931a690e08ee8184d7
+EBUILD netbeans-nb-7.0.ebuild 5051 RMD160 66c6bc81a5f710c66170fd41cf459937a3f97aa9 SHA1 8a7ffc38fc7aa6f412130b928834deef70e88ffb SHA256 7ace984bcafacd1c9d89068c7c691bfa3472df3c851616f48cc6621c8c1f6522
+EBUILD netbeans-nb-9999_p20110813.ebuild 5077 RMD160 4cdb422da454d5e9fcddf2f6f9de1eea69330b06 SHA1 e869ce6be1b218d5dabf04594fc738fa88949795 SHA256 8570c69e734aae82df23cfce0f3eb22ee6c53c02c36467e36c7582e4c1eee135
+EBUILD netbeans-nb-9999_p20110814.ebuild 5077 RMD160 9d49b2315f4489e2c383e86c6ca55fb9775d4f85 SHA1 aa1226218f017bd24dce94f9871dbd472b36ffa3 SHA256 d0c557e72c05e0fe037dae843b31681791f2f2b9c68a4eedbd0d2bbf951fbdac
+EBUILD netbeans-nb-9999_p20110817.ebuild 5077 RMD160 39aec396e8f2a550677f96c69c3248e6980a394b SHA1 b2976d6e8fc67ce6f7ff45312a6654a78ef8dffe SHA256 5104d4a02e87241e7299483bfca52dac25fb4d63a570f81b6fa2f8b97e4d5e94
+MISC ChangeLog 12806 RMD160 ca39ba04160ce7af25e092cbe671185f9c35472f SHA1 2a678d9a213ed119801fe35e2a3304fea325e330 SHA256 0447cd1f5a4171b7a9adf46051d49861cfa2dfb0019fc03c69acdb26a23ff730
MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49
diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild
index 095ba75..f576392 100644
--- a/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild
@@ -115,8 +115,8 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0.ebuild
index f277c3d..67f9033 100644
--- a/dev-java/netbeans-nb/netbeans-nb-7.0.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-7.0.ebuild
@@ -115,8 +115,8 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
index 9ae918e..9b28ecc 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110813.ebuild
@@ -115,8 +115,8 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110814.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110814.ebuild
index 39a843e..8b4397e 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110814.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110814.ebuild
@@ -115,8 +115,8 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110817.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110817.ebuild
index f75172d..323df5e 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20110817.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110817.ebuild
@@ -115,8 +115,8 @@ src_install() {
# fix paths per bug# 163483
if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
- sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
- sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-9999/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+ sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
fi
dodir /usr/share/icons/hicolor/32x32/apps
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/
@ 2015-11-06 11:55 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-11-06 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 05924a50b43e67b7edf93b07c8d750a0e7f66286
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 11:54:53 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 11:54:53 2015 +0000
URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=05924a50
dev-java/netbeans-nb: drop keychain support from version 8.1 and 9999
Package-Manager: portage-2.2.24
dev-java/netbeans-nb/Manifest | 4 ++--
dev-java/netbeans-nb/netbeans-nb-8.1.ebuild | 24 ++--------------------
.../netbeans-nb/netbeans-nb-9999_p20151105.ebuild | 24 ++--------------------
3 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ca4d655..0464f4f 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -30,7 +30,7 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
DIST netbeans-trunk-nightly-201511050002-src.zip 208737487 SHA256 86f4bd2b25363a6893ae9ec91352e93be7d6d707b8d4d0c573ab6634554499c2 SHA512 50d06f779cfdd7bbbffb91844010e93f94339c505e38b3af7a9066bc9f4a35db6dcbc8a9737e436904ea1bc18267e6139656f8dc1a82356d9b48ab442f420ec0 WHIRLPOOL 05c392e0151f0348dd5d51796262f503c312b73a4166b92d24a9598f490da6567e8b76c52ab7cefb957b34e3e0622b3e5cc3888e3a9c6cb88a18a1e917b95314
EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
-EBUILD netbeans-nb-8.1.ebuild 4951 SHA256 fde1bc0f944e6b27d9f9753887846095e3bf4f51d708b52f9ef000f454905720 SHA512 2ac9ffa8b3f0b2b080a5f4ae20eeea3b0d0b1ceee756626e54c6750ebaddb04de46d5d11c57f312dbe7ec8ad3dcaeb113af0b35727c3da5e2305aad7d58d8384 WHIRLPOOL 76cb1d53ff396abcfeb536ff1fef5c301dcad2840526ac9ce6796250b2c348b7d280d56ba53d60b3d2a9bfe9fd431d1ea6014d4ebe28b79b1199564af0fa1765
+EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d
EBUILD netbeans-nb-9999_p20151003.ebuild 4997 SHA256 4a3f76f876ef86def5c520bfe25862b967c4a1541afe3482249606b3f25bf834 SHA512 8b7394269188b4ca4fc3ae1c57b8433d1fcbecfec83a65ce24784f15677417c9023a290e13c2815bed8366d9059aaa958e3e8010a0a5c54e1ba6dcae2991babe WHIRLPOOL dfd1bc86f95779e9a8f0058838a3566153b42095f3c4fac7763eccbab6fee0612053c3becb53d01d4000c314a4299c17653e816007a1b51d262e6b39409b9e47
EBUILD netbeans-nb-9999_p20151004.ebuild 4997 SHA256 fa04d92fff6adbd9130da20623b7543a8688e6049499d626893c89f13c71f35e SHA512 f402582e19c0dea600d2bb222f9aca62671b7a66f8a480a689a70cf0472ced8097a3a9ecdefcefac34c5c03c5e75d56cb6ce1525d347e649559412aa3b5ada72 WHIRLPOOL 7b8dd62345302e778b93a9e27bfadbc8eb559f905362165b9f3c1929141690f521d87dc7d5e783d3fabaa63d0b87cf7d0feee9a47db05277c9723c50cdfa4ba0
@@ -53,5 +53,5 @@ EBUILD netbeans-nb-9999_p20151027.ebuild 4997 SHA256 11d39ce8dcb6e465c843c74367a
EBUILD netbeans-nb-9999_p20151028.ebuild 4997 SHA256 245af016e2976230fc5ede4b16fb09a9fa7ee451498129cb5b06ac97254bcb73 SHA512 1594eb2bb3f6a00938fcca94a7a858681e9d7c263fe95eca8452b6c01c19d1061a0e3e2b69997ae46418d32dccf8dd5278bbc181666910188276000bd618de68 WHIRLPOOL 6b9446734a7c36570a32eb14ac4241a0fdb22fa23ad932c4a5419f09c62538eb6ff15f218804b28466ff107f574a50c708ce23d19800b27f325b0ae319941842
EBUILD netbeans-nb-9999_p20151101.ebuild 4997 SHA256 9c42522f7debe07d0511b8127fcd144fee5acb66fc17888eed697d0723e4ebf1 SHA512 6c34b949c1b8e6c7263fa5c463e43bdedd832d4ff0e82272da4d53f6971a82fc086869309332757a44ac25e68909392b1a37f270bd389cb089418679e133f34c WHIRLPOOL 2ed2078031e3cfb031eb6a06536835269b3dd568740cd083b4bbaee92d1f70c60a795d143c4e6b9e271eea1a023e249732b03c97fbab9af876b7175fced04139
EBUILD netbeans-nb-9999_p20151103.ebuild 4997 SHA256 f19461c82960da3ede496a20f8f79d8f51943b10e1fb16e9cfde899aae4c3e38 SHA512 1b2404a0ef3d847b69fe8e667c8474fdb6a34b114141b2a63c9243c53f7bf622413b3e54047e4612bc9832dfad141aa0aa134dbd5e4afc07f70b2e52d69a51d9 WHIRLPOOL cb1390a21f8cc3c29c3d1c5c95bdc1a4dc2e22344ed8b4458b4654201c9f8fc68932dbb1b443e24b9fe9c13c2bc711126b184f79536d4c6d88b35f802e502152
-EBUILD netbeans-nb-9999_p20151105.ebuild 4997 SHA256 7e614b589c158239eaeae48c7d8c361395ceff6b934b68643061149bd6b16631 SHA512 b09e5493a0c6c054e314c06876575f629643fc2dbbc658564d0c9ecb09e2bb99c93cd03c154e669fcb0f6529e04cf70e376aa3a5fd8683c8ad6eac7559939abb WHIRLPOOL 5814edd97e4d3de43d9aea9597778b872566e10251489fad93c8f9eccb33b1c4ab30abe95bba6fc7778bb4c25a8691fecbd275cad8fce49bbbd9068747d2851a
+EBUILD netbeans-nb-9999_p20151105.ebuild 4111 SHA256 c7295376c78f8ee438a5f3cccfa0fc771778d7af1dd62c32fe8d7b850b39694c SHA512 cc36c1f65772bec2f563188fcbffd98f6a4d5609baf5a201ab6f50e62d03f101a36e06165162fbeb6d6684fb22017e8110da5a0a2b0e15038daf21e2b9f96fe1 WHIRLPOOL e485a6ef921cf6edcb122816176384e35968b1af523289fd1aa88883982fda51cdfb24586a4ae33359259f1854c296c228da0018dcd41256143d80c05a2dc36c
MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
index 3a796bb..ab6b3b9 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
KEYWORDS="~amd64 ~x86"
-IUSE="keychain"
+IUSE=""
S="${WORKDIR}"
CDEPEND="~dev-java/netbeans-platform-${PV}
@@ -25,11 +25,7 @@ DEPEND=">=virtual/jdk-1.7
${CDEPEND}
dev-java/javahelp:0"
RDEPEND=">=virtual/jdk-1.7
- ${CDEPEND}
- keychain? (
- net-misc/keychain:0
- net-misc/x11-ssh-askpass:0
- )"
+ ${CDEPEND}"
INSTALL_DIR="/usr/share/${PN}-${SLOT}"
@@ -53,7 +49,6 @@ src_prepare() {
find -name "*.class" -type f | xargs rm -vf
epatch netbeans-8.1-build.xml.patch
- use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
# Support for custom patches
if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
@@ -131,18 +126,3 @@ src_install() {
mkdir -p "${D}"/${INSTALL_DIR}/nb/config || die
echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
}
-
-pkg_postinst() {
- if use keychain ; then
- einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
- einfo "your keys while connecting to ssh protected repositories. If you want to load some"
- einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
- einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
- einfo "each key on single line, for example:"
- einfo "id_dsa"
- einfo "id_dsa_gentoo"
- einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
- einfo "for key password (only this time and never again). You can find more information"
- einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
- fi
-}
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild
index 04ff1e2..adb46dc 100644
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151105.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
KEYWORDS="~amd64 ~x86"
-IUSE="keychain"
+IUSE=""
S="${WORKDIR}"
CDEPEND="~dev-java/netbeans-platform-${PV}
@@ -25,11 +25,7 @@ DEPEND=">=virtual/jdk-1.7
${CDEPEND}
dev-java/javahelp:0"
RDEPEND=">=virtual/jdk-1.7
- ${CDEPEND}
- keychain? (
- net-misc/keychain:0
- net-misc/x11-ssh-askpass:0
- )"
+ ${CDEPEND}"
INSTALL_DIR="/usr/share/${PN}-${SLOT}"
@@ -53,7 +49,6 @@ src_prepare() {
find -name "*.class" -type f | xargs rm -vf
epatch netbeans-9999-r14-build.xml.patch
- use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
# Support for custom patches
if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
@@ -131,18 +126,3 @@ src_install() {
mkdir -p "${D}"/${INSTALL_DIR}/nb/config || die
echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
}
-
-pkg_postinst() {
- if use keychain ; then
- einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
- einfo "your keys while connecting to ssh protected repositories. If you want to load some"
- einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
- einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
- einfo "each key on single line, for example:"
- einfo "id_dsa"
- einfo "id_dsa_gentoo"
- einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
- einfo "for key password (only this time and never again). You can find more information"
- einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-06 11:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-15 7:55 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2011-08-18 10:51 Miroslav Šulc
2015-11-06 11:55 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox