Revision bump; do not install desktop documentation, temporarily fix bug #509756.

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

3 files changed, 82 insertions, 15 deletions

diff --git a/mate-base/mate-desktop/ChangeLog b/mate-base/mate-desktop/ChangeLog
index 71d2516ccab0..6835f9cf03dc 100644
--- a/mate-base/mate-desktop/ChangeLog
+++ b/mate-base/mate-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2014/05/04 14:53:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/ChangeLog,v 1.8 2014/05/07 12:31:58 tomwij Exp $
+
+*mate-desktop-1.8.0-r1 (07 May 2014)
+
+  07 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.0-r1.ebuild:
+  Revision bump; do not install desktop documentation, temporarily fix bug
+  #509756.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-desktop-1.6.2-r1.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 8a19fc34cd82..79fc891aba2e 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -4,23 +4,18 @@ Hash: SHA256
 DIST mate-desktop-1.6.2.tar.xz 844408 SHA256 f6a31503d68b9951bd7659c5ba4a288d0bede769e99665528eae13d0dd1eb1eb SHA512 fa247255adcda588c4578fbf1eefb98699b823a64008fb02de5acf9fbf57c94d05fac34faae24d2773a81abdc2de4c3eb0cec76c534bda0aaefef686f4ea6de7 WHIRLPOOL 6532b3d111e711164a204e6e09d2d814c669ef540ff80af691a59afd9b0ed0dcebbe294fc3af2cc7e517750e81902a80ae14efa47ead591edc4957b05fd725b8
 DIST mate-desktop-1.8.0.tar.xz 7951460 SHA256 482e7bc4d77e45c03505a899a07b8107f33832b22d59c40f342d5695f789bd17 SHA512 2cf4dbfc0d628ebb48a92c06fc66ac021eb280031305f3c01725dcb5a4357f07a7a33fb2e6d017c5d5081902a68c82d93471530b0bb3415653657366ae8759cf WHIRLPOOL 3db86fa7385e33e97bd5c2388f2abf5e4e87e9177b636da5843aed257062eec1f9bc4bd097ce3f101c04e2128811e5ec39a22f08fa6523cc78200c0362e5e55f
 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
-MISC ChangeLog 1350 SHA256 f237b041da81f1597bb532f81529e1b469c253cbf33964ea0f418495986a760f SHA512 049e0dd1ed8576bb83d605f05d1ff90c9f9d2a0c21e83f83b041abde47311492d817816d4ee40bfc398f5346acab914f54ca4431ebf8be3d0d0bc4a3451cbe28 WHIRLPOOL aeb8dca715514530e2815e0cef02e870df50d0351692d57d3a35cb01509be55a66847db6ec9269c46a63ad4c548e8af132783ea86b4f5b446962b7009fd368fd
+MISC ChangeLog 1556 SHA256 7a16370bf6c30fa3220175de11cc4475f4bd01619f3c85ec89e6d0a8c6a90e41 SHA512 b33ece5ac6573a1d0f415479621c7f98a3c8b7d40ec61f5f6f6a949ae28fd3071b08f9cde92c39ceb56c38fb53aca74f585c7954e68db192dab8d59c1c967914 WHIRLPOOL 806707df5aadd00be52377deb6ff5a11178cd928eda4579998109c82c8d64eae3f97a3d00f5222360c15d41033530c9175c2ef28ea9f156b1a98a83dd59704b7
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlR8AAoJELp701BxlEWfiDwP/1Rts7UZwKOpO8eK/livhiFJ
-pJcyTQ1vV7RAFxkot2axpeHGvASCm6M1z+Sl9hIiTrowqb+TiQ8qqz7m9po0Gn1g
-gOPaLK15HqjUjBSU0WCIsLZ1RlZ6ane2nruFezETKbtTV1f6pRxsbYjf5vz/dI3l
-cG3ORA7bTnqGfHx6o6QP+BxHqdw6gqSkyT6CBm5lnPVTNezYkV+LT81zoCw3vAJ1
-OfC4SCZxhQzZiToIB+63DulSMOdToaMqPfAwPBSYHoLMrSCuNmFG6et2oCz6w/qh
-AW9xsVXTcDVzTxAJiDJQcMOsRjpR3L/ra4P5JaSAKyyreZuRmwtwgj2OvKfkJGn8
-gaQzVOkTZ0kqHqi7grsA3kiFEcQladr47AXaqU3in6EIZlCrykBzn+iJM5UtRLkX
-VMtwoAbQiddOAUl/77VSpD469uXlqi1NabZ2SpfgeAQqdVKo1OaY1iKf4hhvTsKu
-tZh9EjiZLh3lvtDtM5tldqWbz5gUGSJDGZxQtxVDJL8HKLaNSkpOmPZSCEogE3lt
-s0bD7X7WSaoB97pSV43GZtruRfhKGtZEcBMOpOBSdlhGbZez8xE5PJfQpETdzAHU
-5RTbPgMx5cVlFf/OHLvj9cHThOFR1mz75FWYWdNxpiwlXPju52GOUmZyq3m7/M+o
-wswFtmhH6ldW+jpD+GV6
-=Y10P
+iQEcBAEBCAAGBQJTaifCAAoJEJWyH81tNOV9hAoH/2gNQxgIrsXLBUchXcmkrq2+
++hi86P5nQh4n/0J8ZNh0n5yWd3sWA+Jz08rtIl9MdC6gfbW59AP0jHPUEmolX/0/
+GMYL7hp79gSyF8pTVQ8Yb2qfS+QrUMS3INAjp0lfVgb/yC9DLiIdAHvGUQZj5CHq
+u8rBvwq8nloN4JdlbHZ3d6minq7HqjpifFsOX+U613vXmDaeNAI8I5wqe9A9Qu01
+sOfAVP35WVVd8rTWJ47mpYC5eucolMOVE752pf7P5rWLZtVv2N8pjciw+umSnJAm
+U2ZiUfJMmi9lUr8ZsW130oPOMbYPnGSkAjCS+q5AeIheo5b1UI8/7/QK6TERHro=
+=mndl
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..07ed90ce64e2
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild
@@ -0,0 +1,66 @@
+# 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-r1.ebuild,v 1.1 2014/05/07 12:31:58 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-about \
+		--enable-mate-conf-import \
+		--disable-desktop-docs \
+		--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}
+}