Version bump. Remove old.

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

6 files changed, 21 insertions, 176 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index ed1621aefb1c..61ef42e59a52 100644
--- a/app-admin/keepass/ChangeLog
+++ b/app-admin/keepass/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2012/09/26 13:34:34 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.4 2012/10/08 08:09:23 kensington Exp $
+
+*keepass-2.20.1 (08 Oct 2012)
+
+  08 Oct 2012; Michael Palimaka <kensington@gentoo.org> +keepass-2.20.1.ebuild,
+  -files/keepass-2.19-skip-sgen-if-unix.patch,
+  -files/keepass-2.19-xsl-path-detection.patch, -keepass-2.19.ebuild,
+  -keepass-2.20.ebuild:
+  Version bump. Remove old.
 
 *keepass-2.20-r1 (26 Sep 2012)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index d888c97030d5..1ffa8f7fa669 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
+DIST KeePass-2.20.1-Source.zip 3361753 SHA256 21b9b36f18457b5a4058775b9ba3124d7bc9f2654f78d43a7f7850daafd99213 SHA512 e127935adbbb7e87b1ba3f21b76bdb3ee8eff8e20c7b7589b42b3498db33988b2365fec1bbcf0de51a33267015098232bacebb4bb496fe187ba12b323530f766 WHIRLPOOL 519c08d1fa7a80a9aa81a6012dfb54b75446bc2f655572d139d5ca26d43828115cc4f6b9c344f94f9cf3d62e9d96f3c941d026af29147e6f199c7373c17fc6fb
 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 989 SHA256 1ef57c9039f5ac93749e95a26e5d473292c5f96b5dcf516ffd71a2a6920bad08 SHA512 c7c89c99f815472cbb7f8fe18bceecc2b9b32f4714f290078c0b6722aeeec8a294a3da2a31da1ec1b483862b6ba6c33b8ada6c20fc655e118bc8e3b44d327fd0 WHIRLPOOL 964a19ca51ae12d0a5e8e867abef2559ff6f8d4c39bbb8728eb13fa45d82b4af634fd068b588d967b1e5dca7304a2175c125d31e2d90983dc88de957fd0de7de
+EBUILD keepass-2.20.1.ebuild 2603 SHA256 7c31fdfda05d6d3a5733aaf640f482deb43b503aa261a2210725ab9d7e4bc747 SHA512 da3ef2fbe97aad96dba0c6b8684dff628350ebc8194126f499d881c69dd1227f38d4e73906dba7b89dfc9cc380b480c7f248c514440e9ce19b7b9d7f3082c765 WHIRLPOOL 54347775e2c7cd9901e5c740f1624ec5b274e15bedd2109c0f7faef477528fbcc6731cbf55f9b6340c5f29caf1edd801e2dd1c6779f843b23fc0f9613da20ac8
+MISC ChangeLog 1270 SHA256 69c62d5f1ef2433c550dcdb8806eeeee88641e224367559dd4a98e31cffd37e4 SHA512 1a016e59f50314469f29e9a24f15e4d424d13f0c798006de5ee9077c5bf378d5590916d4e2ade9d2e26b108e2a1752397ace7e5d99a71837e8adf52a175db667 WHIRLPOOL 5bc3d60bc71f27b0af065a7fefb99603ccf0cf44f0eed67825e3650ebd9492677d0526235679f77c6d58176e858d38bef8d09364cd67a41435d1776f5ef4487e
 MISC metadata.xml 637 SHA256 48bf99013c8266faf11c6ed20ead4e25b5d081b9f8e9ce4a9ba0905db6a6c6d9 SHA512 954f9e9d800f2b25da7e82f7953b005e41d7d9a996dc261f0ebb9db3944db46d59815698274fda0f93c8fcce5b0563a5200fd09e42d59470bd734b4239841935 WHIRLPOOL 973ea44da3b79e5bef665a018c650a5cbd92e3291377c53dbb5e58c63cdd009e64df4d2ce59a5a6ad9e5ad04d8bacf6c2015f2f1917ed2f0645028cf06944f48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYwQ5AAoJEMbwO6tnXQ0sRIgH/1sLpX5/F4PC9k7LC7GWp90n
-/MFoucWZ7Ipb6TIlRhuiHqsO4zr0TzcmiSQdCISOc9AGjzAEIRY+x8+1GhFIEJl9
-nJ/77vjG8Po0gsGvN2EFZYh1vy3cQwt6Fq1v8YlAM1/UcupFMxutexsKBmAz+934
-bdEQTYyVH9tEFN/D29TVDCW/dPSL0rcLkJpPXJmIMeBgdq/mkJGC+0LxllDZPF3g
-8SN6XHpmm0GH7uVMdpnS4jAZvezaCohDWP5fM8zCpRfWDmWAKAASxb98/qtewB3Z
-LxUIJzV/tXzCGJZSOIVv5Cc5tvbmQEQwCOWJtgelV38vmXyvd+bBZCwHMxoO6Vo=
-=Da1+
+iQEcBAEBCAAGBQJQconzAAoJEMbwO6tnXQ0smjAIALG/78lMtENUVxvecF3Y1gub
+Bx3212t2fgbusae+13idqN101Kito/u5hN4eq/C3fa5edzGpXwK2qRX6Bhz1XvAL
+1GzsK29LP4eFdNUnPsJXqqqkKj2ZxSEnLRGdCCo1U3m83UvtI9uHymMnZV0pjTwH
+Hph6Jvkr1poVrYNnpAGhopE/eMED0X/ugam3Zs7h4ipj5W9+w6dPWB9hLBGBj2xa
+Dg86vu9svzr+IIY7S+DEIP9B+T1LHDEJ84hIxHs/iMhtTvykGUgK2YDqd1u6ySvK
+GM8+KuT/a1VqSXJR2jcVnQzr2LSc76OtK1DA+0C3pzrlgqinN6OCTGYKkxOoRIk=
+=Y02c
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/files/keepass-2.19-skip-sgen-if-unix.patch b/app-admin/keepass/files/keepass-2.19-skip-sgen-if-unix.patch
deleted file mode 100644
index 69abc95d1269..000000000000
--- a/app-admin/keepass/files/keepass-2.19-skip-sgen-if-unix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch is a workaround to disable the use of sgen.exe after the build,
-since sgen.exe is not available in Mono. The trick works because we use a
-syntax which is common to sh and cmd.exe, but we also use `true` which is part
-of UNIX coreutils.
-true || windows-part
-
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
-@@ -1249,6 +1249,6 @@
-   </Target>

-   -->

-   <PropertyGroup>

--    <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>

-+    <PostBuildEvent>true || "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>

-   </PropertyGroup>

--</Project>
-\ No newline at end of file
-+</Project>

diff --git a/app-admin/keepass/files/keepass-2.19-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.19-xsl-path-detection.patch
deleted file mode 100644
index 76b924111141..000000000000
--- a/app-admin/keepass/files/keepass-2.19-xsl-path-detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/".
-
---- 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.XslStylesheets);

--			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.19.ebuild b/app-admin/keepass/keepass-2.19.ebuild
deleted file mode 100644
index 94d842392868..000000000000
--- a/app-admin/keepass/keepass-2.19.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.19.ebuild,v 1.1 2012/08/04 14:21:04 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"
-
-RDEPEND=">=dev-lang/mono-2.10.5"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Remove Windows-specific things
-	pushd Build || die
-	. PrepMonoDev.sh || die
-	popd || die
-
-	# sgen not available on mono
-	epatch "${FILESDIR}/${PN}-2.19-skip-sgen-if-unix.patch"
-
-	# 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.19-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
-}
diff --git a/app-admin/keepass/keepass-2.20.ebuild b/app-admin/keepass/keepass-2.20.1.ebuild
index d959b786e7e7..fa5554c06de1 100644
--- a/app-admin/keepass/keepass-2.20.ebuild
+++ b/app-admin/keepass/keepass-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.20.1.ebuild,v 1.1 2012/10/08 08:09:23 kensington Exp $
 
 EAPI=4
 
@@ -41,6 +41,7 @@ src_compile() {
 
 	# 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
 }