use dev-python/bsddb3 instead of internal berkdb of Python, because the latter is deprecated, see bug 286496, patch by flameeyes; ported ebuild really to EAPI 2

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 172 insertions, 1 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index c94c9e72f90c..b7e8804096af 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/gramps
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.110 2009/10/07 14:45:38 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.111 2009/10/29 10:56:01 fauli Exp $
+
+*gramps-3.1.2-r1 (29 Oct 2009)
+
+  29 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  +gramps-3.1.2-r1.ebuild, +files/gramps-3.1.2-use_bsddb3.patch:
+  use dev-python/bsddb3 instead of internal berkdb of Python, because the
+  latter is deprecated, see bug 286496, patch by flameeyes; ported ebuild
+  really to EAPI 2
 
   07 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> gramps-3.1.1-r1.ebuild,
   gramps-3.1.2.ebuild:
diff --git a/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch
new file mode 100644
index 000000000000..d0bfd60c80a3
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch
@@ -0,0 +1,75 @@
+--- src/DbManager.py
++++ src/DbManager.py
+@@ -129,7 +129,7 @@
+         Returns (people_count, version_number) of current DB.
+         Returns ("Unknown", "Unknown") if invalid DB or other error.
+         """
+-        from bsddb import dbshelve, db
++        from bsddb3 import dbshelve, db
+         from gen.db import META, PERSON_TBL
+         env = db.DBEnv()
+         flags = db.DB_CREATE | db.DB_PRIVATE |\
+--- src/Editors/_EditFamily.py
++++ src/Editors/_EditFamily.py
+@@ -26,7 +26,7 @@
+ # python modules
+ #
+ #-------------------------------------------------------------------------
+-from bsddb import db as bsddb_db
++from bsddb3 import db as bsddb_db
+ from gettext import gettext as _
+ from DdTargets import DdTargets
+ import pickle
+--- src/gen/db/base.py
++++ src/gen/db/base.py
+@@ -36,7 +36,7 @@
+ import locale
+ import os
+ from sys import maxint
+-from bsddb import db
++from bsddb3 import db
+ from gettext import gettext as _
+ 
+ import logging
+--- src/gen/db/dbdir.py
++++ src/gen/db/dbdir.py
+@@ -37,7 +37,7 @@
+ from types import InstanceType
+ 
+ from gettext import gettext as _
+-from bsddb import dbshelve, db
++from bsddb3 import dbshelve, db
+ import logging
+ 
+ _LOG = logging.getLogger(".GrampsDb")
+--- src/GrampsLogger/_ErrorReportAssistant.py
++++ src/GrampsLogger/_ErrorReportAssistant.py
+@@ -2,7 +2,7 @@
+ import Assistant
+ import const
+ import gtk
+-import sys, os,bsddb
++import sys, os, bsddb3
+ 
+ 
+ 
+@@ -99,7 +99,7 @@
+                "OS: %s\n"\
+                "Distribution: %s\n"\
+                % (str(sys.version).replace('\n',''),
+-                  str(bsddb.__version__),
++                  str(bsddb3.__version__),
+                   str(const.VERSION),
+                   os.environ.get('LANG',''),
+                   operatingsystem,
+--- src/plugins/import/ImportGrdb.py
++++ src/plugins/import/ImportGrdb.py
+@@ -35,7 +35,7 @@
+ from gettext import gettext as _
+ import cPickle as pickle
+ import time
+-from bsddb import dbshelve, db
++from bsddb3 import dbshelve, db
+ import logging
+ __LOG = logging.getLogger(".GrampsDb")
+ 
diff --git a/app-misc/gramps/gramps-3.1.2-r1.ebuild b/app-misc/gramps/gramps-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..5d69a6b08354
--- /dev/null
+++ b/app-misc/gramps/gramps-3.1.2-r1.ebuild
@@ -0,0 +1,88 @@
+# 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.1.2-r1.ebuild,v 1.1 2009/10/29 10:56:01 fauli Exp $
+
+EAPI=2
+
+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="gnome mozembed reports spell webkit"
+
+RDEPEND=">=dev-lang/python-2.5
+	dev-python/bsddb3
+	>=dev-python/pygtk-2.10.0
+	x11-misc/xdg-utils
+	gnome-base/librsvg:2
+	gnome? ( dev-python/libgnome-python
+		dev-python/gconf-python )
+	mozembed? ( dev-python/gtkmozembed-python )
+	spell? ( dev-python/gtkspell-python
+		dev-python/pyenchant )
+	reports? ( media-gfx/graphviz )
+	webkit? ( dev-python/pywebkitgtk )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/libiconv
+	dev-util/pkgconfig"
+
+DOCS="NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-mime-install"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	eautoreconf
+
+	epatch "${FILESDIR}"/${P}-use_bsddb3.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
+	ln -s $(type -P true) "${S}"/py-compile
+
+	python_version
+
+	# Fix install path.
+	einfo "Fix installation path"
+	find . -iname 'Makefile.in' | xargs \
+		sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
+		|| die
+
+	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+		-i src/Makefile.in || die
+
+	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+	-i src/docgen/Makefile.in || die
+
+	einfo "Fix wrapper script"
+	sed "s;@datadir@;$(python_get_sitedir);" \
+		-i gramps.sh.in || die
+
+	einfo "Fix icon location"
+	sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
+}
+
+src_install() {
+	python_need_rebuild
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_version
+	python_mod_optimize $(python_get_sitedir)/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup $(python_get_sitedir)/${PN}
+}