Version bump to 2.23, fixes bug #472764 and bug #486936. Still has an unhandled exception when closing the window that still needs to be resolved, see bug #489120.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 133 insertions, 10 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index 4de3f99a4fea..2da301e00303 100644
--- a/app-admin/keepass/ChangeLog
+++ b/app-admin/keepass/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/keepass
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.7 2013/04/09 10:54:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.8 2013/10/23 11:32:48 tomwij Exp $
+
+*keepass-2.23 (23 Oct 2013)
+
+  23 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +keepass-2.23.ebuild,
+  metadata.xml:
+  Version bump to 2.23, fixes bug #472764 and bug #486936. Still has an
+  unhandled exception when closing the window that still needs to be resolved,
+  see bug #489120.
 
 *keepass-2.22 (09 Apr 2013)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 9ef75e8851cf..7df70bfc6975 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -5,18 +5,21 @@ AUX keepass-2.20-xsl-path-detection.patch 1596 SHA256 6b95ac5786824424781dc12bb0
 AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411c77ebb3ee3f SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb WHIRLPOOL d0ee272ae608241ca67a0a2d1365d37e19b86ce4a7baede55f7094f8b1b58671935a753fa3f9859777c0bef2ee47a36b418165e5e6c894bfa6e634f965abd57e
 DIST KeePass-2.21-Source.zip 3386515 SHA256 e079bb09432d1efb0528fc186c77b092153b86809bb9ff6a00f5dbdd77740efe SHA512 7a228896ad6bd9710664e23e3a48fd6d0608dc3059863871893acf76fbfc45c73429138d317d960a00b877327bff0b8546148b8f635930628292e0e6856a13e2 WHIRLPOOL 9f6b05210e6eb44550135df2d796b76a374dd5e04809c87667912d9b4030214e378e75daee0fea07df8c94b2646ef0ffc3314e8717f8e6ee121a6ccea630ddd3
 DIST KeePass-2.22-Source.zip 3403139 SHA256 975f1f8c6c7b76fbf283d2c798152890088afb9455988d200ae6e5cd8b0aff25 SHA512 cf875fbcdc080b0e4fb696561aea312ebf32d4027fdc3b75af157ed4ca06aeb18832a18f7dfa7ccc8e71449ce16d46d97fbda3a0cfdd68323b930e10b704052d WHIRLPOOL 626dc94514110d0d844560eff9a58f368b87b2f1c3532d5cbe1909664c50f9ea44e490b46047ca789ab7304190a41b65522a5fa655ce39029f22316f1c24a6be
+DIST KeePass-2.23-Source.zip 3443624 SHA256 d9de023285228a3e1b7f5ad6f28086dcf7ddb0814ac28803774fdd9ad9efffba SHA512 7baa72ecbd6fb1b44f76c28ca11e18e67b59a6b2aca45135ae57a892e1a4346ca09e8a3a793ac5c53afea282d939b5f7bb94e4771d4ba6f9da9d19522e5c5f67 WHIRLPOOL c45fc54071efe597c88a0d8c5ad414fe06293da5a203dd7a0f090055552e895a8304960957b218902e9d0992acd0235d145597fe8cea443ab90bd9e425925256
+DIST Resources_131022.zip 422443 SHA256 8fc86bbb46db3251b6aaba23a48743cdabb9217c9fc7a00db41e16dccf19d54f SHA512 d21f9e178a1a7de831868763e69b0d7ef3021c9c3dcee54c5c7d2558e75b73d51bd1d27c3eac45781656e48c51c2bbd2d2e3615bd05c5297c96cc52dbf18193f WHIRLPOOL f81d7cfafb23a5578cf33a1f9feb0b9e2bc0e2ce6e626a5658efb0afe6e44522c06891314c68f035fb8be1adf09ee605657aca5e130414a8419e3569011e2acc
 EBUILD keepass-2.21.ebuild 2625 SHA256 45ec41dc41535f9918ef977e5564e5d767a0124ac4c75eb7a6f7319f10a4ce1e SHA512 554cd7a80b5bade9a0670765ab672c3de77d68d84515bb02f74b1af9ed3c9be7ca0f67492d0b7f1377c56ece287b0f9a906bc8c89d7a4849e916d73ce1cf92db WHIRLPOOL 9fc56778cf91c9718f634e9e857d7f4bb8aa21faae7ae82236ea42908113197a645cc2f0731643a5616badab7414841dbb26a1a3798a3b0a2aa17adac2917abf
 EBUILD keepass-2.22.ebuild 2673 SHA256 68a1ef4a1ac62969ff397895501e357e0cffb39b36f9ba1015214bdbe81ca3d5 SHA512 00c2a1161888d740707b7b9a0e9796d7535ce434f03beeaa1bc64a6ec66594607766aae67d3220beb406a50c4d8683e404de205c6efa034bf05f594fb57c2ce4 WHIRLPOOL dadb7684f68fbbcbb5ab73ca804dddad7ee81f149f6fb5dc3ded612b6b787fadd04c596e88384239c8f2a335ae452a68b2f5b39442acf615441d23123be3b69e
-MISC ChangeLog 1738 SHA256 ab6befae97e7040b06facef42f7111e1c197b36e92222edc0064977a83e1a496 SHA512 2989a5791df0145bdfe897645e87513673d6b1eb954497681c370dbdfc934980ce2fab76b0a79820e99fa2e015f27f06f242707c1ce12fec815f9bea34869224 WHIRLPOOL 04067aa531a49e293ba19f0e82eacdd1ad303eff9547571e98978a761b7f90d29cbc16e3f61e7d097e66bf844a01ecb954f30bb4a14344d93c0c99feedd35fc0
+EBUILD keepass-2.23.ebuild 2933 SHA256 825974bcff2e0e8c021efd08858a481adc4adc7f12f3ce16a56a8ef66811cced SHA512 c332b3d224b5a77f4831f1736a2fdb5e03548de4f8878b39c3e7e42cf77a06792bce31eba3915c933457ba9e47a88cadd4f4838e6cfc9013a099f2fed4023c85 WHIRLPOOL 6a8540a30fb938594ee3b165ef989853ad082c0e838d1f25fcb91e225c830401a031d93f0338fecd63343001f45c32da592cbb5b54bf673bd06c530660c53ac9
+MISC ChangeLog 2019 SHA256 c65ea735015c0e393c6650adc8347a40c667e3e1582244b53e2464d5ddfe0eff SHA512 eb6c203dbad8d89a29c754ea3a35599186a0da137abcab1d4f482114308fe5e51704c667eaaf1ddf65bc0cde6b228c518d8db10c3d0320532802f76f341ef9a9 WHIRLPOOL ba2a65abe56aaa2aa0b66bd77c58d35e69ea29128c4ab0415c2bf1dcb5aa218e1576f96dd7356eb445f07d93224676158af6a7caefa12420ca9e671f08e4dd22
 MISC metadata.xml 669 SHA256 a9c03ec6fa46ac03b3cc562e885e832953e50a7e673f7220bc83f8304db872b3 SHA512 5e5049913ee1fa8cecfa952a461a7292f97a299f768aefad5de7ec47cdd2e9b88bd3b4165b03833d322de7f12710cfce08db9f4ba221cd393625dcba544ff0ff WHIRLPOOL 1a980bb98d42fc2f433eabae23a81930d622277385dd2dfd685efae0752792da91a477fc907f6dce57c575da1ee8587e5bb9994fdb97b4d36bd899eaac862f96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRY/M4AAoJEMbwO6tnXQ0s5DQIAKABATh9/iYVkWd4AT/CA/R8
-80Uw8eji2Kxl6C/HUf9puuX1JeDtf7xboX3xgOhSAf64H5Ce2tcKfk/Vf9JO/dFa
-yOv0L0vBR8+WOmwWQhXPSGJZfNTCrorL2FqOU3PrIpvx68/n5UQ9jhDsuoYuiCJo
-GQrPVrDBq/aD65mmD7VWWDbKKwaj+bwhdbyggFALUZQtXWMFCWxvoUw1bamljxQw
-o/8BEfggFRMnmfAvKtwGj51L740u+hzWjwDlSJW9mZ9SRQtgsvRtPyJODlXc9JdV
-X6GXgLcVcuOnPCaH1O+qO9brj2gd/7pmotRL6iNm8gaybyln60kfzLxbIwL8OhQ=
-=dq+n
+iQEcBAEBCAAGBQJSZ7PWAAoJEJWyH81tNOV9EIkH/2xJoJMaPwTzey59o8iRuiiG
+jXrEZO+GEvYjUjqrmuCAQqAXIpVQummzSmVUmZTYkos/uO6n1d6yuFzrb1VAfY3C
+BKuePxaNnyVdrMhvkphQDWDzaYYAHaA90Rb0ubqLPs2FuWQNfXdELivlddpyWTXY
+c5WT7lFQ5Jk4qONi4k7aY25siErOyDvI2Iy4m/KIFCtGd1phEDZEBFSw3pR7oClp
+2rhwF+EOAYHZ4mbg/bfuQUlKkH7BT+kcVEdCA9YFCRzW76iLUYTP4yZua0+jXQkc
+PyjI3GK9xM04PeRWmVc8gBKUphywmD7FalfQ+DnQNcgXkO6EJv32SnK7ICy1sL0=
+=oSgO
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/keepass-2.23.ebuild b/app-admin/keepass/keepass-2.23.ebuild
new file mode 100644
index 000000000000..342b4f39f2f3
--- /dev/null
+++ b/app-admin/keepass/keepass-2.23.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.23.ebuild,v 1.1 2013/10/23 11:32:48 tomwij Exp $
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils mono-env 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
+http://keepass.info/filepool/Resources_131022.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_unpack() {
+	unpack "${MY_PN}-${PV}-Source.zip"
+
+	# Use fixed version of the images, see #472764
+	pushd "${S}/KeePass/Resources" > /dev/null || die
+	unpack "Resources_131022.zip"
+	popd > /dev/null || die
+}
+
+src_prepare() {
+	# Remove Windows-specific things
+	pushd Build > /dev/null || die
+	. PrepMonoDev.sh || die
+	popd > /dev/null || 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
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}