clean up & small fix

(Portage version: 2.0.51.19)

8 files changed, 8 insertions, 149 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 60af6e171dca..e7cab7a40bf2 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.25 2005/04/21 19:17:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.26 2005/06/16 20:47:36 foser Exp $
+
+  16 Jun 2005; Marinus Schraal <foser@gentoo.org> gramps-1.0.11.ebuild :
+  Work around scrollkeeper mess (#92920)
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> gramps-1.0.10.ebuild:
   stable on amd64
diff --git a/app-misc/gramps/files/digest-gramps-0.99 b/app-misc/gramps/files/digest-gramps-0.99
deleted file mode 100644
index 8a0c2bca302a..000000000000
--- a/app-misc/gramps/files/digest-gramps-0.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66183f3f9b7aeeb6afe6808c3d9d67f7 gramps-0.99.tar.gz 7412313
diff --git a/app-misc/gramps/files/digest-gramps-1.0.0 b/app-misc/gramps/files/digest-gramps-1.0.0
deleted file mode 100644
index d191fea594da..000000000000
--- a/app-misc/gramps/files/digest-gramps-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d24ca1eec5e4bec156d6edb3efdf02c gramps-1.0.0.tar.gz 4279952
diff --git a/app-misc/gramps/files/digest-gramps-1.0.1 b/app-misc/gramps/files/digest-gramps-1.0.1
deleted file mode 100644
index 0c82fefdd487..000000000000
--- a/app-misc/gramps/files/digest-gramps-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df3c716a9b5547717a250cd34711cf0b gramps-1.0.1.tar.gz 4286760
diff --git a/app-misc/gramps/gramps-0.99.ebuild b/app-misc/gramps/gramps-0.99.ebuild
deleted file mode 100644
index 07f0200b769b..000000000000
--- a/app-misc/gramps/gramps-0.99.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-0.99.ebuild,v 1.5 2005/01/01 15:05:22 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="http://gramps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-1.99.14
-	>=dev-python/gnome-python-1.99.14
-	>=gnome-base/gnome-vfs-2.0
-	>=dev-python/pyxml-0.7.1
-	>=dev-python/imaging-1.1.3
-	>=dev-python/reportlab-1.11"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-DOCS="NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
-		eerror "You need to install pygtk with libglade support. Try:"
-		eerror "USE='gnome' emerge pygtk gramps"
-		die "libglade support missing from pygtk"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# fix menu entry location
-	dodir /usr/share/applications
-	mv ${D}/usr/share/gnome/apps/Applications/gramps.desktop \
-		${D}/usr/share/applications
-	rm -rf ${D}/usr/share/gnome
-}
diff --git a/app-misc/gramps/gramps-1.0.0.ebuild b/app-misc/gramps/gramps-1.0.0.ebuild
deleted file mode 100644
index 36194f8c90db..000000000000
--- a/app-misc/gramps/gramps-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.0.ebuild,v 1.6 2005/01/01 15:05:22 eradicator Exp $
-
-inherit gnome2
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="http://gramps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-1.99.14
-	>=dev-python/gnome-python-1.99.14
-	>=gnome-base/gnome-vfs-2.0
-	>=dev-python/pyxml-0.7.1
-	>=dev-python/imaging-1.1.3
-	>=dev-python/reportlab-1.11"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-DOCS="NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
-		eerror "You need to install pygtk with libglade support. Try:"
-		eerror "USE='gnome' emerge pygtk gramps"
-		die "libglade support missing from pygtk"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# fix menu entry location
-	dodir /usr/share/applications
-	mv ${D}/usr/share/gnome/apps/Applications/gramps.desktop \
-		${D}/usr/share/applications
-	rm -rf ${D}/usr/share/gnome
-}
diff --git a/app-misc/gramps/gramps-1.0.1.ebuild b/app-misc/gramps/gramps-1.0.1.ebuild
deleted file mode 100644
index 5ddc79560844..000000000000
--- a/app-misc/gramps/gramps-1.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.1.ebuild,v 1.8 2005/01/01 15:05:22 eradicator Exp $
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="http://gramps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-1.99.14
-	>=dev-python/gnome-python-1.99.14
-	>=gnome-base/gnome-vfs-2.0
-	>=dev-python/pyxml-0.7.1
-	>=dev-python/imaging-1.1.3
-	>=dev-python/reportlab-1.11"
-
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-DOCS="NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	export maketype="python"
-	if ! echo 'import gtk.glade' | virtualmake; then
-		eerror "You need to install pygtk with libglade support. Try:"
-		eerror "USE='gnome' emerge pygtk gramps"
-		die "libglade support missing from pygtk"
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# fix menu entry location
-	dodir /usr/share/applications
-	mv ${D}/usr/share/gnome/apps/Applications/gramps.desktop \
-		${D}/usr/share/applications
-	rm -rf ${D}/usr/share/gnome
-}
diff --git a/app-misc/gramps/gramps-1.0.11.ebuild b/app-misc/gramps/gramps-1.0.11.ebuild
index 9247d6b8a7db..f53e3f8cd3c2 100644
--- a/app-misc/gramps/gramps-1.0.11.ebuild
+++ b/app-misc/gramps/gramps-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.11.ebuild,v 1.1 2005/04/04 18:54:32 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.11.ebuild,v 1.2 2005/06/16 20:47:36 foser Exp $
 
 inherit gnome2 eutils
 
@@ -40,8 +40,10 @@ pkg_setup() {
 }
 
 src_install() {
-	gnome2_src_install
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	rm -rf ${D}/usr/share/gramps.desktop
+
 }
 
 USE_DESTDIR="1"