Fix crashes when AOT USE flag is enabled, thanks to Alessandro Di Federico <ale@clearmind.me>. Closes bug #435860.

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

3 files changed, 116 insertions, 9 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index 6dc69c91826d..ed1621aefb1c 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.2 2012/09/11 12:55:30 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.3 2012/09/26 13:34:34 kensington Exp $
+
+*keepass-2.20-r1 (26 Sep 2012)
+
+  26 Sep 2012; Michael Palimaka <kensington@gentoo.org> +keepass-2.20-r1.ebuild:
+  Fix crashes when AOT USE flag is enabled, thanks to Alessandro Di Federico
+  <ale@clearmind.me>. Closes bug #435860.
 
 *keepass-2.20 (11 Sep 2012)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index c744c8453cdb..d888c97030d5 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -8,17 +8,18 @@ AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411
 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
+EBUILD keepass-2.20-r1.ebuild 2604 SHA256 37b18c1e04d97f8f0a3ddea6c4d8a2996406103980f5440e214f84d6c41eff1a SHA512 b884ccd86987b858af21e47701d7654eb57a2a8a03f0304bbe589fa8730c5a21c79f8037cfb8216e10b5a0ea4d76c70a4f8963d57c4fa5922f74c976189645c4 WHIRLPOOL 3a4f59fa0bf783ede27b4c2fcef5417328023ded1fa1d03154a21e7b86d2bd5292cfcef6647099d6c60fbbbcafcd9da28a173d7cd44cb6926cfca3a7b2141bc7
 EBUILD keepass-2.20.ebuild 2550 SHA256 edbcb7c39aebc2f0354b8bc2bd6f58cd286da2999172a94466ff76a3a8e3908c SHA512 19bb54125e8694f9647aa85f354fcb97460618382482b5bd90a9b2a5ab9709bcc89f8b90448b914008ab9d1c96d3040246b9dc537d47a6d3756f77c2fd70336d WHIRLPOOL 6f7c08bd054585df7090dddf4e1d7240fc5fc10927a23c983db927c594fff660778814c1d1e833ecb3136b90c4b15eca4fe630506559f07d8080e667c9567204
-MISC ChangeLog 756 SHA256 55de794e644b9ecbc43dc07d67dd8cd5015219c2cc87725e4d7fb59bffd91fa8 SHA512 62baabe88cbfd4761d1568dbbe8eb9d87a595a8c1398414a03d44839b63d3070e9ccd928c2e1a2e9453d7ee3e87565dcee7df583f13ec65e37cc2d1a71cb2047 WHIRLPOOL 014ba57075e1b7d279a8372f2257c624ce021ebf3bf069b94271fd6823d53dedffd3962884a1d4147d9b615ba2643bc339642436de6f6bd167a543009c8db123
+MISC ChangeLog 989 SHA256 1ef57c9039f5ac93749e95a26e5d473292c5f96b5dcf516ffd71a2a6920bad08 SHA512 c7c89c99f815472cbb7f8fe18bceecc2b9b32f4714f290078c0b6722aeeec8a294a3da2a31da1ec1b483862b6ba6c33b8ada6c20fc655e118bc8e3b44d327fd0 WHIRLPOOL 964a19ca51ae12d0a5e8e867abef2559ff6f8d4c39bbb8728eb13fa45d82b4af634fd068b588d967b1e5dca7304a2175c125d31e2d90983dc88de957fd0de7de
 MISC metadata.xml 637 SHA256 48bf99013c8266faf11c6ed20ead4e25b5d081b9f8e9ce4a9ba0905db6a6c6d9 SHA512 954f9e9d800f2b25da7e82f7953b005e41d7d9a996dc261f0ebb9db3944db46d59815698274fda0f93c8fcce5b0563a5200fd09e42d59470bd734b4239841935 WHIRLPOOL 973ea44da3b79e5bef665a018c650a5cbd92e3291377c53dbb5e58c63cdd009e64df4d2ce59a5a6ad9e5ad04d8bacf6c2015f2f1917ed2f0645028cf06944f48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQTzSUAAoJEMbwO6tnXQ0sTVAIALI+loG/i8VOBrxQ+MhQz3uk
-552Pp95PilNa0+0M4VN1TyHzdhHOCxjJR3UzOLGtlsK/DefeWJgTYQEoxHQP2GKA
-zvpnBCNqq0CGRSQlOiT9HXG1A/hoWjo9YtX7bWC4qmC84tJoEI/uj49fKL6I+1H8
-JOOOm+Nf153nWPoRH7zYBAfsSWi2G6l/mheHxWUR0+/YC65OGl+SiLN3g436l3XZ
-AH5SQl/HlwLLIN//167tyKLKTZeG1OtHOzKgS0aGmBF7lybKBLp6jht7yaPWsYYJ
-yox7OHCTNrkmNl6abfY52wgUvlomYacxoZtuwMjJ8kvREDswH5OVnf1ABoxP2eQ=
-=ijIc
+iQEcBAEBCAAGBQJQYwQ5AAoJEMbwO6tnXQ0sRIgH/1sLpX5/F4PC9k7LC7GWp90n
+/MFoucWZ7Ipb6TIlRhuiHqsO4zr0TzcmiSQdCISOc9AGjzAEIRY+x8+1GhFIEJl9
+nJ/77vjG8Po0gsGvN2EFZYh1vy3cQwt6Fq1v8YlAM1/UcupFMxutexsKBmAz+934
+bdEQTYyVH9tEFN/D29TVDCW/dPSL0rcLkJpPXJmIMeBgdq/mkJGC+0LxllDZPF3g
+8SN6XHpmm0GH7uVMdpnS4jAZvezaCohDWP5fM8zCpRfWDmWAKAASxb98/qtewB3Z
+LxUIJzV/tXzCGJZSOIVv5Cc5tvbmQEQwCOWJtgelV38vmXyvd+bBZCwHMxoO6Vo=
+=Da1+
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/keepass-2.20-r1.ebuild b/app-admin/keepass/keepass-2.20-r1.ebuild
new file mode 100644
index 000000000000..c792a85368b4
--- /dev/null
+++ b/app-admin/keepass/keepass-2.20-r1.ebuild
@@ -0,0 +1,100 @@
+# 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-r1.ebuild,v 1.1 2012/09/26 13:34:34 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
+		cp Ext/KeePass.exe.config Build/KeePass/Release/
+		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
+}