From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D2CC6138010 for ; Sat, 27 Oct 2012 21:59:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09BD6E0508; Sat, 27 Oct 2012 21:59:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 60824E0508 for ; Sat, 27 Oct 2012 21:59:51 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90DA033D897 for ; Sat, 27 Oct 2012 21:59:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2A36BE5436 for ; Sat, 27 Oct 2012 21:59:49 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1351375158.783e7752d80129af48c2c2a85640d98889e3a74a.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/sushi/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/sushi/sushi-3.6.0.ebuild gnome-extra/sushi/sushi-9999.ebuild X-VCS-Directories: gnome-extra/sushi/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 783e7752d80129af48c2c2a85640d98889e3a74a X-VCS-Branch: master Date: Sat, 27 Oct 2012 21:59:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d638572c-afc9-491e-a524-bb75ccb38ffb X-Archives-Hash: ee8cadae8332b0432064512613ab10c9 commit: 783e7752d80129af48c2c2a85640d98889e3a74a Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Oct 27 21:59:18 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Oct 27 21:59:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=783e7752 gnome-extra/sushi: 0.4.1 → 3.6.0 This ebuild depends on not yet commited slots. This is done on purpose. --- .../{sushi-9999.ebuild => sushi-3.6.0.ebuild} | 41 +++++++++++--------- gnome-extra/sushi/sushi-9999.ebuild | 27 +++++++++---- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-3.6.0.ebuild similarity index 69% copy from gnome-extra/sushi/sushi-9999.ebuild copy to gnome-extra/sushi/sushi-3.6.0.ebuild index 370d8e2..cbb03b2 100644 --- a/gnome-extra/sushi/sushi-9999.ebuild +++ b/gnome-extra/sushi/sushi-3.6.0.ebuild @@ -6,23 +6,18 @@ EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit autotools eutils gnome2 DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager" HOMEPAGE="http://git.gnome.org/browse/sushi" LICENSE="GPL-3" SLOT="0" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi -IUSE="" +KEYWORDS="~amd64 ~x86" +IUSE="office" +# Optional app-office/unoconv support (OOo to pdf) +# freetype needed for font loader # libX11 needed for sushi_create_foreign_window() COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection] >=dev-libs/gjs-0.7.7 @@ -34,28 +29,38 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 - media-libs/gstreamer:0.10[introspection] - media-libs/gst-plugins-base:0.10[introspection] + media-libs/gstreamer:1.0[introspection] + media-libs/gst-plugins-base:1.0[introspection] media-libs/clutter-gst:2.0[introspection] media-libs/musicbrainz:5 net-libs/webkit-gtk:3[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/libX11 - office? ( app-office/unoconv )" + office? ( app-office/unoconv ) +" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 - virtual/pkgconfig" + virtual/pkgconfig +" RDEPEND="${COMMON_DEPEND} >=gnome-base/nautilus-3.1.90 - x11-themes/gnome-icon-theme-symbolic" + x11-themes/gnome-icon-theme-symbolic +" -pkg_setup() { +src_prepare() { G2CONF="${G2CONF} UNOCONV=$(type -P false) --disable-schemas-compile --disable-static" + if use office; then + G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)" + fi + DOCS="AUTHORS NEWS README TODO" - use office && G2CONF+=" UNOCONV=$(type -P unoconv)" -} + + epatch "${FILESDIR}"/${P}-gold.patch + eautoreconf + gnome2_src_prepare +} \ No newline at end of file diff --git a/gnome-extra/sushi/sushi-9999.ebuild b/gnome-extra/sushi/sushi-9999.ebuild index 370d8e2..dbd4ccc 100644 --- a/gnome-extra/sushi/sushi-9999.ebuild +++ b/gnome-extra/sushi/sushi-9999.ebuild @@ -21,8 +21,10 @@ if [[ ${PV} = 9999 ]]; then else KEYWORDS="~amd64 ~x86" fi -IUSE="" +IUSE="office" +# Optional app-office/unoconv support (OOo to pdf) +# freetype needed for font loader # libX11 needed for sushi_create_foreign_window() COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection] >=dev-libs/gjs-0.7.7 @@ -34,28 +36,35 @@ COMMON_DEPEND=">=x11-libs/gdk-pixbuf-2.22.1[introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 - media-libs/gstreamer:0.10[introspection] - media-libs/gst-plugins-base:0.10[introspection] + media-libs/gstreamer:1.0[introspection] + media-libs/gst-plugins-base:1.0[introspection] media-libs/clutter-gst:2.0[introspection] media-libs/musicbrainz:5 net-libs/webkit-gtk:3[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/libX11 - office? ( app-office/unoconv )" + office? ( app-office/unoconv ) +" DEPEND="${RDEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 - virtual/pkgconfig" + virtual/pkgconfig +" RDEPEND="${COMMON_DEPEND} >=gnome-base/nautilus-3.1.90 - x11-themes/gnome-icon-theme-symbolic" + x11-themes/gnome-icon-theme-symbolic +" -pkg_setup() { +src_prepare() { G2CONF="${G2CONF} UNOCONV=$(type -P false) --disable-schemas-compile --disable-static" + if use office; then + G2CONF="${G2CONF} UNOCONV=$(type -P unoconv)" + fi + DOCS="AUTHORS NEWS README TODO" - use office && G2CONF+=" UNOCONV=$(type -P unoconv)" -} + gnome2_src_prepare +} \ No newline at end of file