commit: ad75c8e73d26baadf5893e5da3c93cf4eff564b2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 21:11:33 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 3 21:16:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ad75c8e7
app-arch/file-roller: 3.14.2 → 3.16.1
...oller-9999.ebuild => file-roller-3.16.1.ebuild} | 25 ++++------------------
app-arch/file-roller/file-roller-9999.ebuild | 7 ++----
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/app-arch/file-roller/file-roller-9999.ebuild
b/app-arch/file-roller/file-roller-3.16.1.ebuild
similarity index 81%
copy from app-arch/file-roller/file-roller-9999.ebuild
copy to app-arch/file-roller/file-roller-3.16.1.ebuild
index 834bd59..4978148 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,21 +7,14 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2 readme.gentoo
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/";
+HOMEPAGE="http://fileroller.sourceforge.net/
https://wiki.gnome.org/Apps/FileRoller";
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="nautilus packagekit"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
@@ -35,8 +28,6 @@ RDEPEND="
sys-apps/file
x11-libs/cairo
x11-libs/gdk-pixbuf:2
- x11-libs/libICE
- x11-libs/libSM
x11-libs/pango
nautilus? ( >=gnome-base/nautilus-3 )
packagekit? ( app-admin/packagekit-base )
@@ -50,11 +41,6 @@ DEPEND="${RDEPEND}
# eautoreconf needs:
# gnome-base/gnome-common
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools"
-fi
-
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
${PN} is a frontend for several archiving utilities. If you want a
@@ -86,8 +72,6 @@ src_prepare() {
}
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
# --disable-debug because enabling it adds -O0 to CFLAGS
gnome2_src_configure \
@@ -96,10 +80,9 @@ src_configure() {
--disable-debug \
--enable-magic \
--enable-libarchive \
- --with-smclient=xsmp \
$(use_enable nautilus nautilus-actions) \
$(use_enable packagekit) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
src_install() {
diff --git a/app-arch/file-roller/file-roller-9999.ebuild
b/app-arch/file-roller/file-roller-9999.ebuild
index 834bd59..64e2c59 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/";
+HOMEPAGE="http://fileroller.sourceforge.net/
https://wiki.gnome.org/Apps/FileRoller";
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
@@ -35,8 +35,6 @@ RDEPEND="
sys-apps/file
x11-libs/cairo
x11-libs/gdk-pixbuf:2
- x11-libs/libICE
- x11-libs/libSM
x11-libs/pango
nautilus? ( >=gnome-base/nautilus-3 )
packagekit? ( app-admin/packagekit-base )
@@ -96,7 +94,6 @@ src_configure() {
--disable-debug \
--enable-magic \
--enable-libarchive \
- --with-smclient=xsmp \
$(use_enable nautilus nautilus-actions) \
$(use_enable packagekit) \
${myconf}
