summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2013-02-25 13:19:13 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2013-02-25 13:19:13 +0000
commita6f9a2c71ef13d9a017a5bdaea8a3ed445423000 (patch)
tree563e050c36f4c2d5ee56607e9d2b16aee58cce72 /dev-java/netbeans-nb
parentStable for x86, wrt bug #458238 (diff)
downloadhistorical-a6f9a2c71ef13d9a017a5bdaea8a3ed445423000.tar.gz
historical-a6f9a2c71ef13d9a017a5bdaea8a3ed445423000.tar.bz2
historical-a6f9a2c71ef13d9a017a5bdaea8a3ed445423000.zip
dev-java/netbeans-nb: added missing patch
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64 Manifest-Sign-Key: 0xCFE47E2F
Diffstat (limited to 'dev-java/netbeans-nb')
-rw-r--r--dev-java/netbeans-nb/ChangeLog6
-rw-r--r--dev-java/netbeans-nb/Manifest9
-rw-r--r--dev-java/netbeans-nb/files/7.3/keychain-support.patch26
3 files changed, 36 insertions, 5 deletions
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index a76fbf0dfd99..8f5c695e9616 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/netbeans-nb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.19 2013/02/21 15:51:37 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.20 2013/02/25 13:19:02 fordfrog Exp $
+
+ 25 Feb 2013; Miroslav Šulc <fordfrog@gentoo.org>
+ +files/7.3/keychain-support.patch:
+ added missing patch
*netbeans-nb-7.3 (21 Feb 2013)
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 43beaf7135ae..06c1206f7014 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
AUX 7.0/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
AUX 7.1/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
AUX 7.2/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
+AUX 7.3/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f SHA512 ec81bbef311f891dd4371644afd549bef460e8e70eed49f7dbb5aec68f386097f340a411932345ba7bc786a1aef1f0b70a719d8e784b048d5ebf8b1e9ef3bb44 WHIRLPOOL 5c4440c6e2b75209b00030d1e78c28600dc387cc836be8b74bd2d55a6426c5a10d57e21a9572b83f499aa9ed6c33e2ecce44a82c440bba818e4d22c1cf856a55
DIST netbeans-7.0.1-201107282000-src.zip 175987235 SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa SHA512 c2b4122d7bf8332455ac71d72e76d29bc31e13d892997e153ee1bb99a019f58bfc12179a24ab2bdaaf1c61ad823b7c24857523d0363ea6856b81a0aaef9d2eca WHIRLPOOL 296b51405e16e580101f15a459f4e07ec31ab353fec1e4c4d5ae79ff7d378e994291c7c378f380fbf83d1718366f38bbb3801834079db466a1c3bade099d7fd0
DIST netbeans-7.0.png 20011 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113 WHIRLPOOL ef41b010f5c5b2023152c9eb4390c40716025f1162dae68f6c65fc642f1732494f70b086a032599c696d053b963e4edc1220a3c1212ede6209c27fecb1ffe5fa
@@ -19,12 +20,12 @@ EBUILD netbeans-nb-7.1.1.ebuild 5096 SHA256 dd0d2234b67021502a4149a744731b16a4e3
EBUILD netbeans-nb-7.1.2.ebuild 5090 SHA256 5c846045b52986f274ed6c212a3e3ac27353be87f5323d9168da866532c87de4 SHA512 67fec0afd8a4083a3b004738375039264f6e446986efddc91a995207cb76b7dd6951f6c218eff68488a73fc3f5625aa04310584b5d285e168c5415ec4f2d2bbf WHIRLPOOL 5678eaec3836d92204423d7f6b43a96e87ec38b7d89b2e041aa41e1b7e9454311b4bf9063ae0c11e482be9995384786aecac2318e0e348dc98ed006df9215857
EBUILD netbeans-nb-7.2.ebuild 5070 SHA256 2c020f64e7b339be6354b558cfa99cf47a08d058c549ea55615bb324acb89391 SHA512 4037e3a23498868b215278ac6fe00728c1d507d77ef84c2d300ecc34e1d32afedc84590937c6cdbe29b5403ce429e903f8f35037e089dbd133bbdb11a7fdef52 WHIRLPOOL cf08d1ddeeb3b9309360ee94b3bdd39bde6625cbefcb6e410f749c7fffe60f55edf3b3495ff752b25aaf71d972ffc1d94c4df9ebb64058198064b5f266c1b08b
EBUILD netbeans-nb-7.3.ebuild 5094 SHA256 a858025e1d9bd3e42a09381ae6d476e197cda9e0b4c5e071f2de8ad8343beb47 SHA512 84dcaefeae92251ab4db364ab65de1ff7c5b4fdc74c95cbe9b98abcf2b0e40a24a9b4e3ef95d2e683f6c7eaf6f9b73c415b4ff56e2d497beb9932277315f9865 WHIRLPOOL 8c2c829f93e89f5ba010b597ecd775522c58ac436c19f13047709808ced6f9a24a26ae6e8c62cd97a7c6a88c5ddeca0cd4607ae491a75bd2e8000a1790a59b9f
-MISC ChangeLog 2778 SHA256 c13367cac4551e4dcaffe5c6e36456fb0f414ef9824848db0c4263d206a94c00 SHA512 ec7cc9b84e2d3525c520652ee132f7df0baf506bdf1848d1fd6501556e6434373a3a7081b454d92ec780f273a2c4d717bfdcd042e7069517ba1fab4b372bc778 WHIRLPOOL 771d1ad66c281a9c93be1a9e982f6624288a6c4905f8f71d1742bac8c65ee9654eea58154cce8593cf6fc6d9dc50db886b71848e37ca9b05ccc0141788886dc8
+MISC ChangeLog 2890 SHA256 94d451e16b41be464d6f4cab00e66a1458cda88e8f6acea1162a55fdf750523d SHA512 47538683a9b3fe8ca8554a65022463cdb259e1bd86943828d75fbaee98fba4d337819f788b3813bd3fbfb3ed4b9d439860929776f51b8f2dbc4f94cab62faec9 WHIRLPOOL d65613eba1753dadb5278c106b099eda95fa4f806fe7e025448185a0c40a2a123641eb4f99c427d0fb0f83648dacdba3cc75c8caf3954d5138eacaaf7aef40bc
MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlEmQooACgkQ5LnnVc/kfi/RlwD7B+QMVObf3Ee+H69/l1dnEN3b
-nRikzuogaB+DbOqZ+2EA/37CnP40E6XQ8MtUrZ3a44RNLYpPsE5QkxDn5eEtTc3D
-=2tOB
+iF4EAREIAAYFAlErZM4ACgkQ5LnnVc/kfi8vdAD/RY65g63DgxYurRjVEfkM+2MR
+nbwuiZaYwxsF0ZRjk+ABAJqV9px2/o8g529QGW26zK3c9c9VH1hJoKV0XvET9bXX
+=obBQ
-----END PGP SIGNATURE-----
diff --git a/dev-java/netbeans-nb/files/7.3/keychain-support.patch b/dev-java/netbeans-nb/files/7.3/keychain-support.patch
new file mode 100644
index 000000000000..4e9c4878fbcc
--- /dev/null
+++ b/dev-java/netbeans-nb/files/7.3/keychain-support.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
+diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
+--- a/ide/launcher/unix/netbeans Tue Nov 09 13:44:15 2010 +0100
++++ b/ide/launcher/unix/netbeans Tue Nov 09 14:21:18 2010 +0100
+@@ -169,6 +169,20 @@
+ then
+ sh=/bin/bash
+ fi
++ keychain=`which keychain`
++ if [ -n "$keychain" ]; then
++ $keychain -q
++ . $HOME/.keychain/$HOSTNAME-sh
++ if [ -e $userdir/keychain-keys.txt ]; then
++ for key in `cat $userdir/keychain-keys.txt`; do
++ SSH_ASKPASS=`which x11-ssh-askpass`
++ export SSH_ASKPASS
++ if [ -n "$key" ]; then
++ keychain $key
++ fi
++ done
++ fi
++ fi
+ if [ "${founduserdir}" = "yes" ]; then
+ exec $sh "$nbexec" "$@"
+ else