From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- x11-wm/Manifest.gz | Bin 9612 -> 9608 bytes x11-wm/herbstluftwm/Manifest | 6 +- x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 26 ++++++- x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 26 ++++++- x11-wm/herbstluftwm/metadata.xml | 9 +-- x11-wm/muffin/Manifest | 4 +- x11-wm/muffin/muffin-5.0.0.ebuild | 106 -------------------------- x11-wm/muffin/muffin-5.0.1.ebuild | 106 ++++++++++++++++++++++++++ 8 files changed, 160 insertions(+), 123 deletions(-) delete mode 100644 x11-wm/muffin/muffin-5.0.0.ebuild create mode 100644 x11-wm/muffin/muffin-5.0.1.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index ff73e3b0cad4..7841d39b5a46 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index 115c8263fffd..a6b58f7248df 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,6 +1,6 @@ DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f -EBUILD herbstluftwm-0.9.3.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913 -EBUILD herbstluftwm-9999.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913 -MISC metadata.xml 565 BLAKE2B 8a6246f89ec1a463c527d2daff5dc31ec574d6d41bc026255fe4a09e4fc5f1d7136df89364ed3bb6bf46a3848ad19f3737261481f4c217c2bf6004e0ad5072f9 SHA512 08a447578d4b0d98efc301024b182e4f1407040b4c37de73fab0e65990e834a38b3ea7dc17f15e96ea8bde5336d45d30d881f9169ccd461763d7d4fd8d098e99 +EBUILD herbstluftwm-0.9.3.ebuild 2804 BLAKE2B 3b0dfd324aacc7f358b6de74a575558843d1d78b26db8372c7c792204df22ca1b7d36b83d4c61800639027d1573489bb32624a73ec65f0cef86e607529af35ed SHA512 b012accaea69ca4bd340fc38d4317caab55a3468a4ee2bef34eb2d0b720258935352d1fc9f7df46158399f29bbcc23bd7fa4c0eaef1f513cae6b773402f495e3 +EBUILD herbstluftwm-9999.ebuild 2804 BLAKE2B 3b0dfd324aacc7f358b6de74a575558843d1d78b26db8372c7c792204df22ca1b7d36b83d4c61800639027d1573489bb32624a73ec65f0cef86e607529af35ed SHA512 b012accaea69ca4bd340fc38d4317caab55a3468a4ee2bef34eb2d0b720258935352d1fc9f7df46158399f29bbcc23bd7fa4c0eaef1f513cae6b773402f495e3 +MISC metadata.xml 448 BLAKE2B 454fa91d4bf0e1b7f3bf133e1de6cecd55588ac8c49d15c6624f0baf3fcc08663f52c972a8d7ebcb41107825f5bd70c2b8f7e67e10db674d0493d600a2f88de4 SHA512 22390ec4b20611620ea61bc0d93e7f9e67c154843bd3094592f4b69728eccbaaa5ea811872f5d63d55e0c7e0d0c65d7941eb2e57c74c85bfa63469fd4432531d diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild index f374bfa2fc7a..c167e7f353e2 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild @@ -21,10 +21,11 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="+doc python" +IUSE="+doc python test" +RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +COMMON_DEPEND=" media-libs/freetype x11-libs/libX11 x11-libs/libXext @@ -32,8 +33,19 @@ DEPEND=" x11-libs/libXinerama x11-libs/libXrandr " +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-python/ewmh + dev-python/python-xlib + x11-apps/xsetroot + x11-base/xorg-server[xephyr,xvfb] + x11-misc/xdotool + x11-terms/xterm + ) +" RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} app-shells/bash python? ( ${PYTHON_DEPS} ) " @@ -111,3 +123,11 @@ src_install() { done fi } + +distutils_enable_tests pytest + +src_test() { + ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" + ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" + python_test +} diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index f374bfa2fc7a..c167e7f353e2 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -21,10 +21,11 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="+doc python" +IUSE="+doc python test" +RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +COMMON_DEPEND=" media-libs/freetype x11-libs/libX11 x11-libs/libXext @@ -32,8 +33,19 @@ DEPEND=" x11-libs/libXinerama x11-libs/libXrandr " +DEPEND=" + ${COMMON_DEPEND} + test? ( + dev-python/ewmh + dev-python/python-xlib + x11-apps/xsetroot + x11-base/xorg-server[xephyr,xvfb] + x11-misc/xdotool + x11-terms/xterm + ) +" RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} app-shells/bash python? ( ${PYTHON_DEPS} ) " @@ -111,3 +123,11 @@ src_install() { done fi } + +distutils_enable_tests pytest + +src_test() { + ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" + ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" + python_test +} diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml index 272d4aa6b4c7..5d43bb6e9ebe 100644 --- a/x11-wm/herbstluftwm/metadata.xml +++ b/x11-wm/herbstluftwm/metadata.xml @@ -1,12 +1,9 @@ - - flo@geekplace.eu - - - proxy-maint@gentoo.org - Proxy Maintainers + + flow@gentoo.org + Florian Schmaus andrey_utkin@gentoo.org diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 2826d0860dd0..46f5a6247849 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,6 +1,6 @@ AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31 -DIST muffin-5.0.0.tar.gz 5196913 BLAKE2B 50499ad7a8b4a3ea56bf0d06b4f25b4f78d00721d58991fc1c4c174370862560e63ebf0eba32118e8c3a3537c3a98de65f4ee0ea8230130c3e36ad8fa814f2ee SHA512 297a8eaca89085ddf4d89242ce41c594f8221113acd5eb986c3b07f45de2e4e5cc25ec7e183eee6c49062a45d01e8517f0774a02c252b5cb6bac6920d0a04ff6 +DIST muffin-5.0.1.tar.gz 5197104 BLAKE2B b9c9039c2fcd042859c28829f0df1f2d6991a0d90f4a1647d34cc56069ee80f5e0b4a13b1a49797f84815a97adbd96379060cc879c4aa4966f7f0a23cf7e938e SHA512 8e91e37372a2ac67e216c5e1c457e3a1f2a57a274976716aa28bb9c8621af4241f49ab5e46da609588abb23bbbf48b2b67af5926e43d052f31ddc6c6068ef81f EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a -EBUILD muffin-5.0.0.ebuild 2338 BLAKE2B 0c58d9dfe83369e4d9e1759cd180da381935240605f2de243cbaa15f262cc8dc0acdaaefe0f10a38087f2f917ca5f09e56fc19145fbe54f7e96ffe1a848df73b SHA512 99a49dbb02dd0d003fb661e9200def28bb8f9ef77b71463d45bd8b8d62ba941d83b53079a7ebf3ebe96f2c932371fc454f5bee02426eb3081ace6627085d7eea +EBUILD muffin-5.0.1.ebuild 2338 BLAKE2B 0c58d9dfe83369e4d9e1759cd180da381935240605f2de243cbaa15f262cc8dc0acdaaefe0f10a38087f2f917ca5f09e56fc19145fbe54f7e96ffe1a848df73b SHA512 99a49dbb02dd0d003fb661e9200def28bb8f9ef77b71463d45bd8b8d62ba941d83b53079a7ebf3ebe96f2c932371fc454f5bee02426eb3081ace6627085d7eea MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998 diff --git a/x11-wm/muffin/muffin-5.0.0.ebuild b/x11-wm/muffin/muffin-5.0.0.ebuild deleted file mode 100644 index 88d5bcdbe869..000000000000 --- a/x11-wm/muffin/muffin-5.0.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils xdg-utils virtualx - -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" -SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+introspection test xinerama" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2[dbus] - >=dev-libs/json-glib-1.0 - >=gnome-extra/cinnamon-desktop-5.0:0= - gnome-extra/zenity - >=media-libs/libcanberra-0.26[gtk3] - virtual/opengl - >=x11-libs/cairo-1.14:=[X] - x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.9.12:3[X,introspection?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - >=x11-libs/libXcomposite-0.3 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - >=x11-libs/libXi-1.6.0 - >=x11-libs/libxkbcommon-0.4.3 - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/pango-1.14.0[X,introspection?] - >=x11-libs/startup-notification-0.7:= - x11-misc/xkeyboard-config - - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - - test? ( app-text/docbook-xml-dtd:4.5 ) -" -# needs gtk-doc, not just -am, for gtk-doc.make -BDEPEND=" - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf - gnome2_disable_deprecation_warning -} - -# Wayland is not supported upstream. -src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --enable-compile-warnings=minimum \ - --disable-static \ - --enable-shape \ - --enable-sm \ - --enable-startup-notification \ - --enable-xsync \ - --enable-verbose-mode \ - --with-libcanberra \ - $(use_enable introspection) \ - $(use_enable xinerama) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - dodoc HACKING MAINTAINERS *.txt doc/*.txt -} - -src_test() { - virtx default -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_schemas_update -} diff --git a/x11-wm/muffin/muffin-5.0.1.ebuild b/x11-wm/muffin/muffin-5.0.1.ebuild new file mode 100644 index 000000000000..88d5bcdbe869 --- /dev/null +++ b/x11-wm/muffin/muffin-5.0.1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools gnome2-utils xdg-utils virtualx + +DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" +SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+introspection test xinerama" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + >=dev-libs/glib-2.37.3:2[dbus] + >=dev-libs/json-glib-1.0 + >=gnome-extra/cinnamon-desktop-5.0:0= + gnome-extra/zenity + >=media-libs/libcanberra-0.26[gtk3] + virtual/opengl + >=x11-libs/cairo-1.14:=[X] + x11-libs/gdk-pixbuf:2[introspection?] + >=x11-libs/gtk+-3.9.12:3[X,introspection?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + >=x11-libs/libXcomposite-0.3 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + >=x11-libs/libXi-1.6.0 + >=x11-libs/libxkbcommon-0.4.3 + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXrender + >=x11-libs/pango-1.14.0[X,introspection?] + >=x11-libs/startup-notification-0.7:= + x11-misc/xkeyboard-config + + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + + test? ( app-text/docbook-xml-dtd:4.5 ) +" +# needs gtk-doc, not just -am, for gtk-doc.make +BDEPEND=" + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig +" + +src_prepare() { + default + eautoreconf + gnome2_disable_deprecation_warning +} + +# Wayland is not supported upstream. +src_configure() { + econf \ + --disable-gtk-doc \ + --disable-maintainer-mode \ + --disable-schemas-compile \ + --enable-compile-warnings=minimum \ + --disable-static \ + --enable-shape \ + --enable-sm \ + --enable-startup-notification \ + --enable-xsync \ + --enable-verbose-mode \ + --with-libcanberra \ + $(use_enable introspection) \ + $(use_enable xinerama) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die + dodoc HACKING MAINTAINERS *.txt doc/*.txt +} + +src_test() { + virtx default +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_schemas_update +} -- cgit v1.2.3