gentoo resync : 07.10.2018

8 files changed, 1 insertions, 364 deletions

diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index f604ed8f80ea..fd95b1f8c549 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,12 +1,3 @@
-AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 BLAKE2B 50734ebd04df0f3a277408a9051612b7691e4b52a82d1851fb3cbda23b9308ae1868d15d7ce2b9b4ea9576bbd11bd0b7c71852bef5165a8dc09504ffbb674a40 SHA512 a6c11311b15647713a93ec20c52d228cb828ac15767b7dbc2ae1cffef50b73d06ff5e36891763f715a67a8b06dc1d3a6e2bf30b27abc3376baebe390e7a54c27
-AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a7ccd8bb2e8a101a5df4fd902d748fbc2afc909db2f0071248107d8dc0f6d2bb2b3c6a2382955e6fab30a3f0ab3430b80c4e1d72104 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a
-DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
-DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
-DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
 DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
-EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
-EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
-EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
-EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
 EBUILD engrampa-1.18.3.ebuild 1753 BLAKE2B 11e3876e0ea2061f7a4608ffe8795264594d4c2bafb14c430dc404cade3a15fa2c7f839be2acccfc8bd41f3325111b6bb6241570222c0a3048b6ea674c9f66ad SHA512 6ac876b38c305d108ac369231ae0cf1eed5e9d05e188a9be566fa014596b865781fd3953aac4ca3dd05adb4a552a5d9810a180ef073851990b437852e7ba1b1e
-MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
+MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
deleted file mode 100644
index 0448f8a0511f..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,76 +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
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.12.0-r2.ebuild b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
deleted file mode 100644
index 0d3575820196..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,76 +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
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.14.1-r1.ebuild b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
deleted file mode 100644
index 3af21bd02be2..000000000000
--- a/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,75 +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
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.16.1.ebuild b/app-arch/engrampa/engrampa-1.16.1.ebuild
deleted file mode 100644
index 6f37d339de9f..000000000000
--- a/app-arch/engrampa/engrampa-1.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.1.0 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
deleted file mode 100644
index d0937a8959c5..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Thu, 24 Dec 2015 17:11:19 +0300
-Subject: [PATCH] 7z: correct checking for p7zip 15.09+
-
-from https://github.com/GNOME/file-roller/commit/ed9c3fd2
-
-fixes https://github.com/mate-desktop/engrampa/issues/114
----
- src/fr-command-7z.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 297ba1b..0b784f7 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -106,7 +106,7 @@ list__process_line (char     *line,
- 			strncpy (version, ver_start, ver_len);
- 			version[ver_len] = 0;
- 
--			if (strcmp (version, "4.55") < 0)
-+			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
- 				p7z_comm->old_style = TRUE;
- 			else
- 				p7z_comm->old_style = FALSE;
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
deleted file mode 100644
index 4e25898949f0..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001
-From: sc0w <scow@riseup.net>
-Date: Wed, 25 May 2016 02:29:21 +0200
-Subject: [PATCH] p7zip-rar 15.14 supported
-
-since 15.14, p7zip-rar uses the plugin Rar.so to handle archives
-
-It can find on /usr/lib/ or /usr/libexec/
-
-If someone has it in another folder, we can add it
-
-Fixes #136
----
- src/fr-command-7z.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 20cfa2c..a7d032e 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
- 		if (is_mime_type (mime_type, "application/x-rar")
- 		    || is_mime_type (mime_type, "application/x-cbr"))
- 		{
--			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
-+			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)
-+			    || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS))
- 				capabilities |= FR_COMMAND_CAN_READ;
- 		}
- 		else
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index cea4bb4fa4a4..ff7ba4c5fb87 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="magic">Enable filetype auto-detection via
 			<pkg>sys-apps/file</pkg></flag>
 		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>