Add gnome herd to metadata.xml. Misc. clean-ups in ebuild.

Package-Manager: portage-2.0.53_rc6

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index f1e0a1ebaa69e73cb165b948a0b672101323fe07..dbd26a4a3849733055d8315e587f8ebfe436803c 100644 (file)
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.15 2005/10/17 15:09:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.16 2005/10/21 10:02:22 leonardop Exp $
+
+  21 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> metadata.xml,
+  evince-0.4.0-r2.ebuild:
+  Pass --copy to libtoolize call. Pass --disable-scrollkeeper instead of using
+  gnome2_omf_fix. Move gnome-doc-utils from RDEPEND to DEPEND. Added gconf and
+  libglade dependencies. Set G2CONF in pkg_setup() instead of the global
+  scope. Misc clean-ups. Added gnome herd to metadata.xml.
 
   17 Oct 2005; <dang@gentoo.org> +files/evince-0.4.0-no-tiff.patch,
   evince-0.4.0-r2.ebuild:

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 6d0a119385abdc204dedea0c2b7a38243f84b414..dd5c379cca3f9baeec8572f4f2203cd490724210 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4c0919eb69b4e700e877028e2eb82881 ChangeLog 2557
+MD5 4f1932f3308bba03acd744eff15afc96 ChangeLog 2948
 MD5 e4d15a65822c1ff8fd89a3a2568a371f evince-0.4.0-r1.ebuild 1657
-MD5 d336a41daeb9023bf1c5da4b211eec97 evince-0.4.0-r2.ebuild 1983
-MD5 52069416ee02cc54163f313df19ecba8 evince-0.4.0.ebuild 1587
-MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0 65
+MD5 02380dbe4dd128841310bc556621833c evince-0.4.0-r2.ebuild 1992
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r1 65
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r2 65
 MD5 185784a35b672ed49ea8afb3aba25e30 files/evince-0.4.0-display-menu.patch 471
 MD5 94070710202e7c8024edc662eb420658 files/evince-0.4.0-no-tiff.patch 985
 MD5 755b327b4928ab9492b7c2aab72ef52d files/evince-0.4.0-t1lib_is_t1.patch 976
-MD5 80e3213c196ad3e4d107694f8064aad3 metadata.xml 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDU77UomPajV0RnrERAoaRAJwJc7pqy62nSaWIy8xKMVHGNoiqFwCfXrIg
-Q7P5vUhbDJlqtVeyf4Zxxqk=
-=Dnuw
------END PGP SIGNATURE-----
+MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218

diff --git a/app-text/evince/evince-0.4.0-r2.ebuild b/app-text/evince/evince-0.4.0-r2.ebuild
index cceeceb8b5218a3da4d91398010125dcc553bdd8..b02733c9274c64e6f0b41414c897bc45a19dd5f6 100644 (file)
--- a/app-text/evince/evince-0.4.0-r2.ebuild
+++ b/app-text/evince/evince-0.4.0-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0-r2.ebuild,v 1.5 2005/10/17 15:09:44 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0-r2.ebuild,v 1.6 2005/10/21 10:02:22 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 LICENSE="GPL-2"
 
+# TODO: Use 'gnome' flag instead of 'nautilus'
 IUSE="dbus doc dvi nautilus t1lib tiff"
 # For use.local.desc:
 # app-text/evince:t1lib - Enable Type1 fonts support in .dvi files
@@ -19,11 +20,12 @@ RDEPEND="
        dvi? ( app-text/tetex )
        dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
        dbus? ( >=sys-apps/dbus-0.33 )
-       tiff? ( media-libs/tiff )
+       tiff? ( >=media-libs/tiff-3.6 )
        >=app-text/poppler-0.4.1
-       >=app-text/gnome-doc-utils-0.3.2
        >=dev-libs/glib-2
        >=gnome-base/gnome-vfs-2.0
+       >=gnome-base/libglade-2
+       >=gnome-base/gconf-2
        gnome-base/libgnome
        >=gnome-base/libgnomeprintui-2.6
        >=gnome-base/libgnomeui-2.6
@@ -32,27 +34,28 @@ RDEPEND="
        virtual/x11
        "
 
-
 DEPEND="${RDEPEND}
        app-text/scrollkeeper
-       >=dev-util/pkgconfig-0.12.0
-       >=dev-util/intltool-0.30"
+       >=app-text/gnome-doc-utils-0.3.2
+       >=dev-util/pkgconfig-0.9
+       >=dev-util/intltool-0.28"
 
 PROVIDE="virtual/pdfviewer
        virtual/psviewer"
 
-G2CONF="${G2CONF} \
-       $(use_enable dvi) \
-       $(use_enable t1lib) \
-       $(use_enable dbus) \
-       $(use_enable tiff) \
-       $(use_enable nautilus) \
-       --disable-deprecated"
-
-USE_DESTDIR="yes"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
 ELTCONF="--portage"
 
+
 pkg_setup() {
+       G2CONF="--disable-scrollkeeper \
+               $(use_enable dvi)   \
+               $(use_enable t1lib) \
+               $(use_enable dbus)  \
+               $(use_enable tiff)  \
+               $(use_enable nautilus)"
+
        if ! built_with_use app-text/poppler gtk; then
                einfo "Please re-emerge app-text/poppler with the gtk USE flag set"
                die "poppler needs gtk flag set"
@@ -60,22 +63,17 @@ pkg_setup() {
 }
 
 src_unpack(){
-       unpack ${A}
-       cd ${S}
+       unpack "${A}"
+       cd "${S}"
+
        epatch ${FILESDIR}/${P}-t1lib_is_t1.patch
        # Fix .desktop file so menu item shows up
        epatch ${FILESDIR}/${P}-display-menu.patch
        # Make tiff really optional
        epatch ${FILESDIR}/${P}-no-tiff.patch
+
+       export WANT_AUTOMAKE=1.7
        automake || die "automake failed"
-       gnome2_omf_fix ${S}/help/Makefile.in
        autoconf || die "autoconf failed"
-       libtoolize --force || die "libtoolize failed"
-}
-
-src_install() {
-       gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+       libtoolize --copy --force || die "libtoolize failed"
 }
-
-
-DOCS="AUTHORS ChangeLog NEWS README"

diff --git a/app-text/evince/evince-0.4.0.ebuild b/app-text/evince/evince-0.4.0.ebuild
deleted file mode 100644 (file)
index bd2fc02..0000000
--- a/app-text/evince/evince-0.4.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0.ebuild,v 1.1 2005/08/30 19:40:24 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus doc dvi t1lib tiff"
-# For use.local.desc:
-# app-text/evince:t1lib - Enable Type1 fonts support in .dvi files
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-       dvi? ( app-text/tetex )
-       dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-       dbus? ( >=sys-apps/dbus-0.33 )
-       tiff? ( media-libs/tiff )
-       >=app-text/poppler-0.4.1
-       >=app-text/gnome-doc-utils-0.3.2
-       >=dev-libs/glib-2
-       >=gnome-base/gnome-vfs-2.0
-       gnome-base/libgnome
-       >=gnome-base/libgnomeprintui-2.6
-       >=gnome-base/libgnomeui-2.6
-       >=x11-libs/gtk+-2.8
-       virtual/x11
-       "
-
-
-DEPEND="${RDEPEND}
-       app-text/scrollkeeper
-       >=dev-util/pkgconfig-0.12.0
-       >=dev-util/intltool-0.30"
-
-PROVIDE="virtual/pdfviewer
-       virtual/psviewer"
-
-G2CONF="${G2CONF} \
-       $(use_enable dvi) \
-       $(use_enable t1lib) \
-       $(use_enable dbus) \
-       $(use_enable tiff) \
-       --disable-nautilus
-       --disable-deprecated"
-
-USE_DESTDIR="yes"
-ELTCONF="--portage"
-
-src_unpack(){
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${P}-t1lib_is_t1.patch
-       automake || die "automake failed"
-       gnome2_omf_fix ${S}/help/Makefile.in
-       autoconf || die "autoconf failed"
-       libtoolize --force || die "libtoolize failed"
-}
-
-src_install() {
-       gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-
-DOCS="AUTHORS ChangeLog NEWS README"

diff --git a/app-text/evince/files/digest-evince-0.4.0 b/app-text/evince/files/digest-evince-0.4.0
deleted file mode 100644 (file)
index c35b49a..0000000
--- a/app-text/evince/files/digest-evince-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 891605

diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index f8623959897153eb06f64e243e6ce44888efd959..3c856305667ae09f74941d6b6ab7f65ece59fe34 100644 (file)
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>gnome</herd>
 <maintainer>
   <email>dang@gentoo.org</email>
 </maintainer>