commit: b5da8b9dc582495e470cd0ee932de6e12b72f65b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 21:12:11 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 6 21:17:01 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b5da8b9d
app-arch/file-roller: 3.10.2.1 → 3.12.0
---
...oller-9999.ebuild => file-roller-3.12.0.ebuild} | 22 ++++------------------
app-arch/file-roller/file-roller-9999.ebuild | 4 ++--
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/app-arch/file-roller/file-roller-9999.ebuild
b/app-arch/file-roller/file-roller-3.12.0.ebuild
similarity index 83%
copy from app-arch/file-roller/file-roller-9999.ebuild
copy to app-arch/file-roller/file-roller-3.12.0.ebuild
index 2c56cae..b5bc926 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,9 +7,6 @@ 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/";
@@ -17,11 +14,7 @@ HOMEPAGE="http://fileroller.sourceforge.net/";
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
@@ -50,15 +43,10 @@ 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
-particular achive format support, see ${HOMEPAGE}
+particular archive format support, see ${HOMEPAGE}
and install the relevant package. For example:
7-zip - app-arch/p7zip
ace - app-arch/unace
@@ -86,8 +74,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 \
@@ -99,7 +85,7 @@ src_configure() {
--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 2c56cae..2926cbb 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-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -58,7 +58,7 @@ fi
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
${PN} is a frontend for several archiving utilities. If you want a
-particular achive format support, see ${HOMEPAGE}
+particular archive format support, see ${HOMEPAGE}
and install the relevant package. For example:
7-zip - app-arch/p7zip
ace - app-arch/unace
