diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2012-07-28 10:38:23 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2012-07-28 10:38:23 +0000 |
| commit | ce8e6bc79fb229052381bfe994ac7a9c50457f57 (patch) | |
| tree | 0b7b033de3306a7216dda605cdb4b312239eb724 /dev-java | |
| parent | adjust libusb dep to fix bug #428402 (diff) | |
| download | gentoo-2-ce8e6bc79fb229052381bfe994ac7a9c50457f57.tar.gz gentoo-2-ce8e6bc79fb229052381bfe994ac7a9c50457f57.tar.bz2 gentoo-2-ce8e6bc79fb229052381bfe994ac7a9c50457f57.zip | |
dev-java/netbeans-nb: added missing keychain patch for slot 7.2
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/netbeans-nb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/netbeans-nb/files/7.2/keychain-support.patch | 26 |
2 files changed, 31 insertions, 1 deletions
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog index c546a4c07ec7..6b02428bceaf 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.15 2012/07/25 16:09:12 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.16 2012/07/28 10:38:23 fordfrog Exp $ + + 28 Jul 2012; Miroslav Šulc <fordfrog@gentoo.org> + +files/7.2/keychain-support.patch: + added missing keychain patch for slot 7.2 *netbeans-nb-7.2 (25 Jul 2012) diff --git a/dev-java/netbeans-nb/files/7.2/keychain-support.patch b/dev-java/netbeans-nb/files/7.2/keychain-support.patch new file mode 100644 index 000000000000..4e9c4878fbcc --- /dev/null +++ b/dev-java/netbeans-nb/files/7.2/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 |