Version bump by Alessandro Di Federico <ale@clearmind.me>.

Package-Manager: portage-2.1.11.14/cvs/Linux x86_64

4 files changed, 162 insertions, 9 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index 24cdd79dc85e..6dc69c91826d 100644
--- a/app-admin/keepass/ChangeLog
+++ b/app-admin/keepass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/keepass
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.1 2012/08/04 14:21:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.2 2012/09/11 12:55:30 kensington Exp $
+
+*keepass-2.20 (11 Sep 2012)
+
+  11 Sep 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/keepass-2.20-xsl-path-detection.patch, +keepass-2.20.ebuild:
+  Version bump by Alessandro Di Federico <ale@clearmind.me>.
 
 *keepass-2.19 (04 Aug 2012)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 5eb8b1070b56..c744c8453cdb 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -3,19 +3,22 @@ Hash: SHA256
 
 AUX keepass-2.19-skip-sgen-if-unix.patch 839 SHA256 5c17b676df36e763275c71f369c68ad86a793341c0ab65d4adde9c09e63347a5 SHA512 44e9da9480f75cd6837cf802607b3ae9df121f8a9c4b6755ae4b330297478a1f649128431061138426d7ab24b2fc53b368dea41d0096510c94460f1dfad84a59 WHIRLPOOL 2754389e8cbd832fd3a10c35e93a9167d96228c943f50e3c5fa294ecbb95cd1a0ad03b7b478e6e96d3cb2c02e08078bc64e151f9b334c8846786af4e599d4003
 AUX keepass-2.19-xsl-path-detection.patch 1499 SHA256 a187a1923c4373ce60aba9bc62c24180c343a4f637d3799832d8aca7e6324682 SHA512 de61a588f7544fad1994321d49ad6c7c3902825ba70a4fa93fdb7bbb474369d5ee06cdc5095296c97028d32bcbaf3414c02bf5146e03e72e260c13408d5ded8e WHIRLPOOL e76b2bc8dc57aed4c503dddd27de28bf8d1864dfa55a427ce840fc7018709bc9ce63553804d0e51eebe619fd95d42b21be383708a8db8afcfd10db1e6f053978
+AUX keepass-2.20-xsl-path-detection.patch 1596 SHA256 6b95ac5786824424781dc12bb031e22c5ec8cd91ab406231ae4b09de07f42c42 SHA512 6aa8ee88e0dcb09f2394432ea49953c582127a38c75bb86ce24e9f4f979b5dc673a534dac550793bcb3bc337aa218aa71edc22d79aa7eb6bde204cd6981f2976 WHIRLPOOL 62b0e8438195f7ebe7fa3136fb26b95723c55a6cc1e71f9586f95b27225bdf60e28a1b7f67abefda86ca05eeee237369e734f93b8f17c7b4b5b41e68cc1237bf
 AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411c77ebb3ee3f SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb WHIRLPOOL d0ee272ae608241ca67a0a2d1365d37e19b86ce4a7baede55f7094f8b1b58671935a753fa3f9859777c0bef2ee47a36b418165e5e6c894bfa6e634f965abd57e
 DIST KeePass-2.19-Source.zip 3338045 SHA256 772a223ca9a799176fb6e473527bfc756663a57c322241002e6b81638e5e7bef SHA512 27c22552ccf6ec55d430bd90d8f79ac70ff11cf674240cb16575ba8342eee44a0079ee8ab8800b773985fb41b79875b7d88a54267989e3b7b2112732169093e0 WHIRLPOOL a9b5cb2adf48f90f1a922f9ed165cc3e3e95f21e5ed76a1ea6a40c8f1bea1d34ddf0417b7d372adcc557152ee762bfd0a80c8ac7f94da50cafe03fc4a35c22bc
+DIST KeePass-2.20-Source.zip 3417074 SHA256 84917e57e69ae598cd55cc7eeed26f2b1732614e84890cd641a6e64c35509bd4 SHA512 5e4d388d68b23d77d3c519e975a53f85113f6ed7cad7414e14cfc6a8f8ffe3499da594cd571076e1977625c2ebbae8a1add33f1efd34739b0692718b7535a58c WHIRLPOOL 171071195a296e52f44a5c028b1c48665b3e2259d030d6d545370491ef86c4db52f44132cde44a4d871adc0c86890ac879568f341da00b4bbbc65a02c890a3bf
 EBUILD keepass-2.19.ebuild 2569 SHA256 678eca1d10f512f14e3fc9262052dcc322c7ee84ca90eb01a8a220cf18a17ccb SHA512 c340cdb045b7c0dabd46a6a6fc9e4530cc6e3d8185fb951b4827bf4e75713dcdb1468d9b39ece18d6214b0562e164278305074bbd38feac02f0abef873ca90b5 WHIRLPOOL 8509d2c0ec6e79163998c41681ee6bacc61deb2c3a41eb6ad855cda4e4fe052498087a8b0a32619ba4939f788ef545358cc9f9e759c5f46b2dbe4a221922ea0b
-MISC ChangeLog 539 SHA256 1b6d2794462bb6e98da1bf3fe168a61dc1bcbd3f2f5534d00649f0ab0e548f7c SHA512 6149940997352f072553e8bd63e58923ccef9be0fc419065e007223fdcd3e336c86471b9e2d47879c1c402c8767d395f9d58b6041d503f64969a3df5f3ff3bed WHIRLPOOL 06e4f14c89aa296ffb63b9fc13795b359cb86f01de65411b8a67bb1afac408a4787a0ea04faae11c9efedbb555cf62c0a0095217524d76a5e3d76131c16cab07
+EBUILD keepass-2.20.ebuild 2550 SHA256 edbcb7c39aebc2f0354b8bc2bd6f58cd286da2999172a94466ff76a3a8e3908c SHA512 19bb54125e8694f9647aa85f354fcb97460618382482b5bd90a9b2a5ab9709bcc89f8b90448b914008ab9d1c96d3040246b9dc537d47a6d3756f77c2fd70336d WHIRLPOOL 6f7c08bd054585df7090dddf4e1d7240fc5fc10927a23c983db927c594fff660778814c1d1e833ecb3136b90c4b15eca4fe630506559f07d8080e667c9567204
+MISC ChangeLog 756 SHA256 55de794e644b9ecbc43dc07d67dd8cd5015219c2cc87725e4d7fb59bffd91fa8 SHA512 62baabe88cbfd4761d1568dbbe8eb9d87a595a8c1398414a03d44839b63d3070e9ccd928c2e1a2e9453d7ee3e87565dcee7df583f13ec65e37cc2d1a71cb2047 WHIRLPOOL 014ba57075e1b7d279a8372f2257c624ce021ebf3bf069b94271fd6823d53dedffd3962884a1d4147d9b615ba2643bc339642436de6f6bd167a543009c8db123
 MISC metadata.xml 637 SHA256 48bf99013c8266faf11c6ed20ead4e25b5d081b9f8e9ce4a9ba0905db6a6c6d9 SHA512 954f9e9d800f2b25da7e82f7953b005e41d7d9a996dc261f0ebb9db3944db46d59815698274fda0f93c8fcce5b0563a5200fd09e42d59470bd734b4239841935 WHIRLPOOL 973ea44da3b79e5bef665a018c650a5cbd92e3291377c53dbb5e58c63cdd009e64df4d2ce59a5a6ad9e5ad04d8bacf6c2015f2f1917ed2f0645028cf06944f48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQHS/DAAoJEMbwO6tnXQ0ssKsIALd18hlGxtFVRAmV6c9SymlP
-4a+p0d0SomVJnBgbzqjKoHDEaudwgxQu7ke0rwws8V2YmcGOtEAQZ6Xl9zWwGB/k
-O+Lgrmcr4T7cLZlTQX1+mEWWcglnS+7Umf2P7dkGt8F5KgfPPLiqsf73JNZO9D5J
-sbNAOI04hRKWzoWhJKyfo1QHexETwLUWrC1hbtGkTpgFB71S8gzckJuoVGYdoYeD
-SKm/bVPYe5nO14oJ5gcqw7UmkrEjx6mls/U8HP1tNWd55wu8k6KSOD3WQqZ/aSXb
-cUKP9doFER4odPhqhOa7jfusLnNS1UGx/1Yk0vIx5EbAQCqoCORbHg1kWWLNSk0=
-=6Yto
+iQEcBAEBCAAGBQJQTzSUAAoJEMbwO6tnXQ0sTVAIALI+loG/i8VOBrxQ+MhQz3uk
+552Pp95PilNa0+0M4VN1TyHzdhHOCxjJR3UzOLGtlsK/DefeWJgTYQEoxHQP2GKA
+zvpnBCNqq0CGRSQlOiT9HXG1A/hoWjo9YtX7bWC4qmC84tJoEI/uj49fKL6I+1H8
+JOOOm+Nf153nWPoRH7zYBAfsSWi2G6l/mheHxWUR0+/YC65OGl+SiLN3g436l3XZ
+AH5SQl/HlwLLIN//167tyKLKTZeG1OtHOzKgS0aGmBF7lybKBLp6jht7yaPWsYYJ
+yox7OHCTNrkmNl6abfY52wgUvlomYacxoZtuwMjJ8kvREDswH5OVnf1ABoxP2eQ=
+=ijIc
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch
new file mode 100644
index 000000000000..d3805feb0d98
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch
@@ -0,0 +1,45 @@
+KeePass looks for some resources (XSL files) in the executable directory,
+however under UNIX system this not a good idea, so we look into the
+CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
+So the final search path should be "/usr/share/KeePass/XSL/".
+
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index 8a04c87..6083c00 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -31,9 +31,11 @@ using KeePass.UI;
+ using KeePass.Resources;

+ using KeePass.Util;

+ using KeePass.DataExchange;

++using KeePass.Native;

+ 

+ using KeePassLib;

+ using KeePassLib.Utility;

++using KeePassLib.Native;

+ 

+ namespace KeePass.Forms

+ {

+@@ -92,8 +94,21 @@ namespace KeePass.Forms
+ 			m_lvComponents.Items.Add(lvi);

+ 

+ 			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);

+-			string strPath = WinUtil.GetExecutable();

+-			strPath = UrlUtil.GetFileDirectory(strPath, true, false);

++

++			string strPath;

++			if (NativeLib.IsUnix())

++			{

++				strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);

++				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

++				strPath += PwDefs.ShortProductName.ToLower();

++				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

++			}

++			else

++			{

++				strPath = WinUtil.GetExecutable();

++				strPath = UrlUtil.GetFileDirectory(strPath, true, false);

++			}

++

+ 			strPath += AppDefs.XslFilesDir;

+ 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);

+ 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);

diff --git a/app-admin/keepass/keepass-2.20.ebuild b/app-admin/keepass/keepass-2.20.ebuild
new file mode 100644
index 000000000000..d959b786e7e7
--- /dev/null
+++ b/app-admin/keepass/keepass-2.20.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.20.ebuild,v 1.1 2012/09/11 12:55:30 kensington Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime gnome2-utils mono multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Remove Windows-specific things
+	pushd Build || die
+	. PrepMonoDev.sh || die
+	popd || die
+
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass
+	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto /usr/share/${PN}/XSL
+	doins Ext/XSL/*
+
+	insinto /usr/$(get_libdir)/${PN}/
+	exeinto /usr/$(get_libdir)/${PN}/
+	doins Ext/KeePass.exe.config
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	elog "Optional dependencies:"
+	elog "	x11-misc/xdotool (enables autotype)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}