version bump for bug 423315, with help from Yaron Tausky

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

4 files changed, 123 insertions, 2 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index fc77c965970d..684e32dd390e 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gramps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.150 2012/05/03 19:41:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.151 2012/06/30 16:59:23 fauli Exp $
+
+*gramps-3.4.0 (30 Jun 2012)
+
+  30 Jun 2012; Christian Faulhammer <fauli@gentoo.org> +gramps-3.4.0.ebuild,
+  +files/gramps-3.4.0-use_bsddb3.patch:
+  version bump for bug 423315, with help from Yaron Tausky
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gramps-3.2.5.ebuild,
   gramps-3.2.6.ebuild, gramps-3.3.1.ebuild:
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 81c1930046b0..ac9f8819a0c4 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gramps-3.2.4-use_bsddb3.patch 8451 RMD160 1833bb72f353d050986c6801cfd75cebf8d4cbee SHA1 e7f49e3725607cae507ac917c816e2887dfd1892 SHA256 ff4c7ed5c6f396d6816f23d00aaab0dabdf2126b06f5eb57668eff74d72aa52a
 AUX gramps-3.3.0-use_bsddb3.patch 436 RMD160 7b80d1be32f690febca08a62a539e051978d5570 SHA1 008e7263174ee84f2b2a4225cea7dab25d84d52b SHA256 799119d20862ef4857968c8d8a342de4f2634efb7d826ed4ea9d571696613f95
+AUX gramps-3.4.0-use_bsddb3.patch 447 RMD160 f7e49557eccca74d842cbe9b2b03ac2c797a118f SHA1 689fc6e82960be57cbbfd7ae329c24c45924d341 SHA256 a4a7c57c202f65cceed8065e4d5649c02d316203ca31137cfccb98a989b6b3cc
 DIST gramps-3.2.5.tar.gz 7300072 RMD160 e474f2bd2d861babe3512004a8a16eecd337db3c SHA1 80f6284af8fd1290b16f6db17d4867e4a6e027d4 SHA256 6cb97629913cb48e7804d35099813b86727c15b82b6f7a6438fe01935fc8dba2
 DIST gramps-3.2.6.tar.gz 7340674 RMD160 dcea12b7adb86cd4c213eb10afcb1c4649281433 SHA1 0e3343921400758668158bbfa072b37a702ea1b9 SHA256 66db9727e6aa7d65d6b4f798348c7b41b60f0eb4e06a8b8ae5b1f04cc6bdb0ec
 DIST gramps-3.3.1.tar.gz 8793331 RMD160 52bf70fa49de5fcec8d6c917312eaa8bca9cb264 SHA1 76d062268bf48d90fc3d8003dffd7947af393147 SHA256 b186e539e571eebcd077b9684b9e8f8e30e77e1d63ad5b58d18b4b0d6c772375
+DIST gramps-3.4.0.tar.gz 9470815 RMD160 8a323a2d3e366d9911282f7e9fbc2a2952a75de3 SHA1 6eec8629807ed84d196d83c43d0c20abd9cda544 SHA256 4d029c4f3d3ffd369cbf3859f86f3602ce97a038ed6238b9811d0bf3cd15acf0
 EBUILD gramps-3.2.5.ebuild 2158 RMD160 98c83aa439be7be2e0a158d0e5cd04e802b35fa1 SHA1 22682b6f06354e11cf4df77ce4b03bfb7d21c264 SHA256 5ba29ddcef3c89e7ef477c7eeab81315292bd016c16e94282ab1d1be45bcce34
 EBUILD gramps-3.2.6.ebuild 2162 RMD160 e94b119f8cc3266e345d42993b81a7781535aa2a SHA1 2efd493661b8d3929fe7b3cf7db86fce6e57d681 SHA256 0b61e4777b87aaf9888fbb8a3ebe72560d88e13871b05a4462b0e5e9c8b20685
 EBUILD gramps-3.3.1.ebuild 2162 RMD160 b711e4d2445af96311160f0210b438e25a72df79 SHA1 d7a1b9ef731f27ccc6956cb02a26466e6a362137 SHA256 4ef764e00625824bc73759a4dec22124fa0f0adebcd26eb610d173c2a1cd2a2e
-MISC ChangeLog 21649 RMD160 30c5226b5017e9215b83a908daff469affd1af09 SHA1 a6bd8dc22e8500f8f0367b304a45a8566e930fa9 SHA256 8fe81a8b46c3bc59c44abf389bb39b8371920fba0f51fb6308792922afcb6261
+EBUILD gramps-3.4.0.ebuild 2277 RMD160 638413df425fb0a6343b9b9ee0b2beed7dcbaaa4 SHA1 d48b2f3e53dc7ba0a4fbfa9298e28a3ef98eecf8 SHA256 4c299de33480d88f8e1e453f034c68097f1b6a1a59abb4691037577b60f97c7f
+MISC ChangeLog 21854 RMD160 008914fdda71d403d4c45466b97a0237672b811d SHA1 04d7859b95fb45e2593602da30aa746693be203f SHA256 5fac750cb5133fbdfb31f5e01720dec06c71c6fe3cf856e6aefde2364e945499
 MISC metadata.xml 5281 RMD160 7adafd2f3623d5f829601f1211e0092e75ed8af6 SHA1 3d1064a6e576da63fa7ad6b91294a6c040b57505 SHA256 143b1e1e732fd624452538670c2fb390a6d2512c97959009b2bd593ccdef0963
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/vMMMACgkQNQqtfCuFnePiQQCdEWQbPF3RQJlDk77mJdgO+TvK
+lxAAn31UNJYGovHmwVQAlBcJGJUQx+3M
+=iUyL
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
new file mode 100644
index 000000000000..6815ef6ef1f0
--- /dev/null
+++ b/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
@@ -0,0 +1,11 @@
+--- src/config.py.orig	2012-06-02 07:05:21.479670747 +0200
++++ src/config.py	2012-06-02 07:05:58.444713800 +0200
+@@ -302,7 +302,7 @@
+ register('preferences.use-last-view', True)
+ register('preferences.last-view', '')
+ register('preferences.last-views', [])
+-register('preferences.use-bsddb3', False)
++register('preferences.use-bsddb3', True)
+ register('preferences.family-relation-type', 3) # UNKNOWN
+ 
+ register('researcher.researcher-addr', '')
diff --git a/app-misc/gramps/gramps-3.4.0.ebuild b/app-misc/gramps/gramps-3.4.0.ebuild
new file mode 100644
index 000000000000..5e81df0eb90b
--- /dev/null
+++ b/app-misc/gramps/gramps-3.4.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.4.0.ebuild,v 1.1 2012/06/30 16:59:23 fauli Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+GCONF_DEBUG="no"
+
+inherit 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 reports spell webkit"
+
+RDEPEND="dev-python/bsddb3
+	>=dev-python/pygtk-2.16.0
+	dev-python/pygoocanvas
+	x11-misc/xdg-utils
+	gnome-base/librsvg:2
+	gnome? ( dev-python/libgnome-python
+		dev-python/gconf-python )
+	spell? ( dev-python/gtkspell-python )
+	reports? ( media-gfx/graphviz )
+	webkit? ( dev-python/pywebkitgtk )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/pkgconfig"
+
+DOCS="NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-mime-install PYTHON="${EROOT}"/usr/bin/python2"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}/${P}-use_bsddb3.patch"
+
+	# 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, bug 423315 for example
+	einfo "Fix installation path"
+	find . -iname 'Makefile.in' | xargs \
+		sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
+		|| die
+	find . -iname 'Makefile.in' | xargs \
+		sed "s;\(pkgpythondir = \)\(\$(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 ${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup ${PN}
+}