Version bump wrt bug #501126. Remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 29 insertions, 27 deletions

diff --git a/app-admin/keepass/ChangeLog b/app-admin/keepass/ChangeLog
index 8616b9fe9407..d1d0aa6b6714 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.11 2013/11/12 13:50:30 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/ChangeLog,v 1.12 2014/02/14 17:35:17 kensington Exp $
+
+*keepass-2.25 (14 Feb 2014)
+
+  14 Feb 2014; Michael Palimaka <kensington@gentoo.org> +keepass-2.25.ebuild,
+  -keepass-2.23.ebuild:
+  Version bump wrt bug #501126. Remove old.
 
 *keepass-2.24 (12 Nov 2013)
 
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 2ec1fdedbac9..570764da0bf5 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -3,21 +3,27 @@ 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.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.23.ebuild 2933 SHA256 6372351144faee23c264cd676f54d61b71729a25fbb27982c405f69038f3fc85 SHA512 955b10ccc95ec888d5ff88993c83ffe0163719c07077c13c6edfd5a427cc0a82bd9822453b578141797834c8bdd0df7645f85381e27b1eba9bc70d761e958f46 WHIRLPOOL 53bdf52ef535c9c7764beb68632486c9d50ea68fdf34fd34af6569c1eeeb3b1d40c58e76f8563f20cab5050948c514c10fe7874ac6449517f345bb39211afc12
+DIST KeePass-2.25-Source.zip 3497356 SHA256 4be058632f23fc9dfb9ddb00209842e5a025f063980fb6f087ddda47d5661caa SHA512 1fd7e7c1a16d21c6f47694b92c9d541a7b30dd0355861cced349420f266ad2d29cf034690c9ebf0607982705b3f06b36e852c214f8358af7ccff6dce1b5061cd WHIRLPOOL 941112482501f6aeb34ffcf06cab9df6078b1e161049ce3a31351deb24afa0a55e3a10487ea8916239fb383e7d80a4b3e4e7d8a0067f2aaaaaf509fa557ef67e
 EBUILD keepass-2.24.ebuild 2677 SHA256 89999bee6f921c0d61841da248085ed3a8879d01833fa972cc583e2e81eaf654 SHA512 ce31d5959db5840df338faa9480036ad1e900fb43f316ac9447a688e4e6990275381eabff00715d8fd74a414e04a40f921305c279d21c4ab2543f1dc4fd27bec WHIRLPOOL 1e7ee04c36e4eefe7eef1ab3baf177c46369734117bdd0ebc98f97746389ee87165f12bf3b8ee3ebcb875763e39374303c521c364811a68628758ba753a8ce48
-MISC ChangeLog 2265 SHA256 34b3ae1871797bc09baf551e3370daa13af7760550feed692e577a417431475c SHA512 cd7053b60d749b6fc69f1edc098540e73fba06b12a533fa7e0af17e1cfae1a055b826c7eeac0d6f13405ae9c505d904199681cf93730a33cd842cafac79e3a0c WHIRLPOOL c167c8df5eb16e0ab8aa70196c3de5e4ea7e5c6067ae1ee8db5e930e3594ce7966bba9e7948ef5ad88bc02a4ede90c37f6c5e7fc4b19338446a50fb8c491c17b
+EBUILD keepass-2.25.ebuild 2677 SHA256 6899744bb5a981f54ccd0f2c8eb8f2b833e7a958b23ea7fc5410d43314653267 SHA512 0ce62acdbbecc99f25a52fbddf81fca0e65a841768a7c5828e12f24a96476765e4559a286e12606b858a588f1b1d3771b9cd449d3f73367e39ad64bd264239f8 WHIRLPOOL ccdbf2787c49eca9967cf2794fd71eefe5f57e15f043f7b61c312d276f43391f36489bab6d5b10a684e0d3abf3525eaf1cfa1fca96485e83bf6647fc3c8b027c
+MISC ChangeLog 2441 SHA256 735c40027bf1cf2939489dbc09a95675230260210c217a296d2e381fe4b6060f SHA512 1e0f63f47ef19e666ec336b372b8f0ef20cd3ebce18c3d6d62f0b8d8981abf00f854ef44eba41ed45d0b7fb0bd1203e6cdd56ab5039b2793257923a57cf058a2 WHIRLPOOL 987ba5615278227e4d181d600750f9173e517838df20da22fcf64a7de63283b73b65723a0a7ca6332f8ae5aa56776ef9a8ddf8f86ac95d2728a020aa2ba06f0a
 MISC metadata.xml 669 SHA256 a9c03ec6fa46ac03b3cc562e885e832953e50a7e673f7220bc83f8304db872b3 SHA512 5e5049913ee1fa8cecfa952a461a7292f97a299f768aefad5de7ec47cdd2e9b88bd3b4165b03833d322de7f12710cfce08db9f4ba221cd393625dcba544ff0ff WHIRLPOOL 1a980bb98d42fc2f433eabae23a81930d622277385dd2dfd685efae0752792da91a477fc907f6dce57c575da1ee8587e5bb9994fdb97b4d36bd899eaac862f96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSgjFZAAoJEMbwO6tnXQ0scBkH/jdR411zrwgg2yIjikIIpIep
-cvEgiBPQuPIbO04R8JA9VNmVOqVOfzuDjp+rnvpAsGihncWzuYebHtk8T92bkhCc
-RcugHBjScqFVYwjb8BQQwbkxXEvIRtawwQ27Q5CWrqMxTc5aI+TGjWLo/y+X4bKd
-2YDl2hZOwIludFV74FxpmJa/nvJjKuBUgU7XvGEEh1f72b+wiA7yv8tCUI46MEQ2
-UBp2Y1gqFxrTtedKkkEXFAT+RVugEkgWsAmAb6812hY3v2wHq82BkY/xq/syLys7
-oil5j4ffJwken3vPBCTNqD5Gy61vOIfg+osv9hBhhLl77hsdgKKl2sp3+nxnOoc=
-=ZL6G
+iQJiBAEBCABMBQJS/lPWRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7E/cD/0fJKDxWASS5b1WXw6UCHZY6hEBktSQcWid0LTmwJaKOEN+QcgN26eYjl9y
+OLSl66HCZbCcyBImPbuNKd9tBidaXh4+s38KBVDXoVW/HX/PYYdei4u3ViOqYYB8
+R5aMqDhUTOCHxZ590nBJUfonEckCq9yj3vYSnf3PCgrthEJHR8/1eK+YNQIYkJFB
+twZincgkvFrEJLz9Lt/EJptad+9WjqgnANVm0sNJy1afI98iFSlwacme6iB7dLfs
+JfyioHUI2611tCExQzioZXxj3A4gbqxkSDFIPgcLC+9ozpmVMW48HczWV/dRzcnv
+OSonC88EVXnk5BgKk4Nu1bcUYeCZlBL1qhEqlaArTqsUpOR4yOrfYVmuSEwzv33/
+gkRxsnPiSASER8qnZWMJsaWlCXMZW/YfQqDBE3wwsMAN7PTU8TwXVLI3DVjHzXXf
+Qdsi3WyNNDpxu3Ho5E4S/0WUgO8+f/wEGpBwwFrJPeKxPtKUGlDvkJrdccTir/qQ
+eBzChvb6sLy10ktI6v6iifGi8GiSwuC+Lr+ra5ahq2vZf/MVBTbcPfTsssyJvsnq
+sQu/9FhKgcsMcQN1guZyOQ3k+e7jNkTzczmax6fiWJkb9dCkVKGxu8p49bAM87Lw
+oFabnDcNyASh4HRXWRRCMOtSuDMY7g+VUctl438tmC018DEfBg==
+=VyqO
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepass/keepass-2.23.ebuild b/app-admin/keepass/keepass-2.25.ebuild
index ff0f4ab00c90..2c99a74ac08d 100644
--- a/app-admin/keepass/keepass-2.23.ebuild
+++ b/app-admin/keepass/keepass-2.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2 2013/10/23 11:36:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.25.ebuild,v 1.1 2014/02/14 17:35:17 kensington Exp $
 
 EAPI=5
 
@@ -9,8 +9,7 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,15 +24,6 @@ DEPEND="${COMMON_DEPEND}
 
 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