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

Package-Manager: portage-2.1.4.4

4 files changed, 87 insertions, 7 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/Manifest b/app-misc/gramps/Manifest
index f50523573abe..cb5e3709f4b1 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX gramps-2.2.2-desktop-entry-icon.patch 536 RMD160 2b687847b8bd7f0be4188e9db5ea1f84b00224c7 SHA1 5e5c1deb2504a1a4fba1fe5dc4c01253bf53d345 SHA256 6d85936122637d251169522c1319c88dfd408f9f23b82ff8367f2986192d4e3b
+AUX gramps-3.0.1-no_scrollkeeper.patch 2220 RMD160 94fea473a8cd34e51d6d80882569845f9d483970 SHA1 96b32599dc10488aff9520f8bdb9c1f2f29c6be1 SHA256 4c0e81c2b28d6865d2fb598c242a475c6220e01582dddbd18352252f02df6035
 DIST gramps-2.2.10.tar.gz 17230239 RMD160 90e9a04e4842972a319cf90c3cdbb171a05edd3c SHA1 e05691b31d81235b23aea78600d388e351b1a39e SHA256 152ccf9e29b888c7cb78354953664a941f73e18e5023e7ace9f1c0044c212448
 DIST gramps-3.0.1.tar.gz 5932971 RMD160 a76e88bc51e50ae52440cde0779e5b04657a8524 SHA1 371ffba136fe596a3a1a853cd63fd8cd68d0d02b SHA256 5492e8766ef17286ca23ac60bc6c262a07c0669646d1b7c103bf28f4f2032605
 EBUILD gramps-2.2.10.ebuild 1355 RMD160 bbe190719ffb13b1139c8d0cd0e4ff2ff5c25f47 SHA1 261ed5643386e22d87781183080a9e405be820db SHA256 f4f17c3ae2ca54c5da4ad658cd6177139cd5e7f86da9be52165473bdaf5ba4d0
-EBUILD gramps-3.0.1-r1.ebuild 1472 RMD160 c3439dc90cb32162254ced3ae99e9cc8357a2983 SHA1 6fb466d9616b616129f165a006d630773dbc34dd SHA256 a9b47a6307f6e7d7b1589e9aa8df89e9565b9a23816fb543341ce57306e1630a
-MISC ChangeLog 8726 RMD160 6c547f5a3eb73933fbd5f2a9e950cc49c3dbfd40 SHA1 733664d2e65f64b47c600c84ab2fbf80c59dcb42 SHA256 2a5a7ddcee18a922685b7450de79263cd69cca8cfd74a2bed2af7891e2f1a40a
+EBUILD gramps-3.0.1-r1.ebuild 1547 RMD160 cdb70722169a845a812a26f26dccff851af2979c SHA1 e630ccbd8af6497b9fa8a31ba6de8bd2d5b06acb SHA256 4e0acccca68af6b6e584125cc3673d4b1e5df9b658624f48148d41651d819b40
+MISC ChangeLog 8972 RMD160 2490d374ed06c096ed090d55e9a0ad8d017831ad SHA1 97e7a01c8eda345da47b2524a5fddc7844994cac SHA256 8bbeefea40d869b7deb7106045e74e5f0af0c03db938270833435e036ebd35f9
 MISC metadata.xml 975 RMD160 619775633a2d5d1ef7192435199fb8c07b5ec922 SHA1 05f8c085d277d5e2388dac7e76e34a7c56e07b29 SHA256 e939d2ecc59d4f36cb4864de083d984aa3a3c069d854749981d39c07988da777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg0QSQACgkQNQqtfCuFneOCvACff6N2Tjn7Ls8jXAAuknDHfnNF
-iCoAn1p34B2n0AcqBpbDdbaeD4t2uYGE
-=vkzK
+iEYEARECAAYFAkhCW1UACgkQNQqtfCuFneOWiwCdGB6gjjARYJrdhDNdgh7+K5Ws
+KiQAnjwFgmhKjmDwutF3oeSTQl7udFVZ
+=OReZ
 -----END PGP SIGNATURE-----
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