From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SQVFz-0004WV-QI for garchives@archives.gentoo.org; Sat, 05 May 2012 03:02:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A53F2E05AF; Sat, 5 May 2012 03:01:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 61131E05AF for ; Sat, 5 May 2012 03:01:56 +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 728CC1B4008 for ; Sat, 5 May 2012 03:01:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 62791E5401 for ; Sat, 5 May 2012 03:01:53 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1336186845.eb2ba12dec1def800b21971ef60f577e7eab347a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-text/evince/ X-VCS-Repository: proj/gnome X-VCS-Files: app-text/evince/evince-3.4.0.ebuild app-text/evince/evince-9999.ebuild X-VCS-Directories: app-text/evince/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: eb2ba12dec1def800b21971ef60f577e7eab347a X-VCS-Branch: master Date: Sat, 5 May 2012 03:01:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 89ab984a-46af-4166-a0dd-ae2c875e9d84 X-Archives-Hash: e3ce3eaf4f45fa6ed4feea6b100d24aa commit: eb2ba12dec1def800b21971ef60f577e7eab347a Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat May 5 03:00:45 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sat May 5 03:00:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Deb2ba12d app-text/evince: moved to gx86, sync -9999 with gx86 --- app-text/evince/evince-3.4.0.ebuild | 109 -----------------------------= ------ app-text/evince/evince-9999.ebuild | 19 ++++-- 2 files changed, 12 insertions(+), 116 deletions(-) diff --git a/app-text/evince/evince-3.4.0.ebuild b/app-text/evince/evince= -3.4.0.ebuild deleted file mode 100644 index 294f054..0000000 --- a/app-text/evince/evince-3.4.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0.ebuild,= v 1.2 2010/12/07 19:38:52 eva Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"yes" -GNOME2_LA_PUNT=3D"yes" - -inherit eutils gnome2 -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"Simple document viewer for GNOME" -HOMEPAGE=3D"http://www.gnome.org/projects/evince/" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -IUSE=3D"dbus debug djvu doc dvi gnome-keyring +introspection nautilus t1= lib tiff xps" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" -fi - -# Since 2.26.2, can handle poppler without cairo support. Make it option= al ? -# not mature enough -# atk used in libview -# gdk-pixbuf used all over the place -# libX11 used for totem-screensaver -RDEPEND=3D" - >=3Dapp-text/libspectre-0.2.0 - dev-libs/atk - >=3Ddev-libs/glib-2.25.11:2 - >=3Ddev-libs/libxml2-2.5:2 - sys-libs/zlib - x11-libs/gdk-pixbuf:2 - >=3Dx11-libs/gtk+-3.0.2:3[introspection?] - x11-libs/libX11 - >=3Dx11-libs/libSM-1 - x11-libs/libICE - gnome-base/gsettings-desktop-schemas - || ( - >=3Dx11-themes/gnome-icon-theme-2.17.1 - >=3Dx11-themes/hicolor-icon-theme-0.10 ) - >=3Dx11-libs/cairo-1.10.0 - >=3Dapp-text/poppler-0.18[cairo] - djvu? ( >=3Dapp-text/djvu-3.5.17 ) - dvi? ( - virtual/tex-base - dev-libs/kpathsea - t1lib? ( >=3Dmedia-libs/t1lib-5.0.0 ) ) - gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.22.0 ) - introspection? ( >=3Ddev-libs/gobject-introspection-0.6 ) - nautilus? ( >=3Dgnome-base/nautilus-2.91.4[introspection?] ) - tiff? ( >=3Dmedia-libs/tiff-3.6 ) - xps? ( >=3Dapp-text/libgxps-0.2.1 ) -" -DEPEND=3D"${RDEPEND} - app-text/scrollkeeper - >=3Dapp-text/gnome-doc-utils-0.3.2 - ~app-text/docbook-xml-dtd-4.1.2 - >=3Ddev-util/pkgconfig-0.9 - sys-devel/gettext - >=3Ddev-util/intltool-0.35 - >=3Ddev-util/gtk-doc-am-1.13 - doc? ( >=3Ddev-util/gtk-doc-1.13 )" - -ELTCONF=3D"--portage" - -# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ -# Releases: http://people.redhat.com/zcerza/dogtail/releases/ -RESTRICT=3D"test" - -pkg_setup() { - # Passing --disable-help would drop offline help, that would be inconsi= stent - # with helps of the most of Gnome apps that doesn't require network for= that. - G2CONF=3D"${G2CONF} - --disable-schemas-compile - --disable-scrollkeeper - --disable-static - --disable-tests - --enable-pdf - --enable-comics - --enable-thumbnailer - --with-smclient=3Dxsmp - --with-platform=3Dgnome - --enable-help - $(use_enable dbus) - $(use_enable djvu) - $(use_enable dvi) - $(use_with gnome-keyring keyring) - $(use_enable introspection) - $(use_enable nautilus) - $(use_enable t1lib) - $(use_enable tiff) - $(use_enable xps)" - DOCS=3D"AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # Do not depend on gnome-icon-theme, bug #326855 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed" - - # Fix .desktop file so menu item shows up - epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch - - gnome2_src_prepare -} diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-= 9999.ebuild index 294f054..ed0ff58 100644 --- a/app-text/evince/evince-9999.ebuild +++ b/app-text/evince/evince-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0.ebuild,= v 1.2 2010/12/07 19:38:52 eva Exp $ +# $Header: $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" @@ -53,17 +53,17 @@ RDEPEND=3D" gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.22.0 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.6 ) nautilus? ( >=3Dgnome-base/nautilus-2.91.4[introspection?] ) - tiff? ( >=3Dmedia-libs/tiff-3.6 ) + tiff? ( >=3Dmedia-libs/tiff-3.6:0 ) xps? ( >=3Dapp-text/libgxps-0.2.1 ) " DEPEND=3D"${RDEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.3.2 - ~app-text/docbook-xml-dtd-4.1.2 - >=3Ddev-util/pkgconfig-0.9 + app-text/docbook-xml-dtd:4.3 sys-devel/gettext >=3Ddev-util/intltool-0.35 >=3Ddev-util/gtk-doc-am-1.13 + virtual/pkgconfig doc? ( >=3Ddev-util/gtk-doc-1.13 )" =20 ELTCONF=3D"--portage" @@ -99,11 +99,16 @@ pkg_setup() { } =20 src_prepare() { - # Do not depend on gnome-icon-theme, bug #326855 - sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed" + # Regenerate marshalers to allow building with =3D $GNOME_ICON_THEME_REQUIRED//g' \ + -i configure || die "sed failed" }