Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-nb/files/7.3/, dev-java/netbeans-nb/
Date: Mon, 25 Feb 2013 13:15:40
Message-Id: 1361798124.c93e2197807d030932b6ee92452202f73263b5c7.fordfrog@gentoo
1 commit: c93e2197807d030932b6ee92452202f73263b5c7
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 25 13:15:24 2013 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 25 13:15:24 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=c93e2197
7
8 dev-java/netbeans-nb: added missing patch
9
10 ---
11 dev-java/netbeans-nb/ChangeLog | 4 +++
12 dev-java/netbeans-nb/Manifest | 3 +-
13 .../netbeans-nb/files/7.3/keychain-support.patch | 26 ++++++++++++++++++++
14 3 files changed, 32 insertions(+), 1 deletions(-)
15
16 diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
17 index 4e994fa..712bf57 100644
18 --- a/dev-java/netbeans-nb/ChangeLog
19 +++ b/dev-java/netbeans-nb/ChangeLog
20 @@ -2,6 +2,10 @@
21 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
22 # $Header: $
23
24 + 25 Feb 2013; Miroslav Šulc <fordfrog@g.o>
25 + +files/7.3/keychain-support.patch:
26 + added missing patch
27 +
28 *netbeans-nb-9999_p20130224 (25 Feb 2013)
29
30 25 Feb 2013; Miroslav Šulc <fordfrog@g.o>
31
32 diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
33 index 47ba41f..c45754e 100644
34 --- a/dev-java/netbeans-nb/Manifest
35 +++ b/dev-java/netbeans-nb/Manifest
36 @@ -1,6 +1,7 @@
37 AUX 7.0/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
38 AUX 7.1/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
39 AUX 7.2/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
40 +AUX 7.3/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
41 AUX 9999/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
42 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f SHA512 ec81bbef311f891dd4371644afd549bef460e8e70eed49f7dbb5aec68f386097f340a411932345ba7bc786a1aef1f0b70a719d8e784b048d5ebf8b1e9ef3bb44 WHIRLPOOL 5c4440c6e2b75209b00030d1e78c28600dc387cc836be8b74bd2d55a6426c5a10d57e21a9572b83f499aa9ed6c33e2ecce44a82c440bba818e4d22c1cf856a55
43 DIST netbeans-7.0.1-201107282000-src.zip 175987235 SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa SHA512 c2b4122d7bf8332455ac71d72e76d29bc31e13d892997e153ee1bb99a019f58bfc12179a24ab2bdaaf1c61ad823b7c24857523d0363ea6856b81a0aaef9d2eca WHIRLPOOL 296b51405e16e580101f15a459f4e07ec31ab353fec1e4c4d5ae79ff7d378e994291c7c378f380fbf83d1718366f38bbb3801834079db466a1c3bade099d7fd0
44 @@ -38,5 +39,5 @@ EBUILD netbeans-nb-9999_p20130220.ebuild 5036 SHA256 0e259dae7b15ce297ac5e42864e
45 EBUILD netbeans-nb-9999_p20130222.ebuild 5036 SHA256 40e577b93434b5a2c957b3c2999c890ff3f9fec3b1cef94237860eadb4fe7ce4 SHA512 df1e2e6bf1cd41c995a97d35d6af4f74db35fa835ba578a25a6f3c21dacde6a7c115b7cb86e17ff8c31d6dffc538b00493b421b0256ca5dfb620f45614572e7a WHIRLPOOL 19877b2a7672f7bc073cf371fdce02f457400657f019b4cadcf4575c685e52ebc4191148e71e27c36a207f19d86e420ab54607737ff133a788d0a32d17523aa3
46 EBUILD netbeans-nb-9999_p20130223.ebuild 5036 SHA256 cf6cda5afae6da23827421f67ae354c0252b8fa9c6be5178bb0d2d8385b8086d SHA512 b1654244e254b62c005f453e775382bca45d54b507a4b270177ad956414cbc34f8ca0d8f95e33699d373d4c3024965d77772c49c9728d6226c151645ef2ed505 WHIRLPOOL cfc031e0484db0e339daa0842d7f00692859e6f5f08528aac988341d85b4be5b8a51e87bde28db4f4fbba1902c432491b9ba31251d915c26a5aaf393a671cdf8
47 EBUILD netbeans-nb-9999_p20130224.ebuild 5036 SHA256 7da168bf75c1f3673d267b325b6da83daf63b690eb92a94a6b08105de260a49d SHA512 d86670c92c359db5a6cf34a10ffd2d1d92b502a946766b65767fa2648a8f94d7a3dec8f256dea18d24fec268d971483e4281921eb00abbe0e4333e85d4e361a5 WHIRLPOOL f12a215cff3186f785122f0d2861810ccb1f694ff78c2e10cab0e6a898df50b3e8d0d769afc48dff2bc0133d198c32d1fcc64ec0616e924b1a5bf21337ab982c
48 -MISC ChangeLog 65665 SHA256 c7f3b85b480ee62eeec767810b129b95a7e4ced128bd658f3be556d6fdfed0b9 SHA512 9517685c9e09c7d1cba9a6f789d7cc354ba2fb56f815d4eb754c8d77d464d60d26e0663d811d40b9d1e1e3254e95508751988929863d6e6594ad1915057ff5dd WHIRLPOOL dbb2d7613cfdf5abca5d157928c373ade8539daaff2f822faff8f157b9378c010773fb2e8605066fac8154836166a00620844d587e5c2f621047c95c856a2eee
49 +MISC ChangeLog 65777 SHA256 bbeb7b2a96660ea30ed2646854b3bcbe4b1f3b00c20854ca7f748793d8bab4e0 SHA512 60400bc5108e043112e82053702b7c0d44c367b5999cb30c767a1ad9c26d8a24daecae2e0bc26295618d4c20dff76b9a8f56e92672413d21a2ffffe241c83697 WHIRLPOOL bfb8f4d31576d126cad4183859b7fc7b4da3dbf94dacff4e71e52356172f6012e654c8b701b7f152ccf5045b7d9ecdf8250c2d301e163dd3a5ac920bb598a4b8
50 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7
51
52 diff --git a/dev-java/netbeans-nb/files/7.3/keychain-support.patch b/dev-java/netbeans-nb/files/7.3/keychain-support.patch
53 new file mode 100644
54 index 0000000..4e9c487
55 --- /dev/null
56 +++ b/dev-java/netbeans-nb/files/7.3/keychain-support.patch
57 @@ -0,0 +1,26 @@
58 +# HG changeset patch
59 +# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
60 +diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
61 +--- a/ide/launcher/unix/netbeans Tue Nov 09 13:44:15 2010 +0100
62 ++++ b/ide/launcher/unix/netbeans Tue Nov 09 14:21:18 2010 +0100
63 +@@ -169,6 +169,20 @@
64 + then
65 + sh=/bin/bash
66 + fi
67 ++ keychain=`which keychain`
68 ++ if [ -n "$keychain" ]; then
69 ++ $keychain -q
70 ++ . $HOME/.keychain/$HOSTNAME-sh
71 ++ if [ -e $userdir/keychain-keys.txt ]; then
72 ++ for key in `cat $userdir/keychain-keys.txt`; do
73 ++ SSH_ASKPASS=`which x11-ssh-askpass`
74 ++ export SSH_ASKPASS
75 ++ if [ -n "$key" ]; then
76 ++ keychain $key
77 ++ fi
78 ++ done
79 ++ fi
80 ++ fi
81 + if [ "${founduserdir}" = "yes" ]; then
82 + exec $sh "$nbexec" "$@"
83 + else