gentoo auto-resync : 06:09:2024 - 12:28:42

4 files changed, 23 insertions, 220 deletions

diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 54af8fe8aa84..c27769aa851b 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,8 +1,6 @@
-AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
-AUX gramps-5.1.6-pep517_setup.patch 5873 BLAKE2B 62b8ca02f318c318e019366f35e39bda53fd000c8389cf1c4edfc673df008029d475c8667e69e25e3f27edbcce2f64e71d21fad43657bcfeb449b00ac7d9f2c0 SHA512 98a3807916f624b81f92cdbac1296fa9e91dd796b73d206da8561c61d45ead48bb178894cf0793471bb798f82d114a9fb3de1f0f0252cff7356402d0ba6111cb
 AUX gramps-5.2.1-test_locale.patch 1192 BLAKE2B 74c870c893a5187e5f73cd5f7fd4e5b667d6dc07984ce573ac4b1e3235f5ddc525ebe69e52edf49e9b884668e6ad5ad48f17b3b687cc5a3862a673ad3b057044 SHA512 5266e3fffde071f345e191c3c47dc74683ea645973e7a3863ab2e27d44ac7de12d5d075e67b6dcd44c7f8397dc1f11ee79515ef2903c76edab233c76bc907f21
-DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b SHA512 419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
 DIST gramps-5.2.2.tar.gz 21070723 BLAKE2B 8edf794e766663a1536cc50599a418ccb6e06ea832be14227aaa29336a1165f54c00cfb5fa7ed6657256b6660d3217ac4f4e2e62d41097d66808f0f4f554238c SHA512 4e2480081c16a61e9b0d4b0bbecccf4e6af6a40498d6994d8103ac37a7f3ce7993359fc0a9ee72cb06173ab82e17029e1a731bcf4af360cfc73e3c44c9800ef5
-EBUILD gramps-5.1.6-r3.ebuild 2425 BLAKE2B d66caf7c462d2be3d243423094937cedb34517baf7991d9ede070f608fe8122172d095c08ea95e5f2e0fc468fddebc1fd4a27a7601995107ea1868cf769f934a SHA512 07996daac28aa12585ae5699e6a89f5e591967b8d0c89ae7c27a326cee17062284a39e14144ea236d9726aa9f6ec594f4664e893532f04a98205a7b859f21dff
+DIST gramps-5.2.3.tar.gz 21081011 BLAKE2B 1ed8bc46e3c0d49b77194e52a060e5e3627871620f87bb7aca1b112972aecbd94a382cbc03ac07f8ef0424b4e47abbb4245ec4761fce5f5b019bdf41591530a1 SHA512 830af5c7276ff4e6c3a43ce37f1cd7bf345368885489701d17e4fe276f468890b267c5c72d7055e6043dc715e7a7f950e5a2084e31863d338c3487f29561ac75
 EBUILD gramps-5.2.2.ebuild 2134 BLAKE2B a879d55499ed3561595af2d8f23a4d95c3132e63308ca26fe1c127f1867a37902466aadd9a060ebe5631e09e001b21a3fb5852e62c8407b79dd9712ead3975a1 SHA512 8dc696d7284bfc72c300c80447b9dec0c98d940a14d1fec416e150c32311243d9c04ab3a48343e670928635d47ad12a1b8387578d22b1384cb52ded4638ea616
+EBUILD gramps-5.2.3.ebuild 2447 BLAKE2B 29b93faa5db2218e0704c45fea2a91ae398a4a4dc4878265fd2083b43bfd87585fe8a5820cd1160fc694a502dc76c9029cb6038e813b84a0c2568f831d786228 SHA512 bf089af0f07b4e4a20cf809552783e3bb04262d8ab954a566aa88ca486889ef9a8ed537bc153af5b279261412183c5ad6140846295b76e866a644a73a1f0f577
 MISC metadata.xml 5521 BLAKE2B f0ded0e16a02c46c4f4fd8e1abf60b53bab2feb81d24465cc59b1ca8113b49e6a3a0dba04fbe6828da07998ecb161505ae60dd969c73d503b78b07622697445d SHA512 833c7014cad20b694f91bbd093202c825017f08c67e6f86fd5b1bb0d69828ef9f4a834770faf5ac0e5fd5e028342bbd00c6cc44c3d8e92cf34ef81b8f552ddae
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..000000000000
--- 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 @@
-       </style>
-     </note>
-     <note handle="_000000f9000000f9" change="1591544255" id="N0036" type="General">
--      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
-+      <text>Objects referenced by this note were missing in a file imported on 12/25/99 00:00:00.</text>
-     </note>
-   </notes>
- </database>
---- 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..000000000000
--- 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/locale/' + lang + '/LC_MESSAGES'
-@@ -179,7 +193,7 @@
-                     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)
-+                        _LOG.info('Compiling %s >> %s', filename, man_file_gz)
- 
-                     os.remove(newfile)
-                     filename = False
-@@ -193,30 +207,26 @@
-     '''
-     Merge translation files into desktop and mime files
-     '''
--    for filename in _FILES:
--        filename = convert_path(filename)
--        strip_files(filename + '.in', filename, ['_tip', '_name'])
--
-     i_v = intltool_version()
-     if i_v is None or i_v < (0, 25, 0):
--        log.info('No intltool or version < 0.25.0, build_intl is aborting')
-+        _LOG.info('No intltool or version < 0.25.0, build_intl is aborting')
-         return
-     data_files = build_cmd.distribution.data_files
-     base = build_cmd.build_base
- 
--    merge_files = (('data/gramps.desktop', 'share/applications', '-d'),
--                    ('data/gramps.keys', 'share/mime-info', '-k'),
--                    ('data/gramps.xml', 'share/mime/packages', '-x'),
--                    ('data/gramps.appdata.xml', 'share/metainfo', '-x'))
-+    merge_files = (('gramps.desktop', 'share/applications', '-d'),
-+                    ('gramps.keys', 'share/mime-info', '-k'),
-+                    ('gramps.xml', 'share/mime/packages', '-x'),
-+                    ('gramps.appdata.xml', 'share/metainfo', '-x'))
- 
-     for filename, target, option in merge_files:
--        filenamelocal = convert_path(filename)
-+        filenamelocal = os.path.join('data', filename)
-         newfile = os.path.join(base, filenamelocal)
-         newdir = os.path.dirname(newfile)
-         if not(os.path.isdir(newdir) or os.path.islink(newdir)):
-             os.makedirs(newdir)
-         merge(filenamelocal + '.in', newfile, option)
--        data_files.append((target, [base + '/' + filename]))
-+        data_files.append((target, [base + '/data/' + filename]))
- 
- def strip_files(in_file, out_file, mark):
-     '''
-@@ -232,7 +242,7 @@
-                     line = line.replace(marker, marker[1:])
-                 fb.write(line)
-         old.close()
--        log.info('Compiling %s >> %s', in_file, out_file)
-+        _LOG.info('Compiling %s >> %s', in_file, out_file)
- 
- def merge(in_file, out_file, option, po_dir='po', cache=True):
-     '''
-@@ -262,7 +272,7 @@
-             msg = ('ERROR: %s was not merged into the translation files!\n' %
-                     out_file)
-             raise SystemExit(msg)
--        log.info('Compiling %s >> %s', in_file, out_file)
-+        _LOG.info('Compiling %s >> %s', in_file, out_file)
- 
- class build(_build):
-     """Custom build command."""
-@@ -273,22 +283,6 @@
-         build_intl(self)
-         _build.run(self)
- 
--class install(_install):
--    """Custom install command."""
--    def run(self):
--        resource_file = os.path.join(os.path.dirname(__file__), 'gramps', 'gen',
--                                     'utils', 'resource-path')
--        with open(resource_file, 'w', encoding='utf-8', errors='strict') as fp:
--            if packaging:
--                path = resource_path
--            else:
--                path = os.path.abspath(os.path.join(self.install_data, 'share'))
--            fp.write(path)
--
--        _install.run(self)
--
--        os.remove(resource_file)
--
- class test(Command):
-     """Command to run Gramps unit tests"""
-     description = "run all unit tests"
-@@ -503,7 +497,7 @@
-       url = 'http://gramps-project.org',
-       license = 'GPL v2 or greater',
-       platforms = ['FreeBSD', 'Linux', 'MacOS', 'Windows'],
--      cmdclass = {'build': build, 'install': install, 'test': test},
-+      cmdclass = {'build': build, 'test': test},
-       packages = packages,
-       package_data = {'gramps': package_data},
-       data_files = data_files,
-Binary files a/.setup.py.swp and b/.setup.py.swp differ
diff --git a/app-misc/gramps/gramps-5.1.6-r3.ebuild b/app-misc/gramps/gramps-5.2.3.ebuild
index 6b5daf8a89da..391d5dc54184 100644
--- a/app-misc/gramps/gramps-5.1.6-r3.ebuild
+++ b/app-misc/gramps/gramps-5.2.3.ebuild
@@ -1,28 +1,27 @@
-# Copyright 2001-2023 Gentoo Authors
+# 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..11} )
+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"
+SRC_URI="
+	https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+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}]
@@ -46,16 +45,11 @@ BDEPEND="test? (
 	')
 )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.3-test_locale.patch
-	"${FILESDIR}"/${PN}-5.1.6-pep517_setup.patch
-)
-
 DISTUTILS_ARGS=(
 	--no-compress-manpages
 )
 
-distutils_enable_tests pytest
+distutils_enable_tests unittest
 
 src_prepare() {
 	# Install documentation to the proper location. This can't be done
@@ -63,19 +57,23 @@ src_prepare() {
 	# and that changes with every revision.
 	sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
 
-	# The final part of PEP-517 support, handled with sed in order to avoid
-	# making the patch file too large
-	sed -e "s:_name:name:g" data/holidays.xml.in > data/holidays.xml || die
-	sed -e "s:_tip:tip:g" data/tips.xml.in > data/tips.xml || die
-
 	default
 }
 
-python_install() {
-	distutils-r1_python_install
+python_test() {
+	# gramps.gen.utils.test.file_test.FileTest.test_mediapath expects existing ~/.gramps
+	# see https://gramps-project.org/bugs/view.php?id=13305
+	mkdir -p "${HOME}/.gramps" || die
+	# we need to populate test data to resources, they are not installed
+	ln -snf "${S}/data/tests" "${BUILD_DIR}/install/usr/share/gramps/tests" || die
+	# test_imp_sample_ged wrongly detects mimetype for OBJE without file in ${S}
+	rm -f data/tests/imp_sample.ged || die
+
+	local -x GRAMPS_RESOURCES="${BUILD_DIR}/install/usr/share" GDK_BACKEND=-
+	eunittest -p "*_test.py"
 
-	# setup.py option --resourcepath appears to have problems at the moment
-	echo -n "/usr/share" > "${ED}"$(python_get_sitedir)/${PN}/gen/utils/resource-path || die
+	# we don't want to install this symlink
+	rm -f "${BUILD_DIR}/install/usr/share/gramps/tests" || die
 }
 
 pkg_postinst() {