version bump

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 294 insertions, 1 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index d502dcbf18c9..11b300aff0a2 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,12 @@
 # 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.133 2010/09/18 16:53:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.134 2010/10/11 11:41:58 fauli Exp $
+
+*gramps-3.2.4 (11 Oct 2010)
+
+  11 Oct 2010; Christian Faulhammer <fauli@gentoo.org> +gramps-3.2.4.ebuild,
+  +files/gramps-3.2.4-use_bsddb3.patch:
+  version bump
 
   18 Sep 2010; Raúl Porcel <armin76@gentoo.org> gramps-3.2.3-r2.ebuild:
   sparc stable wrt #328105
diff --git a/app-misc/gramps/files/gramps-3.2.4-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.2.4-use_bsddb3.patch
new file mode 100644
index 000000000000..de57b97794ea
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.2.4-use_bsddb3.patch
@@ -0,0 +1,198 @@
+diff -ru gramps-3.2.4.orig/src/cli/clidbman.py gramps-3.2.4/src/cli/clidbman.py
+--- gramps-3.2.4.orig/src/cli/clidbman.py	2010-10-11 12:21:07.201000002 +0200
++++ gramps-3.2.4/src/cli/clidbman.py	2010-10-11 13:21:19.090000002 +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 -ru gramps-3.2.4.orig/src/gen/db/bsddbtxn.py gramps-3.2.4/src/gen/db/bsddbtxn.py
+--- gramps-3.2.4.orig/src/gen/db/bsddbtxn.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/bsddbtxn.py	2010-10-11 13:21:05.704000001 +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 -ru gramps-3.2.4.orig/src/gen/db/cursor.py gramps-3.2.4/src/gen/db/cursor.py
+--- gramps-3.2.4.orig/src/gen/db/cursor.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/cursor.py	2010-10-11 13:20:53.307000001 +0200
+@@ -24,7 +24,7 @@
+ #
+ #-------------------------------------------------------------------------
+ from cPickle import dumps, loads
+-from bsddb import db
++from bsddb3 import db
+ 
+ #-------------------------------------------------------------------------
+ #
+diff -ru gramps-3.2.4.orig/src/gen/db/dbconst.py gramps-3.2.4/src/gen/db/dbconst.py
+--- gramps-3.2.4.orig/src/gen/db/dbconst.py	2010-10-11 12:21:07.161000002 +0200
++++ gramps-3.2.4/src/gen/db/dbconst.py	2010-10-11 13:20:30.869000001 +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 -ru gramps-3.2.4.orig/src/gen/db/read.py gramps-3.2.4/src/gen/db/read.py
+--- gramps-3.2.4.orig/src/gen/db/read.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/read.py	2010-10-11 13:20:34.707000001 +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 -ru gramps-3.2.4.orig/src/gen/db/txn.py gramps-3.2.4/src/gen/db/txn.py
+--- gramps-3.2.4.orig/src/gen/db/txn.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/txn.py	2010-10-11 13:21:12.982000001 +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 -ru gramps-3.2.4.orig/src/gen/db/undoredo.py gramps-3.2.4/src/gen/db/undoredo.py
+--- gramps-3.2.4.orig/src/gen/db/undoredo.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/undoredo.py	2010-10-11 13:20:48.720000001 +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 -ru gramps-3.2.4.orig/src/gen/db/write.py gramps-3.2.4/src/gen/db/write.py
+--- gramps-3.2.4.orig/src/gen/db/write.py	2010-10-11 12:21:07.162000002 +0200
++++ gramps-3.2.4/src/gen/db/write.py	2010-10-11 13:20:39.458000001 +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 -ru gramps-3.2.4.orig/src/GrampsAboutDialog.py gramps-3.2.4/src/GrampsAboutDialog.py
+--- gramps-3.2.4.orig/src/GrampsAboutDialog.py	2010-10-11 12:21:07.202000002 +0200
++++ gramps-3.2.4/src/GrampsAboutDialog.py	2010-10-11 13:27:15.077000002 +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__) + " " + str(bsddb.db.version())),
++                   elipses(str(bsddb3.__version__) + " " + str(bsddb3.db.version())),
+                    elipses(os.environ.get('LANG','')),
+                    elipses(operatingsystem),
+                    elipses(distribution)))
+diff -ru gramps-3.2.4.orig/src/GrampsLogger/_ErrorReportAssistant.py gramps-3.2.4/src/GrampsLogger/_ErrorReportAssistant.py
+--- gramps-3.2.4.orig/src/GrampsLogger/_ErrorReportAssistant.py	2010-10-11 12:21:07.112000002 +0200
++++ gramps-3.2.4/src/GrampsLogger/_ErrorReportAssistant.py	2010-10-11 13:22:26.863000002 +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(bsddb.db.version()),
++                  str(bsddb3.__version__) + " " + str(bsddb3.db.version()),
+                   str(const.VERSION),
+                   os.environ.get('LANG',''),
+                   operatingsystem,
+diff -ru gramps-3.2.4.orig/src/gui/editors/editfamily.py gramps-3.2.4/src/gui/editors/editfamily.py
+--- gramps-3.2.4.orig/src/gui/editors/editfamily.py	2010-10-11 12:21:07.130000002 +0200
++++ gramps-3.2.4/src/gui/editors/editfamily.py	2010-10-11 13:20:23.312000001 +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 -ru gramps-3.2.4.orig/src/plugins/import/ImportGrdb.py gramps-3.2.4/src/plugins/import/ImportGrdb.py
+--- gramps-3.2.4.orig/src/plugins/import/ImportGrdb.py	2010-10-11 12:21:07.253000002 +0200
++++ gramps-3.2.4/src/plugins/import/ImportGrdb.py	2010-10-11 13:21:21.789000002 +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 -ru gramps-3.2.4.orig/src/plugins/lib/libgrdb.py gramps-3.2.4/src/plugins/lib/libgrdb.py
+--- gramps-3.2.4.orig/src/plugins/lib/libgrdb.py	2010-10-11 12:21:07.255000002 +0200
++++ gramps-3.2.4/src/plugins/lib/libgrdb.py	2010-10-11 13:21:30.551000002 +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 -ru gramps-3.2.4.orig/src/plugins/tool/ChangeNames.py gramps-3.2.4/src/plugins/tool/ChangeNames.py
+--- gramps-3.2.4.orig/src/plugins/tool/ChangeNames.py	2010-10-11 12:21:07.262000002 +0200
++++ gramps-3.2.4/src/plugins/tool/ChangeNames.py	2010-10-11 13:21:41.097000002 +0200
+@@ -31,7 +31,7 @@
+ import gobject
+ import gtk
+ import cPickle
+-from bsddb.db import DB_CURRENT
++from bsddb3.db import DB_CURRENT
+ 
+ #-------------------------------------------------------------------------
+ #
+diff -ru gramps-3.2.4.orig/src/plugins/tool/Leak.py gramps-3.2.4/src/plugins/tool/Leak.py
+--- gramps-3.2.4.orig/src/plugins/tool/Leak.py	2010-10-11 12:21:07.262000002 +0200
++++ gramps-3.2.4/src/plugins/tool/Leak.py	2010-10-11 13:21:36.903000002 +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.4.ebuild b/app-misc/gramps/gramps-3.2.4.ebuild
new file mode 100644
index 000000000000..07ed86353223
--- /dev/null
+++ b/app-misc/gramps/gramps-3.2.4.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.4.ebuild,v 1.1 2010/10/11 11:41:58 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.4-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}
+}