gentoo auto-resync : 13:08:2022 - 14:24:01

5 files changed, 19 insertions, 8 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 2eac4ca482b2..708ac7eaa225 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/foot-terminfo/Manifest b/gui-apps/foot-terminfo/Manifest
index fe24ec620908..c1c55ebec2bd 100644
--- a/gui-apps/foot-terminfo/Manifest
+++ b/gui-apps/foot-terminfo/Manifest
@@ -1,5 +1,5 @@
-DIST foot-1.11.0.tar.gz 468899 BLAKE2B f3e3909c670598dab151f8be4104921fddd6621e833a8fe43c68d06347e3e866101fe1563282622436638674b7f73770762d47a7b9fd61d42b00bc7634e2ea76 SHA512 edf8130dfb52e06b6d8638115eca19695b24536f3f6b284e0319876edb95c3c86800f9527cc9dae3f66d2d317d26add793634a19f302e52c9f0118b9b91fc9c2
 DIST foot-1.12.1.tar.gz 484702 BLAKE2B 5f3ed5923dfe2e3d110da298d4abefb331c15bb0f3db3135a4e8d481b528b3f8287fc5d8516e9d3a34b8084f6364edae93dee496d9192fe610d2c17733277451 SHA512 553f404b074f4372fb8cfb050f0378d1cbe1620ea8afe2e279523df3006eefd0b0ed24addca33de10cfc8109e5aaec66beccbd5f30e032bb9f2bd9b81ac798cb
-EBUILD foot-terminfo-1.11.0-r1.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
+DIST foot-1.13.0.tar.gz 495396 BLAKE2B 9acad754d47754d6161fd4024b7f6a8336cd5e6faa1112bdf390c79ecbd52f74b187544667ca8517618f05324af76da66f0320e86e8b0e178a0f63c556992edf SHA512 ac7c8dc967c897f81f8eda8b0c5de17896015698ac266bc9ce898d3fdb41d0dd96762f28f433d8a31f768e0505e4c89151ef10484407f66865ea6322fa1b6705
 EBUILD foot-terminfo-1.12.1.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
+EBUILD foot-terminfo-1.13.0.ebuild 650 BLAKE2B c55b2484914072849ef8b591be60847277299fd4a32a1d57bbd415f0e6dd764dbd189a289fbdd46a325f2004e5449dfc2f362c39541f94bed8806d144a8e9652 SHA512 ed97c8e883e7c152cb9707c7bbb71516802f8b87992cc64ea6d597257d92c122073f8ecccf10e448862ad1407243084a1ba6bc963f98e39df447c670418a96be
 MISC metadata.xml 395 BLAKE2B ab339b3a0e03010977d4ef364da63a1cce6d1986829234a158c6d3c6bd9d639235d081d34bf8a49f8deb9d567b05320479718a5c79cf6b5a8113067fc69e2ad1 SHA512 d04b9e89a98877d7c39b48af3221705f3e2ebd0ed34fb0508bd13228c196350dda1a21a430b42777ccf9349e2e1ab76f39c20961de4429b10d5925a81855a291
diff --git a/gui-apps/foot-terminfo/foot-terminfo-1.11.0-r1.ebuild b/gui-apps/foot-terminfo/foot-terminfo-1.13.0.ebuild
index 665d31273e16..665d31273e16 100644
--- a/gui-apps/foot-terminfo/foot-terminfo-1.11.0-r1.ebuild
+++ b/gui-apps/foot-terminfo/foot-terminfo-1.13.0.ebuild
diff --git a/gui-apps/foot/Manifest b/gui-apps/foot/Manifest
index 746dd8ef457e..20af31798f17 100644
--- a/gui-apps/foot/Manifest
+++ b/gui-apps/foot/Manifest
@@ -1,5 +1,5 @@
-DIST foot-1.11.0.tar.gz 468899 BLAKE2B f3e3909c670598dab151f8be4104921fddd6621e833a8fe43c68d06347e3e866101fe1563282622436638674b7f73770762d47a7b9fd61d42b00bc7634e2ea76 SHA512 edf8130dfb52e06b6d8638115eca19695b24536f3f6b284e0319876edb95c3c86800f9527cc9dae3f66d2d317d26add793634a19f302e52c9f0118b9b91fc9c2
 DIST foot-1.12.1.tar.gz 484702 BLAKE2B 5f3ed5923dfe2e3d110da298d4abefb331c15bb0f3db3135a4e8d481b528b3f8287fc5d8516e9d3a34b8084f6364edae93dee496d9192fe610d2c17733277451 SHA512 553f404b074f4372fb8cfb050f0378d1cbe1620ea8afe2e279523df3006eefd0b0ed24addca33de10cfc8109e5aaec66beccbd5f30e032bb9f2bd9b81ac798cb
-EBUILD foot-1.11.0-r1.ebuild 1130 BLAKE2B a4c723923b9f9244fad2fa02643dd743059b967352fd41cc2c89f53cecd02ee61527eff205535cfd3a388090d9e458b6edee294d627b6c5e4f041c4ded54761e SHA512 496e9f1b8ff835490bc104d42a787e76795298c80b1894bc742c327ff4266aea258e41d3e3d586343d897d0191e8ae1a62d3958dacb66e1548fd84eb8a375a42
+DIST foot-1.13.0.tar.gz 495396 BLAKE2B 9acad754d47754d6161fd4024b7f6a8336cd5e6faa1112bdf390c79ecbd52f74b187544667ca8517618f05324af76da66f0320e86e8b0e178a0f63c556992edf SHA512 ac7c8dc967c897f81f8eda8b0c5de17896015698ac266bc9ce898d3fdb41d0dd96762f28f433d8a31f768e0505e4c89151ef10484407f66865ea6322fa1b6705
 EBUILD foot-1.12.1.ebuild 1591 BLAKE2B e453588383603bb3806acbd0674344310c27de1076124d8434f72d79b95322175dc00f5143b64c49ae2a1ee0507e685aab62d5e1da87ac816ff634a5e048db82 SHA512 cf29983afddebec219c94e720f83d541ef13e060a7d613043952b227bebbe55e595d4bc4246a34fcb55ef2b43c8100298de3036e1f0159b323e2ab20568bcd21
+EBUILD foot-1.13.0.ebuild 1592 BLAKE2B cfe29b7a5dcfecd51e61c227eb06547ffb5d87844d41e81d346ecf0637a30608f958eaa6cfd2e955faa935a93b4179ea962c81a2fba18870c7dc258a73cbafcf SHA512 e7b79fea6e923e4a6afc82a307224c95b5558afbbbe01d6d01ae1822e1e74b2d45734556dadd6b8e8b41a33986863437a39a1bccfbc0548fc53d7b15bfc57265
 MISC metadata.xml 487 BLAKE2B c9585e04b395d413dc3d087f7e5043a39c8c422299e5aadb560a50a3f600913d2e27f0ac7a3eb8ec5816f167b4c5637063a71cdd4c84a15885200d6417154764 SHA512 78b22205ff6d7f6f75a8d01df4ac4ba497bc31783f2c626d0b9cc3b8347a72e6bc4bd598fc3a1c0da3bd84af2df9391f39bdf00ddc33830ad41aa94b67d57304
diff --git a/gui-apps/foot/foot-1.11.0-r1.ebuild b/gui-apps/foot/foot-1.13.0.ebuild
index 2d7d8555051b..d56767ce65b7 100644
--- a/gui-apps/foot/foot-1.11.0-r1.ebuild
+++ b/gui-apps/foot/foot-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson xdg
+inherit meson xdg systemd
 
 DESCRIPTION="Fast, lightweight and minimalistic Wayland terminal emulator"
 HOMEPAGE="https://codeberg.org/dnkl/foot"
@@ -28,8 +28,8 @@ COMMON_DEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	dev-libs/wayland-protocols
 	dev-libs/tllist
+	dev-libs/wayland-protocols
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -39,10 +39,16 @@ RDEPEND="
 	)
 "
 BDEPEND="
-	dev-util/wayland-scanner
 	app-text/scdoc
+	dev-util/wayland-scanner
 "
 
+src_prepare() {
+	default
+	# disable the systemd dep, we install the unit file manually
+	sed -i "s/systemd', required: false)$/', required: false)/" "${S}"/meson.build || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature grapheme-clustering)
@@ -51,11 +57,16 @@ src_configure() {
 		-Dterminfo=disabled
 	)
 	meson_src_configure
+
+	sed 's|@bindir@|/usr/bin|g' "${S}/"/foot-server@.service.in > foot-server@.service
 }
 
 src_install() {
-	local DOCS=( CHANGELOG.md README.md )
+	local DOCS=( CHANGELOG.md README.md LICENSE )
 	meson_src_install
 
+	# foot unconditionally installs CHANGELOG.md, README.md and LICENSE.
+	# we handle this via DOCS and dodoc instead.
 	rm -r "${ED}/usr/share/doc/${PN}" || die
+	systemd_douserunit foot-server@.service "${S}"/foot-server@.socket
 }