summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
commitf516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree8bfecb640b7b6403d7a3d662d923eed630033da7 /x11-libs
parent1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
gentoo resync : 30.05.2020
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin20650 -> 20663 bytes
-rw-r--r--x11-libs/libfakekey/Manifest2
-rw-r--r--x11-libs/libfakekey/libfakekey-0.3-r1.ebuild (renamed from x11-libs/libfakekey/libfakekey-0.3.ebuild)4
-rw-r--r--x11-libs/libfm-qt/Manifest4
-rw-r--r--x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild2
-rw-r--r--x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild47
-rw-r--r--x11-libs/libva-intel-media-driver/Manifest4
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild40
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild17
-rw-r--r--x11-libs/libva/Manifest2
-rw-r--r--x11-libs/libva/libva-2.7.1.ebuild83
-rw-r--r--x11-libs/libxcb/Manifest4
-rw-r--r--x11-libs/libxcb/libxcb-1.13.1.ebuild51
-rw-r--r--x11-libs/libxcb/libxcb-1.14.ebuild7
-rw-r--r--x11-libs/qtermwidget/Manifest6
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild2
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild31
-rw-r--r--x11-libs/qtermwidget/qtermwidget-9999.ebuild10
-rw-r--r--x11-libs/qwt/Manifest5
-rw-r--r--x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch304
-rw-r--r--x11-libs/qwt/qwt-6.1.3-r2.ebuild9
-rw-r--r--x11-libs/qwt/qwt-6.1.4.ebuild130
-rw-r--r--x11-libs/qwtpolar/Manifest2
-rw-r--r--x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild6
-rw-r--r--x11-libs/xapps/Manifest4
-rw-r--r--x11-libs/xapps/metadata.xml4
-rw-r--r--x11-libs/xapps/xapps-1.8.4.ebuild87
27 files changed, 776 insertions, 91 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b040743e8c1f..0116856f9913 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 8230c4b04062..ef8cf94a89a6 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,4 +1,4 @@
AUX libfakekey-0.3-ac.patch 764 BLAKE2B 733cdb11da016a2d3b9e196943d6c0a948404ed15de0684d8bf7bba28d700a5cc83a3cb0ed5b82ca95ed2d7c531136362f0373c87bab3c979a33ce8c2f613e64 SHA512 8cfe2a3185580e26c5d76d6b392003b96b73a1aabb15255b1aab54a777b3759e496d4c0323b18ee2a67a5537e68388b9c67f6d885bd791f62b42b39e37fb635c
DIST libfakekey-0.3.tar.bz2 9672 BLAKE2B 1cd86581148e218879b14ff52fb085fd20248a475ccf00a08918d64db811b21bbba3632e799d798077a197298da4d976be3180c060a6016c396428519d1aaef2 SHA512 b0502dbb01839009de7120f8ca939c839850e7c3c88678b52d6df9f4205cbec20769cedd61c9307e8307f6bf789eee25b20d4fe20c25e7285318f5ea1334555a
-EBUILD libfakekey-0.3.ebuild 1148 BLAKE2B 8fa5ba23bda2f51379c930255a074b8e36f1c94cea00485b542109c5d0f8b7c1958c078a94fdfe71ba5273607ed43f084ee9be1d6bd5a01ccb3f6340b6d0e356 SHA512 5c82621b0c0386949bf91aa7f39a12feef9eafbdebcb825305270af7f9c870521f016f26b0d02aae851d857d74320863e7e22d9002ce51f9b9c022fbb29f9066
+EBUILD libfakekey-0.3-r1.ebuild 1216 BLAKE2B eed7d86cb60a7db54ad56f2a91fcb3dfc9191c4b88f01ed1e94e6171c64e47d455aa8acf7df1b64dc5653574883fbbd5fcef2b32f3888c8e8c5e93a013ed068d SHA512 9c11db4f178c4dfc5908f67aa3756e0b2a157d7355b3f4ba300fac58e38f9c2b2fc2983060258fd18ade2a165bed63a264fa7afb0ac34f940626adc891f28b2e
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/libfakekey-0.3.ebuild b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
index 02a258f0146f..ba84cd53b002 100644
--- a/x11-libs/libfakekey/libfakekey-0.3.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,6 +34,7 @@ src_configure() {
local myeconfargs=(
# --with/without-x is ignored by configure script and X is used.
--with-x
+ --disable-static
$(use_enable debug)
$(use_enable doc doxygen-docs)
)
@@ -43,4 +44,5 @@ src_configure() {
src_install() {
use doc && local HTML_DOCS=( doc/html/. )
default
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 909431747639..e6c020a47da2 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,4 +1,6 @@
AUX libfm-qt-0.14.1-phantom-desktop-files.patch 4871 BLAKE2B 9466f517953a8733f72296bda5c8b0081828fceda505f1603b7d5db193fb7bf72b6ce7c3c007877558b8f1a4295fa73a496e0b279790126a5859bdbd246b07c4 SHA512 19b3803704dba01da16725f1cc20b4cbb6b50210fcc7f0aea397dd8061cff55f9a0e57838b48f59649d6b8e4cc53dfb992b6160687cfa0b8f46b2dda6d431021
DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
-EBUILD libfm-qt-0.14.1-r2.ebuild 885 BLAKE2B 475351c6b235118b71cd266558050cd69b6d663bb25480f600b97870bb19beedef74fd67f3fc043be02fcf13e215cf9807269ca6433d330d00a00a3ab2c55eb0 SHA512 8cc1751a0e230452ab891feea05bbf8ab30538019d8797f8a6f826a0066042372c01c96ffcc4d87e6ce6e4712ecf931fbf2c9f8041696d03892d06c0338e01b9
+DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5
+EBUILD libfm-qt-0.14.1-r2.ebuild 891 BLAKE2B dbcefdec629df0704f774e9bb62f4469edcc8ba402299a50f0aa96fedb620736ce669bc8f30f4b294ae858204aa7f43ce29052b2fcb83a984a8354d9b1dee775 SHA512 a5e69d0ef73ee74fe74217ae55b2937ca42d6b70d52abeaad0f47649ebf409cb0a03c51b81ab417c86842272735d10b15bd00e6853ea45cdc0f825e8079fb31b
+EBUILD libfm-qt-0.15.1.ebuild 903 BLAKE2B 18b712e1adcf4cad1b8dbfd8c7466431c5fae102d285fb9d412688092dd7e30b54eef42f7bbca89a65cc0991021f66c1a7c40f0f7c1b414e7b452af1e2a4ef20 SHA512 3c01045c648f1fc33602e74a7fa8538c0144f8421858afa556dac933c41bda1707b4b62592ef98da2664778ca5f5571ffc2c4bbc25ff22cc325aaf9ea25253f7
MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
index 0339cf6dda21..57a6caf855e8 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit cmake
DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
new file mode 100644
index 000000000000..d22a9ffd9ab0
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Library for Building File Managers"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD GPL-2+ LGPL-2.1+"
+SLOT="0/7"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ >=dev-util/lxqt-build-tools-0.7.0
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5=
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ >=lxde-base/menu-cache-1.1.0:=
+ media-libs/libexif
+ x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+ !lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index d8109ad86927..99fc6c411cb2 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,6 +1,8 @@
DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d
DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536
+DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
EBUILD libva-intel-media-driver-18.3.0.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
EBUILD libva-intel-media-driver-18.4.1.ebuild 892 BLAKE2B efb6cbcf1340852a3ca27f5e763be43175e9d6c870877beb4a794f1da03d1e47c8d08668274b9e8dc26f4ef3674581e4bb6518547515c984bff7a6767d011ce1 SHA512 ace25c724f3434ddc08884d7bed8f944e78364d8f72c54b33f1f6f5919596a7a81581b369a0f0b9024858cc274a43df3095a76643a9433fc4a3d54ee1abb1d23
-EBUILD libva-intel-media-driver-9999.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
+EBUILD libva-intel-media-driver-20.1.1.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6
+EBUILD libva-intel-media-driver-9999.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6
MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
new file mode 100644
index 000000000000..3c1a6331fa39
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+else
+ SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
+ S="${WORKDIR}/media-driver-intel-media-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/gmmlib-${PV}
+ >=x11-libs/libva-2.7.1
+ >=x11-libs/libpciaccess-0.13.1-r1:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DMEDIA_BUILD_FATAL_WARNINGS=OFF
+ -DMEDIA_RUN_TEST_SUITE=OFF
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 14fd59d27674..3c1a6331fa39 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-utils
@@ -11,31 +11,28 @@ if [[ ${PV} == *9999 ]] ; then
: ${EGIT_BRANCH:="release/${PV%.9999}"}
fi
inherit git-r3
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
- KEYWORDS=""
else
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${PV}"
KEYWORDS="~amd64"
fi
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
LICENSE="MIT BSD"
SLOT="0"
IUSE=""
DEPEND=">=media-libs/gmmlib-${PV}
- >=x11-libs/libva-2.3.0
+ >=x11-libs/libva-2.7.1
>=x11-libs/libpciaccess-0.13.1-r1:=
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DMEDIA_BUILD_FATAL_WARNINGS=OFF
-DMEDIA_RUN_TEST_SUITE=OFF
)
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 3c6ff0b47ae8..76fef7e1687d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,8 +1,10 @@
DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
DIST libva-2.7.0.tar.bz2 477326 BLAKE2B 4ec99cebe3be8de46a7663b36cf5cededc271dc3ce6f6a42a2e861043c3bc3a1cb93ea31c4a2b7a1e5d7789de128066728b7d910bf19eceab107fe3b12966126 SHA512 4922d7c0d706d160b6885a045ca585e822275f04e66142d963b0e8e3efcf2ada81edc1255d0eb334c46c51b994e35c080d8ced10bf29a153cabe5c6991de3a68
+DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126
EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
EBUILD libva-2.7.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
+EBUILD libva-2.7.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild
new file mode 100644
index 000000000000..016d79e6442e
--- /dev/null
+++ b/x11-libs/libva/libva-2.7.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+ inherit autotools git-r3
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="https://github.com/intel/libva"
+ AUTOTOOLS_AUTORECONF="yes"
+else
+ SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+ video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+ utils? ( media-video/libva-utils )
+"
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+src_prepare() {
+ default
+ [[ "${PV}" == *9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable drm)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index cd529c9c3c82..c56bf0e890c8 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,3 @@
-DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.13.1.ebuild 1456 BLAKE2B 926fe40639249315fc0c91c019ca8369f2aa5ddd87e5ac23818f17e76054c0c672af94298fb78307544f305712080a33180727b5437e7042c60eba5dae5a6ad1 SHA512 f2932a09d32d3685e447c5813f532a53b905b9c4b360ae814b2b285eac19290a936b61c79d2ff476ee997ac2b1fda9c3733534802c3a1c57c2ededa98f6b9d0e
-EBUILD libxcb-1.14.ebuild 1257 BLAKE2B c67b646a5c4a19363af81afb341fe8e6a7c57e0df26b76d7da6f52507224f9a224c7f53516466b1547edf138edd990c6d3312834e824ba421ebb9e9735692541 SHA512 ee5293494dbc06b09a91e36544d75abcb0e1f5012801525a4df4e58940d9f3bb5121ba8b75489ffb2ed618b045cd3c4e845662d818ea847bc9c34c98246cec1b
+EBUILD libxcb-1.14.ebuild 1244 BLAKE2B 8e5258b8d5df35ffbef5d61c2e6b26087801f46b084552c88dff57e0293120b786896b7454adc5853af3d1accf4bc2e29ba95b5c786bd11f8ff670362f3f9214 SHA512 c6ec26ff668073e1142bbb5e04092001841cc520e8e9de1582dc34621f597294a07a99ad5c8898e62334c5ab9d09b15e401f7a6d366b308b87598583727f8eba
MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
deleted file mode 100644
index 7edd83f2255f..000000000000
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-[[ ${PV} != 9999* ]] && \
- SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-RESTRICT="!test? ( test )"
-SLOT="0/1.12"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
- test? ( dev-libs/check[${MULTILIB_USEDEP}] )
- doc? ( app-doc/doxygen[dot] )
- dev-libs/libxslt
- ${PYTHON_DEPS}
- $(python_gen_any_dep \
- ">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
- has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable doc devel-docs)
- $(use_enable selinux)
- $(use_enable xkb)
- --enable-xinput
- )
- xorg-2_src_configure
-}
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index 6c9cecc9c186..59e72ccd0e61 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -28,9 +28,10 @@ DEPEND="${RDEPEND}
test? ( dev-libs/check[${MULTILIB_USEDEP}] )
doc? ( app-doc/doxygen[dot] )
dev-libs/libxslt
- ${PYTHON_DEPS}
- $(python_gen_any_dep \
- ">=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
+"
python_check_deps() {
has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 21edd6a17a1b..d231d6c3950c 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,4 +1,6 @@
DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
-EBUILD qtermwidget-0.14.1.ebuild 645 BLAKE2B 4c934f6c8e940edf3e675fc570ba55b6ee060277b717261534c39133e375b4fb0047442bf9b66b90233ad278ed3ebd5fed5047a44cfd39fe53039703204d3ec6 SHA512 11ff64843599e0b37c4b95770ad90df62fcf7818ab9057bc892bdccbef5e7bf3cf898582807b4ff88d774af31f83a67f6e0a8ca98a263c94462cacf719e82235
-EBUILD qtermwidget-9999.ebuild 617 BLAKE2B dd22689dbc1e91d9dde06fb37b67910acd174389b1f6e720cd264324eba92d0759057ffb7e91ba35c61aae008048d148279adfcbc3d9a77b6da08a2fdc0cd10e SHA512 866ff9f4d5801b14347b107649295018106133e3d4c0f462bafbcc2a2b205109cb54c2060e339f21adb25db537694bfb75e4216efe118e8bdbbe860ae1213511
+DIST qtermwidget-0.15.0.tar.xz 181284 BLAKE2B a862821d30831c829e2391f33348e1499e80b515d23226f06070bd8bb82b383d51ea73f0784f04e5a30630db5176564af35995641b3958d60a206f82fecd680f SHA512 95f44c77d0b678b1a204b559a7adb2fb68b2e82b2357d89239e9fc1c6f445346d84ec7f395d58f17a2ef7b42e58c02590f637683193eae4f7efbd001b61857c7
+EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B ffe5762f8b8a6fdf86915371391831c7f5595ac9da8044baf8f400a92b6d7b3c109619d0308abecc9067fd088dbff79d6e1e9c4525592c76dc9ce0325e9def8b SHA512 1778f1ed57ca6e295a510ebb0c6fc6fca0be35dbbc43fe1c8663caf9ecaec1b8645fde0215653ada1cc501a248b71b55a3bf318fbfb13b26922a35712b3a8ab6
+EBUILD qtermwidget-0.15.0.ebuild 635 BLAKE2B c1a7ace3b67de65be4f5ab7600b5bb1dfcc5f26d6d9cab78d31a9d47de94cee02fb3f372dd382f0a55221a3f54d92f4c49d66a32c24cf3732558ed6420c256b4 SHA512 208c7d506d6d738d8a827701840964278d71b4275ee7e9ad8a922677f4200fbe4fd93071c4912175bfd64de19e23e44794c1412b60251cd1035f8767b7161723
+EBUILD qtermwidget-9999.ebuild 635 BLAKE2B c1a7ace3b67de65be4f5ab7600b5bb1dfcc5f26d6d9cab78d31a9d47de94cee02fb3f372dd382f0a55221a3f54d92f4c49d66a32c24cf3732558ed6420c256b4 SHA512 208c7d506d6d738d8a827701840964278d71b4275ee7e9ad8a922677f4200fbe4fd93071c4912175bfd64de19e23e44794c1412b60251cd1035f8767b7161723
MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
index b7ed36058ef8..ac30ad35a110 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit cmake
DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
diff --git a/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild
new file mode 100644
index 000000000000..2f1859de6b24
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ >=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index e9a17c8f55cd..2f1859de6b24 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,14 +6,14 @@ EAPI=7
inherit cmake
DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
- SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
LICENSE="BSD GPL-2 LGPL-2+"
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
BDEPEND="
dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.6.0
+ >=dev-util/lxqt-build-tools-0.7.0
"
DEPEND="
dev-qt/qtcore:5
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 33a8e1a3b3ea..0ed98bffbe9f 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,8 @@
AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
+AUX qwt-6.1.4-qt-5.15.patch 8857 BLAKE2B 539dd05419d36428aee36a78f92a875c5067366dfe56289e491c70a79d6e94f761eab55c97cf7b34e495ed049d438810ad48dfc9e01dd4bc1078b9fc1b4fe192 SHA512 ed00c4f3a06fd17d0a0bf9540937824e5f4e8e0b8b2fb3bf6e16f18d6fec5415ebc5ac828127ecc7cda6e2de7e52086cc236152f53cb8c21e2f86f6b0d6f430a
DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
-EBUILD qwt-6.1.3-r2.ebuild 3823 BLAKE2B 2e7f84120045c7b5fe9c6564d2748201f2308b4869424df8d984dde188634fd0a22c9b2e5507a378d6420c4d3f30b5dde4947b2f81bdb584de606d0139e41e2f SHA512 99e6e026e702dad243844bba3378c675c6beaf7fa701884e94aad60a1fb1e62f13b6457bc6449ddd7a8e2d4fd37103429e294c13f15e5140ae8e34ca04e204ac
+DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
+EBUILD qwt-6.1.3-r2.ebuild 3829 BLAKE2B 8004bef99cd22601a42a34c5af2ecab197fa631d92d72f0a2dbded59f48022d2c774a1ba37475a8f3b923828ddc913eac3d8c655ce95b439e083df68d10b7eee SHA512 f45ba8f2be6718a78e3aa513bc4659cf5c174ad96dba52a1fda09052ed46326930230f4dc7e3dc7ec883bd5e2a76888989963b85cb9216f338daeda8a9d7fda8
+EBUILD qwt-6.1.4.ebuild 3224 BLAKE2B e621d8f84a498a06b2d53a80729c12671a15f9ef5605a8964820390adbcb84ef53e1e1c6467c3dd142059745b3e805e801462d5ec9680650c0288a7b15745880 SHA512 6b1482963719e6032a5a12951d5b3308b0e8f9ea0f9df4d3fd475d51855b90be04b4f88e4c477ef1168c7bff6b8288075d636707c229f672f76307987d744967
MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch b/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch
new file mode 100644
index 000000000000..0ee4b1f9d178
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.1.4-qt-5.15.patch
@@ -0,0 +1,304 @@
+From a5bdaa3b3a34b8a018fe67dfdd34bf8c890de2fa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 22 May 2020 17:56:55 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing headers)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ examples/dials/attitude_indicator.cpp | 1 +
+ examples/itemeditor/editor.cpp | 2 ++
+ examples/sinusplot/sinusplot.cpp | 1 +
+ playground/graphicscale/mainwindow.h | 1 +
+ playground/symbols/symbols.cpp | 1 +
+ src/qwt_compass_rose.cpp | 1 +
+ src/qwt_dial_needle.cpp | 1 +
+ src/qwt_graphic.h | 1 +
+ src/qwt_null_paintdevice.cpp | 1 +
+ src/qwt_null_paintdevice.h | 1 +
+ src/qwt_painter.cpp | 1 +
+ src/qwt_painter.h | 2 ++
+ src/qwt_painter_command.h | 2 ++
+ src/qwt_plot_canvas.cpp | 1 +
+ src/qwt_plot_canvas.h | 1 +
+ src/qwt_plot_glcanvas.cpp | 1 +
+ src/qwt_plot_glcanvas.h | 2 ++
+ src/qwt_plot_panner.cpp | 2 ++
+ src/qwt_plot_renderer.cpp | 1 +
+ src/qwt_plot_shapeitem.cpp | 3 +++
+ src/qwt_symbol.h | 2 ++
+ src/qwt_widget_overlay.cpp | 1 +
+ 22 files changed, 30 insertions(+)
+
+diff --git a/examples/dials/attitude_indicator.cpp b/examples/dials/attitude_indicator.cpp
+index ea0d5ab..a01611e 100644
+--- a/examples/dials/attitude_indicator.cpp
++++ b/examples/dials/attitude_indicator.cpp
+@@ -3,6 +3,7 @@
+ #include <qwt_round_scale_draw.h>
+ #include <qevent.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpolygon.h>
+
+ AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
+diff --git a/examples/itemeditor/editor.cpp b/examples/itemeditor/editor.cpp
+index bd06372..c741b01 100644
+--- a/examples/itemeditor/editor.cpp
++++ b/examples/itemeditor/editor.cpp
+@@ -4,6 +4,8 @@
+ #include <qwt_scale_map.h>
+ #include <qwt_plot_shapeitem.h>
+ #include <qevent.h>
++#include <qpainter.h>
++#include <qpainterpath.h>
+
+ class Overlay: public QwtWidgetOverlay
+ {
+diff --git a/examples/sinusplot/sinusplot.cpp b/examples/sinusplot/sinusplot.cpp
+index 119fa4a..6a9bfe7 100644
+--- a/examples/sinusplot/sinusplot.cpp
++++ b/examples/sinusplot/sinusplot.cpp
+@@ -1,5 +1,6 @@
+ #include <qapplication.h>
+ #include <qlayout.h>
++#include <qpainterpath.h>
+ #include <qwt_plot.h>
+ #include <qwt_plot_marker.h>
+ #include <qwt_plot_curve.h>
+diff --git a/playground/graphicscale/mainwindow.h b/playground/graphicscale/mainwindow.h
+index d284413..3b544de 100644
+--- a/playground/graphicscale/mainwindow.h
++++ b/playground/graphicscale/mainwindow.h
+@@ -2,6 +2,7 @@
+ #define MAIN_WINDOW_H
+
+ #include <qmainwindow.h>
++#include <qpainterpath.h>
+
+ class Canvas;
+ class QPainterPath;
+diff --git a/playground/symbols/symbols.cpp b/playground/symbols/symbols.cpp
+index f7b2ed6..5b9f56d 100644
+--- a/playground/symbols/symbols.cpp
++++ b/playground/symbols/symbols.cpp
+@@ -1,5 +1,6 @@
+ #include <qapplication.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qbuffer.h>
+ #ifdef QT_SVG_LIB
+ #include <qsvggenerator.h>
+diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
+index 05f7039..fbd30fe 100644
+--- a/src/qwt_compass_rose.cpp
++++ b/src/qwt_compass_rose.cpp
+@@ -11,6 +11,7 @@
+ #include "qwt_point_polar.h"
+ #include "qwt_painter.h"
+ #include <qpainter.h>
++#include <qpainterpath.h>
+
+ static QPointF qwtIntersection(
+ QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
+diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
+index 49dd44a..d98f68c 100644
+--- a/src/qwt_dial_needle.cpp
++++ b/src/qwt_dial_needle.cpp
+@@ -13,6 +13,7 @@
+ #include "qwt_painter.h"
+ #include <qapplication.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+
+ #if QT_VERSION < 0x040601
+ #define qFastSin(x) qSin(x)
+diff --git a/src/qwt_graphic.h b/src/qwt_graphic.h
+index cbd41f9..6881ea9 100644
+--- a/src/qwt_graphic.h
++++ b/src/qwt_graphic.h
+@@ -14,6 +14,7 @@
+ #include "qwt_null_paintdevice.h"
+ #include <qmetatype.h>
+ #include <qimage.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+
+ class QwtPainterCommand;
+diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
+index 3baf0e9..468a838 100644
+--- a/src/qwt_null_paintdevice.cpp
++++ b/src/qwt_null_paintdevice.cpp
+@@ -9,6 +9,7 @@
+
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+
+ class QwtNullPaintDevice::PrivateData
+diff --git a/src/qwt_null_paintdevice.h b/src/qwt_null_paintdevice.h
+index e4e9cad..b804429 100644
+--- a/src/qwt_null_paintdevice.h
++++ b/src/qwt_null_paintdevice.h
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qpaintdevice.h>
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+
+ /*!
+ \brief A null paint device doing nothing
+diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
+index 7959fe5..626677f 100644
+--- a/src/qwt_painter.cpp
++++ b/src/qwt_painter.cpp
+@@ -17,6 +17,7 @@
+ #include <qframe.h>
+ #include <qrect.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpalette.h>
+ #include <qpaintdevice.h>
+ #include <qpixmap.h>
+diff --git a/src/qwt_painter.h b/src/qwt_painter.h
+index c0a0ff7..bcbe289 100644
+--- a/src/qwt_painter.h
++++ b/src/qwt_painter.h
+@@ -16,6 +16,8 @@
+ #include <qrect.h>
+ #include <qpen.h>
+ #include <qline.h>
++#include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpalette.h>
+
+ class QPainter;
+diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
+index a2f509a..a49ee52 100644
+--- a/src/qwt_painter_command.h
++++ b/src/qwt_painter_command.h
+@@ -12,6 +12,8 @@
+
+ #include "qwt_global.h"
+ #include <qpaintengine.h>
++#include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+diff --git a/src/qwt_plot_canvas.cpp b/src/qwt_plot_canvas.cpp
+index 9438f15..bfe660d 100644
+--- a/src/qwt_plot_canvas.cpp
++++ b/src/qwt_plot_canvas.cpp
+@@ -13,6 +13,7 @@
+ #include "qwt_math.h"
+ #include "qwt_plot.h"
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
+ #include <qpaintengine.h>
+diff --git a/src/qwt_plot_canvas.h b/src/qwt_plot_canvas.h
+index c79e4e4..90a32ce 100644
+--- a/src/qwt_plot_canvas.h
++++ b/src/qwt_plot_canvas.h
+@@ -12,6 +12,7 @@
+
+ #include "qwt_global.h"
+ #include <qframe.h>
++#include <qpainter.h>
+ #include <qpainterpath.h>
+
+ class QwtPlot;
+diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
+index 996c0ad..6975863 100644
+--- a/src/qwt_plot_glcanvas.cpp
++++ b/src/qwt_plot_glcanvas.cpp
+@@ -12,6 +12,7 @@
+ #include "qwt_painter.h"
+ #include <qevent.h>
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qdrawutil.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
+diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
+index 7ca9b5a..a6c01e0 100644
+--- a/src/qwt_plot_glcanvas.h
++++ b/src/qwt_plot_glcanvas.h
+@@ -13,6 +13,8 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <qpainter.h>
++#include <qpainterpath.h>
+
+ class QwtPlot;
+
+diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
+index b7daa05..2f31d05 100644
+--- a/src/qwt_plot_panner.cpp
++++ b/src/qwt_plot_panner.cpp
+@@ -14,6 +14,8 @@
+ #include <qbitmap.h>
+ #include <qstyle.h>
+ #include <qstyleoption.h>
++#include <qpainter.h>
++#include <qpainterpath.h>
+
+ #if QT_VERSION >= 0x050000
+ #if QT_VERSION < 0x050100
+diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
+index 549c4bc..71cadec 100644
+--- a/src/qwt_plot_renderer.cpp
++++ b/src/qwt_plot_renderer.cpp
+@@ -20,6 +20,7 @@
+ #include "qwt_math.h"
+
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qtransform.h>
+ #include <qprinter.h>
+ #include <qfiledialog.h>
+diff --git a/src/qwt_plot_shapeitem.cpp b/src/qwt_plot_shapeitem.cpp
+index db7896b..09efd95 100644
+--- a/src/qwt_plot_shapeitem.cpp
++++ b/src/qwt_plot_shapeitem.cpp
+@@ -13,6 +13,9 @@
+ #include "qwt_curve_fitter.h"
+ #include "qwt_clipper.h"
+
++#include <qpainter.h>
++#include <qpainterpath.h>
++
+ static QPainterPath qwtTransformPath( const QwtScaleMap &xMap,
+ const QwtScaleMap &yMap, const QPainterPath &path, bool doAlign )
+ {
+diff --git a/src/qwt_symbol.h b/src/qwt_symbol.h
+index 538778d..2961ebe 100644
+--- a/src/qwt_symbol.h
++++ b/src/qwt_symbol.h
+@@ -11,6 +11,8 @@
+ #define QWT_SYMBOL_H
+
+ #include "qwt_global.h"
++#include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpolygon.h>
+
+ class QPainter;
+diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
+index 5974413..fa6da48 100644
+--- a/src/qwt_widget_overlay.cpp
++++ b/src/qwt_widget_overlay.cpp
+@@ -10,6 +10,7 @@
+ #include "qwt_widget_overlay.h"
+ #include "qwt_painter.h"
+ #include <qpainter.h>
++#include <qpainterpath.h>
+ #include <qpaintengine.h>
+ #include <qimage.h>
+ #include <qevent.h>
+--
+2.26.2
+
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 539d33c4abed..f9fd1d423593 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -1,14 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit multibuild qmake-utils
+EAPI=7
MY_P="${PN}-${PV/_/-}"
+inherit multibuild qmake-utils
DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="http://qwt.sourceforge.net/"
+HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
@@ -125,7 +124,7 @@ src_install() {
fi
if use doc; then
- HTML_DOCS=( doc/html/. )
+ local HTML_DOCS=( doc/html/. )
else
rm -rf "${ED}"/usr/share/doc/${PF}/html || die
fi
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
new file mode 100644
index 000000000000..de7c90317610
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6/1.4"
+IUSE="designer doc examples mathml opengl svg"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
+ opengl? (
+ dev-qt/qtopengl:5
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES-6.1 README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+ "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # trunk
+)
+
+src_prepare() {
+ default
+
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF
+ QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+ -e "/^TARGET/s:qwt):qwt6-qt5):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+ -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ cd examples || die
+ eqmake5 examples.pro
+ emake
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ if use mathml; then
+ sed \
+ -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
+ -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+ fi
+
+ if use doc; then
+ local HTML_DOCS=( doc/html/. )
+ else
+ rm -r "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+
+ einstalldocs
+
+ mkdir -p "${ED}"/usr/share/man/ || die
+ mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
+ rmdir "${ED}"/usr/share/doc/${PF}/man || die
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 4cb635a441e7..5cf434cdffcd 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,3 +1,3 @@
DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
-EBUILD qwtpolar-1.1.1-r2.ebuild 1441 BLAKE2B fc2164438a0db2b0a5c0d49757c0387af8d32aa710474d4f74423de3e509847bf5e9c4e65d1eb698ff4a32044e12849e5c1ed5834a61714149a67ee17148c5c2 SHA512 474574fa866d9efc3afa074deed099a34a5813383cd4d050fdc6f7a8071e8143b3309eb642a580af579179639ebe8eee430024849c7b28740e2a10ac2585a338
+EBUILD qwtpolar-1.1.1-r2.ebuild 1438 BLAKE2B a36821c7ab8a18a14abb1f28c7621d8387b0f8e6635f1cd621a883d274d225264548465f4ac651e3866d58ebe06a408a8d0ab1ceab86f901eb7e5d460996b320 SHA512 3e849cd907a486305662d61342529c5ed41f41c2762d8c036f2dc58f1337824861d6b3fd6a85bf5802425499d00f26cef377db5a962c32845853c8738a1e5884
MISC metadata.xml 347 BLAKE2B e21decebd423f18e461da054cc36d026ebbb79da6419b31602b0ce8abd33922cd6d82a60c86a0d2eabfdf3eddd9aeaaed03a93cb83dec0a4a725d85c6b4dc794 SHA512 854d3d9237d44a1afc6926805c9efb4444326a87bf68fd0c2e636d44b4f3e012490f327921f0e3174579657b7177e231d64c983412d8f09cd4b99592d311986e
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 2206f2747bf8..39bb2faf54f9 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit qmake-utils
DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/"
+HOMEPAGE="https://qwtpolar.sourceforge.io/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="qwt"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 2dafd20639fa..cc1a7ace1ad5 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,3 +1,5 @@
DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2
+DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
EBUILD xapps-1.4.2.ebuild 1160 BLAKE2B d086673cc4e148393b122af0ac0ee1b9b2561b732095e0e622766e9719bec529af134586ff6934b56b50cbfddfc67ef8dce7e7473480869b934d9645ba24c088 SHA512 ac27b0e47ae63463599cf0a72cce821a47541118d47234349c2cedc2f68398c381669308be9916126bad857a12d358bf39ba9a456b72a7742f46d9a76d995a78
-MISC metadata.xml 572 BLAKE2B 00e4836258e392a457e25dd1e700be5e3bce019eac729d4c8d0a10c5ecf76a679c667b960dca28ede76d8a41071cbeda4825cadbb354b5ff586fbcdad22f865d SHA512 3523f93546f6dd7ee8b108ac2f4b31886b68723e1479e1516ad6f2d03505e52e25702e133a0602265076170f254cc02bd61ef1ac7a42e632085405973830aaa3
+EBUILD xapps-1.8.4.ebuild 2023 BLAKE2B 4415eb0ad87329d28a39de45a5bc97e39901f2219433a407227cf9dc0ac38894fce8a00e49e979b0a8e5e54705ee677139f10310f456d2ef95b9b52ec4c2311b SHA512 d20845e80cf01dfe39a6872596c4543a3a95f6c0d1cae3fedba20630baaa361ff5f33bfbbd1f1ecb9ba5c837ff3880e364cac9719c66466537f8ac588403d9b3
+MISC metadata.xml 690 BLAKE2B 08cdd7b976068fb4e8744b8092952e95696bf7bcbc8d08d079cc22990152b59e3362473dd23561404947e12ad837cb791cf58e3e45acebf2fc8a14a9e1c38e4e SHA512 b179ee513fe2b71444f8b28fe706f0c918d5e9fcdaf2c236f77fa0041137a1593b0bcb81e36f5a9222a46bee663158368f6e87daecfddbdfbb873b52e2bc48a4
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index c55fc58fae04..0f3abac753e0 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -13,6 +13,10 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <maintainer type="person">
+ <email>sparky@bluefang-logic.com</email>
+ <name>Matthew Turnbull</name>
+ </maintainer>
<upstream>
<remote-id type="github">linuxmint/xapps</remote-id>
</upstream>
diff --git a/x11-libs/xapps/xapps-1.8.4.ebuild b/x11-libs/xapps/xapps-1.8.4.ebuild
new file mode 100644
index 000000000000..6e106233d427
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.8.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+VALA_USE_DEPEND="vapigen"
+inherit gnome2-utils vala meson python-r1 xdg-utils
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapps/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+IUSE="gtk-doc introspection static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.37.3:2
+ dev-libs/gobject-introspection:0=
+ gnome-base/libgnomekbd
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+ >=x11-libs/gtk+-3.3.16:3[introspection?]
+ x11-libs/libxkbfile
+ dev-libs/libdbusmenu[gtk3]
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ gtk-doc? ( dev-util/gtk-doc )
+ $(vala_depend)
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+"
+
+src_prepare() {
+ xdg_environment_reset
+ vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc docs)
+ -Dpy-overrides-dir="/pygobject"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ rm -rf "${ED}/usr/bin" || die
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+
+ # copy pygobject files to each active python target
+ # work-around for "py-overrides-dir" only supporting a single target
+ install_pygobject_override() {
+ PYTHON_GI_OVERRIDESDIR=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die
+ einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR"
+ mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/"
+ cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die
+ python_optimize
+ }
+ python_foreach_impl install_pygobject_override
+ rm -rf "${D}/pygobject" || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}