From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- media-video/griffith/Manifest | 5 +++-- media-video/griffith/files/0.10-fix_lib_path.patch | 4 ++-- .../griffith/files/griffith-0.13-validators.patch | 17 +++++++++++++++++ media-video/griffith/griffith-0.13-r2.ebuild | 21 ++++++++++++++------- 4 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 media-video/griffith/files/griffith-0.13-validators.patch (limited to 'media-video/griffith') diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest index 2a5716d97a17..7cf38fb7fd44 100644 --- a/media-video/griffith/Manifest +++ b/media-video/griffith/Manifest @@ -1,5 +1,6 @@ -AUX 0.10-fix_lib_path.patch 667 BLAKE2B d5c9b02b39de379c494f8828327e7d56a4f73060916b051538b4d7567c1270d667de99b123e423d15236c3c2e428be7a776cc31391b71036bddc742f699ba579 SHA512 9e85aa92627898a667b86ead4ae691c9d2562300f99da4c4efe57644a9c2bddef0648fce39290b50471cc22e49b4bd478979d3147dfda8a52e8bd55d2c1c6ee7 +AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df812de334bffae8ef3368700e0d31488665ca3fe934aee0765ceaf1cec871829976327021e12846657668a506 SHA512 f8831dd13f640ed4700d1c3e9d2a8e856f9525b9583338b93465491b2da6a7e5c485d297cd8dc34842c101dbd8a9678e68e310dd16d9be924b7d8a09ec1ac3a5 +AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734 -EBUILD griffith-0.13-r2.ebuild 2068 BLAKE2B ca7b4d15c67c6c132491d7abafd8545caa1b5cd2951d85b9b489c4732601ac7964e573c8dabf545e768a89cd8e2249eb57f75001d8d2308bb4d46f0006dba159 SHA512 e777dc37a63b01cfb7818fad1487795a1d768606d5389215335787da7ccabd69310b415c0e2fc82456d1c4c9ead0472b8bfa72310b8f3b668ffcfc6b5f772957 +EBUILD griffith-0.13-r2.ebuild 2122 BLAKE2B 52390854850805261f5c6da3020329fe7ab2e4df9dfce62104c8e70036ae0e3519dfb7b4656524fb1d3bfbbc8aaff1d85164db8233594da29123452349b7afbf SHA512 ef0fec8a4962bbbdb1cded7a7f9212ce5e765c074a35bab593bd266a40bc2f234a90935aa10bfa887388dbd828611db6b69f64462db3261957ebb23c1407ca46 MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592 diff --git a/media-video/griffith/files/0.10-fix_lib_path.patch b/media-video/griffith/files/0.10-fix_lib_path.patch index 952448f0f013..9c918b25f487 100644 --- a/media-video/griffith/files/0.10-fix_lib_path.patch +++ b/media-video/griffith/files/0.10-fix_lib_path.patch @@ -1,7 +1,7 @@ Index: lib/initialize.py =================================================================== ---- lib.orig/initialize.py -+++ lib/initialize.py +--- a/lib/initialize.py ++++ b/lib/initialize.py @@ -73,7 +73,7 @@ def locations(self, home_dir): os.environ['LANG'] = lang diff --git a/media-video/griffith/files/griffith-0.13-validators.patch b/media-video/griffith/files/griffith-0.13-validators.patch new file mode 100644 index 000000000000..9c39feec0095 --- /dev/null +++ b/media-video/griffith/files/griffith-0.13-validators.patch @@ -0,0 +1,17 @@ +--- griffith-0.13/lib/db/validators.py ++++ griffith-0.13/lib/db/validators.py +@@ -23,7 +23,13 @@ + + import logging + +-from sqlalchemy.orm.interfaces import AttributeExtension, InstrumentationManager ++from sqlalchemy.orm.interfaces import AttributeExtension ++try: ++ # sql alchemy 0.8 (and above) ++ from sqlalchemy.ext.instrumentation import InstrumentationManager ++except: ++ # sql alchemy 0.7 ++ from sqlalchemy.orm.interfaces import InstrumentationManager + from sqlalchemy.orm import ColumnProperty + from sqlalchemy.types import String + diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild index 66b03bc29c8b..a4a8911d4db9 100644 --- a/media-video/griffith/griffith-0.13-r2.ebuild +++ b/media-video/griffith/griffith-0.13-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='sqlite' -inherit versionator python-single-r1 multilib +inherit python-single-r1 ARTWORK_PV="0.9.4" @@ -31,6 +31,11 @@ RDEPEND=" DEPEND="${RDEPEND} doc? ( app-text/docbook2X )" +PATCHES=( + "${FILESDIR}/0.10-fix_lib_path.patch" + "${FILESDIR}/griffith-0.13-validators.patch" +) + pkg_setup() { python-single-r1_pkg_setup } @@ -45,7 +50,7 @@ src_prepare() { -e 's/ISO-8859-1/UTF-8/' \ "${S}"/lib/gconsole.py || die "sed failed" - epatch "${FILESDIR}/0.10-fix_lib_path.patch" + default } src_compile() { @@ -54,17 +59,19 @@ src_compile() { } src_install() { - use doc || { sed -i -e '/docs/d' Makefile || die ; } + if ! use doc ; then + sed -i -e '/docs/d' Makefile || die + fi emake \ LIBDIR="${D}/usr/$(get_libdir)/griffith" \ DESTDIR="${D}" DOC2MAN=docbook2man.pl install dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS - cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" + cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die emake DESTDIR="${D}" install # This carries over from -0.13 but appears to have no effect. - python_optimize "${D}"usr/share/${PN} + python_optimize "${ED}"usr/share/${PN} } pkg_postinst() { -- cgit v1.2.3