New version for GNOME 2.28. Clean up old revision.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 118 insertions, 15 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 518b8640dc14..bab48447b2bb 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.176 2009/10/24 16:54:38 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.177 2009/10/29 21:19:02 eva Exp $
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -evince-2.26.1.ebuild,
+  +files/evince-2.27.4-smclient-configure.patch, +evince-2.28.1.ebuild,
+  metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
+
+*evince-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -evince-2.26.1.ebuild,
+  +files/evince-2.27.4-smclient-configure.patch, +evince-2.28.1.ebuild,
+  metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> evince-2.26.2.ebuild:
   ppc stable #281427
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 971b62802e38..56a1593deb7e 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
+AUX evince-2.27.4-smclient-configure.patch 1994 RMD160 75e5952b1c4f74682c3e19e635849b29db4ff32a SHA1 1c9c65b4a6a66a5761055a90b0ac311c2624eaee SHA256 45d0323ef245bb50f7a64a6e457548356dbe4a5c07f798b5ebaab4ad310b2d65
 DIST evince-2.24.2.tar.bz2 1717166 RMD160 d038ac41e2d956011e294344e442317719149fb3 SHA1 918f8ec07c393cad4fea1c3315cd26ed384d65eb SHA256 aa6f29c93413e206b0e30fc241b4e5aa8d67c94baff50b9b92147543516e6bce
-DIST evince-2.26.1.tar.bz2 1879053 RMD160 27838c3235809305156f570b4f0dfc5bc2eb40eb SHA1 dff4222b39f9bff10fb106f543d6a7268622b2bf SHA256 bf2591ef38a4e705cbce1d2cd6d1b4e4d4734cdfccaae61648797a6a5dc69426
 DIST evince-2.26.2.tar.bz2 2033141 RMD160 00dd3dfa006dc019f8f951a356d7260283bf8bab SHA1 1a789e078b4c95f3e3387a45092ae2f222135013 SHA256 5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
+DIST evince-2.28.1.tar.bz2 2033193 RMD160 6658e0516faffacd926de781da39c26e174ae182 SHA1 28fb2b9fa0bbe126d0275badcf6091e6e56d0e01 SHA256 c64047d4dc8424b613274651a5ef6bc78d306fc71bef36a3e033c07ddc2487a6
 EBUILD evince-2.24.2.ebuild 1690 RMD160 7a02554c58987ccbee819ccaa049027625b5fda6 SHA1 e25db42bd052f7a5c51215b3d9e50fc9b04ef04e SHA256 47ba66023934fc78dce7618fa34a89262c369ac6f6e4e4f2d753c2d1a30b333d
-EBUILD evince-2.26.1.ebuild 1817 RMD160 60e8d9a471ffba0cdbccc325a57fc1e10209ab08 SHA1 4adc686677ef3abdc47d5643bc0f1d2ca91f5247 SHA256 c594635c34551110da88e39d4f04a2bf28936f9640b7afc81e2d27a8dd954176
 EBUILD evince-2.26.2.ebuild 1894 RMD160 fa86fc71c2a144f04d28f6f574d08bb2684f7fa8 SHA1 cec080a1c933e98a230931b94135d27784c9543e SHA256 bf30df609f2465cc7e7dad10d9d5cc7bbbec5aff587c676ca5bec25d204ec9c3
-MISC ChangeLog 25083 RMD160 3755ebfc29825520634a594b1e23d5a2e64b983c SHA1 7e42bf722cd7adebc4e4636ea2f7bed8a76b1037 SHA256 25fdb6d1f10e39a062e38207f91657b45d05c9543f69a2b66b478560f71fddae
-MISC metadata.xml 498 RMD160 b319329bc2c242221268761b3945f693b3aa0490 SHA1 8a5bea77d715fff4cc4480b76f7d9015e147636d SHA256 ba365b677379bdd81e8b38b42003be020d9f5bb1e96f6733800d2d8d8e3e2464
+EBUILD evince-2.28.1.ebuild 2695 RMD160 394fe925348b3f991445fc5a2449d4741deb4b7b SHA1 69b29cb8a5cd25512c3e06b3ca930fdcc0225229 SHA256 be36142e52faaf97f548153c59fa1f108ff06aaae74195d8b79d7c9f0d5335e4
+MISC ChangeLog 25548 RMD160 fac002d2b66898967b693042a7bf991b6e380fa1 SHA1 3043dcba45cf7b2cbd13b7516b74a27080d9beee SHA256 79cc844fbe85e6849b7d2a844ebc02ed0d745d84bc9671b7f17a708be5aa74a8
+MISC metadata.xml 601 RMD160 8963b582cc85e9e523b27d982d6d0c748f3a84ab SHA1 444f50d9a702cf170425b3808804ef9f50b4a8f7 SHA256 3f1878f2cb8b21146eadd2469f9d16b3c5a10c91d82e89093dffa3f38cf4d3e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqBswACgkQ1fmVwcYIWAY8HwCeKZmJ56mjCvCVoPkubnmXkofa
+blQAoLSe6naaYumE1dK+FJ+0NvShIH/8
+=JlUk
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.26.1.ebuild b/app-text/evince/evince-2.28.1.ebuild
index d95aa4b9a97c..6bed8e79070a 100644
--- a/app-text/evince/evince-2.26.1.ebuild
+++ b/app-text/evince/evince-2.28.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+ # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.26.1.ebuild,v 1.1 2009/05/02 20:46:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.28.1.ebuild,v 1.1 2009/10/29 21:19:02 eva Exp $
 
 EAPI="2"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
@@ -12,21 +12,24 @@ HOMEPAGE="http://www.gnome.org/projects/evince/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus debug djvu doc dvi gnome-keyring nautilus t1lib tiff"
+IUSE="dbus debug djvu doc dvi gnome gnome-keyring nautilus t1lib tiff"
+# tests introspection
 
-# FIXME: enable gobject-introspection when we have an ebuild for it.
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+#	introspection? ( >=dev-libs/gobject-introspection-0.6 )
 RDEPEND="
 	>=app-text/libspectre-0.2.0
 	>=dev-libs/glib-2.18.0
 	>=dev-libs/libxml2-2.5
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2.12
+	>=x11-libs/gtk+-2.14
 	>=x11-libs/libSM-1
 	>=x11-themes/gnome-icon-theme-2.17.1
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=gnome-base/gconf-2 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
 	nautilus? ( >=gnome-base/nautilus-2.10 )
-	>=virtual/poppler-glib-0.8[cairo]
+	>=virtual/poppler-glib-0.11[cairo]
 	dvi? (
 		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
@@ -37,29 +40,39 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2
 	~app-text/docbook-xml-dtd-4.1.2
 	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext
 	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 ELTCONF="--portage"
+
+# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
+# Releases: http://people.redhat.com/zcerza/dogtail/releases/
 RESTRICT="test"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		--disable-scrollkeeper
 		--disable-introspection
+		--disable-scrollkeeper
+		--disable-static
+		--disable-tests
 		--enable-pdf
 		--enable-comics
 		--enable-impress
 		--enable-thumbnailer
-		--with-gconf
+		--with-smclient=xsmp
+		--with-platform=gnome
 		$(use_enable dbus)
 		$(use_enable djvu)
 		$(use_enable dvi)
+		$(use_with gnome gconf)
 		$(use_with gnome-keyring keyring)
 		$(use_enable t1lib)
 		$(use_enable tiff)
 		$(use_enable nautilus)"
+#		$(use_enable introspection)
 }
 
 src_prepare() {
@@ -67,4 +80,19 @@ src_prepare() {
 
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+
+	# Fix bug #279591, compilation error with
+	# --with-smclient=xsmp gave to the configure script
+	epatch "${FILESDIR}"/${PN}-2.27.4-smclient-configure.patch
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	intltoolize --force --automake --copy || die "intltoolized failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
 }
diff --git a/app-text/evince/files/evince-2.27.4-smclient-configure.patch b/app-text/evince/files/evince-2.27.4-smclient-configure.patch
new file mode 100644
index 000000000000..532151842065
--- /dev/null
+++ b/app-text/evince/files/evince-2.27.4-smclient-configure.patch
@@ -0,0 +1,50 @@
+Prototype of AC_ARG_WITH is the following :
+AC_ARG_WITH (package, help-string, [action-if-given], [action-if-not-given])
+
+action-if-given is executed only if a option --{with,without}-smclient is
+given to the configure script, is nothing is given action-if-not-given is
+executed.
+
+The problem was SMCLIENT_PKGS="sm >= 1.0.0" was assigned ONLY IF nothing was
+given to the configure (default behaviour) so in action-if-not-given.
+If the user gave --with-smclient=stuff "[]" was executed, and then
+SMCLIENT_PKGS was empty, then the PKG_CHECK_MODULES into the if statement
+didn't check it, and necesseraly libSM's cflags and libs wasn't found.
+
+ configure.ac |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 821c52b..3d8d7c4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,19 +157,19 @@ GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
+ SMCLIENT_PKGS=
+ AC_MSG_CHECKING([which smclient backend to use])
+ AC_ARG_WITH([smclient],
+-  [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])],
+-  [],
+-  [case "$GDK_TARGET" in
+-    x11) case "$with_platform" in
+-           gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;;
+-           *) with_smclient=no ;;
+-         esac ;;
+-    win32|quartz) with_smclient=$GDK_TARGET ;;
+-    *) with_smclient=no ;;
+-   esac])
++  [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])])
+ AC_MSG_RESULT([$with_smclient])
+ 
+ if test "$with_smclient" != "no"; then
++   case "$GDK_TARGET" in
++   	x11)
++	   case "$with_platform" in
++           	gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;;
++           	*) with_smclient=no ;;
++           esac ;;
++        win32|quartz) with_smclient=$GDK_TARGET ;;
++        *) with_smclient=no ;;
++   esac
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ 
+   PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS])
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index af3d72102c2e..f0dad078cf9b 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -6,6 +6,8 @@
   <email>dang@gentoo.org</email>
 </maintainer>
 <use>
+	<flag name='gnome'>Enable the use of <pkg>gnome-base/gconf</pkg> to honour
+		lockdown settings</flag>
   <flag name='dvi'>Enable the built-in DVI viewer</flag>
   <flag name='nautilus'>Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
   <flag name='t1lib'>Enable the Type-1 fonts for the built-in DVI viewer