summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/Manifest.gzbin46545 -> 46537 bytes
-rw-r--r--x11-misc/compose-tables/Manifest2
-rw-r--r--x11-misc/compose-tables/compose-tables-1.8.7.ebuild43
-rw-r--r--x11-misc/safeeyes/Manifest5
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild42
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.6.ebuild43
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.8.ebuild (renamed from x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild)24
-rw-r--r--x11-misc/xkeyboard-config/Manifest4
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild66
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild1
10 files changed, 90 insertions, 140 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index fc03a7c36579..00ac9e4b68ac 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index ced509c989dc..ed3f4d2f4618 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6
DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96
-EBUILD compose-tables-1.8.7.ebuild 966 BLAKE2B 3d311500f1975ad468872ba6a7a0455cd12373136383bf6cd8cc9b79e226398217d3b6ea512a3e524594eb35f01978a6501e6ec72bbb2f22489075e4f478c53f SHA512 ccd113992763322e33b1d1fa398195edaf7d38271170053de474bc348e0b4d85858ca8ba8eafd524750515404700864c179fb7adf2b8f0e7a90495427297b005
EBUILD compose-tables-1.8.9.ebuild 1023 BLAKE2B d80f56618bb18a1189632e54acc9da61154accd2ee11e83ce51d4dd619589c35b13a90af3c4095eaf918f2ea4c3af3b83f78dfb3390e409d858f1a08dd604d59 SHA512 adbce76a5ccf6fa1bf06dc2711ffcd555438cec317f6d6f73df821efb4fa5962bf6e47344e67f1d2fcd3a355fc6234b9c577551a0cd49dac1c58ec514d9abc73
MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.7.ebuild b/x11-misc/compose-tables/compose-tables-1.8.7.ebuild
deleted file mode 100644
index f8356e0b46b9..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.8.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
- x11-base/xorg-proto
- >=x11-libs/libxcb-1.11.1
- x11-libs/xtrans"
-RDEPEND=""
-
-XORG_CONFIGURE_OPTIONS=(
- --without-xmlto
- --without-fop
- --disable-specs
- --disable-xkb
- --with-keysymdefdir="${ESYSROOT}/usr/include/X11"
-)
-
-src_compile() {
- emake -C nls
-}
-
-src_test() {
- :;
-}
-
-src_install() {
- emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 8fa4eac877da..cf90a0e146b5 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +1,6 @@
AUX safeeyes-2.1.6-py312.patch 934 BLAKE2B f071929938ec8cf8511099e11844ee517a86c7b5abcac5cbee9f3722718b58ea61700ee95ba67d607dae7b8d833c8ff26cb00a7fcf4b7e7aef477bac87015f40 SHA512 684082d2d6a21d2ec64081e765d76e47788ba9ee56650435e2a5ec86a89784e912f09001099408d4fc4d2694decd20b2425ef03f1bfa41c47bb8fcd711b1d2d7
DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961 SHA512 6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93
-EBUILD safeeyes-2.1.6-r1.ebuild 974 BLAKE2B dfa896cd9dc0007a43b99801bcffea0fcfa28f8a11cd67741627671bb9cceda8f74593b3915c2b9920be3b24fdcbb0ddae7cb0754f00a12eb92302e7d0a8a7dd SHA512 b3746e14c3db875f7ad785f69d5eafd99b64043d2437c0df2093a031ef964ee531fd9f9524ebb10d359a618e9e3b4103f9aaaaf4a7ad1fb8f59b4afba2e9c36c
-EBUILD safeeyes-2.1.6-r2.ebuild 1019 BLAKE2B 24307618902eaeb06aa0adfd42a46be2f7cd94119e865d3b4049adb76e6765a69d0e924150e10f14e95f0469d5d7e9a4f9993351a7a50f3986b08a6ad1f1685f SHA512 7ac6b529cc8219e0576037a369e297dc01d677ba7ccaa29fe8a919526e250fd0f04a71195c9a84f0c78b2b42f883aa80f525c0888c7a815b1375483afa28734c
+DIST safeeyes-2.1.8.tar.gz 288991 BLAKE2B 53fa71171c42679f7241a13b5542855c542c020814a4ec9e9c7480163bc2179e93787fb87291999815f900d5dea3522f5de8e35e85b714d3cb1cc4e24bad5638 SHA512 df3192ee751510449a0ee8946c8e59daff3dc5b4ef95a2f5563cc82834fbe8d3de52f39be2e0c26c13db7ac3d115ef1de63184ec8d069b99f411f4d60e9b5139
EBUILD safeeyes-2.1.6-r3.ebuild 1510 BLAKE2B 60436c6dbe9219d0cb5ae21954960e3de0937a19b5de421a0cb777036891b1d602fea774d0531d14a65159665ecef9b2a6d8230fd4b760c590654f89a77240e4 SHA512 5cec71ed3b05454d28a8ffd78889ef1d4f877b3ce2327f1c8b20b056d6ab184e804407f3835e2f9fed965e0ec0f0f69b8bbce8534e3add17537589b2cc62fc41
-EBUILD safeeyes-2.1.6.ebuild 982 BLAKE2B 0123c6f56dcb8d3b924302cb5b0721e98876fb77d369d454f17ad4de298841fc30610401020ea8df45bac2a34da349148aa04c414ab3e6fd46a238cf50230286 SHA512 3c70aaff2379eab803973356e1510fc8076d9efb790b9efb837377e5ce74d09a409ab47eb05e9a2fdfb95a14fd63d98f7a697d608a9e4fad0a00a4785a06b41c
+EBUILD safeeyes-2.1.8.ebuild 1465 BLAKE2B 1bc5ecef32af8f1ed838060df592c8de6dd602858dd0dc368d73d2b99874a3d177ee97c872306b2918a82f2765fda5398e3e4a9fdb382ba1fc62789f423295ec SHA512 0c1921df7e62f9d6a60709a17a4d572ae204bf06252c8ad164546a4d3ec9260616125ae79911797bd6749a826815cd2fee3d1196d09fdd9cc3ff29350cfc6277
MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
deleted file mode 100644
index c6d102ef6476..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
-DISTUTILS_USE_PEP517=setuptools
-
-inherit xdg distutils-r1 pypi
-
-DESCRIPTION="Linux alternative to EyeLeo"
-HOMEPAGE="https://github.com/slgobinath/SafeEyes"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
- dev-libs/libayatana-appindicator
- dev-python/Babel[${PYTHON_USEDEP}]
- dev-python/croniter[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-xlib[${PYTHON_USEDEP}]
- media-sound/alsa-utils
- x11-apps/xprop
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
- x11-misc/xprintidle
- "
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild
deleted file mode 100644
index 5aca9341d36c..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
-DISTUTILS_USE_PEP517=setuptools
-
-inherit xdg distutils-r1 pypi
-
-DESCRIPTION="Linux alternative to EyeLeo"
-HOMEPAGE="https://github.com/slgobinath/SafeEyes"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/libayatana-appindicator
- dev-python/Babel[${PYTHON_USEDEP}]
- dev-python/croniter[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-xlib[${PYTHON_USEDEP}]
- media-sound/alsa-utils
- x11-apps/xprop
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
- x11-misc/xprintidle
- "
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.8.ebuild
index 307103b60daf..cd7e15330da3 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,10 +16,6 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~riscv ~x86"
-PATCHES=(
- "${FILESDIR}"/${P}-py312.patch
-)
-
RDEPEND="
dev-libs/libayatana-appindicator
dev-python/Babel[${PYTHON_USEDEP}]
@@ -35,6 +31,24 @@ RDEPEND="
x11-misc/xprintidle
"
+python_install() {
+ distutils-r1_python_install
+
+ # Workaround for https://bugs.gentoo.org/926816
+ # Files were misplaced and also duplicate across Python slots.
+ local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr"
+ local i
+ for i in applications icons ; do
+ local source="${misplaced_usr}/share/${i}"
+ local target="${D}/usr/share/${i}"
+ if [[ ! -d "${target}" ]]; then
+ dodir /usr/share/
+ mv "${source}" "${target}" || die
+ fi
+ done
+ rm -R "${misplaced_usr}" || die
+}
+
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index afd153502348..34a4bfc232f0 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
+DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9
EBUILD xkeyboard-config-2.41.ebuild 1636 BLAKE2B 4967819e4ce4d77947bda3195747beb826a21cd78ecc5bb05bfcf0669d0f020ff6a879a3881d03d8dee3758b8e8b68e7b5a4c319d931d34a5fe1c849abe79e21 SHA512 968ee58b66c757c7ae0e982f0969c61f54f34a18d66e7573a9a37f89d949b2d146a7780b1a8eda724ce7278276cffc83be1b67bb7691da699d3bf749cd97a923
-EBUILD xkeyboard-config-9999.ebuild 1644 BLAKE2B 5a10a4e5ac7c7d40ba7f83d084303fae1f21e1506005442f847b70fbd951e618b7a23b0106011ed82c1a7728c08920897a737da273ac04855d23b4ec3f184ee7 SHA512 579292ce8a3dba6c48ef8dc77aa53dba79d9861c560c25155de0edd98314e52f68e3948864f0ac617f0eb6f7b18451088f9db4f1d1fc362b9a91b6b435fc3aad
+EBUILD xkeyboard-config-2.42.ebuild 1600 BLAKE2B c3b4523c66cc22353bcfa50323ca345686924b87ca207c766f988cd52ee0f775cb3c359f8e9aa2f7f2001dadaccf85536821bc6d0b582dc6824441109a332472 SHA512 a7605df30d8c88a64ea3dbc93916b4dc58dcbcb545ef8ec622e89045fb8132ac68bee56438ed4065b493ac58b6f61888a22fa4972a2aa8f32908c693f493f870
+EBUILD xkeyboard-config-9999.ebuild 1600 BLAKE2B c3b4523c66cc22353bcfa50323ca345686924b87ca207c766f988cd52ee0f775cb3c359f8e9aa2f7f2001dadaccf85536821bc6d0b582dc6824441109a332472 SHA512 a7605df30d8c88a64ea3dbc93916b4dc58dcbcb545ef8ec622e89045fb8132ac68bee56438ed4065b493ac58b6f61888a22fa4972a2aa8f32908c693f493f870
MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
new file mode 100644
index 000000000000..33edbae597e4
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-lang/perl
+ dev-libs/libxslt
+ sys-devel/gettext
+ test? (
+ ${PYTHON_DEPS}
+ x11-apps/xkbcomp
+ x11-libs/libxkbcommon
+ $(python_gen_any_dep '
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+python_check_deps() {
+ use test || return 0
+ python_has_version \
+ "dev-python/pycountry[${PYTHON_USEDEP}]" \
+ "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
+ "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply_user
+
+ # Remove pytest timeout
+ sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+ -Dcompat-rules=true
+ )
+ meson_src_configure
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 8dccf01c3ce0..33edbae597e4 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-# <dev-python/pycountry-23.12.7 bug #920278
BDEPEND="
dev-lang/perl
dev-libs/libxslt
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 20:05:12 +0000