commit: 4044764ecad552dc9ac77da0fd6825159861d923
Author: kuzetsa <kuzetsa <AT> gmail <DOT> com>
AuthorDate: Fri Mar 10 23:40:32 2017 +0000
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 09:18:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4044764e
app-arch/engrampa: gtk3 must be built with X
Gentoo-Bug: #611104
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Ettore Di Giacinto <mudler <AT> gentoo.org>
.../{engrampa-1.14.1.ebuild => engrampa-1.12.0-r2.ebuild} | 15 ++++++++-------
.../{engrampa-1.14.1.ebuild => engrampa-1.14.1-r1.ebuild} | 4 ++--
...ngrampa-1.16.0-r1.ebuild => engrampa-1.16.0-r2.ebuild} | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/app-arch/engrampa/engrampa-1.14.1.ebuild
b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
similarity index 88%
copy from app-arch/engrampa/engrampa-1.14.1.ebuild
copy to app-arch/engrampa/engrampa-1.12.0-r2.ebuild
index 8caf614..0d35758 100644
--- a/app-arch/engrampa/engrampa-1.14.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
IUSE="caja gtk3 magic packagekit"
-COMMON_DEPEND="
+RDEPEND="
>=dev-libs/glib-2.32.0:2
>=dev-libs/json-glib-0.14:0
x11-libs/gdk-pixbuf:2
@@ -25,20 +25,21 @@ COMMON_DEPEND="
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 )
+ 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}
+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.14-compat.patch" )
+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 \
diff --git a/app-arch/engrampa/engrampa-1.14.1.ebuild
b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
similarity index 96%
rename from app-arch/engrampa/engrampa-1.14.1.ebuild
rename to app-arch/engrampa/engrampa-1.14.1-r1.ebuild
index 8caf614..3af21bd 100644
--- a/app-arch/engrampa/engrampa-1.14.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,7 @@ COMMON_DEPEND="
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 )
+ gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
magic? ( sys-apps/file )
packagekit? ( app-admin/packagekit-base )
!!app-arch/mate-file-archiver"
diff --git a/app-arch/engrampa/engrampa-1.16.0-r1.ebuild
b/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
similarity index 98%
rename from app-arch/engrampa/engrampa-1.16.0-r1.ebuild
rename to app-arch/engrampa/engrampa-1.16.0-r2.ebuild
index 3c7aced..3cf6e95 100644
--- a/app-arch/engrampa/engrampa-1.16.0-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
x11-libs/pango:0
virtual/libintl:0
caja? ( >=mate-base/caja-1.1.0 )
- >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtk+-3.14:3[X]
magic? ( sys-apps/file )
packagekit? ( app-admin/packagekit-base )
!!app-arch/mate-file-archiver"
