5 files changed, 17 insertions, 149 deletions
diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 6edaee7e3fa1..516b523721d1 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2009/06/03 12:41:09 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.108 2009/06/03 12:48:58 fauli Exp $
+
+  03 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/gramps-3.0.3_fix-installation-race-condition.patch,
+  -gramps-3.0.3.ebuild, -gramps-3.0.4.ebuild:
+  clean up
 
   03 Jun 2009; Ferris McCormick <fmccor@gentoo.org> gramps-3.1.1.ebuild:
   Sparc stable, Bug #266452.
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index ddb9a32f3cc4..ad9764fb06eb 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,10 +1,15 @@
-AUX gramps-3.0.3_fix-installation-race-condition.patch 358 RMD160 b792536b814a66b808e1932c188f683848da5401 SHA1 476f672669d7fa06c3957c0a8bd35ced5ad26ec3 SHA256 53bd2058c6e1b5d72e781b1c09bdcaca66888d4f9daf4221ccfbe404ce06e85e
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gramps-3.1.1.tar.gz 6794185 RMD160 56cd774a5145a629d136988d76b9571113729b42 SHA1 1cfd0ffcec6507a0cb2ec4a703b7e8253ca38871 SHA256 cbd6b657dc3e1f79008b14cfa117862b0211f7418114de1d528df2818e5ee8bd
-EBUILD gramps-3.0.3.ebuild 1706 RMD160 2699029271e1cac616481c5d443abe5154540144 SHA1 57e88be4947f508b54fa291465caebfb0370a0d7 SHA256 854a563cb1be9532701b22790891e881dba16463a79f76effe11bf447903ba81
-EBUILD gramps-3.0.4.ebuild 1474 RMD160 98243ad0bd61839701543220fa554cabcd066b38 SHA1 ca0e6280094b45bc9f920c1bd7a8d960821d0860 SHA256 fff8b86d3ea2d7e377ce04d3026bec29e95b10735833b6a1b5c0272ea3a6523a
 EBUILD gramps-3.1.1-r1.ebuild 2110 RMD160 242eabb9fd623f7217295acbc141594ba517581d SHA1 2ef84c1513c0e70a3f6872066e542382aac7cb7d SHA256 f629ca5789505461ec5f4e572f0fd61474eaddd8e7a09cf1f0c8f1baeb785b48
 EBUILD gramps-3.1.1.ebuild 2167 RMD160 b0721ff8dafb873b8a0edaf90b4e20580aa03417 SHA1 69d994d429aa96a4e8bf2282e8a48cea37320964 SHA256 6ec5de018110e3003dc128ae19b44a81a8b882f178529d32cf964bd0ffae47b3
-MISC ChangeLog 15293 RMD160 8031fb29988657f695d3e0505add92414f0dbc92 SHA1 38ebbba6b71094029b3ccbaf2415c430949db96c SHA256 15a981ac2bb29700b93fbf9f7cfafc46c74e4302c73b5f769910f255aa50d542
+MISC ChangeLog 15466 RMD160 275db890812c5bf9c7018ee629fdaa54086bcbf9 SHA1 c2577b4848fdd8aacff58821b1060afee899de90 SHA256 97d340f98141a07980b343e52f019bcf228d72fef8876fd5536ef64c207cc74b
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkomcUkACgkQNQqtfCuFneMjwQCdEhV+4CmpJNXqn8B1sXGF7edb
+vEQAn3cNGYk/qAR1YdH3tOveU9tT5Mj4
+=iZJ3
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch b/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch
deleted file mode 100644
index ed5e5cb487f2..000000000000
--- a/app-misc/gramps/files/gramps-3.0.3_fix-installation-race-condition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/docgen/Makefile.am.orig	2008-12-22 13:24:05.000000000 +0100
-+++ src/docgen/Makefile.am	2008-12-22 13:24:39.000000000 +0100
-@@ -23,11 +23,9 @@
- 	TextBufDoc.py \
- 	GtkPrint.py
- 
--docgen_DATA = \
-+dist_docgen_DATA = \
- 	gtkprintpreview.glade
- 
--dist_docgen_DATA = $(docgen_DATA)
--
- # Clean up all the byte-compiled files
- MOSTLYCLEANFILES = *pyc *pyo
- 
diff --git a/app-misc/gramps/gramps-3.0.3.ebuild b/app-misc/gramps/gramps-3.0.3.ebuild
deleted file mode 100644
index 10a6373f351a..000000000000
--- a/app-misc/gramps/gramps-3.0.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.3.ebuild,v 1.9 2009/01/09 13:34:02 fauli Exp $
-
-NEED_PYTHON="2.5"
-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-python/pygtk-2.10.0
-	|| ( dev-python/libgnome-python
-		>=dev-python/gnome-python-2.22.0
-		>=dev-python/gnome-python-desktop-2.6 )
-	reports? ( media-gfx/graphviz )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libiconv
-	dev-util/pkgconfig"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	if ! built_with_use -a 'dev-lang/python' sqlite berkdb ; then
-		eerror "You need to install python with Berkeley 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 Python"
-	fi
-
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${P}_fix-installation-race-condition.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
-}
-
-src_install() {
-	python_need_rebuild
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-misc/gramps/gramps-3.0.4.ebuild b/app-misc/gramps/gramps-3.0.4.ebuild
deleted file mode 100644
index be79d92ee068..000000000000
--- a/app-misc/gramps/gramps-3.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.0.4.ebuild,v 1.7 2009/01/30 02:39:42 beandog Exp $
-
-EAPI=2
-NEED_PYTHON="2.5"
-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-python/pygtk-2.10.0
-	|| ( dev-python/libgnome-python
-		>=dev-python/gnome-python-2.22.0
-		>=dev-python/gnome-python-desktop-2.6 )
-	reports? ( media-gfx/graphviz )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python[sqlite] dev-lang/python[berkdb] )
-	sys-devel/gettext
-	virtual/libiconv
-	dev-util/pkgconfig"
-
-DOCS="NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-mime-install"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${PN}-3.0.3_fix-installation-race-condition.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
-}
-
-src_install() {
-	python_need_rebuild
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/${PN}
-}