clean up

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r4 i686

4 files changed, 16 insertions, 138 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/Manifest b/app-misc/gramps/Manifest
index 8da3530c8a45..c4de973c7630 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,10 +1,17 @@
-AUX gramps-3.0.1-no_scrollkeeper.patch 2220 RMD160 94fea473a8cd34e51d6d80882569845f9d483970 SHA1 96b32599dc10488aff9520f8bdb9c1f2f29c6be1 SHA256 4c0e81c2b28d6865d2fb598c242a475c6220e01582dddbd18352252f02df6035
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gramps-3.0.3_fix-installation-race-condition.patch 358 RMD160 b792536b814a66b808e1932c188f683848da5401 SHA1 476f672669d7fa06c3957c0a8bd35ced5ad26ec3 SHA256 53bd2058c6e1b5d72e781b1c09bdcaca66888d4f9daf4221ccfbe404ce06e85e
-DIST gramps-3.0.1.tar.gz 5932971 RMD160 a76e88bc51e50ae52440cde0779e5b04657a8524 SHA1 371ffba136fe596a3a1a853cd63fd8cd68d0d02b SHA256 5492e8766ef17286ca23ac60bc6c262a07c0669646d1b7c103bf28f4f2032605
 DIST gramps-3.0.3.tar.gz 6056907 RMD160 0fc33fdbb8017174d0bce007b3662fe0c67cd782 SHA1 15e344033bf6015c6714f5c5b13a8e3e96096b80 SHA256 e880a6fb86b13170c28c4203d04b9821617014e51dbc0ef8ad422192b994f046
 DIST gramps-3.0.4.tar.gz 5830725 RMD160 2b5da63a67b814ef43ceb555351dd0930dfc32a7 SHA1 42501cb29b7b6b60006db0ded4a732e838becd45 SHA256 cca1262bb4e15fd018342c49bbe07a1cac96b1307bffdff10c34f3c1518fd792
-EBUILD gramps-3.0.1-r1.ebuild 1610 RMD160 3d346d68f5502d2dfa9d4528091a1e81eec16175 SHA1 a571a7de933cb33bf726fe0cd5e8df642fcfa3d4 SHA256 e4263362d527a1d7c2c82a7c3114031587bd64f651eb7004ae785338f5034fc4
 EBUILD gramps-3.0.3.ebuild 1733 RMD160 8e58f353baca89e72854a4803c2edc822b7e46f7 SHA1 8fc59d9478e44900f0d35b2d84ad61e89003fe5b SHA256 705029348401c675a18fe66d12c1b6199ad6e97aed0b59056c297005ef2953b9
 EBUILD gramps-3.0.4.ebuild 1743 RMD160 ac1402a95540aecc22d5c8ac764df51a592d0b8c SHA1 8f523930270a89f47e8f51e4151f22bcea668351 SHA256 bc6c100fa66c75759a5fc5d2f2a7500828aecd964bec0382a06bfcf450958175
-MISC ChangeLog 12195 RMD160 65b0d54e1326bf8b01de7f456bcffcf21a2a5505 SHA1 fad107071727aea532c000fac5c23a11826783dc SHA256 6503f3db769ef98be3eb0204e196285bc823f6b571ba5ddf3fab3d2666f88b0c
+MISC ChangeLog 12331 RMD160 46cb932a2b335a8b4d604bf05bbc847b3e1b5e38 SHA1 dfdfebf5022bf2687a2cc191f626ecacadd80b73 SHA256 26e9985fdfc64f97b0ea4bdaf73c1b8a0c6daab881dd4923a215848c8c8bbc23
 MISC metadata.xml 1107 RMD160 fa9e24e467103fb07bfacddbdafa7209c0428774 SHA1 60e89b5c5bbbfddecca19f80a3d06ad4b277a211 SHA256 475ba5393a3802b3201f89c0cad5a1ffcc7259b4f1f5357a0cf9fe71049a070c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklgpj0ACgkQNQqtfCuFnePqfgCeI263ShsfsmuwnGT0uLjYWLaz
+tbIAoJUtmTvz4AiVwJ4a/SKV0S51bB4s
+=/PJT
+-----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
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}
-}