Version bump wrt bug #490818.

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 9 insertions, 103 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/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"