From 590b9b7b03bf4651e099949e318755af7cfa81b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 1 Aug 2021 22:03:23 +0100 Subject: gentoo resync : 01.08.2021 --- x11-wm/Manifest.gz | Bin 9603 -> 9606 bytes x11-wm/herbstluftwm/Manifest | 2 +- x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 24 ++++-- x11-wm/muffin/Manifest | 2 +- x11-wm/muffin/muffin-5.0.1-r1.ebuild | 106 +++++++++++++++++++++++++++ x11-wm/muffin/muffin-5.0.1.ebuild | 106 --------------------------- x11-wm/xpra/Manifest | 4 +- x11-wm/xpra/xpra-4.2.1.ebuild | 11 ++- x11-wm/xpra/xpra-4.2.ebuild | 11 ++- 9 files changed, 137 insertions(+), 129 deletions(-) create mode 100644 x11-wm/muffin/muffin-5.0.1-r1.ebuild delete 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 4fd343cb0a08..582e6e04210e 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 091319e58492..80c6f5b6eec9 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,4 +1,4 @@ DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53 -EBUILD herbstluftwm-9999.ebuild 2984 BLAKE2B df15aa0ba6046e3f5aaeee12e872a544a1b94aaa96a27ca477493ae7be13cf18700474589198d1280cf44a8760061e609f0151338e91a5ad8fce5754dc139c3a SHA512 a60df5c98a7ad7329161d5ea4f26ac302f89f1ae1384aec815f0f91e11bc03e15bcdc3313a4cc43fa9961773c0c11e358800c5f5427a45ce5e87ecbb2a52025a +EBUILD herbstluftwm-9999.ebuild 3262 BLAKE2B 0c6d211c2fa9d0e80b271e5107650a5176fa1bab34f1c948d25fd72f8111409c6d9c6543a1b46bb02ba103c030cc3b28edcd34d2b9e121f2b75072b534d7a7e4 SHA512 2739175752081dc17db123bd089e8f027d17ba1d1fb9a81b836d381976f07aaea194509733d766617b2dd8444992d62a065f5b83a091e0395c1b218c3afc893e MISC metadata.xml 448 BLAKE2B 454fa91d4bf0e1b7f3bf133e1de6cecd55588ac8c49d15c6624f0baf3fcc08663f52c972a8d7ebcb41107825f5bd70c2b8f7e67e10db674d0493d600a2f88de4 SHA512 22390ec4b20611620ea61bc0d93e7f9e67c154843bd3094592f4b69728eccbaaa5ea811872f5d63d55e0c7e0d0c65d7941eb2e57c74c85bfa63469fd4432531d diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index 37035a6a5ff8..ed397f906c24 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -55,6 +55,10 @@ BDEPEND=" " if [[ -n "${EGIT_REPO_URI}" ]]; then + # If hlwm is build from VCS, then hlwm-doc.json, which is used in + # the tests, needs to generated by the WITH_DOCUMENTATION option. + REQUIRED_USE+=" test? ( doc )" + # Herbstluftwm tarballs ship with pre-compiled documentation, only # if we build from git asciidoc is needed. BDEPEND+=" doc? ( app-text/asciidoc )" @@ -126,15 +130,21 @@ src_install() { 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() { pushd python > /dev/null || die distutils_install_for_testing popd > /dev/null || die - # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658. - export PYTHONPATH - python_test + distutils-r1_python_test +} + +src_test() { + if [[ -n "${EGIT_REPO_URI}" ]]; then + ln -s "${BUILD_DIR}/doc/hlwm-doc.json" "doc/hlwm-doc.json" || die "Could not symlink hlwm-doc.json" + fi + + ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient" + ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm" + + distutils-r1_src_test } diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 46f5a6247849..367ecce47752 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -2,5 +2,5 @@ AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31 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.1.ebuild 2338 BLAKE2B 0c58d9dfe83369e4d9e1759cd180da381935240605f2de243cbaa15f262cc8dc0acdaaefe0f10a38087f2f917ca5f09e56fc19145fbe54f7e96ffe1a848df73b SHA512 99a49dbb02dd0d003fb661e9200def28bb8f9ef77b71463d45bd8b8d62ba941d83b53079a7ebf3ebe96f2c932371fc454f5bee02426eb3081ace6627085d7eea +EBUILD muffin-5.0.1-r1.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075 MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998 diff --git a/x11-wm/muffin/muffin-5.0.1-r1.ebuild b/x11-wm/muffin/muffin-5.0.1-r1.ebuild new file mode 100644 index 000000000000..bad4d915000b --- /dev/null +++ b/x11-wm/muffin/muffin-5.0.1-r1.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[X] + 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 deleted file mode 100644 index 88d5bcdbe869..000000000000 --- a/x11-wm/muffin/muffin-5.0.1.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/xpra/Manifest b/x11-wm/xpra/Manifest index a11ea9f6c1d6..aac5695949b8 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -3,6 +3,6 @@ AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c824 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 -EBUILD xpra-4.2.1.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65 -EBUILD xpra-4.2.ebuild 4172 BLAKE2B 0310419a1ce47d0a7b58d141845dbf13609e2633d0fd481e53c091340ec0c643b71095bc39b393a2639a21c61983de03aeb34533b1d8226d35ec6898870f4247 SHA512 54179fbdbfa576c03e0ec1263c453c8f08e0a80d3614cf3b782e2595a8edb4402ee968ffad6d67ba9cd47bdee2bbe172d2860e3a45ace1d2da0b31b9071034ca +EBUILD xpra-4.2.1.ebuild 4153 BLAKE2B 83fabbba7623d98cd9fc4455f405eebf8d0c8d227f172ecc2e6db62f748a7c0452d37c15aefa61d29fe532afd80fe4a581c9703ba296e374654dcbeae25705b9 SHA512 7c78c3248308d8aff10618eb3dae089dea1206192e919f45a622455276b885a668ccce392cd87f1d124bc75b3a4cbd5584c839048f2112b79df7f463853d4850 +EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4 MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204 diff --git a/x11-wm/xpra/xpra-4.2.1.ebuild b/x11-wm/xpra/xpra-4.2.1.ebuild index 1f8dc0a75fa6..3cf2a6ed02a9 100644 --- a/x11-wm/xpra/xpra-4.2.1.ebuild +++ b/x11-wm/xpra/xpra-4.2.1.ebuild @@ -98,12 +98,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-suid-warning.patch ) -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf - - xdg_pkg_postinst -} - python_prepare_all() { hprefixify -w '/os.path/' setup.py hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ @@ -168,3 +162,8 @@ python_install_all() { dodir "${dir%/*}" mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die } + +pkg_postinst() { + tmpfiles_process xpra.conf + xdg_pkg_postinst +} diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild index f79d0e144a07..6e18d37932bb 100644 --- a/x11-wm/xpra/xpra-4.2.ebuild +++ b/x11-wm/xpra/xpra-4.2.ebuild @@ -98,12 +98,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-suid-warning.patch ) -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf - - xdg_pkg_postinst -} - python_prepare_all() { hprefixify -w '/os.path/' setup.py hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ @@ -168,3 +162,8 @@ python_install_all() { dodir "${dir%/*}" mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die } + +pkg_postinst() { + tmpfiles_process xpra.conf + xdg_pkg_postinst +} -- cgit v1.2.3