clean up patches

(Portage version: 2.1.9.40/cvs/Linux i686)

4 files changed, 7 insertions, 285 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 1f833abf696b..583f540c15ad 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gramps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.142 2011/02/27 15:44:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.143 2011/02/27 15:52:33 fauli Exp $
+
+  27 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  -files/gramps-3.1.2-use_bsddb3.patch,
+  -files/gramps-3.1.3-fix_mo_install.patch,
+  -files/gramps-3.2.3-use_bsddb3.patch:
+  clean up patches
 
   27 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
   -gramps-3.1.3-r1.ebuild, -gramps-3.2.3-r2.ebuild, -gramps-3.2.4.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
deleted file mode 100644
index d0bfd60c80a3..000000000000
--- a/app-misc/gramps/files/gramps-3.1.2-use_bsddb3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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/files/gramps-3.1.3-fix_mo_install.patch b/app-misc/gramps/files/gramps-3.1.3-fix_mo_install.patch
deleted file mode 100644
index 3b7978b633fc..000000000000
--- a/app-misc/gramps/files/gramps-3.1.3-fix_mo_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in-orig	2010-01-13 22:50:46.471767466 +0100
-+++ po/Makefile.in.in	2010-01-13 22:51:10.263766542 +0100
-@@ -56,7 +56,7 @@
- 
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
- 
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
- 
- USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
- 
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
deleted file mode 100644
index cd492192a1a1..000000000000
--- a/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-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 14:00:20.613290384 +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")
-@@ -124,7 +124,7 @@
-                  "Distribution: %s")
-                 % (elipses(str(const.VERSION)),
-                    elipses(str(sys.version).replace('\n','')),
--                   elipses(str(bsddb.__version__)),
-+                   elipses(str(bsddb3.__version__)),
-                    elipses(os.environ.get('LANG','')),
-                    elipses(operatingsystem),
-                    elipses(distribution)))
-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 14:00:13.771042190 +0200
-@@ -5,7 +5,7 @@
- import pygtk
- import gobject
- import cairo
--import sys, os,bsddb
-+import sys, os,bsddb3
- 
- 
- class ErrorReportAssistant(object):
-@@ -119,7 +119,7 @@
-                "gobject version: %s\n"\
-                "cairo version  : %s"\
-                % (str(sys.version).replace('\n',''),
--                  str(bsddb.__version__),
-+                  str(bsddb3.__version__),
-                   str(const.VERSION),
-                   os.environ.get('LANG',''),
-                   operatingsystem,
-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
- 
- #------------------------------------------------------------------------
- #