Clean old, add missing gnome2-utils inherit

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 16 insertions, 59 deletions

diff --git a/app-misc/metromap/ChangeLog b/app-misc/metromap/ChangeLog
index bf7ea8c53b53..e73acb98e757 100644
--- a/app-misc/metromap/ChangeLog
+++ b/app-misc/metromap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/metromap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/metromap/ChangeLog,v 1.5 2014/04/08 17:20:12 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/metromap/ChangeLog,v 1.6 2014/04/08 18:57:59 maksbotan Exp $
+
+  08 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> -metromap-0.1.4.ebuild,
+  metromap-0.1.4-r1.ebuild:
+  Clean old, add missing gnome2-utils inherit
 
   08 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> metromap-0.1.4-r1.ebuild:
   Depend on pygobject, update icon cache, bugs #507060 and #507064. Thanks to
diff --git a/app-misc/metromap/Manifest b/app-misc/metromap/Manifest
index cc2abfced448..52750a39a137 100644
--- a/app-misc/metromap/Manifest
+++ b/app-misc/metromap/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 DIST metromap-0.1.4.tar.bz2 3419243 SHA256 7fc3b7dd92443ace8944429895c27b2d9bc6444d1eef973b5608cdba72b38fba SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec WHIRLPOOL 5acd843dfa35b87b804c4e879253843f60c4c6df4e0d1dfa5975006b3d9cfe2d58a418f2255b88ab35f1052eeb6a929ba6b00ba1ae75b51d8129021051ee2516
-EBUILD metromap-0.1.4-r1.ebuild 1123 SHA256 dff6a0e7662c25059dd9b06a6bdc7df5793264fb64ad05d2873ab197dd6b8f40 SHA512 50c0dca41a2aa409c8f3f8af85030a94fa864dd7564686f8806d531d8da21edfd433f5842d5886f3dd3fc6d0070e42d00560f089188d8ad47407cad07fe48028 WHIRLPOOL f4532fb0a7f51b314f7229fc5418ae53348d5cc99479fb4e22813b57d500de2c7b1c5c872d51343f759e0fb20acbc22e4704e3d2a8042ac8d62c462eea4b5cc7
-EBUILD metromap-0.1.4.ebuild 878 SHA256 31863e42c05c87e7cb02c65772e537b4dcbbd3225ec49e085e2ae0b43694f843 SHA512 5715e85b9c597c61e86c1a43032ce817824a8a50204515be1411714b01b6c69115821f38cc50930d12075cc5f5a261a7dbe3d64ba0181c91b36cceff45eb2c03 WHIRLPOOL b1a22844423175aef8498a21adec465ead8c1d1737aa11b2bfe283ca2ef5970dd4cf56852895bf9b779e31e8efd62a5dba75ff466f13945db8235b209c97bfc0
-MISC ChangeLog 983 SHA256 a9fef2c8f6bd4c2ce152311989cf12399c928c5111afa3728514d77f8e4c5c17 SHA512 b8203ea1a9bd04b071704c99d442758d2bf017fe1a2c5c24c244e4606f4800e7784a0344872ad45fe800e509710b912be1de688644112b30e0ed040087bc4709 WHIRLPOOL efb0fb8d65f1fef14fe5a61e9826192df5af0c8bace937b4fe8ce04b8edbd1af0c121fc707da3b1f02e4ed48391162f9dbd254d712d7569f088b46701412dfea
+EBUILD metromap-0.1.4-r1.ebuild 1068 SHA256 7bf688ca892261a8bb395186598b252e9883b65a4d047a272fc5b4cca3a30327 SHA512 67210af0b3b87fd0fcb072030340e6adadb443acf18a3f2c0aa384630d4fd1c32ec833262dd18b39e123ccafc2122416fb28bf09f58d55b39a0e2777c3dfb901 WHIRLPOOL 553892ce49e9d7ac8d86ba95c9a6a970ca74bca526b394f461527f481ef62cf44f00ada3c2daa28cb48044fa223cde2d188b83bc22cb686e2ed26d805a9c0ed5
+MISC ChangeLog 1134 SHA256 9b26ec40be64e188f969ffab11151a902610e4716e34eaceb1a30f2754f08199 SHA512 33050f847d1f01a23b803dee6280bb8fd31e6cf8a3c559556f913c54030564e1668294233170e6bc1b73584e93b6b86986abd9a2ee07fa71de5f79af35b221a8 WHIRLPOOL 3f371fa3e4bc4051d5f4df469b8eaf84c6573b3b680d2d43e39242ebb2e20ee523ba162f713f7a9fe3673dd69e9366b1f837e361d418df97569aae4495f10671
 MISC metadata.xml 349 SHA256 0588fe8b44502f319e8de7916d53b7788ec564ce2dd9e98a1929cf17b8829e84 SHA512 bc6e78cadc8556804a2db10804a866c5860c3e4618c49faf6e9c36bccf24c4045bcd365e7ead0519c183fa8cabf7ea98d13d14103c01cbd9d3d426054659e07b WHIRLPOOL 6e6762daacc936b4466e78f559b5b8ad4e2a9cb959193a5b953fb25a8ce0d8bf65ab17cca6b55720a3bd67013610d88f192bb25c74abbf2e29929b620307960b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTRC/RAAoJEAmJmMX429reE/YH/3CLoP4btoDYoXrJWlkf0/WC
-2w6usNlBiHZztbvvbmYroO3lR+FL4KBsqRjoBgSVa6hZYY2a1lSlbLc595fhH6sT
-0Dua6f5YCRrIrArhPfhkr8P7G6WmqwOmWKIbNZDqW7iOrInqXVuc/+LffrqviQYR
-31TYzPpEVCrmgIwkOVQfX1cHIAoHJEz0LnjS+SFiEgAEetIaoHIS44aTnujqMZWz
-NRaLQXE+7qgyOsW62IeiM0mYEOFQ4XDs8wkv7UF9ikuSanb/K2e+pNOAWIk/t3yy
-JlJmIVDRbrCLS/QUsVS6Mb9VDrOQyoSgt7OOJzO+1u69jRAZR3Q0ELhPaVPex3s=
-=APKp
+iQEcBAEBCAAGBQJTREa9AAoJEAmJmMX429re/HQIAKhMBs3NNINX6WIpONHZVhar
+70xMRV1CjH8QosD53gTqb+UCd4L1/gYy/qItUh78ZHEUNl2HFZGLtCjrSEsYu0av
+dhqp+hGy1kr8vTSzpILbbuGsSuAf38CRK5pbaWTlfdM6GX8wZA/d/C6tB55eOsm5
+iuQbuWlYokOcZjZhevnQwNcGpchSy+6PRca3+Ni9XlpgjpDLSSjplMp94bWYHpLB
+h3fA01k1rwkkEw5FortGdYWggCLRGTr01zzuwhKYSt8DL9EOpKRhG3krr193EHGx
+NfmOBJ+SbD+3tiPNzCRBD3aSyD0vTFvDmVDF4dVRTpzTipTICyHxDlJVEzA3zXs=
+=qcle
 -----END PGP SIGNATURE-----
diff --git a/app-misc/metromap/metromap-0.1.4-r1.ebuild b/app-misc/metromap/metromap-0.1.4-r1.ebuild
index 30288d179737..9a966c79b7c4 100644
--- a/app-misc/metromap/metromap-0.1.4-r1.ebuild
+++ b/app-misc/metromap/metromap-0.1.4-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/metromap/metromap-0.1.4-r1.ebuild,v 1.3 2014/04/08 17:20:12 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/metromap/metromap-0.1.4-r1.ebuild,v 1.4 2014/04/08 18:57:59 maksbotan Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit python-single-r1
+inherit python-single-r1 gnome2-utils
 
 DESCRIPTION="Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps."
 HOMEPAGE="http://metromap.antex.ru/"
@@ -42,11 +42,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/app-misc/metromap/metromap-0.1.4.ebuild b/app-misc/metromap/metromap-0.1.4.ebuild
deleted file mode 100644
index e610fc391de5..000000000000
--- a/app-misc/metromap/metromap-0.1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/metromap/metromap-0.1.4.ebuild,v 1.1 2012/05/21 19:40:55 maksbotan Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps."
-HOMEPAGE="http://metromap.antex.ru/"
-SRC_URI="http://metromap.antex.ru/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2.8:2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${D}"/usr install
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}/modules
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}/modules
-}