version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 308 insertions, 2 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/Manifest b/app-misc/gramps/Manifest
index 46021c82e31a..a11dec17962d 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 8351 RMD160 9ef4a25b361e2210909b6aa20b1f4c936dffe22d SHA1 84120e9c77d87b6d37845f43c57d79e7b27686d6 SHA256 af1a6388a731788ae06195039464b9a9966bd30ec5dc33916a5dad6f3fe9aff7
+AUX gramps-3.2.4-use_bsddb3.patch 8451 RMD160 1833bb72f353d050986c6801cfd75cebf8d4cbee SHA1 e7f49e3725607cae507ac917c816e2887dfd1892 SHA256 ff4c7ed5c6f396d6816f23d00aaab0dabdf2126b06f5eb57668eff74d72aa52a
 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
 DIST gramps-3.2.3.tar.gz 7234196 RMD160 b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c SHA1 156622b7a51189fb2c105e29ff33978d4c165be4 SHA256 a5f34c484afa66af4ef54e19a9b7cce8783f91caa911cbe24fcef9fab2489ce8
+DIST gramps-3.2.4.tar.gz 7251891 RMD160 96a86c30c5b6166531b779ecdc4aeff4e8b1d185 SHA1 ad09b89a8d63a5b22e60459872e388fc17468f53 SHA256 6d9c43b0ddc323d7304d330deae92b4fa6d927c488457ca4ecb0776e7754d5d5
 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-r2.ebuild 2193 RMD160 e2b7ae7ebdec2dbe6bb70ec13832ff3f54954086 SHA1 3e77500434e771d7cc9badfd6b647a0fe461e18a SHA256 cae50ace78b71cb57c6f03db449b7a1d0f8d91df66e899a62f42b9854d33e403
 EBUILD gramps-3.2.3.ebuild 2137 RMD160 a1f50529e831e8a1580b344e620b66438efe7a8e SHA1 73c9e8ce3b5774b3a1cce02f425ff3ae873a3648 SHA256 0cf028520296f06ccd84653d1ef2d0c646ae5f96648098f018dafd64984e1c8c
-MISC ChangeLog 19011 RMD160 3194c0b8d5c197bac8e7afed78450183fa3435a9 SHA1 92c2baa74074e53f2931118574ba5a245c43b8d7 SHA256 ef58490612a94bedea7d6093530a528642612ab93d4083400cf40bf34a677fff
+EBUILD gramps-3.2.4.ebuild 2191 RMD160 c205c2af90b01b82ace8c8cbc1ba237234eb9b26 SHA1 b81c866b54768411faada5cd7ff52dbfcac2d442 SHA256 48159c8ffeed7baba45383a7cf80f37caafdd0790e7de06746a16138a95add92
+MISC ChangeLog 19171 RMD160 62bdc3289e9012105c67a695fe6ff70d0c2ec3ff SHA1 82d0b3103b3d1bfbc222b6298c4c630f995b60a9 SHA256 4a297f613b7289a6d28080814dac737a83bb76a8712382fbe3b8fdac83786bec
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyy+IwACgkQNQqtfCuFnePYKwCeIrbY1y4k1vUDx+PcX5Y2s5Xv
++70AoIpXJkuH2+vhbRCkrxn9wJRcVSKS
+=1HGY
+-----END PGP SIGNATURE-----
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}
+}