gentoo auto-resync : 22:12:2022 - 01:55:45

5 files changed, 5 insertions, 216 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 28f00e1f73f4..c141bc9a80a0 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 0bf3c2775538..60221c6f3c31 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,9 +1,6 @@
 AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
 AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
-DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24
 DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
-EBUILD wayfire-0.7.2-r1.ebuild 2580 BLAKE2B d7068b765aed6b69eb6081e16e78bb378e1fb808752f9c329aaba49a7a240fddc18395233743cfd2e2eff07d4cf3776ff9258aef41357395a21e6899f46ec897 SHA512 cc2d609f54b5204080470ee783b017f5fc79bd33c7fcc16a0df77319b6e95f6600f449b3bddfb8210b49d26bcfd4510ee8bf3174880f7b292443c318932012c4
-EBUILD wayfire-0.7.3-r2.ebuild 2544 BLAKE2B 862c8eed635cf792fef4f8a4f8c28e39d353a5389c20ce0ef18f088bbe000c431d82e14c4ec2e0a2454625bd7b9cdc85f3e8119670068b68ba86ef1d0bbe9568 SHA512 57acc551d0bee9ba91c2a1dc0298443e9deeabfdb56a0388d8da7b9749c302883a92dff0dacc985de5e27fdd981c9efeff744c3cf09bc4a9a42dac13e4c37c44
 EBUILD wayfire-0.7.3-r3.ebuild 2553 BLAKE2B b7d8caa0ef5e425ba5f4ffeef1f7dec8c39fbc2f6ef5aff0989f1aeac93c404550ba8d19e48e288fdfb683e89e982018718afab3b5ca68e0bce45217bea714bf SHA512 988f82606f448bac536e0e6633a0a23dbc513351a84df1fb81e1deb8298b9f0738ef559c15997693c7a93699198eeaf1904feff570b8e73a4e1a7d008aa7ff3f
 EBUILD wayfire-9999.ebuild 2501 BLAKE2B 91272a403814f085b1d5bc3efd9a5ec47ab60b5e27bfe8b679f5142d0c432997864ea6ab9ed61380cf9fb92ade3e5eb5629d4230d3d410c3596e68a1d3ce80b1 SHA512 3b99a0a6046ad22fac943d6b95a6c8d1c71714d7abed2466d42424591e8b2305b799592c8700f1e926c2d87dda559c2f77c4fd076f0e24fc2c7329e35d18dd41
-MISC metadata.xml 826 BLAKE2B b9f5dbd9d8072b9f9c1559e341247d2a8462bd4e0927a9196d8a99c08eff7bcb686d2dc4beb04c8ae4afae48068b2d2eed15367b8c567c7366d800c4dfe551b4 SHA512 9476f06db6a703730a6590f79aab70fe5ded825e5b17ef8ca8abc692b1fc634e404e06c07af6788f82caaf1802ec699512126e84eb3f5d481ef6a8bcf93fa32d
+MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index ea9f40a8d22c..b7ebd8524caf 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <!-- maintainer-needed -->
     <longdescription>
         compiz like eye-candy 3D wayland, with low memory footprint.
         Aims to bring desktop features such as 3D cube, fire burn,
         fisheye, wrot and all other desktop effects to wayland.
     </longdescription>
-    <!-- maintainer-needed -->
     <use>
         <flag name="gles">use libglvnd to do animations more efficiently</flag>
         <flag name="system-wfconfig">use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
         <flag name="system-wlroots">use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
     </use>
+    <upstream>
+        <remote-id type="github">WayfireWM/wayfire</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/gui-wm/wayfire/wayfire-0.7.2-r1.ebuild b/gui-wm/wayfire/wayfire-0.7.2-r1.ebuild
deleted file mode 100644
index 1a57d10a0023..000000000000
--- a/gui-wm/wayfire/wayfire-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug +gles +system-wfconfig +system-wlroots X"
-
-DEPEND="
-	dev-libs/libevdev
-	dev-libs/libinput
-	dev-libs/wayland
-	gui-libs/gtk-layer-shell
-	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X?]
-	media-libs/libglvnd[X?]
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/freetype:=[X?]
-	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X?]
-	x11-libs/cairo:=[X?,svg(+)]
-	x11-libs/libxkbcommon:=[X?]
-	x11-libs/pixman
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb
-	)
-	system-wfconfig? (
-		>=gui-libs/wf-config-0.7.1
-		<gui-libs/wf-config-0.8.0
-	)
-	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? (
-		>=gui-libs/wlroots-0.14.0:=[X?]
-		<gui-libs/wlroots-0.15.0:=
-	)
-	!system-wlroots? ( !gui-libs/wlroots )
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-src_configure() {
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
-	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_feature X xwayland)
-		$(meson_use gles enable_gles32)
-		$(usex debug --buildtype=debug "")
-		$(usex debug -Db_sanitize=address,undefined "")
-	)
-
-	# Clang will fail to link without this
-	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dobin "${T}"/wayfire-session
-
-	insinto "/usr/share/wayland-sessions/"
-	insopts -m644
-	doins wayfire.desktop
-	doins "${T}"/wayfire-session.desktop
-
-	insinto "/usr/share/wayfire/"
-	doins wayfire.ini
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Wayfire has been installed but the session cannot be used"
-		elog "until you install a configuration file. The default config"
-		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
-		elog "To install the file execute"
-		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
-	fi
-}
diff --git a/gui-wm/wayfire/wayfire-0.7.3-r2.ebuild b/gui-wm/wayfire/wayfire-0.7.3-r2.ebuild
deleted file mode 100644
index 7caf04ae818a..000000000000
--- a/gui-wm/wayfire/wayfire-0.7.3-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="compiz like 3D wayland compositor"
-HOMEPAGE="https://github.com/WayfireWM/wayfire"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
-else
-	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug +gles +system-wfconfig +system-wlroots X"
-
-DEPEND="
-	dev-libs/libinput:=
-	dev-libs/wayland
-	gui-libs/gtk-layer-shell
-	media-libs/glm
-	media-libs/mesa:=[gles2,wayland,X?]
-	media-libs/libglvnd[X?]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/freetype:=[X?]
-	x11-libs/libdrm
-	x11-libs/gtk+:3=[wayland,X?]
-	x11-libs/cairo[X?,svg(+)]
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango
-	x11-libs/pixman
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb
-	)
-	system-wfconfig? (
-		>=gui-libs/wf-config-0.7.1
-		<gui-libs/wf-config-0.8.0
-	)
-	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? (
-		gui-libs/wlroots:0/15[X?]
-	)
-	!system-wlroots? ( !gui-libs/wlroots )
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	dev-libs/wayland-protocols
-	virtual/pkgconfig
-"
-
-src_configure() {
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
-	sed -e "s:@EPREFIX@:${EPREFIX}:" \
-	    "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
-	local emesonargs=(
-		$(meson_feature system-wfconfig use_system_wfconfig)
-		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_feature X xwayland)
-		$(meson_use gles enable_gles32)
-		$(usex debug --buildtype=debug "")
-		$(usex debug -Db_sanitize=address,undefined "")
-	)
-
-	# Clang will fail to link without this
-	tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dobin "${T}"/wayfire-session
-
-	insinto "/usr/share/wayland-sessions/"
-	insopts -m644
-	doins wayfire.desktop
-	doins "${T}"/wayfire-session.desktop
-
-	insinto "/usr/share/wayfire/"
-	doins wayfire.ini
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Wayfire has been installed but the session cannot be used"
-		elog "until you install a configuration file. The default config"
-		elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
-		elog "To install the file execute"
-		elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
-	fi
-}