remove check for scrollkeeper from configure, patch provided by Zsolt Foldvari <zsolt DOT foldvari AT gmail DOT com>

(Portage version: 2.1.4.4)

3 files changed, 81 insertions, 2 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index f08aabf4b55b..e7d43d27bcac 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.63 2008/05/21 15:34:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.64 2008/06/01 08:18:22 opfer Exp $
+
+  01 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/gramps-3.0.1-no_scrollkeeper.patch, gramps-3.0.1-r1.ebuild:
+  remove check for scrollkeeper from configure, patch provided by Zsolt
+  Foldvari <zsolt DOT foldvari AT gmail DOT com>
 
 *gramps-3.0.1-r1 (21 May 2008)
 
diff --git a/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch b/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch
new file mode 100644
index 000000000000..8120d2b8775f
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch
@@ -0,0 +1,72 @@
+Index: m4/Makefile.am
+===================================================================
+--- m4/Makefile.am	(revision 10747)
++++ m4/Makefile.am	(working copy)
+@@ -2,7 +2,6 @@
+ 	codeset.m4 \
+ 	gettext.m4 \
+ 	glibc21.m4 \
+-	gnome-doc-utils.m4 \
+ 	iconv.m4 \
+ 	intltool.m4 \
+ 	isc-posix.m4 \
+Index: configure.in
+===================================================================
+--- configure.in	(revision 10747)
++++ configure.in	(working copy)
+@@ -10,7 +10,6 @@
+ AM_INIT_AUTOMAKE([1.6.3 foreign])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-GNOME_DOC_INIT
+ 
+ RELEASE=0.SVN$(svnversion -n .)
+ dnl RELEASE=0beta
+@@ -30,13 +29,6 @@
+ 
+ AM_SHARED_MIME
+ AM_PACKAGER
+-dnl This is a hack to disable scrollkeeper update when in the packager mode.
+-dnl It may not seem good to purists, since we're defining
+-dnl ENABLE_SK_{TRUE,FALSE} twice, but I cannot see any other way
+-dnl without tweaking the gnome-doc-utils macros manually.
+-dnl So, scrollkeeper update is enabled when it would normally be,
+-dnl *provided* this is not the packager mode. Packager mode cancels it.
+-AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollkeeper" = "xyes")
+ AC_SUBST(RELEASE)
+ AC_SUBST(VERSIONSTRING)
+ 
+Index: INSTALL
+===================================================================
+--- INSTALL	(revision 10747)
++++ INSTALL	(working copy)
+@@ -35,7 +35,6 @@
+ The latter is possible, but you should supply additional arguments to
+ autogen or configure:
+    --with-mime-dir=$HOME/.local/share/mime
+-   --disable-scrollkeeper
+ Most likely, such local install will also need some prefix with write
+ permissions for you:
+    --prefix=$HOME/my_gramps_path
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 10747)
++++ Makefile.am	(working copy)
+@@ -7,7 +7,7 @@
+ 	config.rpath autogen.sh \
+ 	FAQ COPYING \
+ 	intltool-extract.in intltool-merge.in intltool-update.in \
+-	config.sub config.guess gnome-doc-utils.make
++	config.sub config.guess
+ 
+ bin_SCRIPTS = gramps
+ 
+@@ -18,8 +18,6 @@
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
+ 	gnome-doc-utils.make
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+-
+ gramps: gramps.sh
+ 	cp gramps.sh gramps
+ 
diff --git a/app-misc/gramps/gramps-3.0.1-r1.ebuild b/app-misc/gramps/gramps-3.0.1-r1.ebuild
index b2a093335bfc..fa23591e41b8 100644
--- a/app-misc/gramps/gramps-3.0.1-r1.ebuild
+++ b/app-misc/gramps/gramps-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.1-r1.ebuild,v 1.1 2008/05/21 15:34:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.1-r1.ebuild,v 1.2 2008/06/01 08:18:22 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -40,6 +40,8 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
+	# will be fixed in 3.0.2
+	epatch "${FILESDIR}"/${P}-no_scrollkeeper.patch
 	# This is for bug 215944, so .pyo/.pyc files don't get into the
 	# file system
 	mv "${S}"/py-compile "${S}"/py-compile.orig