[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/
Date: Thu, 18 Aug 2011 10:51:47 +0000 (UTC)	[thread overview]
Message-ID: <5f8371e26cbb08876179ac4b78a9b14bd25845dd.fordfrog@gentoo> (raw)

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

next             reply	other threads:[~2011-08-18 10:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-18 10:51 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-11-06 11:55 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/ Miroslav Šulc
2011-08-15  7:55 Miroslav Šulc

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:4fa553f dfblob:88f4bd4 dfblob:a8dd10d dfblob:f7b47cc
dfblob:095ba75 dfblob:f576392 dfblob:f277c3d dfblob:67f9033
dfblob:9ae918e dfblob:9b28ecc dfblob:39a843e dfblob:8b4397e
dfblob:f75172d dfblob:323df5e )
 OR (
bs:"[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5f8371e26cbb08876179ac4b78a9b14bd25845dd.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox