Bring over changes from the revision bump, remove old revisions; fixes bug #509756, comment #4.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 20 insertions, 76 deletions

diff --git a/mate-base/mate-desktop/ChangeLog b/mate-base/mate-desktop/ChangeLog
index 59012624ac34..4743f9e79343 100644
--- a/mate-base/mate-desktop/ChangeLog
+++ b/mate-base/mate-desktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mate-base/mate-desktop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/ChangeLog,v 1.9 2014/05/09 11:51:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/ChangeLog,v 1.10 2014/05/10 11:36:46 tomwij Exp $
+
+*mate-desktop-1.8.1-r1 (10 May 2014)
+
+  10 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.1-r1.ebuild,
+  -mate-desktop-1.8.0.ebuild, -mate-desktop-1.8.1.ebuild:
+  Bring over changes from the revision bump, remove old revisions; fixes bug
+  #509756, comment #4.
 
 *mate-desktop-1.8.1 (09 May 2014)
 
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 05aa5cf21266..f64f1c3ae844 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -6,18 +6,17 @@ DIST mate-desktop-1.8.0.tar.xz 7951460 SHA256 482e7bc4d77e45c03505a899a07b8107f3
 DIST mate-desktop-1.8.1.tar.xz 8027312 SHA256 a4e1316f9468150e30495b54024fbc9f98e12cc7f9750d972f5457f13ca908f3 SHA512 64c32ea32a0e0e88df314297b2b45c5a6da2747a3bed41437eb17bf282511a4d01bd678728005a6301f93ae2b3c09a38039af85a8666d18e51958d6ffa091d9b WHIRLPOOL f5ed8a0b338b453ccbf7fcb560dd2490f43edceff21c8b6104eb91e8df6e016890174d34a1be3eec2b20322fd34a5c9ce553d0450a533407d4ef8269ff1aa4f8
 EBUILD mate-desktop-1.6.2-r1.ebuild 1687 SHA256 7355fc6220db4948e775debdfc67284111a9a25d9869994e16e6c12f02605458 SHA512 adb92ab343781c07a69f4a7c8ca7d4e5c1f4195a1808097a0bff62fb9b28fe34deece304a67f2e5432b3591bf6b3725b24472d0f4f747617bed8557d9c6970e4 WHIRLPOOL 2c1b860355c9dc26f8baab2548d2465b442bdf72b369418aae3731b2b5f9a43abde30259e7925b67439a986322e1ba95b262c114a0111c57257a09af425e631f
 EBUILD mate-desktop-1.8.0-r1.ebuild 1638 SHA256 05ffd8fa739b9be2177167c13339812bd7e5258f95e02dd21805c9881a015c27 SHA512 a5d9ecd63f978d6b15ad97b8a76e1f023e2f46a65e4732d127ae726dd51620955c19a49b2d1a99e1ade2fe43cf03e3845ac63b5854d59b71cd5d919301f97774 WHIRLPOOL 03aacb4910ff19ecfc3bab192aec4a76e2b8d96a459bd5f6cf7bd327c36650b337cad9d2749c75458c87795568a3a86005900795a088273779fe50b1f2f0ee08
-EBUILD mate-desktop-1.8.0.ebuild 1584 SHA256 667e50822ba814f134edd469d40adbb7434b53261d7a8585e0107c89c5ecc26e SHA512 e86cd6b02697b88c55091dceea5ec05f92662548be08df4a259cdd8c95a3d065751a8e59ebd63856776658ed0288f13a22a27a6a82f9d99d211d1e2b0b1a69a0 WHIRLPOOL 459534bd290b4a6cdc32fd538fdeda2fb6b305ef1b6be1cea02c0e7b5970082bcf5174a892b325165da04487d3c0df41e11583e6a377ec34d2807eff8b47524f
-EBUILD mate-desktop-1.8.1.ebuild 1584 SHA256 8211de82970143c469ae338408b7aa26cad5ceb142a0c67d974a70c15b9edd45 SHA512 b3c5b579d3add306d95c2b2ecccf89fe9fe923ad1442905c20e20ab21031c8fa796502f7f8d55478a216b2fdf67a076bacb6818a064431e984d812e241ae5576 WHIRLPOOL 89836a7916fbab339b9966558c0ea1de7404b735d53f1306e8d52020b84c15cf1633c914bd07772eaeb4dce600d65448af6e842a562f09106d6de647a569cb31
-MISC ChangeLog 1692 SHA256 abb0afe0fe302b2767a1c1b6878915e934611ac400d0afd03bea4349fe598076 SHA512 869e82ad6e30e1091378e5c7848e422478e77c718fb07f292ddecb142573f35fbd0b6166187df4b95ea601c729686f13fed5907b030f4dc3b65888ad3e7bcd14 WHIRLPOOL ccbd28017b055596c0316b9f0709fe06953e888eb39f77deb3e0f41316e49667dc8aee6f17a8e9e0b0d8f8c48bc093ebbee979943fa1ba3d0544b6cc6ece7830
+EBUILD mate-desktop-1.8.1-r1.ebuild 1638 SHA256 a2c46580e33e28a03c318f19e5ebadf2b8fe1f44bcf27a8bc4a588a13eb92a2b SHA512 da694f6ca75c32ab44397ec33988d4cd84a70234e9c62bb5f6f5bb0aee8163591b64627a6cc9b148b055fd3ea70f140d443888ecc912840c579f44293c4ec962 WHIRLPOOL de92b791f50801d444fac8377c28a489dec364583404bcd42509821bfb5ad8bdafc1375d2bd1f9d929653572bdaacde6bf995ecdb6ec84d73eca7f593b325d70
+MISC ChangeLog 1968 SHA256 3d014c1c246788b1280e8de638f754306b880906cd68ec72c6b434ef9fa070bd SHA512 9f6296d2b9ba6418bda5d57c802ae44f4d8550ac22567f1e051b5ca3dd6cff91b267510a4af4abdbea8141e149565c81350ea456e840ca3d86d5496b10711317 WHIRLPOOL 2b1a6fb080ade32e723e5b312e61eb5f109807feac8babc5dc10733f5aea1b396a4fccc134f39011af982fd291547686354657f1ca64240a38e1b4cf90b37372
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTbMFIAAoJEJWyH81tNOV9nAgH/jc4gHPePIxo7D/GxRjRF+R3
-iQPLQjOjYCnnnyNgInDoMcxF95+OEN+fZ8lHZTq7TB63CBkg3S46Ahkfy9Gee0Rd
-isFmRfJmHptUl9k70nGcLknwekQzTALlHtdY9FkAjMKIiUv1smJ4GmnCUMtoEZD3
-J8JGJifEPlDgdD2OrxAYYsavKoK64jgADnk9JB5PZ9bWCXq4XXAyz1IBbNBBhdRb
-L/u0C5OwG6KLnn0RktjnIpBJCDwm6XUPZ87UImfC/VoRbFjnHinzgb2CUM7TJuXu
-Aihd1o1i85d0lAMeESWel6i8d0jZT+gxlJz7G52H/5gU2si/gxzYZLNpJgNcN24=
-=+ZNf
+iQEcBAEBCAAGBQJTbg9JAAoJEJWyH81tNOV9g/QH/jiydxWxrQ/0JQ+rzsJorhyD
+yA3jEhxWSvBFfeHhzmyuFDhzbYibms/g6jYv7xSiNBEDFJYRC4Eh/ieL4cpJlxa7
+82sbPMd1Z5IcVCleoCNc4TkBOzy2+vcKDd1kkPg4j9gNNGCmVTlIIDi3Vi+wbThP
+GwKnyPt/yH1t56x0aOUrbQjhc1qG2D1/37j5N4Q4BTl0bLhR70xIfhWYsCn7rzzn
+C24Gp3eSv1/HBaEH6i/tW5x8CZpzdgSxzja2v9tzTojTM3fk2GqdcvZPEPrti5aX
+6YmRXBAxWDDDwPnGjqkrPSiRBFg+dEcx5lY9xGS4aUfAIYryNbC+RVkwoiNmJHQ=
+=Qmop
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-desktop/mate-desktop-1.8.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild
index 960e04d552fa..e8b24422788d 100644
--- a/mate-base/mate-desktop/mate-desktop-1.8.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/mate-desktop-1.8.0.ebuild,v 1.1 2014/04/10 12:03:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild,v 1.1 2014/05/10 11:36:46 tomwij Exp $
 
 EAPI="5"
 
@@ -46,7 +46,9 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
+		--enable-mate-about \
 		--enable-mate-conf-import \
+		--disable-desktop-docs \
 		--with-gtk=2.0 \
 		$(use_with X x) \
 		$(use_enable startup-notification)
diff --git a/mate-base/mate-desktop/mate-desktop-1.8.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.8.1.ebuild
deleted file mode 100644
index 7974cc920eee..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.8.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/mate-desktop-1.8.1.ebuild,v 1.1 2014/05/09 11:51:36 tomwij Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-inherit gnome2 multilib python-r1 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="X startup-notification"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/libunique-1:1
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.2:0
-	virtual/libintl:0
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.40:*
-	>=gnome-base/dconf-0.10:0
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.2:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-mate-conf-import \
-		--with-gtk=2.0 \
-		$(use_with X x) \
-		$(use_enable startup-notification)
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_install() {
-	gnome2_src_install
-
-	python_replicate_script "${ED}"/usr/bin/mate-conf-import
-
-	# Remove installed files that cause collissions.
-	rm -rf "${ED}"/usr/share/help/C/{lgpl,gpl,fdl}
-}