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

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 11 insertions, 66 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/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}
-}