[gentoo-commits] proj/gentoo-mate:1.14-bump commit in: app-arch/engrampa/
commit: 03ad997a315dbc5c7fe28de274e9b528b1a34364 Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 5 04:44:52 2016 + Commit: NP Hardass gentoo org> CommitDate: Mon Sep 5 04:44:52 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=03ad997a app-arch/engrampa: swap out itstool for proper dep yelp-tools Package-Manager: portage-2.3.0 app-arch/engrampa/engrampa-1.10.2-r1.ebuild | 2 +- app-arch/engrampa/engrampa-1.12.0-r1.ebuild | 2 +- app-arch/engrampa/engrampa-1.14.1.ebuild| 2 +- app-arch/engrampa/engrampa-.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-arch/engrampa/engrampa-1.10.2-r1.ebuild b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild index 8a613bc..c8a2bf2 100644 --- a/app-arch/engrampa/engrampa-1.10.2-r1.ebuild +++ b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild @@ -32,8 +32,8 @@ RDEPEND=">=x11-libs/gtk+-2.24.0:2 !!app-arch/mate-file-archiver" DEPEND="${RDEPEND} + app-text/yelp-tools >=dev-util/intltool-0.35:* - dev-util/itstool:0 >=mate-base/mate-common-1.8:0 sys-devel/gettext:* virtual/pkgconfig:*" diff --git a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild index 48c44f3..89cfca9 100644 --- a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild +++ b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild @@ -32,8 +32,8 @@ RDEPEND=" !!app-arch/mate-file-archiver" DEPEND="${RDEPEND} + app-text/yelp-tools >=dev-util/intltool-0.50.1:* - dev-util/itstool:0 sys-devel/gettext:* virtual/pkgconfig:*" diff --git a/app-arch/engrampa/engrampa-1.14.1.ebuild b/app-arch/engrampa/engrampa-1.14.1.ebuild index be74917..dbe8cf7 100644 --- a/app-arch/engrampa/engrampa-1.14.1.ebuild +++ b/app-arch/engrampa/engrampa-1.14.1.ebuild @@ -34,8 +34,8 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} + app-text/yelp-tools >=dev-util/intltool-0.50.1:* - dev-util/itstool:0 sys-devel/gettext:* virtual/pkgconfig:*" diff --git a/app-arch/engrampa/engrampa-.ebuild b/app-arch/engrampa/engrampa-.ebuild index 309ac50..2e1da1b 100644 --- a/app-arch/engrampa/engrampa-.ebuild +++ b/app-arch/engrampa/engrampa-.ebuild @@ -33,8 +33,8 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} + app-text/yelp-tools >=dev-util/intltool-0.50.1:* - dev-util/itstool:0 sys-devel/gettext:* virtual/pkgconfig:*"
[gentoo-commits] proj/gentoo-mate:1.14-bump commit in: app-arch/engrampa/
commit: b9ec783afd3405edac7990d49ac3c6b68121eeb8 Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 5 04:35:34 2016 + Commit: NP Hardass gentoo org> CommitDate: Mon Sep 5 04:35:34 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=b9ec783a app-arch/engrampa: Version bump to 1.14.1 Package-Manager: portage-2.3.0 app-arch/engrampa/Manifest | 1 + app-arch/engrampa/engrampa-1.14.1.ebuild | 76 2 files changed, 77 insertions(+) diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest index d4430b7..9a2f24a 100644 --- a/app-arch/engrampa/Manifest +++ b/app-arch/engrampa/Manifest @@ -1,2 +1,3 @@ DIST engrampa-1.10.2.tar.xz 137 SHA256 964bf6fd8463b378e3bdd7713e86eca9dd65f1a6d99e10bb59cb2185084f986b SHA512 86772801d80584c4020fce63cde11478a914372598f3c41774f4248817a05e37eb72842cd2f88be81c22969452f33806738d94a872ffe4ca8743fe8a9c115e1d WHIRLPOOL db2824550840296b636ea48ac987e004184d9cc41c669f0f2c30b67da8ebd6e991d5e27a55a5691c004cce4df26fb101318420d67f20015af55b6f5521525891 DIST engrampa-1.12.0.tar.xz 1380144 SHA256 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec WHIRLPOOL b1132440b2d02fd2bfa9c903794113cf7d36eb7e67b4dc3222635dc7c33c459a87885ce1ec7bcdc623db8c75a6d33015ade6faaf3cfa8fd85fc85631d87366da +DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c diff --git a/app-arch/engrampa/engrampa-1.14.1.ebuild b/app-arch/engrampa/engrampa-1.14.1.ebuild new file mode 100644 index 000..be74917 --- /dev/null +++ b/app-arch/engrampa/engrampa-1.14.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != ]]; 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 ) + magic? ( sys-apps/file ) + packagekit? ( app-admin/packagekit-base ) + !!app-arch/mate-file-archiver" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50.1:* + dev-util/itstool:0 + 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" +}
[gentoo-commits] proj/gentoo-mate:1.14-bump commit in: app-arch/engrampa/files/, app-arch/engrampa/
commit: ca81a7fe3dddf312caad6e97451b81fcc71a Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 5 04:25:39 2016 + Commit: NP Hardass gentoo org> CommitDate: Mon Sep 5 04:25:39 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=ca81 app-arch/engrampa: Update p7zip support Package-Manager: portage-2.3.0 ...mpa-1.10.2.ebuild => engrampa-1.10.2-r1.ebuild} | 5 ...mpa-1.12.0.ebuild => engrampa-1.12.0-r1.ebuild} | 5 .../files/engrampa-1.10.2-p7zip-15.09-compat.patch | 25 ++ .../files/engrampa-1.10.2-p7zip-15.14-compat.patch | 30 ++ 4 files changed, 65 insertions(+) diff --git a/app-arch/engrampa/engrampa-1.10.2.ebuild b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild similarity index 94% rename from app-arch/engrampa/engrampa-1.10.2.ebuild rename to app-arch/engrampa/engrampa-1.10.2-r1.ebuild index f0fc91b..8a613bc 100644 --- a/app-arch/engrampa/engrampa-1.10.2.ebuild +++ b/app-arch/engrampa/engrampa-1.10.2-r1.ebuild @@ -38,6 +38,11 @@ DEPEND="${RDEPEND} 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_prepare() { gnome2_src_prepare diff --git a/app-arch/engrampa/engrampa-1.12.0.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild similarity index 93% rename from app-arch/engrampa/engrampa-1.12.0.ebuild rename to app-arch/engrampa/engrampa-1.12.0-r1.ebuild index c1ec897..48c44f3 100644 --- a/app-arch/engrampa/engrampa-1.12.0.ebuild +++ b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild @@ -37,6 +37,11 @@ DEPEND="${RDEPEND} 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 \ 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 new file mode 100644 index 000..d0937a8 --- /dev/null +++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch @@ -0,0 +1,25 @@ +From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001 +From: monsta +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 new file mode 100644 index 000..4e25898 --- /dev/null +++ b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch @@ -0,0 +1,30 @@ +From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001 +From: sc0w +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
[gentoo-commits] proj/gentoo-mate:1.14-bump commit in: app-arch/engrampa/
commit: b2efdb68dc6a2a3f8f23696c717137edf3a5fb67 Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 5 04:40:46 2016 + Commit: NP Hardass gentoo org> CommitDate: Mon Sep 5 04:40:46 2016 + URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=b2efdb68 app-arch/engrampa: update , force gtk3 Package-Manager: portage-2.3.0 app-arch/engrampa/engrampa-.ebuild | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app-arch/engrampa/engrampa-.ebuild b/app-arch/engrampa/engrampa-.ebuild index 1da8430..309ac50 100644 --- a/app-arch/engrampa/engrampa-.ebuild +++ b/app-arch/engrampa/engrampa-.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Engrampa archive manager for MATE" LICENSE="GPL-2" SLOT="0" -IUSE="caja gtk3 magic packagekit" +IUSE="caja magic packagekit" COMMON_DEPEND=" >=dev-libs/glib-2.32.0:2 @@ -24,9 +24,8 @@ COMMON_DEPEND=" 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 ) + caja? ( >=mate-base/caja-1.12[gtk3(+)] ) + >=x11-libs/gtk+-3.14:3 magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver" @@ -43,7 +42,6 @@ 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)