4 files changed, 20 insertions, 15 deletions
diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index c0ff6d50315d..1278e32138cc 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/gnome-mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.66 2011/11/18 15:36:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.67 2011/12/22 13:01:38 ssuominen Exp $
+
+  22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-mplayer-1.0.4.ebuild, gnome-mplayer-1.0.5_beta1.ebuild:
+  Remove --uninstall argument from gnome2_schemas_update wrt #394737 by
+  Alexandre Rostovtsev
 
   18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   -gnome-mplayer-1.0.0.ebuild, -files/gnome-mplayer-1.0.0-libnotify-0.7.patch,
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index 40323aa358cf..359a4dfa6e09 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -4,18 +4,18 @@ Hash: SHA1
 AUX gnome-mplayer-1.0.4-noalsa.patch 548 RMD160 74ae3582c87d52fe2ae04a02e6625ed71edc0678 SHA1 1f030882a5a53fda07567c0a91fb0c9c0a3f4f6d SHA256 5ff4bcbd2af09c2c80dbf15d48da13fa80ebec411238ef2490fbf5ec22ac0ba9
 DIST gnome-mplayer-1.0.4.tar.gz 1069389 RMD160 d2c42caa22b66b94e98d72b8c53074aa61e8485c SHA1 15c329573692e97bb550063854ddc6404309b265 SHA256 e2f6e20e983f520512d2f13f343566f2afb8cd7296c0a27e3f95b5b635bdbecc
 DIST gnome-mplayer-1.0.5b1.tar.gz 1001415 RMD160 7848a905b19a9057c2824e010008992864c6a404 SHA1 54fece7a1f53845666e4de14acb4ad84cac3951b SHA256 e89d0af09b8d9a8020858d367cbc53bfedf258842b3814113fe404a4e71a8234
-EBUILD gnome-mplayer-1.0.4.ebuild 2179 RMD160 26d32b763df6bb36f6c02d571314d63309f67fcc SHA1 b2e4c0be6a2c3440ca2fb7c1e506c9c71684aa62 SHA256 723aff676660b81a51845aa3f0e9de4c0e021d6b81b381105937be67f302e3c7
-EBUILD gnome-mplayer-1.0.5_beta1.ebuild 2193 RMD160 fadbfb695900d59fba61f8b0dc669f4e09bd31e1 SHA1 cbf33d90612abf7bec150775c9e3361430e76243 SHA256 281b5f627bc6b973c7382b26884076b8ae5b86420c61baf26342cd795ee5b896
-MISC ChangeLog 9538 RMD160 d8d5dd966d096e905f51652d17054d04dd054b73 SHA1 e1dc19f5936ccecef1a465bee7b52b884cad63ed SHA256 53cb3bf832fd9983e381e79c9198ab4d8107e6274d248b580089c7e150219977
+EBUILD gnome-mplayer-1.0.4.ebuild 2170 RMD160 ff753ccdf48ad97fd0796323ee40f3788e981cbf SHA1 5466952fcd9f1d688885f187494f09f090b5056f SHA256 8dd2c0f5a5f0e270b056e68b254f3ee63fb0a1488a2e46d920a0e38c6fb981d2
+EBUILD gnome-mplayer-1.0.5_beta1.ebuild 2181 RMD160 f446b49e4c835240ae4313fb33a71845735a79d9 SHA1 6627304f2e1122e6e1e63f197e14024a301cfef5 SHA256 aa9bf7793ffb4d8c740bdb4a37b82d3da65fb114becda6e3ba1469f90468bbb1
+MISC ChangeLog 9752 RMD160 957ebca863bf85cc745f7100e216cfae065be287 SHA1 74f5c4e8ab4f23f846debf952c090452f8dbe7de SHA256 e11eb2940efcd55a93d23a2d07cdb7e68a1505139922752d3c31b67d52d419a1
 MISC metadata.xml 327 RMD160 75e9402355adfb572cd450dbae701f08c8a6c053 SHA1 45028c27ee27aafc174a0afc4241b30b6e26285a SHA256 2723362c5df56964fb37f6914bef8467cd7534e1bfc2893929437f74d18979b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOxnsMAAoJEEdUh39IaPFNek8H/jXcz/q/RY/35m1jbUb6R0bZ
-4cKaORWG1bY8nMDiyxFORO+QpB56XQHuO1AnKw9rA8gLFwXTk1/DGFyC9oeGijoa
-P6Jxd/7YgtbNBkiyOxvnmh8gElyd3HKBTwxMnuH2dyqEBoI8pUSNcigr01oDR0bA
-TeldHIoJXLMkuMQkHO5ZkBZaQD8jG5dnqj1vLleMdeJYTg/Ij3jCHeOC3GeUwczc
-4KFrOTOKUvf8gF70FiPEFtzfCqiqD4iOdPbn8fFiOKh1HaGDRr3NQwiwV2TDT+VI
-o5sFMzD+qaCLsgPLzmP4h6A5lxa8Jhhi5x+TE77fTxhTVjrN0xIGejg3laoeQeY=
-=Rj4T
+iQEcBAEBAgAGBQJO8yn9AAoJEEdUh39IaPFN/vUH+wbIs6kyRuQnYbgzij+o96dI
+/dib28w+fy/6t+XcQLGKbYHTNRSsNWUd5HXYpCT8ntWmPyczgYkZ3g4OrXelJyVe
+bXNY2a/a3Zpnl5Jmbst+QcYEHdTuGRnaPdHPFxydcvlpLOACkIRBayC0C1eDwlS+
+n/JkOTvT5YIhvztLtj7C9ki9eviDY1ZHzjyCObKJvpAoeMThS1eMKE1mmbd7Cqte
+ttN8gOcbZ4G5PQJRrs8chIkoX491jCILTDLCeSt2EU+DQWR71rkhsa7WP+hNhZoX
+0oL3UGTf9D8hhWa3uh5sRJFGkpD4VMNlG+MF0N+A8+Lp6mWfA6HHF7xTx39FYD4=
+=+A7f
 -----END PGP SIGNATURE-----
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
index 514dbddff6de..d16ba74310c7 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.5 2011/10/23 12:06:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.6 2011/12/22 13:01:38 ssuominen Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils
@@ -79,5 +79,5 @@ pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
-	gnome2_schemas_update --uninstall
+	gnome2_schemas_update
 }
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild
index f04b85273baa..f02027c5bcd5 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild,v 1.2 2011/11/18 15:29:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.5_beta1.ebuild,v 1.3 2011/12/22 13:01:38 ssuominen Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils
@@ -82,5 +82,5 @@ pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
-	gnome2_schemas_update --uninstall
+	gnome2_schemas_update
 }