gentoo resync : 07.10.2018

5 files changed, 1 insertions, 297 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index b882198159fa..f330596ee4cd 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,9 +1,3 @@
-DIST caja-1.12.7.tar.xz 3645820 BLAKE2B 75f76841b6a14aff27521d9a8db40f5ebfa536a10c727a272439c1ea8d54c9cba191eedcbdf2b8af42c92cd30f4f4b300bc159e3813239e6addd5a11a557945b SHA512 32761370cc419ab8d8f815a291782d1ce380d04bf2450dbcea9d0f17d91a1c0b9a487a67a51a0c769a5fcb11091638a7b60e27b28f3148899ba44fb6feb313da
-DIST caja-1.14.2.tar.xz 3560252 BLAKE2B 6fc45445c279085276a55f718f809db9813fc6602b45018487529a85176915fef5713492448b55703355e422da47d23b60365de1a675403d21b0a3290cd2fc00 SHA512 ef0c42e26fbeb2a2296c67fd0a1f59d18b104ba818761600dec2ab571fbd5a1d659471105b97a9fcd7b0e16afa1dfdf860decad1f65b299964017932f7dfdfbc
-DIST caja-1.16.6.tar.xz 3511140 BLAKE2B 88f965d89ecd027d76c64143d99dd0820f338aa2e6260702eca0f3ec0893fddddd0fffc26e2e678973ed12e27e0e3b9126490d845178d779341c0ddcd18f008b SHA512 21553b44e97f3d294996de59af151471928d0153234f986c0a3cd639ce0661eba5182975d3f03915f7e5ade72266837c9ba5747d02527b65f74f8e0ea6471fb0
 DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
-EBUILD caja-1.12.7-r2.ebuild 2170 BLAKE2B 42053624182ca2de4c91f5a7ca0a4d2196c0508705b93aab7665ba3fe13f0cd40f6c9ad219f1b97be001446544b4a89507905f5679070cecef54ec8e1a525bd9 SHA512 88a39a9219ecdf4d56f2f03ec0108499f210a8bd85437b698905341df8ef48713a9b796d682f7da7edcda2d2c7f55a6940a32e45b6d75760d78824d9cc4ebbf7
-EBUILD caja-1.14.2.ebuild 2204 BLAKE2B c9cd0c103c2340a8a3ea2a7065017b3625b79f603f7d41fe7d24ea39f7cb03e8f7bdaf3130e0e0a62cffb742cc9a2be232891b2e7a4772a4bfc1d30c22e81919 SHA512 79245d5d02007280262641d001cb545de2bcd5427b02c9179005feb8629031003f4c3f76ba2ec5390a01eaac3d6778ca1466f3567d7fb39664d5fbf121f83500
-EBUILD caja-1.16.6.ebuild 2207 BLAKE2B 8506a9bd9dab659f05ad9e3d7230f5a4eb436203a3b6d3b6fc3d43ae04af7c6eff602d5d929fea0f5b601f2e3bc67c87cc46f59e2b0f46623e4c261db2952683 SHA512 a5aa456c6fb6b89ff7618baa7844c2bbba0feea51c830dd7d27b5438f5a8f737910ff8a8852eef220ec7d699810d03ee61671541b5b114ca6b637a77865d39c6
 EBUILD caja-1.18.5.ebuild 2070 BLAKE2B 0a53984070a8d2f3f67b695301cc71689966bb8d0f0a5d4e31f07d48a6fbdad47b73077adfb8fef3678a06c3b27d41e5e1db0ee68bf8e9127a480564fa84b057 SHA512 587350b7071d903e33e4d23989d48c0c870b103b9d30ef4f13335c83eac9960978470aee18cc2b2b3ab2fa651fd1d232458335a5faa3b89524eedd6aa3e834d8
-MISC metadata.xml 682 BLAKE2B e64e762f92934cacb28463f366ba5e79514fa609445f0524097de46f4983e40b129dfeccc05d37e9be2ff1cd30e4c900579d8cc1a40e6fa35b3b9b4793676e99 SHA512 731fdad4d4e0dd3c862df5dfbbc48817cd434c9c7fca9a5b71d6ccc844caaea871128774f4bc69acd0a0197746870b3a6353dfa1ba06f55e0841b616db7860e1
+MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.12.7-r2.ebuild b/mate-base/caja/caja-1.12.7-r2.ebuild
deleted file mode 100644
index ebb0d4bf0506..000000000000
--- a/mate-base/caja/caja-1.12.7-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-RDEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36: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.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	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
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )"
-
-DEPEND="${RDEPEND}
-	!!mate-base/mate-file-manager
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# 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
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_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."
-}
diff --git a/mate-base/caja/caja-1.14.2.ebuild b/mate-base/caja/caja-1.14.2.ebuild
deleted file mode 100644
index fc09a87e70f5..000000000000
--- a/mate-base/caja/caja-1.14.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36: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.9:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	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
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# 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 || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_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."
-}
diff --git a/mate-base/caja/caja-1.16.6.ebuild b/mate-base/caja/caja-1.16.6.ebuild
deleted file mode 100644
index d0c09026f371..000000000000
--- a/mate-base/caja/caja-1.16.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36: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.16.2:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	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
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# 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 || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_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."
-}
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml
index fcee9f59fc63..1302ac7693b1 100644
--- a/mate-base/caja/metadata.xml
+++ b/mate-base/caja/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which 
 		is needed when this package is used in the MATE desktop 
 		environment.</flag>