fix patch finally, thanks arfrever for pointing out

Package-Manager: portage-2.1.8.3/cvs/Linux i686
RepoMan-Options: --force

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index f1de957735596f868b9ef005455e8382f3cd5766..89754d24a10821a7e93571fc64af930484c81c87 100644 (file)
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,13 @@
 # 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.131 2010/07/14 09:16:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.132 2010/07/14 12:06:29 fauli Exp $
+
+*gramps-3.2.3-r2 (14 Jul 2010)
+
+  14 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  -gramps-3.2.3-r1.ebuild, +gramps-3.2.3-r2.ebuild,
+  files/gramps-3.2.3-use_bsddb3.patch:
+  fix patch finally, thanks arfrever for pointing out
 
 *gramps-3.2.3-r1 (14 Jul 2010)
 

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index a22b756c49ef0a5916959861292e46dfb6bdc2d4..025ba6cc5c6b2e5b981a909cbb256970870f28af 100644 (file)
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -3,7 +3,7 @@ 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 7565 RMD160 4dabe0903604138fa527c11f93f9dfcc222272a9 SHA1 ae1bec619ada09a2394cf97c3a045aa8444a79a5 SHA256 57d4076a6885ed6f212ebeb996f576c241abb92f45aa942562ba5a7e58887694
+AUX gramps-3.2.3-use_bsddb3.patch 8351 RMD160 9ef4a25b361e2210909b6aa20b1f4c936dffe22d SHA1 84120e9c77d87b6d37845f43c57d79e7b27686d6 SHA256 af1a6388a731788ae06195039464b9a9966bd30ec5dc33916a5dad6f3fe9aff7
 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
@@ -11,14 +11,14 @@ DIST gramps-3.2.3.tar.gz 7234196 RMD160 b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c
 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-r1.ebuild 2192 RMD160 b1eb294cc4d8f11d2d19cf66d7d452b09f32ca0b SHA1 1afaacf524d284f3a838620da892b73c99642264 SHA256 c78fcee032106b2902b5bc9d1892e98d5c5f0b614e862f7039793b1d47ef333a
+EBUILD gramps-3.2.3-r2.ebuild 2192 RMD160 c26fc83879e53d7442046acba139a0854b9a0cfb SHA1 4898fd51c02afdee18cbdb6d478661e55fc1770b SHA256 9373b9aa9edd7efe75c9c46f35a149640f6f00a54437273cefa0136857e4f101
 EBUILD gramps-3.2.3.ebuild 2137 RMD160 a1f50529e831e8a1580b344e620b66438efe7a8e SHA1 73c9e8ce3b5774b3a1cce02f425ff3ae873a3648 SHA256 0cf028520296f06ccd84653d1ef2d0c646ae5f96648098f018dafd64984e1c8c
-MISC ChangeLog 18675 RMD160 df6acdc21fe8a1895e0ed63952e1a1f84fd33f29 SHA1 e8bba8940c4c942cf80056db5e56332b4f6da329 SHA256 20f8471e697736c1a399bcc3afc96d236c0b2899da720cb7c682987529902242
+MISC ChangeLog 18908 RMD160 975ecc9bcd428bfc14061fffe03f1648f7439171 SHA1 0bbd3ade6592c392aea27fbb3b6625e4a56d0dcf SHA256 b5183f38ff8f97b7f5b9a4ac098bbf080009c9c39bf43e5365c7fdeeff129f61
 MISC metadata.xml 5391 RMD160 6b000acb76bc6562c214c0078c58874f72cf839a SHA1 4a32ff9f7ca6549f951445dfa6309aea5b5d031c SHA256 bf3d518f68f9f0c58915b821f767d9d407390f0f971a8d0dfdd6f64cad5c74c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw9gNoACgkQNQqtfCuFneN9iQCgmYKMAasnGWUa4OnEYjqWocHk
-t1QAnjWcRhTG0FHAsacRywB2/ezqg2dl
-=To6c
+iEYEARECAAYFAkw9qLsACgkQNQqtfCuFneNfKACdFXvMqyQx2AoDcF60I7NGwq3t
+glEAn0d1G8E3e6l5M5tYJfAk3PpWTsAE
+=02Gk
 -----END PGP SIGNATURE-----

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
index 9ea7a4e3efa498491d99417264c8a9d67acd422b..cd492192a1a170fa13933cc45077b7b7141b2405 100644 (file)
--- a/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch
+++ b/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch
@@ -96,7 +96,7 @@ diff -r -u gramps-3.2.3.orig/src/gen/db/write.py gramps-3.2.3/src/gen/db/write.p
  
 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 11:07:08.703288777 +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
@@ -106,9 +106,18 @@ diff -r -u gramps-3.2.3.orig/src/GrampsAboutDialog.py gramps-3.2.3/src/GrampsAbo
  
  ##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 11:07:07.753040488 +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
@@ -118,6 +127,15 @@ diff -r -u gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py gramps-3.
  
  
  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

diff --git a/app-misc/gramps/gramps-3.2.3-r1.ebuild b/app-misc/gramps/gramps-3.2.3-r2.ebuild
similarity index 97%
rename from app-misc/gramps/gramps-3.2.3-r1.ebuild
rename to app-misc/gramps/gramps-3.2.3-r2.ebuild
index 7223e3eb24183876a5d0e4873444822ad5d32906..ef3355bdcdf88b8cebfd22b31a98e261fd973551 100644 (file)
--- a/app-misc/gramps/gramps-3.2.3-r1.ebuild
+++ b/app-misc/gramps/gramps-3.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.1 2010/07/14 09:16:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.2.3-r2.ebuild,v 1.1 2010/07/14 12:06:29 fauli Exp $
 
 EAPI=2