summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2012-07-28 10:38:23 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2012-07-28 10:38:23 +0000
commit7101a2aea6c5a3d6f6e395b91d450bc066964984 (patch)
treee8bdaebbde76393bb3a85d97d5fc9ff4c8680964 /dev-java
parentadjust libusb dep to fix bug #428402 (diff)
downloadhistorical-7101a2aea6c5a3d6f6e395b91d450bc066964984.tar.gz
historical-7101a2aea6c5a3d6f6e395b91d450bc066964984.tar.bz2
historical-7101a2aea6c5a3d6f6e395b91d450bc066964984.zip
dev-java/netbeans-nb: added missing keychain patch for slot 7.2
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/netbeans-nb/ChangeLog6
-rw-r--r--dev-java/netbeans-nb/Manifest3
-rw-r--r--dev-java/netbeans-nb/files/7.2/keychain-support.patch26
3 files changed, 33 insertions, 2 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/Manifest b/dev-java/netbeans-nb/Manifest
index eae2594c7dac..a6016f23cbaf 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -1,5 +1,6 @@
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
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
@@ -12,5 +13,5 @@ EBUILD netbeans-nb-7.0.1.ebuild 5225 SHA256 1a21df7cc55b4dd8d97a3106c41f65b61a91
EBUILD netbeans-nb-7.1.1.ebuild 5096 SHA256 dd0d2234b67021502a4149a744731b16a4e3eaddce4180f1c55f4b8db5362af4 SHA512 e1ca7beb228ce7ae908444de04d041e39129f235fff76d078c95895432c22047c401395f59e129b31087f5d3bbbe24f8aace83169d0155cbb56b79a65bf7dbd5 WHIRLPOOL f874f8aea2b35a432d612956bb42305cafefa010d760e49602c1adbfc050270b9ca534b0382ecabc8322445fe04c0ff9bd1aaf0e12733d01f9db8d131315bd6a
EBUILD netbeans-nb-7.1.2.ebuild 5090 SHA256 5c846045b52986f274ed6c212a3e3ac27353be87f5323d9168da866532c87de4 SHA512 67fec0afd8a4083a3b004738375039264f6e446986efddc91a995207cb76b7dd6951f6c218eff68488a73fc3f5625aa04310584b5d285e168c5415ec4f2d2bbf WHIRLPOOL 5678eaec3836d92204423d7f6b43a96e87ec38b7d89b2e041aa41e1b7e9454311b4bf9063ae0c11e482be9995384786aecac2318e0e348dc98ed006df9215857
EBUILD netbeans-nb-7.2.ebuild 5077 SHA256 47cb2b6e7343318152d533dd30b10d127e61b72ac6c33ab353c942e4701c0919 SHA512 308505a0b0481ec9432fcc4814e476a128b20ea29a456bd885a77bc038be857d952dfc257f938eb5b14baeb7978f298efa586cff6c44eb8bb55ca777c975dc65 WHIRLPOOL 1dac525f906b549ab324244f1580b67a91eed533d1f8407474c5cc355519b39b7739d5fe3b16c42492575d3f5396bf62c23c78ea43111c005916a76371d900ac
-MISC ChangeLog 2335 SHA256 27e683c631d8213806a9a300972a51ca5b422a4730ba09704b815340cb7c3179 SHA512 d88a23f8a35192ced31eaedbdd03c2c08b0c0a407fe76eaadc15448da7862f1e2a1650d51c2e2640a041731130ef82a4cf3c080d6e7ffee5e1a74e7c729ee5c8 WHIRLPOOL e517902d68a223d37a2463e797b302795a08665c008fbd962c2bddf1a41da3bd3e0565bd4ceca2eb17ce1ccd0e7d2b4e670d915c44ad18faa1d9bcd734b9056f
+MISC ChangeLog 2469 SHA256 94db99ed6977de67ffd997098d09e98d6b487bc63053a3fb4664148613a7442b SHA512 9d3236583d173fa5b96f79a93be389ba05e75c3a8a23087ac7171c200d3f0d6e7544a28020ef4961f4bcb8ee4ccdbea4063ae37ca8fb251d5b03fe8c3d80c7c1 WHIRLPOOL 89d9c25aaf006a4afc247946bb15c8258cea802aba4272c231232d6f6f37134ae53e7a7287aa4253eb62aa1bdce55e8b60d8db847b8cff43096426414beeeb36
MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7
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