diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 37863 -> 37874 bytes | |||
-rw-r--r-- | media-gfx/digikam/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-7.8.0-r3.ebuild | 150 | ||||
-rw-r--r-- | media-gfx/mypaint/Manifest | 3 | ||||
-rw-r--r-- | media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch | 92 | ||||
-rw-r--r-- | media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch | 74 | ||||
-rw-r--r-- | media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 79 | ||||
-rw-r--r-- | media-gfx/scrot/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/scrot/scrot-1.8.ebuild | 60 | ||||
-rw-r--r-- | media-gfx/scrot/scrot-9999.ebuild | 3 |
10 files changed, 312 insertions, 155 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 571588813e82..8cc7ece82447 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 0e9822034fa6..3e1313df88fc 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,4 @@ AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0 -DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B 222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863 SHA512 6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6 -EBUILD digikam-7.8.0-r3.ebuild 4056 BLAKE2B cd643794978d8a9b909fe8696368cdae34dce5deba1b6e7ad8c4547b9e4635bc57e3a97a35bfc8c80bdac536dc3e6df6c1b3fdbb65a7f163abbdffe601ff5c3e SHA512 8a7c07168370998cb59523f1af7b11530583371c86e94bfc8eb9766a05ff4c45941fdb80e905ae59fd22d9ec9e6f8e547d6355cc64c13405e236803af128dc63 EBUILD digikam-7.9.0-r1.ebuild 4063 BLAKE2B 2f32992381662a047bd301ceb68ba6a5f908eefdf67ca2d315dc9b0dc142eb219f8e49e63210073742c84a3dd7984ad53492ddde833c02fce4cd9ca7b26a7eae SHA512 c0f95c42e99097a1560f9939438b596b5ac6000a8635c2c03ab997faf06da2a1eceb44babf18eafd6fce017c22997759c88a94579b7a517702e47efa06312901 MISC metadata.xml 1054 BLAKE2B 7263a191f8935c2a52ad84701366969a39e42412efc26d30c28e8703d545aa49454331dc8da159d08007cd6eed682d647099ca76137acf378eef2ac481b2d8cc SHA512 224c4c6188bb6978d8e2a83bfb8cc4fb7e22937fede593e6227b7afe1c6533f9685814d8721282312015a42d601f85b0a48f587e6b0fce2a69a5e142d8266ce5 diff --git a/media-gfx/digikam/digikam-7.8.0-r3.ebuild b/media-gfx/digikam/digikam-7.8.0-r3.ebuild deleted file mode 100644 index 4b14069014ab..000000000000 --- a/media-gfx/digikam/digikam-7.8.0-r3.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.88.0 -QTMIN=5.15.5 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/" - fi - SRC_URI+="digiKam-${PV/_/-}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${PN}-${PV/_/-}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" - -# bug 366505 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:=[xmp] - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/liblqr - media-libs/libpng:= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:= - addressbook? ( - >=kde-apps/akonadi-contacts-19.04.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-apps/marble-19.04.3:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - ) - mediaplayer? ( - media-libs/qtav[opengl(+)] - media-video/ffmpeg:= - ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-19.04.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_QWEBENGINE=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif Libheif) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index f576238216a2..54137e508a88 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -1,5 +1,8 @@ AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15 +AUX mypaint-2.0.1-python3.11.patch 3968 BLAKE2B 02318c3543bc66fc1ffd89af02f00c0e02a233d9656415505abbd6585cb89ece985b5e8b6946a2b279df22d088fcb36e740e395b712dae8eab8a93e3fe76b212 SHA512 cb6a547ab5e842b9bf4b8ba7c3af83ab3027d9e9b6f65563a530f9ddb8f015024e9d4aa0a35a8881e8a59342c428ee2b457ed9243a37333290e81a854542bd0d AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349 +AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562 EBUILD mypaint-2.0.1-r2.ebuild 1816 BLAKE2B 164664c5d655be800632266601806561675880f31f71911e481088fe83930732312f698419510eacf15052edf84bdf62c98d49ef607e6590519e7d1ea5be74b2 SHA512 b98f77948c760fe47e595b504607e254d64496b0b7348ea06992b111ed7ef5f18a978330f8fd0844415580691e6e44227d1c24ed77831526c05c52fc8b0a1201 +EBUILD mypaint-2.0.1-r3.ebuild 1898 BLAKE2B 40bbf73ab37e99377b8bf991e28f81e8442af50d9e48d2779c0c186280642560bb27ccb81517ac40d46c4e8bda53f3989263b6f7230bce3581cf515a074352ac SHA512 bc3514ca35ed8f62924160cf7b669357bb890d2d71a638452e03723b5faaec80d6ef2b37f0c05eb0c2e920d45678291df7884bc5a0da69808d3bd6d1e1352a77 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133 diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch new file mode 100644 index 000000000000..7a652754204d --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch @@ -0,0 +1,92 @@ +https://github.com/mypaint/mypaint/pull/1193 + +From 032a155b72f2b021f66a994050d83f07342d04af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + <congdanhqx@gmail.com> +Date: Wed, 9 Nov 2022 11:24:33 +0700 +Subject: [PATCH] python: fix for Python 3.11 + +- python 3 always open in universal mode, U is default mode in 3.0, + and removed in 3.11 +- mypaint doesn't use ld?n?gettext, so bind_textdomain_codeset isn't + needed, that function is deprecated in 3.8 and is no-ops in 3.10 and + removed in 3.11 +--- a/lib/gettext_setup.py ++++ b/lib/gettext_setup.py +@@ -82,13 +82,11 @@ def init_gettext(localepath): + # yanked in over GI. + # https://bugzilla.gnome.org/show_bug.cgi?id=574520#c26 + bindtextdomain = None +- bind_textdomain_codeset = None + textdomain = None + + # Try the POSIX/Linux way first. + try: + bindtextdomain = locale.bindtextdomain +- bind_textdomain_codeset = locale.bind_textdomain_codeset + textdomain = locale.textdomain + except AttributeError: + logger.warning( +@@ -117,12 +115,6 @@ def init_gettext(localepath): + ctypes.c_char_p, + ) + bindtextdomain.restype = ctypes.c_char_p +- bind_textdomain_codeset = libintl.bind_textdomain_codeset +- bind_textdomain_codeset.argtypes = ( +- ctypes.c_char_p, +- ctypes.c_char_p, +- ) +- bind_textdomain_codeset.restype = ctypes.c_char_p + textdomain = libintl.textdomain + textdomain.argtypes = ( + ctypes.c_char_p, +@@ -177,35 +169,22 @@ def init_gettext(localepath): + # complete set from the same source. + # Required for translatable strings in GtkBuilder XML + # to be translated. +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + assert os.path.exists(path) + assert os.path.isdir(path) + if sys.platform == 'win32': + p = bindtextdomain(dom.encode('utf-8'), path.encode('utf-8')) +- c = bind_textdomain_codeset( +- dom.encode('utf-8'), codeset.encode('utf-8') +- ) + else: + p = bindtextdomain(dom, path) +- c = bind_textdomain_codeset(dom, codeset) + logger.debug("C bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "C bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) + # Call the implementations in Python's standard gettext module + # too. This has proper cross-platform support, but it only + # initializes the native Python "gettext" module. + # Required for marked strings in Python source to be translated. + # See http://docs.python.org/release/2.7/library/locale.html + p = gettext.bindtextdomain(dom, path) +- c = gettext.bind_textdomain_codeset(dom, codeset) + logger.debug("Python bindtextdomain(%r, %r): %r", dom, path, p) +- logger.debug( +- "Python bind_textdomain_codeset(%r, %r): %r", +- dom, codeset, c, +- ) +- if bindtextdomain and bind_textdomain_codeset and textdomain: ++ if bindtextdomain and textdomain: + if sys.platform == 'win32': + d = textdomain(defaultdom.encode('utf-8')) + else: +--- a/setup.py ++++ b/setup.py +@@ -679,7 +679,7 @@ def _install_script(self, src, header): + self.announce("installing %s as %s" % (src, targ_basename), level=2) + if self.dry_run: + return [] +- with open(src, "rU") as in_fp: ++ with open(src, "r") as in_fp: + with open(targ, "w") as out_fp: + line = in_fp.readline().rstrip() + if line.startswith("#!"): + diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch b/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch new file mode 100644 index 000000000000..352e23aceb7d --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-2.0.1-setuptools.patch @@ -0,0 +1,74 @@ +https://github.com/mypaint/mypaint/commit/1e97b4e1c0ea785b527ea63bf19f8554f3a25319 +https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847 + +From 1e97b4e1c0ea785b527ea63bf19f8554f3a25319 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Wed, 6 Apr 2022 22:55:21 +0200 +Subject: [PATCH] setup.py: + +Setuptools 54.1.0+ complains: + + lib/python3.9/site-packages/setuptools/dist.py:732: UserWarning: Usage of dash-separated 'install-data' will not be supported in future versions. Please use the underscore name 'install_data' instead + +https://github.com/pypa/setuptools/commit/a2e9ae4cb75f9b00ddf37713ec307e5f00869737 +--- a/setup.cfg ++++ b/setup.cfg +@@ -7,11 +7,11 @@ + + [install] + verbose=1 +-install-scripts=$base/bin +-install-platlib=$base/lib/mypaint +-install-purelib=$base/lib/mypaint +-install-data=$base/share +-install-headers=$base/include ++install_scripts=$base/bin ++install_platlib=$base/lib/mypaint ++install_purelib=$base/lib/mypaint ++install_data=$base/share ++install_headers=$base/include + + [nosetests] + with-doctest=1 + +From 423950bec96d6057eac70442de577364d784a847 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Wed, 6 Apr 2022 23:13:06 +0200 +Subject: [PATCH] setup.py: Ensure setuptools-compatible distutils are used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Setuptools is warning: + + lib/python3.9/site-packages/_distutils_hack/__init__.py:17: UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. + +And in fact, I am getting such errors: + + distutils.errors.DistutilsClassError: command class <class '__main__.Build'> must subclass Command + +Let’s do as asked. +--- a/setup.py ++++ b/setup.py +@@ -16,9 +16,6 @@ + import shutil + import functools + +-from distutils.command.build import build +-from distutils.command.clean import clean +- + from setuptools import setup + from setuptools import Extension + from setuptools import Command +@@ -26,6 +23,11 @@ + from setuptools.command.install import install + from setuptools.command.install_scripts import install_scripts + ++# setuptools must be imported first since they ensure ++# their distutils implementation will be used. ++from distutils.command.build import build ++from distutils.command.clean import clean ++ + # Constants + + diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild new file mode 100644 index 000000000000..a491c415a316 --- /dev/null +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit desktop distutils-r1 xdg + +DESCRIPTION="Fast and easy graphics application for digital painters" +HOMEPAGE="http://mypaint.org/" +SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp" +LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + ') + >=dev-libs/json-c-0.11:= + gnome-base/librsvg + media-gfx/mypaint-brushes:2.0 + media-libs/lcms:2 + >=media-libs/libmypaint-1.5.0[openmp?] + media-libs/libpng:= + sys-devel/gettext + sys-libs/libomp + x11-libs/gdk-pixbuf[jpeg] + x11-libs/gtk+:3 +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/swig + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-r1-build-system.patch + "${FILESDIR}"/${P}-GIL-hold.patch + "${FILESDIR}"/${P}-setuptools.patch + "${FILESDIR}"/${PN}-2.0.1-python3.11.patch +) + +distutils_enable_tests setup.py + +src_compile() { + # --disable-openmp can't be passed to setup.py build, + # only setup.py build_ext. + # Trying to call build_ext then build and such fails. + # + # We just override the environment instead for simplicity. + local openmp=$(usex openmp '-fopenmp' '-fno-openmp') + + OPENMP_CFLAG="${openmp}" OPENMP_LDFLAG="${openmp}" distutils-r1_src_compile +} + +src_install() { + distutils-r1_src_install + + newicon pixmaps/${PN}_logo.png ${PN}.png + + local lang= + for lang in ${LANGS}; do + if ! has ${lang} ${LINGUAS}; then + rm -rf "${ED}"/usr/share/locale/${lang} || die + fi + done +} diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest index 83cd60987860..8ad0b7c43789 100644 --- a/media-gfx/scrot/Manifest +++ b/media-gfx/scrot/Manifest @@ -1,6 +1,8 @@ AUX scrot-1.7-fix-docdir.patch 1794 BLAKE2B b55621bbf24cca877c9d50119bb0eeaf40e5372c9ff5b21c0de1620f37deb2c6d6a069b16355c01844387709f475e29a97f66bdc4b1aaea84cbeafc9ff46119b SHA512 4b28c1458bebb22b1d6dfdbfe2478e0e829a73f641b1b7b5b8140bee4d7384f84d3d7b538f0a7b9f89a824bd255af1158611fd7a3f8787797a111641e2dfeaff AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88 +DIST scrot-1.8.tar.gz 175453 BLAKE2B 2c6cd9c6d8ea7b2dbdfa4827af52ead01327556565d957c3fc37d8511aed3247b02e61f97e1d4136fc047062fa7ff5c01f2a12b290620d2a8572b813c73413b2 SHA512 64d74da0afb4249687b757206baca704911cab34e15e56e7328d259bdb2daf984c0cd5bcd0764c7688c4340b3453cac9d6af1ce750fa65c8d7a31992dff1fcea EBUILD scrot-1.7-r3.ebuild 1420 BLAKE2B 7be9689b2c7da17bdca5d3947d16c64a8355dd501175c5cf56ce3015f1ba47d2c9e2233359ded22d58bb0523d2026c45096ea496ce764de39bb6c9a5fc18c9a8 SHA512 77bec0b350ed47c2e3ff178af374ed22074d45f2225647c6cebc3820a686fec101a9cd6958cefffd8576109cf646b880a66a4836924339d6bbf78fe137c42f3d -EBUILD scrot-9999.ebuild 1276 BLAKE2B d5c6fdcf669205334e274a3785016c2b0c78ecf9404c511d4289d08df61d48069ec2d8a6aa184b82132349789b40ee40a1c70adbcc253df12449eebc6d38313d SHA512 c2eb6beeb7a8b6b8209df6b79e943a1ed28a9e5c8196a8a72eefa42ea027e21641f7a5c8cf1230bd6a12f1a86ce429bf8f65a8f35ebafffbadf6f7b047f7f28d +EBUILD scrot-1.8.ebuild 1275 BLAKE2B 4d11e61499ff6889d1febf627dc56457d6a462b94f7cf81e66e13a085df7a8c084ab609d9672f544a66ed129ac7ef87e82d1e95b6aefd4932b3e6db6df8915be SHA512 a476d78fd770230b74808a835162e56e1ba11ef47236c0c95ae37ba418d7322b1c3bb7e52155ecfefb12de9cbe7c014ee0a564b6c7203299209c91a0d5ebe4bd +EBUILD scrot-9999.ebuild 1275 BLAKE2B 4d11e61499ff6889d1febf627dc56457d6a462b94f7cf81e66e13a085df7a8c084ab609d9672f544a66ed129ac7ef87e82d1e95b6aefd4932b3e6db6df8915be SHA512 a476d78fd770230b74808a835162e56e1ba11ef47236c0c95ae37ba418d7322b1c3bb7e52155ecfefb12de9cbe7c014ee0a564b6c7203299209c91a0d5ebe4bd MISC metadata.xml 272 BLAKE2B 57b20f968b45b46bc686a75c4c121c11f67ea4628207fecbc093b2774e6f5bca3a1f5fb09af03aa8c8446dcd12f76e186d03de77dc2dd3ee544ed7995b82f0a6 SHA512 dc5f6095066e15f76bea7061eb33937cb8178abc6fbaeb13ce288aa5a65c1c73be970a8a5bb957a58fbb105d82dfb0919e4553c9aa563ce3dc374a26a18a2cca diff --git a/media-gfx/scrot/scrot-1.8.ebuild b/media-gfx/scrot/scrot-1.8.ebuild new file mode 100644 index 000000000000..a7f14945b8f4 --- /dev/null +++ b/media-gfx/scrot/scrot-1.8.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="Screen capture utility using imlib2 library" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}" + inherit autotools git-r3 +else + SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="feh LGPL-2+" +SLOT="0" + +# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582 +RDEPEND=" + dev-libs/libbsd + media-libs/imlib2[X] + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXfixes + || ( + media-libs/imlib2[gif] + media-libs/imlib2[jpeg] + media-libs/imlib2[png] + media-libs/imlib2[tiff] + ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + elibc_musl? ( sys-libs/queue-standalone ) +" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig +" + +DOCS=( + AUTHORS ChangeLog README.md +) + +src_prepare() { + default + + [[ ${PV} == *9999* ]] && eautoreconf +} + +src_install() { + default + + newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN} +} diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild index a99487cdc4e9..a7f14945b8f4 100644 --- a/media-gfx/scrot/scrot-9999.ebuild +++ b/media-gfx/scrot/scrot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,6 @@ if [[ ${PV} == *9999* ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi |