version bump; cleanup obsolete dependency (bug #519152)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 123 insertions, 16 deletions

diff --git a/mate-base/caja/ChangeLog b/mate-base/caja/ChangeLog
index 4682663770b1..aa30804c481d 100644
--- a/mate-base/caja/ChangeLog
+++ b/mate-base/caja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mate-base/caja
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/ChangeLog,v 1.7 2014/07/07 23:45:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/ChangeLog,v 1.8 2014/12/08 23:37:22 tamiko Exp $
+
+*caja-1.8.2 (08 Dec 2014)
+
+  08 Dec 2014; Matthias Maier <tamiko@gentoo.org> +caja-1.8.2.ebuild,
+  caja-1.8.1.ebuild:
+  version bump; cleanup obsolete dependency (bug #519152)
 
   07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> caja-1.8.1.ebuild:
   Add missing dconf dependency; fixes bug #515148, reported by Patrick Lauer.
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index ea59303e6290..fc89688d44b3 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -2,17 +2,25 @@
 Hash: SHA256
 
 DIST caja-1.8.1.tar.xz 3647396 SHA256 6706fc853a6cc6a2f0a012cd08b396f2f72607bc6c50cf6dfd5b38c64d7c6818 SHA512 d3bddd25c355e8f9aad810ccec302e08f5be4992dd8680a88f6ab552fd56f0a1517dd71eef6d3f7c35aca7acad7fed63f2af9fdbb0eb65e9b6751d97f7465367 WHIRLPOOL 3c0aaf0a23e142099312272feebb71ad9272e58b47d1bb152f12cb7aeda62235624d33ed66e5e4da3cd2c38bb4aeadfd9ccc9b0b92d456c4615b834afabdd215
-EBUILD caja-1.8.1.ebuild 2448 SHA256 911bfd3766cea44a555ebe7946259ec2588222058113d9a9f61b7a0dc0f7b76d SHA512 3d70a2de86fa53dbbee5538f01791b0e43e26dddb8a7360dbc10f834b3ee5dc4669473169f51b1fb1475c87296e8ff09a9ffe667b54aa6be68fa7588efe847df WHIRLPOOL 257a5727bb54b629e6be82716aa7ebb86e87cbeb481da20321c33bb4c06901c54a7914765d5c6dc6d5fc6e61ef18c29cc821dc3899626e779255bc33375d6824
-MISC ChangeLog 1090 SHA256 cf2a539acd0d6c6d81ace69d5773b1c7bbb7c74f78868c2a861a3a78c0322ae3 SHA512 55ed853ac8e2798091b0006636916fd38595d16d0ea580126f0c6a15d1f0da559a49780adf9e7123ee50360b4e53d0be7675cfdd8c8cddaa51b3e3aa20a8bc8e WHIRLPOOL f7d899fcdf02ecd682a006dd47a02845950d583df179bfe78eb8f5a45c287215da46f122c0a59f358ca4dd6efb46fea9a75f3b7ce367eb56e615f681f60304f0
+DIST caja-1.8.2.tar.xz 3596308 SHA256 99331a7439c346382c3b82c889fee9aaabca8760e9c7dfb60041c1fbcd2c6ac0 SHA512 0e704639ea895081f4175f88437d54635cf8b0891e04afda9f9cf87b6edae3ae32de35279f40518fb7044ef8fe38d1b2700acb5a93708e34e8ce2d6e7bc23ad6 WHIRLPOOL 28ec0d5f04c55bd71b368249a64bb0add323e3a0935d39e44b1f9c4919cfc4bfe3ce81d7e527a01abf033023405bdc272654a7ea05520004da7fb159e6abe47b
+EBUILD caja-1.8.1.ebuild 2404 SHA256 51e408d73f4605e875ef8d7eb5190f5c447bbeb90286a81ac96d39b83a5226eb SHA512 24dc5ed0aad1dffe5c8019445e09b691fc313281255bb64872d86b9543ac54ae8a0d52643e384d53c5e671ef85c6a3f6bd61ccfa8054b3d10418354060b655d9 WHIRLPOOL a3c57510e930b89ff30e0abb585a4743327e97ac3d5cfc4313a8da54cbe1b4e2ac74344a99379db52a6f55c916672cb5b2bbe6ca1ab781a99dc6f7ffdb2e15e1
+EBUILD caja-1.8.2.ebuild 2406 SHA256 f2688b5b3904154963021dd67c2f2a91d3b7515007b298f6ed877bcaaaa2d2c3 SHA512 8558978a98d67aa3987f6c554767f88ebd76f688508cdcc4dc4c0274631459650b67e527ecaef528b997f71aec13c95f92a0b728e3ecbd1108effb8b929ffdda WHIRLPOOL cb127c81b0e2a10317c533ab9d67a71c44fa37d7a858487cfbb18b4741eaa944e4e55188e6fba7242fe83cae89756b73d3e26968bb7e6c90ac20016a7644944f
+MISC ChangeLog 1267 SHA256 b61dd7ba108b1a00f88e2aa348ba5b439e16ef375a49efc1ea6cc5b8e9667d77 SHA512 dfd4b0e56d81732ecccc0ccdd91ad96357cd085905acf88ab516bc70f68fe063f6c5e31655be23b4d0aee6c5b5bc8ba4978841caafa3bf3244028bd857b2b026 WHIRLPOOL a2c6497c7d837a6a14b66594fd87ddda2154060e8075648418dabb6737e6e01a58dd59858e189e8aceda76d7238e3a72499e948e53a59381beba18d2e90e04c8
 MISC metadata.xml 499 SHA256 f7df17342fc39ef91a30e5a5fc3fea7083ce3884ae3037419458e01ed06712f0 SHA512 b949a905f073339113ba7de1d7d89a3fa5637a692f5e727c6b1be3bcda6aee768a3f87687eb581324e493cc28a08b6c31065d358d278488e3468fb4a8225e04a WHIRLPOOL b3b2c548a3168d0d5a10067108e907c95af153ecfa22abdf3b1e50a87a26fefa123984975190fd9f3b72fe564abd9135c051ad80a9220556d6412343e18d7671
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJTuzEFAAoJEJWyH81tNOV9Z6oH/RaneXebHiHI+k5I6PHMKd65
-npsqYEHkvosSqhrehEbnBrcVrvR/9qZoGLXfdvqGOj+eXSbBiPpVjqBRJLzyei00
-3uvK07bcZLYC//CsxHlWKbUMg0hd9JsQd5e0omxBPzQ242oszSOWCSqvRPr1WVtL
-JGDdBQdexo1uu8LLnGKto19x0mtzhUF6NPXy/KGhwlA9Jo7lML89RSKMBqUoKsR9
-QrxcD83EFUQi4QFzy8RU12NaKf0bz8cDQ4SSyxPHQw5iBmnFURFxYo9Dfq8XHLP9
-WHmZfXuhaGM17rpYRkoDy58XUT5Y2zQeQ3oTFQdBNGlTUoHS/4E9EMKYkarWjZU=
-=ec5M
+iQIcBAEBCAAGBQJUhjYzAAoJELhOzYlK7nn/+OIP/RugvRBf+AbaEMXP24+w+u7H
+n6WXVAvMnOEpSIShg+3SMyNM8F162sbxMG9Npi7ItEG2/KnlnarSI6GdBeGbU+oj
+3ZWInHwMC8oFfifXg6OBYacan9M4b9mx1pgpcvWxu+20lv6SQxbIP0xu3BSa3kXt
+ljvoTOtvo5U0b1/TBMi84MuPgAuhJiZ+B3So4R6W5+vVHcWsIe/N4CsRHJuWO/y6
+eZlhc7a/bHUgVfOCha5E9mWsVDF3FK4M6HN5Xr9MQ/EY1ZJbPn46s2PgVN7FW5sM
+TMHrlHG74DLvjJDUpWjs8PcMjjRy8kyH35XM0YuD7dbWZi7JD1gHJqh1NR4QOG4r
+kyjr9m4b0FvUgvO4Heymh8bSmZhi+a70+1ty5Zoc9ma4DzQW/wwwMRbbuVKHQyqX
+Yd0WQVMA5LIzS0VMHBCt0roDggrO1OgpG2xZJ3Neb0uvLw4VftZ3VslN2Rke2gan
+/owt9w4aQFki6dOfvv+b9pCG1qNTizJGk+AV98td53rTPHhSX8ymPWBsYOHL11/+
+k6EB/zCd6SgHFE89bkXgYriqew9rfnWJ+85qhGspDDaCJA3GoHuoMyr7ccyD7y0y
+gw91NGc6vmTydGLiAoNG3Ks5fNE4wY25+AjnzA9Kud//oSZO9w1LEx8TeIyJMhCq
+BY2jkH3RmbuBnt7h8k86
+=S//8
 -----END PGP SIGNATURE-----
diff --git a/mate-base/caja/caja-1.8.1.ebuild b/mate-base/caja/caja-1.8.1.ebuild
index 690f47a85758..de1d26fa3fb8 100644
--- a/mate-base/caja/caja-1.8.1.ebuild
+++ b/mate-base/caja/caja-1.8.1.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/caja/caja-1.8.1.ebuild,v 1.5 2014/07/07 23:45:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/caja-1.8.1.ebuild,v 1.6 2014/12/08 23:37:22 tamiko Exp $
 
 EAPI="5"
 
@@ -25,10 +25,7 @@ RDEPEND="dev-libs/atk:0
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf:0
-	|| (
-		>=gnome-base/gvfs-1.10.1:0[gdu]
-		>=gnome-base/gvfs-1.10.1:0[udisks]
-	)
+	>=gnome-base/gvfs-1.10.1:0[udisks]
 	>=mate-base/mate-desktop-1.8:0
 	>=media-libs/libexif-0.5.12:0
 	>=x11-libs/gtk+-2.24:2[introspection?]
diff --git a/mate-base/caja/caja-1.8.2.ebuild b/mate-base/caja/caja-1.8.2.ebuild
new file mode 100644
index 000000000000..a13cc1381ac8
--- /dev/null
+++ b/mate-base/caja/caja-1.8.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/caja-1.8.2.ebuild,v 1.1 2014/12/08 23:37:22 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 versionator virtualx
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Caja file manager for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X +mate +introspection +unique xmp"
+
+RDEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.8:0
+	>=media-libs/libexif-0.5.12:0
+	>=x11-libs/gtk+-2.24:2[introspection?]
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	virtual/libintl:0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 )
+	unique? ( >=dev-libs/libunique-1:1 )
+	xmp? ( >=media-libs/exempi-1.99.2:2 )"
+
+DEPEND="${RDEPEND}
+	!!mate-base/mate-file-manager
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	>=dev-util/intltool-0.40.1:*
+	>=mate-base/mate-common-1.6:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-1.6:0 )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure{,.ac} eel/Makefile.{am,in} || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-unique \
+		--disable-packagekit \
+		--disable-update-mimedb \
+		--with-gtk=2.0 \
+		$(use_enable introspection) \
+		$(use_enable unique) \
+		$(use_enable xmp) \
+		$(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}