Gentoo Archives: gentoo-commits

From: "Christian Faulhammer (fauli)" <fauli@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/gramps/files: gramps-3.1.2-use_bsddb3.patch
Date: Thu, 29 Oct 2009 10:56:04
Message-Id: E1N3Sfi-0004Ab-NX@stork.gentoo.org
1 fauli 09/10/29 10:56:02
2
3 Added: gramps-3.1.2-use_bsddb3.patch
4 Log:
5 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
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch?rev=1.1&content-type=text/plain
13
14 Index: gramps-3.1.2-use_bsddb3.patch
15 ===================================================================
16 --- src/DbManager.py
17 +++ src/DbManager.py
18 @@ -129,7 +129,7 @@
19 Returns (people_count, version_number) of current DB.
20 Returns ("Unknown", "Unknown") if invalid DB or other error.
21 """
22 - from bsddb import dbshelve, db
23 + from bsddb3 import dbshelve, db
24 from gen.db import META, PERSON_TBL
25 env = db.DBEnv()
26 flags = db.DB_CREATE | db.DB_PRIVATE |\
27 --- src/Editors/_EditFamily.py
28 +++ src/Editors/_EditFamily.py
29 @@ -26,7 +26,7 @@
30 # python modules
31 #
32 #-------------------------------------------------------------------------
33 -from bsddb import db as bsddb_db
34 +from bsddb3 import db as bsddb_db
35 from gettext import gettext as _
36 from DdTargets import DdTargets
37 import pickle
38 --- src/gen/db/base.py
39 +++ src/gen/db/base.py
40 @@ -36,7 +36,7 @@
41 import locale
42 import os
43 from sys import maxint
44 -from bsddb import db
45 +from bsddb3 import db
46 from gettext import gettext as _
47
48 import logging
49 --- src/gen/db/dbdir.py
50 +++ src/gen/db/dbdir.py
51 @@ -37,7 +37,7 @@
52 from types import InstanceType
53
54 from gettext import gettext as _
55 -from bsddb import dbshelve, db
56 +from bsddb3 import dbshelve, db
57 import logging
58
59 _LOG = logging.getLogger(".GrampsDb")
60 --- src/GrampsLogger/_ErrorReportAssistant.py
61 +++ src/GrampsLogger/_ErrorReportAssistant.py
62 @@ -2,7 +2,7 @@
63 import Assistant
64 import const
65 import gtk
66 -import sys, os,bsddb
67 +import sys, os, bsddb3
68
69
70
71 @@ -99,7 +99,7 @@
72 "OS: %s\n"\
73 "Distribution: %s\n"\
74 % (str(sys.version).replace('\n',''),
75 - str(bsddb.__version__),
76 + str(bsddb3.__version__),
77 str(const.VERSION),
78 os.environ.get('LANG',''),
79 operatingsystem,
80 --- src/plugins/import/ImportGrdb.py
81 +++ src/plugins/import/ImportGrdb.py
82 @@ -35,7 +35,7 @@
83 from gettext import gettext as _
84 import cPickle as pickle
85 import time
86 -from bsddb import dbshelve, db
87 +from bsddb3 import dbshelve, db
88 import logging
89 __LOG = logging.getLogger(".GrampsDb")