Version bump wrt bug #490818.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 20 insertions, 116 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index b8222c7b4859..cbef1031368a 100644
--- a/app-admin/keepass/ChangeLog
+++ b/app-admin/keepass/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2013/10/23 11:36:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.10 2013/11/12 13:48:50 kensington Exp $
+
+*keepass-2.24 (12 Nov 2013)
+
+  12 Nov 2013; Michael Palimaka <kensington@gentoo.org> +keepass-2.24.ebuild,
+  -keepass-2.21.ebuild, -keepass-2.22.ebuild:
+  Version bump wrt bug #490818.
 
 *keepass-2.23 (23 Oct 2013)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 76d902e7f916..e48329ac56f1 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -3,23 +3,21 @@ Hash: SHA256
 
 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.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 KeePass-2.24-Source.zip 3462540 SHA256 c0ea4da461d267ab95b92a9398328b1a85bc163316503d2354b2cc1ad46e7dce SHA512 ebd225634cda0f21704ccec620dd6c5309e5b14c32330f3221f107d51a1ee64f12d5d6da5da6a7a510c00f1a446f600fdfbc0369b1b44d08e5d140d84bbbf0b2 WHIRLPOOL ed70c69848a870d77f5a142a77016c3460ce6ca35a739658c2ed59507e0701973fe1299ad74e889460ea9174d514e97d20c2c87b8980d8e9b81f67f5a8a179b6
 DIST Resources_131022.zip 422443 SHA256 8fc86bbb46db3251b6aaba23a48743cdabb9217c9fc7a00db41e16dccf19d54f SHA512 d21f9e178a1a7de831868763e69b0d7ef3021c9c3dcee54c5c7d2558e75b73d51bd1d27c3eac45781656e48c51c2bbd2d2e3615bd05c5297c96cc52dbf18193f WHIRLPOOL f81d7cfafb23a5578cf33a1f9feb0b9e2bc0e2ce6e626a5658efb0afe6e44522c06891314c68f035fb8be1adf09ee605657aca5e130414a8419e3569011e2acc
-EBUILD keepass-2.21.ebuild 2621 SHA256 acfd68b0bfd7e86301126ddc05e0dcf05d4c34f56d4cc823b2aa0e584f214956 SHA512 3570f67cb18e97e00949fbd39c6a79d1152bc00f881c55da9760245d12ce459605711466cc9886a20a785bf86b7af6b8ad5a7579aa976b13eaa0603db78122db WHIRLPOOL 571987c62150a9916e0ca2cbae49802da63a77f40399de95f0aee617ee6f5fa868e86cf1e1fa4dbd7c7bf63f1959423bba5590c0d6c360de770a190add6dae25
-EBUILD keepass-2.22.ebuild 2669 SHA256 a18b5fbe4024f33f4938d833531c5a63e076caa6f17fbc003fae73bbad1c801c SHA512 6ee8648caa808514a1b63189fc2cb9ed51b649bebc5e1d142db05a394aafe0dde8201174dc57cd2c2e69f2c79cec116c1c99b5ebc71912939780fcf716ad9802 WHIRLPOOL 6bf73a0afbfcee0042fd237cd3f24ac16cd1162d796870f7e07e1acf612681097bd98b4942c84a19a99f83b1f6a0e7f272975568ebd511452fcfc5c37c737d97
 EBUILD keepass-2.23.ebuild 2933 SHA256 6372351144faee23c264cd676f54d61b71729a25fbb27982c405f69038f3fc85 SHA512 955b10ccc95ec888d5ff88993c83ffe0163719c07077c13c6edfd5a427cc0a82bd9822453b578141797834c8bdd0df7645f85381e27b1eba9bc70d761e958f46 WHIRLPOOL 53bdf52ef535c9c7764beb68632486c9d50ea68fdf34fd34af6569c1eeeb3b1d40c58e76f8563f20cab5050948c514c10fe7874ac6449517f345bb39211afc12
-MISC ChangeLog 2062 SHA256 c69730cb0aab948c52d2f4dc20ff286c3eaf615069ebb609e2a7dcfe55ddc0a4 SHA512 595880980a1742f529d65fc2f7702706cd933d515aea62330dddcd1d003a4896cb523cde0bae2157de6ef2f9b9981333e31f6228a88004ce9dbf8f1d7f387ffd WHIRLPOOL 3eac82e757b45f9f80f65df96614a4fa332fc7484c6b2b5e8613be3e55d12f98dab108528dcacfd19954e38aaa0b215bbc136b1659db2342579bf59aed713e98
+EBUILD keepass-2.24.ebuild 2677 SHA256 89999bee6f921c0d61841da248085ed3a8879d01833fa972cc583e2e81eaf654 SHA512 ce31d5959db5840df338faa9480036ad1e900fb43f316ac9447a688e4e6990275381eabff00715d8fd74a414e04a40f921305c279d21c4ab2543f1dc4fd27bec WHIRLPOOL 1e7ee04c36e4eefe7eef1ab3baf177c46369734117bdd0ebc98f97746389ee87165f12bf3b8ee3ebcb875763e39374303c521c364811a68628758ba753a8ce48
+MISC ChangeLog 2253 SHA256 2dc5f8e442271bc92cdc0f2f33fecbdb670925a25279ca53575330094414377b SHA512 d5b9db8c56a485c19d56154c3334b88dc3cda8994764f7b99a19058abae014eb0cfd0374782ea6fe65adaf06bf026ac6a0eb6eb449bfe80915688b8c491438ea WHIRLPOOL e62fc274f460e98c45804a3b1266f26d78a558f1fed94e4e47481152eab6eb1b3e3f2deff010afec7aefa02828e2bbc2c7688a16fa7a34c6073982d80748e5a1
 MISC metadata.xml 669 SHA256 a9c03ec6fa46ac03b3cc562e885e832953e50a7e673f7220bc83f8304db872b3 SHA512 5e5049913ee1fa8cecfa952a461a7292f97a299f768aefad5de7ec47cdd2e9b88bd3b4165b03833d322de7f12710cfce08db9f4ba221cd393625dcba544ff0ff WHIRLPOOL 1a980bb98d42fc2f433eabae23a81930d622277385dd2dfd685efae0752792da91a477fc907f6dce57c575da1ee8587e5bb9994fdb97b4d36bd899eaac862f96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZ7VZAAoJEJWyH81tNOV9ifEIALoKWszCP72+pucFbcfg/onp
-j2oPvicTPjR9ZiYx6DVmU4aG8GZuKhmda26ye0Ll5in7CsLIvE3swxLHWW5ueodR
-vFkYljKiGUDf0sjNnMOlJuRiXK6zE1axAEdxO0jPVKo2jyJDqMTAUqbsDSBQS2lM
-gaLAVTNtDeVK3Grx0pnUof71h7UIoV7+hwE8rqe1hzI35UkXQ2xp0tx/rwiqfb8k
-9EuuFe6wJ12FFHwfrkMISv9MEXIZDoW+3TpKJsohz42DbPGeTbstWQI8BhxXSpOf
-Es1lJWFXD/3aMda3w/fZT6KLQddoxmd74VRljvTsT6kZpDAE14lvodqEQ+Pxcw0=
-=q98/
+iQEcBAEBCAAGBQJSgjDyAAoJEMbwO6tnXQ0s6AMH/ixFjEkF7TfoLWegl1BAXqGI
+gLAfKsMc0mWx4s/obFaM1K+V03I9C0f4iBvd5aZ+pqQULiLLCxwhd+2K2ulmX25Q
+NSLoewcivzrlQ/afYKxrC7f4/0TlE9jBhvGjl29rrRxETy8UKno/SrML+HUE7Zp0
+Q4UKFASno+n22i4V6uVEVKp7MnKuqWSGRS8ciEZMQ/6rDjMNG+g2SexSKMdJhyg8
+JcmQPRQ8T5ZUpCYGMFaNGVbUkDQPNDUHl0+k3KgwWF+tyzSk8VhQdN3TLFBY23TB
+lFTk9L/kuBYiJLvyOTWgGc2Xh8FsduCxXdsPOWVhRfaeSC/A2UPFFPgxNIRaZfM=
+=71hn
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/keepass-2.21.ebuild b/app-admin/keepass/keepass-2.21.ebuild
deleted file mode 100644
index 8d7337d4107f..000000000000
--- a/app-admin/keepass/keepass-2.21.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.21.ebuild,v 1.2 2013/10/23 11:36:19 tomwij Exp $
-
-EAPI=5
-
-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 > /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
-
-	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
-}
diff --git a/app-admin/keepass/keepass-2.22.ebuild b/app-admin/keepass/keepass-2.24.ebuild
index 2fe3b00a91a0..250adb0932c4 100644
--- a/app-admin/keepass/keepass-2.22.ebuild
+++ b/app-admin/keepass/keepass-2.24.ebuild
@@ -1,10 +1,10 @@
 # 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.22.ebuild,v 1.2 2013/10/23 11:36:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.24.ebuild,v 1.1 2013/11/12 13:48:50 kensington Exp $
 
 EAPI=5
 
-inherit eutils fdo-mime gnome2-utils mono multilib
+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"