Add actual configure switch for dbus; bug #158034

Package-Manager: portage-2.1.2_rc3-r5

5 files changed, 138 insertions, 5 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 1b90eed84884..30756da3eba2 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.74 2006/12/17 00:20:00 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.75 2006/12/17 17:38:34 dang Exp $
+
+*evince-0.6.1-r1 (17 Dec 2006)
+
+  17 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evince-0.6.1-dbus-switch.patch, +evince-0.6.1-r1.ebuild:
+  Add actual configure switch for dbus; bug #158034
 
   17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> evince-0.6.1.ebuild:
   Stable on ppc wrt bug #156662.
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index f2e2902a049c..0deecf7937f2 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX evince-0.5.3-display-menu.patch 460 RMD160 8c72adb3a9a7105518eb9d1f686c4a96f1467f96 SHA1 c0a71996202fe85e3e3554fdc7e9a37cf0d3b795 SHA256 b9355d24321352e294170b86110019b47e26de80bd7f7c626eab582d35d5b46e
 MD5 42ae4caf217262666d8e46b484e0ee0c files/evince-0.5.3-display-menu.patch 460
 RMD160 8c72adb3a9a7105518eb9d1f686c4a96f1467f96 files/evince-0.5.3-display-menu.patch 460
@@ -6,6 +9,10 @@ AUX evince-0.5.3-links.patch 642 RMD160 651f8f89937d7692480008ac4726b4fc0abdacb6
 MD5 305c6d34f25677e48edf3cddc1e05915 files/evince-0.5.3-links.patch 642
 RMD160 651f8f89937d7692480008ac4726b4fc0abdacb6 files/evince-0.5.3-links.patch 642
 SHA256 7f6c609adf6da89e5c05b5e35379d361ec80b868b5f3ee0384e9c19639876e75 files/evince-0.5.3-links.patch 642
+AUX evince-0.6.1-dbus-switch.patch 974 RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 SHA1 246f5c18ba30de97922af003757283179134c7bf SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49
+MD5 0ae3972c36cf8a8e09566e710c40c4bc files/evince-0.6.1-dbus-switch.patch 974
+RMD160 85726bcd9000ebde631d8102a0f79aa6d6df8de1 files/evince-0.6.1-dbus-switch.patch 974
+SHA256 1fe375cf561b215a9d25482b7e74ee254cf3f052a7a77a7ac7b71fa0e872fd49 files/evince-0.6.1-dbus-switch.patch 974
 DIST evince-0.5.3.tar.bz2 994976 RMD160 6f29572326eef5f68309b3fa85e583eaaddc1eb6 SHA1 8336966d4c269065eee30912f8dd94caa76b0ba5 SHA256 793067426e0adf18129642426c4b4e8e4f61747dfea48111690525eff06822a0
 DIST evince-0.6.0.tar.bz2 1120159 RMD160 697fe6b5c1ba60d529422c2ea2a145b2e2dc7f3b SHA1 b3a38490b109284d91de3b50a3bb85b2847b39ed SHA256 c1a43a2795c2305ee4ce1cac86e31be959335133bb65fd6475d2abeaac090ec2
 DIST evince-0.6.1.tar.bz2 1212271 RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 SHA1 bc314761ecc9c29d10d09294ad8e32bab3a5dbc6 SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
@@ -17,14 +24,18 @@ EBUILD evince-0.6.0.ebuild 1905 RMD160 35e3b50c892a0e11d252d398a6766924a992d957
 MD5 79463d9ce464575960fe951a15db8751 evince-0.6.0.ebuild 1905
 RMD160 35e3b50c892a0e11d252d398a6766924a992d957 evince-0.6.0.ebuild 1905
 SHA256 65fc2e9dfa2a1df8c05f680d1bfc199f92cbf58d261c1343d40438a6be3c0211 evince-0.6.0.ebuild 1905
+EBUILD evince-0.6.1-r1.ebuild 1967 RMD160 cd00d6b24c34750f46b979ddad27f67ee51f9d37 SHA1 76e10805afd0c68dfafa1dde265ecd4bf6d10c5f SHA256 fa13be4ac014e090c05a8d796082c27eecb9866ba7019c66defffae8b69082c1
+MD5 636fbd69023ab4fb8f37a6afdebb7037 evince-0.6.1-r1.ebuild 1967
+RMD160 cd00d6b24c34750f46b979ddad27f67ee51f9d37 evince-0.6.1-r1.ebuild 1967
+SHA256 fa13be4ac014e090c05a8d796082c27eecb9866ba7019c66defffae8b69082c1 evince-0.6.1-r1.ebuild 1967
 EBUILD evince-0.6.1.ebuild 1866 RMD160 18d9d3b6b7a4ac3d22135d5d8185398685fea72a SHA1 9736f2c1ccad3bad83496003994641aadd155572 SHA256 27894ce23999517d8df17ca34a805738194ca3f4bb9f8e0a27bce64398e90b8b
 MD5 72b7b4f49815913b330f145245ca55d7 evince-0.6.1.ebuild 1866
 RMD160 18d9d3b6b7a4ac3d22135d5d8185398685fea72a evince-0.6.1.ebuild 1866
 SHA256 27894ce23999517d8df17ca34a805738194ca3f4bb9f8e0a27bce64398e90b8b evince-0.6.1.ebuild 1866
-MISC ChangeLog 10425 RMD160 7eaabddbbccc8365a60a4527e9606df727c36ea9 SHA1 c6e13ab23041eaa8fac4be16e0c867dd02c38561 SHA256 104d0dddd0b1dafa397bcc41cc5862d1722e5e847671cff331a78af158c0c9dd
-MD5 122866bf5619bd2f6662aec2abc68ab5 ChangeLog 10425
-RMD160 7eaabddbbccc8365a60a4527e9606df727c36ea9 ChangeLog 10425
-SHA256 104d0dddd0b1dafa397bcc41cc5862d1722e5e847671cff331a78af158c0c9dd ChangeLog 10425
+MISC ChangeLog 10621 RMD160 376802e887e3b453649c5bd028627ebd622c29d5 SHA1 0c5e4dcc1fef6f3ad5413d719932154df18bf5b9 SHA256 63db09ed82e20617e72254b39440976762de23af1b0a8bc31566198beab313ad
+MD5 06dc72e799125e6346d64991dd37f7f3 ChangeLog 10621
+RMD160 376802e887e3b453649c5bd028627ebd622c29d5 ChangeLog 10621
+SHA256 63db09ed82e20617e72254b39440976762de23af1b0a8bc31566198beab313ad ChangeLog 10621
 MISC metadata.xml 218 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 SHA1 bb11546aaa0d850f95621d0a9c291bf447697982 SHA256 b53b06e28caff7a3a8fdd06a56946440e889e56ba1e3627dee44e02707cd1a52
 MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
 RMD160 356edd8735bce3bdded1992ed1e01831af9f1f60 metadata.xml 218
@@ -38,3 +49,13 @@ SHA256 33a2c59b3d827bd17c0c7851226d8a000e6dfa34a928150ba9479e8ecdf398c8 files/di
 MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1 244
 RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1 244
 SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1 244
+MD5 f0a0f1d849c5b4752f41d565c47cb363 files/digest-evince-0.6.1-r1 244
+RMD160 755fb9f6972779bb060873f439e99eff2a5a20db files/digest-evince-0.6.1-r1 244
+SHA256 3080898d61c2f52fcf2e25788b71061292a8a4a4f49c5981e86c9253ff886b96 files/digest-evince-0.6.1-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+
+iD8DBQFFhYCIomPajV0RnrERAsRXAJ90a0U4IGQpYbgc1WcLvey6CFJAqQCZAfh7
+YZKqS5ccd10K7T4hFigoBjs=
+=QHsS
+-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-0.6.1-r1.ebuild b/app-text/evince/evince-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..f52f26f2bdf7
--- /dev/null
+++ b/app-text/evince/evince-0.6.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.1-r1.ebuild,v 1.1 2006/12/17 17:38:34 dang Exp $
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="http://www.gnome.org/projects/evince/"
+LICENSE="GPL-2"
+
+IUSE="dbus djvu doc dvi gnome t1lib tiff"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dvi? (
+		virtual/tetex
+		t1lib? ( >=media-libs/t1lib-5.0.0 )
+	)
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.33 ) ) )
+	tiff? ( >=media-libs/tiff-3.6 )
+	>=app-text/poppler-bindings-0.5.4
+	>=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
+		>=x11-libs/gtk+-2.10
+		)
+	>=gnome-base/libgnomeui-2.14
+	gnome? ( >=gnome-base/nautilus-2.10 )
+	>=x11-libs/gtk+-2.8.15
+	gnome-base/gnome-keyring
+	djvu? ( >=app-text/djvu-3.5.17 )
+	virtual/ghostscript"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/pkgconfig-0.9
+	>=sys-devel/automake-1.9
+	>=dev-util/intltool-0.35"
+
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+ELTCONF="--portage"
+
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--enable-comics		\
+		--enable-impress	\
+		$(use_enable dbus)  \
+		$(use_enable djvu)  \
+		$(use_enable dvi)   \
+		$(use_enable t1lib) \
+		$(use_enable tiff)  \
+		$(use_enable gnome nautilus)"
+
+	if ! built_with_use app-text/poppler-bindings gtk; then
+		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
+		die "poppler-bindings needs gtk flag set"
+	fi
+}
+
+src_unpack(){
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix .desktop file so menu item shows up
+	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
+
+	# Make dbus actually switchable
+	epatch ${FILESDIR}/${P}-dbus-switch.patch
+
+	eautoreconf
+}
diff --git a/app-text/evince/files/digest-evince-0.6.1-r1 b/app-text/evince/files/digest-evince-0.6.1-r1
new file mode 100644
index 000000000000..498e46d52a0f
--- /dev/null
+++ b/app-text/evince/files/digest-evince-0.6.1-r1
@@ -0,0 +1,3 @@
+MD5 55a1d4af3cac209c7cfbe83b7ffcee1d evince-0.6.1.tar.bz2 1212271
+RMD160 ac94e1964f4f46e505fe945daa9de288c2587898 evince-0.6.1.tar.bz2 1212271
+SHA256 ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e evince-0.6.1.tar.bz2 1212271
diff --git a/app-text/evince/files/evince-0.6.1-dbus-switch.patch b/app-text/evince/files/evince-0.6.1-dbus-switch.patch
new file mode 100644
index 000000000000..701114e87af4
--- /dev/null
+++ b/app-text/evince/files/evince-0.6.1-dbus-switch.patch
@@ -0,0 +1,21 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN evince-0.6.1.orig/configure.ac evince-0.6.1/configure.ac
+--- evince-0.6.1.orig/configure.ac	2006-10-09 14:58:09.000000000 -0400
++++ evince-0.6.1/configure.ac	2006-12-17 11:41:10.000000000 -0500
+@@ -109,6 +109,9 @@ AM_CONDITIONAL(WITH_GTK_PRINT, test x$en
+ 
+ 
+ dnl ========= Check for DBUS
++AC_ARG_ENABLE(dbus,
++ 	[AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],enable_dbus="$enableval",enable_dbus=yes)
++if test "x$enable_dbus" != "xno"; then
+ PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
+ 	[enable_dbus=yes],[enable_dbus=no])
+ AC_SUBST([DBUS_CFLAGS])
+@@ -130,6 +133,7 @@ if test "x$enable_dbus" = "xyes" ; then
+ 	DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)/\1/'`
+ 	AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
+ fi
++fi
+ 
+ SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
+ SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"