[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2024-09-05 Thread Petr Vaněk
commit: 33a489c7d33c565426fc44d923273ddf5bad3694
Author: Petr Vaněk  gentoo  org>
AuthorDate: Wed Sep  4 06:59:56 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Thu Sep  5 13:25:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a489c7

app-misc/gramps: drop 5.1.6-r3

Signed-off-by: Petr Vaněk  gentoo.org>

 app-misc/gramps/Manifest   |   1 -
 .../gramps/files/gramps-5.1.3-test_locale.patch|  30 
 .../gramps/files/gramps-5.1.6-pep517_setup.patch   | 163 -
 app-misc/gramps/gramps-5.1.6-r3.ebuild |  91 
 4 files changed, 285 deletions(-)

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 11642f054cd5..21ee3a3cde1b 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1 @@
-DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B 
fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b
 SHA512 
419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
 DIST gramps-5.2.2.tar.gz 21070723 BLAKE2B 
8edf794e73a1536cc50599a418ccb6e06ea832be14227aaa29336a1165f54c00cfb5fa7ed6657256b6660d3217ac4f4e2e62d41097d66808f0f4f554238c
 SHA512 
4e2480081c16a61e9b0d4b0bbecccf4e6af6a40498d6994d8103ac37a7f3ce7993359fc0a9ee72cb06173ab82e17029e1a731bcf4af360cfc73e3c44c9800ef5

diff --git a/app-misc/gramps/files/gramps-5.1.3-test_locale.patch 
b/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
deleted file mode 100644
index 40eba66dd216..
--- a/app-misc/gramps/files/gramps-5.1.3-test_locale.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
-assume a US date and time format. That locale is not guaranteed to be
-present and checking that in ebuild is a hassle, therefore use C.UTF8
-instead - it's similar enough.
-
 a/data/tests/imp_sample.gramps
-+++ b/data/tests/imp_sample.gramps
-@@ -1706,7 +1706,7 @@
-   
- 
- 
--  Objects referenced by this note were missing in a file imported 
on 12/25/1999 12:00:00 AM.
-+  Objects referenced by this note were missing in a file imported 
on 12/25/99 00:00:00.
- 
-   
- 
 a/gramps/plugins/test/imports_test.py
-+++ b/gramps/plugins/test/imports_test.py
-@@ -51,10 +51,7 @@
- # --
- 
- # These tests assume a US date and time format.
--try:
--locale.setlocale(locale.LC_ALL, 'en_US.utf8')
--except locale.Error: # seems to fail on Windows system for some reason
--locale.setlocale(locale.LC_ALL, 'English_United States')
-+locale.setlocale(locale.LC_ALL, 'C.utf8')
- 
- 
- def mock_time(*args):

diff --git a/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch 
b/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch
deleted file mode 100644
index 7853b23ba1b8..
--- a/app-misc/gramps/files/gramps-5.1.6-pep517_setup.patch
+++ /dev/null
@@ -1,163 +0,0 @@
 a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@
- #
- 
- '''
--Gramps distutils module.
-+Gramps setuptools module.
- '''
- 
- #check python version first
-@@ -32,11 +32,11 @@
- if sys.version_info < (3, 2):
- raise SystemExit("Gramps requires Python 3.2 or later.")
- 
--from distutils import log
--from distutils.core import setup, Command
--from distutils.util import convert_path, newer
--from distutils.command.build import build as _build
--from distutils.command.install import install as _install
-+from setuptools import setup, Command
-+try:
-+from setuptools.command.build import build as _build
-+except ImportError:
-+from distutils.command.build import build as _build
- import os
- import glob
- import codecs
-@@ -45,6 +45,9 @@
- from gramps.version import VERSION
- import unittest
- import argparse
-+import logging
-+
-+_LOG = logging.getLogger(".setup")
- 
- # this list MUST be a subset of _LOCALE_NAMES in gen/utils/grampslocale.py
- # (that is, if you add a new language here, be sure it's in _LOCALE_NAMES too)
-@@ -75,6 +78,17 @@
- packaging = True
- sys.argv = [sys.argv[0]] + passthrough
- 
-+def newer(source, target):
-+'''
-+Determines if a target file needs to be rebuilt.
-+
-+Returns True if the target file doesn't exist or if the source file is
-+newer than the target file.
-+'''
-+if not os.path.exists(target):
-+return True
-+return os.path.getmtime(source) > os.path.getmtime(target)
-+
- def intltool_version():
- '''
- Return the version of intltool as a tuple.
-@@ -140,7 +154,7 @@
- reply = input(ask)
- if reply in ['n', 'N']:
- raise SystemExit(msg)
--log.info('Compiling %s >> %s', po_file, mo_file)
-+_LOG.info('Compiling %s >> %s', po_file, mo_file)
- 
- #linux specific piece:
- target = 'share

[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2024-03-29 Thread Marek Szuba
commit: 3407c4c5a8cda3b6cc842bac456ae3978adb482c
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Mar 29 10:43:06 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Mar 29 10:43:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3407c4c5

app-misc/gramps: add 5.2.1

Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/gramps/Manifest   |  1 +
 .../gramps/files/gramps-5.2.1-test_locale.patch| 30 
 app-misc/gramps/gramps-5.2.1.ebuild| 85 ++
 3 files changed, 116 insertions(+)

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index e03b8f571b65..0fb1ade4a359 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1 +1,2 @@
 DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B 
fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b
 SHA512 
419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
+DIST gramps-5.2.1.tar.gz 21059645 BLAKE2B 
0fda7a637abe4f7f8019d113cc62b353f4e3628274e614cf8778b4c8303f68951ccb5ca7356faf7bce58ee399da1aa33f70ac482d995c60c9103eed9bae3b490
 SHA512 
ac7b9bd1bccf1094ccf91d3fec5cf1ed7327911d314c05b544c15aaf7681c0b5acd4088411200e23a70bcd965297107ea5deaf5c200b6b144b24d16e085c613e

diff --git a/app-misc/gramps/files/gramps-5.2.1-test_locale.patch 
b/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
new file mode 100644
index ..e1e0b7997075
--- /dev/null
+++ b/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
@@ -0,0 +1,30 @@
+GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
+assume a US date and time format. That locale is not guaranteed to be
+present and checking that in ebuild is a hassle, therefore use C.UTF8
+instead - it's similar enough.
+
+--- a/data/tests/imp_sample.gramps
 b/data/tests/imp_sample.gramps
+@@ -1719,7 +1719,7 @@
+   
+ 
+ 
+-  Objects referenced by this note were missing in a file imported 
on 12/25/1999 12:00:00 AM.
++  Objects referenced by this note were missing in a file imported 
on 12/25/99 00:00:00.
+ 
+   
+ 
+--- a/gramps/plugins/test/imports_test.py
 b/gramps/plugins/test/imports_test.py
+@@ -54,10 +54,7 @@
+ # --
+ 
+ # These tests assume a US date and time format.
+-try:
+-locale.setlocale(locale.LC_ALL, "en_US.utf8")
+-except locale.Error:  # seems to fail on Windows system for some reason
+-locale.setlocale(locale.LC_ALL, "English_United States")
++locale.setlocale(locale.LC_ALL, "C.utf8")
+ 
+ 
+ def mock_time(*args):

diff --git a/app-misc/gramps/gramps-5.2.1.ebuild 
b/app-misc/gramps/gramps-5.2.1.ebuild
new file mode 100644
index ..302a27877ada
--- /dev/null
+++ b/app-misc/gramps/gramps-5.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2001-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Community genealogy program aiming to be both intuitive and 
feature-complete"
+HOMEPAGE="https://gramps-project.org/";
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif geo postscript +rcs +reports spell test"
+
+# Many tests fail unless the deprecated BerkeleyDB back-end is enabled.
+RESTRICT="test"
+
+RDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/pycairo[${PYTHON_USEDEP}]
+   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+   dev-python/pyicu[${PYTHON_USEDEP}]
+   exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] 
)
+   ')
+   gnome-base/librsvg:2
+   >x11-libs/gtk+-3.14.8:3[introspection]
+   x11-libs/pango[introspection]
+   x11-misc/xdg-utils
+   geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   spell? ( app-text/gtkspell:3[introspection] )
+   rcs? ( dev-vcs/rcs )
+   reports? ( media-gfx/graphviz[postscript?] )
+"
+BDEPEND="test? (
+   $(python_gen_cond_dep '
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]
+   ')
+)"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2.1-test_locale.patch
+)
+
+DISTUTILS_ARGS=(
+   --no-compress-manpages
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   # Install documentation to the proper location. This can't be done
+   # easily with a patch because we substitute in the ${PF} variable,
+   # and that changes with every revision.
+   sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+
+   default
+}
+
+python_install() {
+   distutils-r1_python

[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2018-03-24 Thread Michał Górny
commit: f34f1d2975c24e6edcf644bd829bbf2254bcf897
Author: Herb Miller Jr  hlmjr  com>
AuthorDate: Sat Mar 24 17:39:42 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 24 19:57:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34f1d29

app-misc/gramps: Don't compress man pages during compile.

Closes: https://github.com/gentoo/gentoo/pull/7346
Package-Manager: Portage[mgorny]-2.3.24.1

 .../files/gramps-4.2.8-uncompressed-docs.patch | 33 ++
 app-misc/gramps/gramps-4.2.8.ebuild|  9 +++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch 
b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
new file mode 100644
index 000..8d43447027d
--- /dev/null
+++ b/app-misc/gramps/files/gramps-4.2.8-uncompressed-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/setup.py b/setup.py
+index 0177ce7..7aaa681 100644
+--- a/setup.py
 b/setup.py
+@@ -160,27 +160,8 @@ def build_man(build_cmd):
+ subst_vars = (('@VERSION@', VERSION), )
+ substitute_variables(filename, newfile, subst_vars)
+ 
+-import gzip
+-man_file_gz = os.path.join(newdir, 'gramps.1.gz')
+-if os.path.exists(man_file_gz):
+-if newer(filename, man_file_gz):
+-os.remove(man_file_gz)
+-else:
+-filename = False
+-os.remove(newfile)
+-
+-if filename:
+-#Binary io, so open is OK
+-with open(newfile, 'rb') as f_in,\
+-gzip.open(man_file_gz, 'wb') as f_out:
+-f_out.writelines(f_in)
+-log.info('Compiling %s >> %s', filename, man_file_gz)
+-
+-os.remove(newfile)
+-filename = False
+-
+ lang = man_dir[8:]
+-src = build_cmd.build_base  + '/data/man/' + lang  + 
'/gramps.1.gz'
++src = build_cmd.build_base  + '/data/man/' + lang  + '/gramps.1'
+ target = 'share/man/' + lang + '/man1'
+ data_files.append((target, [src]))
+ 

diff --git a/app-misc/gramps/gramps-4.2.8.ebuild 
b/app-misc/gramps/gramps-4.2.8.ebuild
index 556bb44410a..d9142b2bb5c 100644
--- a/app-misc/gramps/gramps-4.2.8.ebuild
+++ b/app-misc/gramps/gramps-4.2.8.ebuild
@@ -33,18 +33,19 @@ RDEPEND="
rcs? ( dev-vcs/rcs )
 "
 
-python_configure_all() {
-   mydistutilsargs=( --resourcepath=/usr/share )
-}
-
 python_prepare_all() {
# Install documentation to the proper location. This can't be done
# easily with a patch because we substitute in the $PF variable,
# and that changes with every revision.
sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+   eapply "${FILESDIR}/${P}-uncompressed-docs.patch"
distutils-r1_python_prepare_all
 }
 
+python_configure_all() {
+   mydistutilsargs=( --resourcepath=/usr/share )
+}
+
 pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update



[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2017-06-04 Thread Pacho Ramos
commit: dbd61635080a941e6f6acfab6d928fb487d84f11
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun  4 10:46:45 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun  4 10:47:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd61635

app-misc/gramps: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-misc/gramps/Manifest   |  1 -
 .../gramps/files/gramps-4.2.4-resourcepath.patch   | 11 --
 app-misc/gramps/gramps-4.2.4-r1.ebuild | 41 --
 3 files changed, 53 deletions(-)

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 4a55d6920c4..fa2e4dc74d0 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1 @@
-DIST gramps-4.2.4.tar.gz 18683901 SHA256 
25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 
640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499
 WHIRLPOOL 
ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
 DIST gramps-4.2.5.tar.gz 18694912 SHA256 
1de3007215b7d0b779ec8f086e14e7a75f2aa811ee37c6d0cff06bfc9458743d SHA512 
20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 WHIRLPOOL 
d9f49b188e20697477860ecb5916c452b95ea08c038b828b0f01edc1097d3d45b549e3e1a5bc5a4aad1d8aab390b8dfefc4ec46ac58420161de8e4d644c8f95e

diff --git a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch 
b/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
deleted file mode 100644
index 4c1f6920cbb..000
--- a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/setup.py 2016-09-04 14:44:02.0 +
-+++ b/setup.py 2016-09-22 12:21:52.496968618 +
-@@ -278,7 +278,7 @@
- if packaging:
- path = resource_path
- else:
--path = os.path.abspath(os.path.join(self.install_data, 
'share'))
-+path = '/usr/share'
- fp.write(path)
- 
- _install.run(self)

diff --git a/app-misc/gramps/gramps-4.2.4-r1.ebuild 
b/app-misc/gramps/gramps-4.2.4-r1.ebuild
deleted file mode 100644
index 43033e1cf0a..000
--- a/app-misc/gramps/gramps-4.2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/";
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+reports +exif spell"
-
-RDEPEND="
-   dev-python/bsddb3[${PYTHON_USEDEP}]
-   dev-python/pycairo[${PYTHON_USEDEP}]
-   >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-   dev-python/pyicu[${PYTHON_USEDEP}]
-   gnome-base/librsvg:2
-   >x11-libs/gtk+-3.14.8:3[introspection]
-   x11-libs/pango[introspection]
-   x11-misc/xdg-utils
-   reports? ( media-gfx/graphviz )
-   exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-   spell? ( app-text/gtkspell:3[introspection] )
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-resourcepath.patch"
-)
-
-python_prepare_all() {
-   sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
-   distutils-r1_python_prepare_all
-}



[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2017-06-02 Thread Pacho Ramos
commit: b234892011f616a6f8aad52fb2600b79f9723994
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jun  2 08:28:03 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jun  2 08:28:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2348920

app-misc/gramps: Drop old version needing vulnerable webkit-gtk version

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-misc/gramps/Manifest   |  1 -
 .../gramps/files/gramps-3.4.0-use_bsddb3.patch | 11 
 .../files/gramps-4.2.4-versioned_doc_dir.patch | 15 -
 app-misc/gramps/gramps-3.4.5-r1.ebuild | 75 --
 app-misc/gramps/metadata.xml   |  2 -
 5 files changed, 104 deletions(-)

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index cc81765024d..4a55d6920c4 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,3 +1,2 @@
-DIST gramps-3.4.5.tar.gz 10444188 SHA256 
940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 
c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3
 WHIRLPOOL 
4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228
 DIST gramps-4.2.4.tar.gz 18683901 SHA256 
25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 
640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499
 WHIRLPOOL 
ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
 DIST gramps-4.2.5.tar.gz 18694912 SHA256 
1de3007215b7d0b779ec8f086e14e7a75f2aa811ee37c6d0cff06bfc9458743d SHA512 
20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 WHIRLPOOL 
d9f49b188e20697477860ecb5916c452b95ea08c038b828b0f01edc1097d3d45b549e3e1a5bc5a4aad1d8aab390b8dfefc4ec46ac58420161de8e4d644c8f95e

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
deleted file mode 100644
index 133c4edfd06..000
--- a/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/config.py2012-06-02 07:05:21.479670747 +0200
-+++ b/src/config.py2012-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/files/gramps-4.2.4-versioned_doc_dir.patch 
b/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
deleted file mode 100644
index 3d1ea8cb87c..000
--- a/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/setup.py 2016-09-04 14:44:02.0 +
-+++ b/setup.py 2016-09-22 13:08:33.188167127 +
-@@ -436,9 +436,9 @@
- CSS_FILES = glob.glob(os.path.join('data', 'css', '*.css'))
- SWANKY_PURSE = glob.glob(os.path.join('data', 'css', 'swanky-purse', '*.css'))
- SWANKY_IMG = glob.glob(os.path.join('data', 'css', 'swanky-purse', 'images', 
'*.png'))
--data_files_core.append(('share/doc/gramps', DOC_FILES))
--data_files_core.append(('share/doc/gramps/example/gedcom', GEDCOM_FILES))
--data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES))
-+data_files_core.append(('share/doc/gramps-' + VERSION, DOC_FILES))
-+data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gedcom', 
GEDCOM_FILES))
-+data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gramps', 
GRAMPS_FILES))
- data_files_core.append(('share/gramps/images/webstuff', IMAGE_WEB))
- data_files_core.append(('share/gramps/css', CSS_FILES))
- data_files_core.append(('share/gramps/css/swanky-purse', SWANKY_PURSE))

diff --git a/app-misc/gramps/gramps-3.4.5-r1.ebuild 
b/app-misc/gramps/gramps-3.4.5-r1.ebuild
deleted file mode 100644
index 299a7a4af63..000
--- a/app-misc/gramps/gramps-3.4.5-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python-single-r1
-
-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 x86"
-
-IUSE="gnome reports spell webkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-python/bsddb3[${PYTHON_USEDEP}]
-   >=dev-python/py

[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2016-09-22 Thread Marek Szuba
commit: 2621df486a36a61ea5f21039709f5094688a8864
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep 22 14:53:32 2016 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Sep 23 06:56:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2621df48

app-misc/gramps: version bump to 4.2.4

Dependency on sci-geosciences/osm-gps-map temporarily removed because we
haven't got the right version in Portage yet.

Seems to work with python3_5 as well but needs more testing, will
officially add support for that version  later.

Suggested-By: Kevin Simmons  kblob.com>

Package-Manager: portage-2.3.1

 app-misc/gramps/Manifest   |  1 +
 .../gramps/files/gramps-4.2.4-resourcepath.patch   | 11 ++
 .../files/gramps-4.2.4-versioned_doc_dir.patch | 15 
 app-misc/gramps/gramps-4.2.4.ebuild| 40 ++
 4 files changed, 67 insertions(+)

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 39006df..4000583 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1,3 @@
 DIST gramps-3.4.5.tar.gz 10444188 SHA256 
940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 
c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3
 WHIRLPOOL 
4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228
 DIST gramps-3.4.9.tar.gz 10190446 SHA256 
402a8616efeda730d10941690edb6dfb2719c3f7383e376a404577412676a8f3 SHA512 
f15481b3791a98568a0a7f734ef5eb9a1149cf76c5e83f1270eee41bcf3518713391cb271a54177e6e6bbaf78da098d7a7a2a807266c971c1331dbb9d29d5fbb
 WHIRLPOOL 
834777cb20ee7a3ef7a2397eef5a0e70caab02666cf127ba01f6310ac68463ea67733883cd3ca63676b9541dc104da818986d7b249950ae6a30415f5fa1bddee
+DIST gramps-4.2.4.tar.gz 18683901 SHA256 
25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 
640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499
 WHIRLPOOL 
ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0

diff --git a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch 
b/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
new file mode 100644
index ..4c1f692
--- /dev/null
+++ b/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
@@ -0,0 +1,11 @@
+--- a/setup.py 2016-09-04 14:44:02.0 +
 b/setup.py 2016-09-22 12:21:52.496968618 +
+@@ -278,7 +278,7 @@
+ if packaging:
+ path = resource_path
+ else:
+-path = os.path.abspath(os.path.join(self.install_data, 
'share'))
++path = '/usr/share'
+ fp.write(path)
+ 
+ _install.run(self)

diff --git a/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch 
b/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
new file mode 100644
index ..3d1ea8c
--- /dev/null
+++ b/app-misc/gramps/files/gramps-4.2.4-versioned_doc_dir.patch
@@ -0,0 +1,15 @@
+--- a/setup.py 2016-09-04 14:44:02.0 +
 b/setup.py 2016-09-22 13:08:33.188167127 +
+@@ -436,9 +436,9 @@
+ CSS_FILES = glob.glob(os.path.join('data', 'css', '*.css'))
+ SWANKY_PURSE = glob.glob(os.path.join('data', 'css', 'swanky-purse', '*.css'))
+ SWANKY_IMG = glob.glob(os.path.join('data', 'css', 'swanky-purse', 'images', 
'*.png'))
+-data_files_core.append(('share/doc/gramps', DOC_FILES))
+-data_files_core.append(('share/doc/gramps/example/gedcom', GEDCOM_FILES))
+-data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES))
++data_files_core.append(('share/doc/gramps-' + VERSION, DOC_FILES))
++data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gedcom', 
GEDCOM_FILES))
++data_files_core.append(('share/doc/gramps-' + VERSION + '/example/gramps', 
GRAMPS_FILES))
+ data_files_core.append(('share/gramps/images/webstuff', IMAGE_WEB))
+ data_files_core.append(('share/gramps/css', CSS_FILES))
+ data_files_core.append(('share/gramps/css/swanky-purse', SWANKY_PURSE))

diff --git a/app-misc/gramps/gramps-4.2.4.ebuild 
b/app-misc/gramps/gramps-4.2.4.ebuild
new file mode 100644
index ..749a4c2
--- /dev/null
+++ b/app-misc/gramps/gramps-4.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="http://www.gramps.org/";
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+reports +exif spell"
+
+RDEPEND="
+   dev-python/bsddb3[${PYTHON_USEDEP}]
+   >

[gentoo-commits] repo/gentoo:master commit in: app-misc/gramps/, app-misc/gramps/files/

2016-07-08 Thread Austin English
commit: e38867b2b69044eb64ed641e848376864f3a81dd
Author: Austin English  gentoo  org>
AuthorDate: Fri Jul  8 18:28:10 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Jul  8 18:28:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38867b2

app-misc/gramps: fix gramps-3.4.0-use_bsddb3.patch for EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/588292

Package-Manager: portage-2.2.28

 app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch | 4 ++--
 app-misc/gramps/gramps-3.4.9-r1.ebuild  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

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
index 6815ef6..133c4ed 100644
--- a/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
+++ b/app-misc/gramps/files/gramps-3.4.0-use_bsddb3.patch
@@ -1,5 +1,5 @@
 src/config.py.orig 2012-06-02 07:05:21.479670747 +0200
-+++ src/config.py  2012-06-02 07:05:58.444713800 +0200
+--- a/src/config.py2012-06-02 07:05:21.479670747 +0200
 b/src/config.py2012-06-02 07:05:58.444713800 +0200
 @@ -302,7 +302,7 @@
  register('preferences.use-last-view', True)
  register('preferences.last-view', '')

diff --git a/app-misc/gramps/gramps-3.4.9-r1.ebuild 
b/app-misc/gramps/gramps-3.4.9-r1.ebuild
index 4ed4bf7..dd3a36a 100644
--- a/app-misc/gramps/gramps-3.4.9-r1.ebuild
+++ b/app-misc/gramps/gramps-3.4.9-r1.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
 
 inherit gnome2 python-single-r1