clean up

(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r4 i686)

3 files changed, 5 insertions, 134 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 683200df646f..d671f4e33727 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.87 2009/01/03 14:31:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.88 2009/01/04 12:06:04 fauli Exp $
+
+  04 Jan 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/gramps-3.0.1-no_scrollkeeper.patch, -gramps-3.0.1-r1.ebuild:
+  clean up
 
   03 Jan 2009; nixnut <nixnut@gentoo.org> gramps-3.0.3.ebuild:
   ppc stable #249165
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
deleted file mode 100644
index 8120d2b8775f..000000000000
--- a/app-misc/gramps/files/gramps-3.0.1-no_scrollkeeper.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 0e8a50852b88..000000000000
--- a/app-misc/gramps/gramps-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.10 2008/09/07 01:48:58 opfer Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="http://www.gramps-project.org/"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="reports"
-
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.10.0
-	>=dev-python/gnome-python-2.6
-	reports? ( media-gfx/graphviz )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libiconv
-	dev-util/pkgconfig
-	app-text/gnome-doc-utils"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	if ! built_with_use -a 'dev-lang/python' sqlite berkdb ; then
-		eerror "You need to install python with Berkely Database support."
-		eerror "Add 'dev-lang/python berkdb sqlite' to /etc/portage/package.use "
-		eerror "and then re-emerge python."
-		die "berkdb or sqlite support missing from Gnome"
-	fi
-
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# will be fixed in 3.0.2
-	epatch "${FILESDIR}"/${P}-no_scrollkeeper.patch
-	eautoreconf
-	# This is for bug 215944, so .pyo/.pyc files don't get into the
-	# file system
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/${PN}
-}