Use dev-python/bsddb3 instead of bsddb from Python, see bug 328203 by Nikoli <nikoli AT lavabit DOT com>

Package-Manager: portage-2.1.8.3/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 283 insertions, 5 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 35f1485b587b..f1de95773559 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/gramps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.130 2010/07/14 05:44:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.131 2010/07/14 09:16:20 fauli Exp $
+
+*gramps-3.2.3-r1 (14 Jul 2010)
+
+  14 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  +gramps-3.2.3-r1.ebuild, +files/gramps-3.2.3-use_bsddb3.patch:
+  Use dev-python/bsddb3 instead of bsddb from Python, see bug 328203 by
+  Nikoli <nikoli AT lavabit DOT com>
 
   14 Jul 2010; Christian Faulhammer <fauli@gentoo.org> gramps-3.2.3.ebuild:
   add dev-util/intltool as dependency as reported by Nikoli <nikoli AT
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 86bf191e1313..a22b756c49ef 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX gramps-3.1.2-use_bsddb3.patch 2042 RMD160 28b4068768b3837b276457acd5fde417edcef76b SHA1 f329982e9b286e053130715d4f384a6b0b4a6772 SHA256 f70d07ac75b2807032221d86f1f1ca592e90eb6f0968289ecf3a996ef6b85b98
 AUX gramps-3.1.3-fix_mo_install.patch 1089 RMD160 064c23f70302269f5a8923fec61e6cfa52fb576f SHA1 6b4c76d2519dd75eac5433fea2d992512d76ce4f SHA256 6229731ed220a2a0cbdcc6dd03e55e9404b2505f0a31d4d7fdcb94cc7d93e018
+AUX gramps-3.2.3-use_bsddb3.patch 7565 RMD160 4dabe0903604138fa527c11f93f9dfcc222272a9 SHA1 ae1bec619ada09a2394cf97c3a045aa8444a79a5 SHA256 57d4076a6885ed6f212ebeb996f576c241abb92f45aa942562ba5a7e58887694
 DIST gramps-3.1.3.tar.gz 7136101 RMD160 98f63d652b96daf932021c8d3c66161e4362d0a6 SHA1 4798d433eaaf1680d539350c631ad6d50a0bbffb SHA256 222904836d7e947dd42c89ad32161c139e1c01a5ce069b42ded193dad3cf26cc
 DIST gramps-3.2.0.tar.gz 7648591 RMD160 3d2bc442942e6d7e92589d84a86e9f06745d1a49 SHA1 f9e334bba254072a86c55cf8e153e3f10bb8cbfb SHA256 21870d3482bb76b166c5df217d9fae1c6380463f7cb8973b5a4ad5d0a7635bf7
 DIST gramps-3.2.2.tar.gz 7226317 RMD160 d3d5bf22206515bf44cb7ce30899898127526ada SHA1 027d4c8ef33ad17edb25a95d1756ec32a7a4de3f SHA256 7ce769659914dd821dbd78863476b954336a45ba409d574b1d99f6283a137bd8
@@ -10,13 +11,14 @@ DIST gramps-3.2.3.tar.gz 7234196 RMD160 b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c
 EBUILD gramps-3.1.3-r1.ebuild 2306 RMD160 aca184dc993d5babcf20bae3c015c03d6430e3d6 SHA1 d09bcf6e0c9cda75d3a0f11ba86770033373871c SHA256 ad7213be59de267ceb730cc9cf8d42b798a1d2ba65b0e0eb4d1d80fe83156257
 EBUILD gramps-3.2.0.ebuild 2223 RMD160 bfdbf25e3ea4443630933d8bc35db40793209a3d SHA1 acbb2a08cf79d68a8dadc86d72363e080cb50246 SHA256 6cad8942a8795509fcc5d09a979d238de83d2d878e2ba0297306bed0bbf6992e
 EBUILD gramps-3.2.2.ebuild 2120 RMD160 29f9e8e099ff824a267737e10ce1a4e48f0c4fbc SHA1 336d8db8ae6e55413f28ba918b3c8a3a3e900c62 SHA256 44c036ff9edd21c26ffa24472f9286412b87e5ca5062a169858001b07ead53d8
+EBUILD gramps-3.2.3-r1.ebuild 2192 RMD160 b1eb294cc4d8f11d2d19cf66d7d452b09f32ca0b SHA1 1afaacf524d284f3a838620da892b73c99642264 SHA256 c78fcee032106b2902b5bc9d1892e98d5c5f0b614e862f7039793b1d47ef333a
 EBUILD gramps-3.2.3.ebuild 2137 RMD160 a1f50529e831e8a1580b344e620b66438efe7a8e SHA1 73c9e8ce3b5774b3a1cce02f425ff3ae873a3648 SHA256 0cf028520296f06ccd84653d1ef2d0c646ae5f96648098f018dafd64984e1c8c
-MISC ChangeLog 18413 RMD160 92f083891f8f3754766c2ae9dd40337a46f66592 SHA1 dfb565f3c7289f00e2f68fe7f0058aea30335f19 SHA256 ea9e0437d0d3ab92f444b8d81d0e309f01a4b180ea58f956c58315586dbfbdc5
+MISC ChangeLog 18675 RMD160 df6acdc21fe8a1895e0ed63952e1a1f84fd33f29 SHA1 e8bba8940c4c942cf80056db5e56332b4f6da329 SHA256 20f8471e697736c1a399bcc3afc96d236c0b2899da720cb7c682987529902242
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw9TzQACgkQNQqtfCuFneOK5ACeP8JcTqWefq5S+Nov3b3gCw3g
-+A0AnRfTSLI9rCZ24ZddKzkPoFTDDooL
-=fqh9
+iEYEARECAAYFAkw9gNoACgkQNQqtfCuFneN9iQCgmYKMAasnGWUa4OnEYjqWocHk
+t1QAnjWcRhTG0FHAsacRywB2/ezqg2dl
+=To6c
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch
new file mode 100644
index 000000000000..9ea7a4e3efa4
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch
@@ -0,0 +1,180 @@
+diff -r -u gramps-3.2.3.orig/src/cli/clidbman.py gramps-3.2.3/src/cli/clidbman.py
+--- gramps-3.2.3.orig/src/cli/clidbman.py	2010-07-14 11:01:39.949040698 +0200
++++ gramps-3.2.3/src/cli/clidbman.py	2010-07-14 11:07:08.684288847 +0200
+@@ -109,7 +109,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 |\
+diff -r -u gramps-3.2.3.orig/src/gen/db/bsddbtxn.py gramps-3.2.3/src/gen/db/bsddbtxn.py
+--- gramps-3.2.3.orig/src/gen/db/bsddbtxn.py	2010-07-14 11:01:39.906049218 +0200
++++ gramps-3.2.3/src/gen/db/bsddbtxn.py	2010-07-14 11:07:08.206289266 +0200
+@@ -188,7 +188,7 @@
+ # test code
+ if __name__ == "__main__": 
+     print "1"
+-    from bsddb import db, dbshelve
++    from bsddb3 import db, dbshelve
+     print "2"
+     x = db.DBEnv()
+     print "3"
+diff -r -u gramps-3.2.3.orig/src/gen/db/cursor.py gramps-3.2.3/src/gen/db/cursor.py
+--- gramps-3.2.3.orig/src/gen/db/cursor.py	2010-07-14 11:01:39.905041606 +0200
++++ gramps-3.2.3/src/gen/db/cursor.py	2010-07-14 11:07:08.205288497 +0200
+@@ -24,7 +24,7 @@
+ #
+ #-------------------------------------------------------------------------
+ from cPickle import dumps, loads
+-from bsddb import db
++from bsddb3 import db
+ 
+ #-------------------------------------------------------------------------
+ #
+diff -r -u gramps-3.2.3.orig/src/gen/db/dbconst.py gramps-3.2.3/src/gen/db/dbconst.py
+--- gramps-3.2.3.orig/src/gen/db/dbconst.py	2010-07-14 11:01:39.903039091 +0200
++++ gramps-3.2.3/src/gen/db/dbconst.py	2010-07-14 11:07:08.180288358 +0200
+@@ -63,7 +63,7 @@
+ DBOBJECTS = 25000           # Maximum number of simultaneously locked objects
+ DBUNDO    = 1000            # Maximum size of undo buffer
+ 
+-from bsddb.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
++from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
+ DBFLAGS_O = DB_CREATE | DB_AUTO_COMMIT  # Default flags for database open
+ DBFLAGS_R = DB_RDONLY                   # Flags to open a database read-only
+ DBFLAGS_D = DB_DUP | DB_DUPSORT         # Default flags for duplicate keys
+diff -r -u gramps-3.2.3.orig/src/gen/db/read.py gramps-3.2.3/src/gen/db/read.py
+--- gramps-3.2.3.orig/src/gen/db/read.py	2010-07-14 11:01:39.904047682 +0200
++++ gramps-3.2.3/src/gen/db/read.py	2010-07-14 11:07:08.188288637 +0200
+@@ -35,7 +35,7 @@
+ import locale
+ import os
+ from sys import maxint
+-from bsddb import db
++from bsddb3 import db
+ from gen.ggettext import gettext as _
+ 
+ import logging
+diff -r -u gramps-3.2.3.orig/src/gen/db/txn.py gramps-3.2.3/src/gen/db/txn.py
+--- gramps-3.2.3.orig/src/gen/db/txn.py	2010-07-14 11:01:39.906049218 +0200
++++ gramps-3.2.3/src/gen/db/txn.py	2010-07-14 11:07:08.209288637 +0200
+@@ -32,7 +32,7 @@
+ #-------------------------------------------------------------------------
+ from __future__ import with_statement
+ import cPickle as pickle
+-from bsddb import dbshelve, db
++from bsddb3 import dbshelve, db
+ import logging
+ from collections import defaultdict
+ 
+diff -r -u gramps-3.2.3.orig/src/gen/db/undoredo.py gramps-3.2.3/src/gen/db/undoredo.py
+--- gramps-3.2.3.orig/src/gen/db/undoredo.py	2010-07-14 11:01:39.905041606 +0200
++++ gramps-3.2.3/src/gen/db/undoredo.py	2010-07-14 11:07:08.204288707 +0200
+@@ -33,7 +33,7 @@
+ from __future__ import with_statement
+ import time, os
+ import cPickle as pickle
+-from bsddb import db
++from bsddb3 import db
+ from gen.ggettext import gettext as _
+ 
+ #-------------------------------------------------------------------------
+diff -r -u gramps-3.2.3.orig/src/gen/db/write.py gramps-3.2.3/src/gen/db/write.py
+--- gramps-3.2.3.orig/src/gen/db/write.py	2010-07-14 11:01:39.905041606 +0200
++++ gramps-3.2.3/src/gen/db/write.py	2010-07-14 11:07:08.195288637 +0200
+@@ -39,7 +39,7 @@
+ from functools import wraps
+ 
+ from gen.ggettext import gettext as _
+-from bsddb import dbshelve, db
++from bsddb3 import dbshelve, db
+ import logging
+ from sys import maxint
+ 
+diff -r -u gramps-3.2.3.orig/src/GrampsAboutDialog.py gramps-3.2.3/src/GrampsAboutDialog.py
+--- gramps-3.2.3.orig/src/GrampsAboutDialog.py	2010-07-14 11:01:39.950040977 +0200
++++ gramps-3.2.3/src/GrampsAboutDialog.py	2010-07-14 11:07:08.703288777 +0200
+@@ -30,7 +30,7 @@
+ from gen.ggettext import gettext as _
+ import os
+ import sys
+-import bsddb
++import bsddb3
+ 
+ ##import logging
+ ##_LOG = logging.getLogger(".GrampsAboutDialog")
+diff -r -u gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py gramps-3.2.3/src/GrampsLogger/_ErrorReportAssistant.py
+--- gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py	2010-07-14 11:01:39.820290663 +0200
++++ gramps-3.2.3/src/GrampsLogger/_ErrorReportAssistant.py	2010-07-14 11:07:07.753040488 +0200
+@@ -5,7 +5,7 @@
+ import pygtk
+ import gobject
+ import cairo
+-import sys, os,bsddb
++import sys, os,bsddb3
+ 
+ 
+ class ErrorReportAssistant(object):
+diff -r -u gramps-3.2.3.orig/src/gui/editors/editfamily.py gramps-3.2.3/src/gui/editors/editfamily.py
+--- gramps-3.2.3.orig/src/gui/editors/editfamily.py	2010-07-14 11:01:39.871291221 +0200
++++ gramps-3.2.3/src/gui/editors/editfamily.py	2010-07-14 11:07:07.987288707 +0200
+@@ -26,7 +26,7 @@
+ # python modules
+ #
+ #-------------------------------------------------------------------------
+-from bsddb import db as bsddb_db
++from bsddb3 import db as bsddb_db
+ from gen.ggettext import gettext as _
+ from DdTargets import DdTargets
+ import cPickle as pickle
+diff -r -u gramps-3.2.3.orig/src/plugins/import/ImportGrdb.py gramps-3.2.3/src/plugins/import/ImportGrdb.py
+--- gramps-3.2.3.orig/src/plugins/import/ImportGrdb.py	2010-07-14 11:01:39.958042234 +0200
++++ gramps-3.2.3/src/plugins/import/ImportGrdb.py	2010-07-14 11:07:08.875288428 +0200
+@@ -36,7 +36,7 @@
+ from gen.ggettext import gettext as _
+ import cPickle as pickle
+ import time
+-from bsddb import dbshelve, db
++from bsddb3 import dbshelve, db
+ import logging
+ LOG = logging.getLogger(".Db")
+ 
+diff -r -u gramps-3.2.3.orig/src/plugins/lib/libgrdb.py gramps-3.2.3/src/plugins/lib/libgrdb.py
+--- gramps-3.2.3.orig/src/plugins/lib/libgrdb.py	2010-07-14 11:01:39.959041536 +0200
++++ gramps-3.2.3/src/plugins/lib/libgrdb.py	2010-07-14 11:07:08.922288847 +0200
+@@ -36,7 +36,7 @@
+ import locale
+ import os
+ from sys import maxint
+-from bsddb import db
++from bsddb3 import db
+ from gen.ggettext import gettext as _
+ 
+ import logging
+diff -r -u gramps-3.2.3.orig/src/plugins/tool/ChangeNames.py gramps-3.2.3/src/plugins/tool/ChangeNames.py
+--- gramps-3.2.3.orig/src/plugins/tool/ChangeNames.py	2010-07-14 11:01:39.965038812 +0200
++++ gramps-3.2.3/src/plugins/tool/ChangeNames.py	2010-07-14 11:07:09.072288707 +0200
+@@ -31,7 +31,7 @@
+ import gobject
+ import gtk
+ import cPickle
+-from bsddb.db import DB_CURRENT
++from bsddb3.db import DB_CURRENT
+ 
+ #-------------------------------------------------------------------------
+ #
+diff -r -u gramps-3.2.3.orig/src/plugins/tool/Leak.py gramps-3.2.3/src/plugins/tool/Leak.py
+--- gramps-3.2.3.orig/src/plugins/tool/Leak.py	2010-07-14 11:01:39.965038812 +0200
++++ gramps-3.2.3/src/plugins/tool/Leak.py	2010-07-14 11:07:09.070289126 +0200
+@@ -31,7 +31,7 @@
+ #
+ #------------------------------------------------------------------------
+ from gen.ggettext import gettext as _
+-from bsddb.db import DBError
++from bsddb3.db import DBError
+ 
+ #------------------------------------------------------------------------
+ #
diff --git a/app-misc/gramps/gramps-3.2.3-r1.ebuild b/app-misc/gramps/gramps-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..7223e3eb2418
--- /dev/null
+++ b/app-misc/gramps/gramps-3.2.3-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.2.3-r1.ebuild,v 1.1 2010/07/14 09:16:20 fauli Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools eutils gnome2 python
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="http://www.gramps-project.org/"
+SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="gnome mozembed reports spell webkit"
+
+RDEPEND="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}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/libiconv
+	dev-util/pkgconfig"
+
+DOCS="NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-mime-install"
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-3.2.3-use_bsddb3.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
+
+	# 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_mod_optimize $(python_get_sitedir)/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup $(python_get_sitedir)/${PN}
+}