gentoo auto-resync : 31:01:2023 - 03:00:52

3 files changed, 61 insertions, 21 deletions

diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 284ee59c6344..b19da0274be5 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,8 +1,10 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
 DIST girara-0.3.7.tar.xz 60352 BLAKE2B 59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a SHA512 9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717
+DIST girara-0.3.9.tar.xz 60832 BLAKE2B e577c4273c2d8f4d51e0ee283184ecd2b5b48877996f95aa5cec83ad716efd4946508203d3108d451492ff5d118d965ca98d86f4e0d9b31fcc1cc0b2266b9511 SHA512 b5399b26389cff0c6aa6f70687b53a99243d38d66ec401f48de49391c88b31dc3287366819288c405051d14f4f778db952953d48be51ac47d90d9f3604c94708
 EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 EBUILD girara-0.3.6.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 EBUILD girara-0.3.7.ebuild 964 BLAKE2B 59a0adee901ec76751ab2df7fe9e4802281b52957f366bd7acbdce5640ecdc910a78c33fe310ffad5696167bca6b8a905c0cbdbfdfdee349cfcab99cc2ce0b73 SHA512 6d16decdf15865794c8adbbdad49d7de6b28fdc0a5231c393916269a735ae7c21f01511445d688be48f63e7c83bad4db13c48b5d2dd53a94b7bdbfbe219adec2
-EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
+EBUILD girara-0.3.9.ebuild 970 BLAKE2B 0a889eb37c75ab98ceb942847b32f956a3ed781834c68b75fa7d1f180aa71d938d8b0bdb362131c48decad03a84712f96c091fd60464de176bd66626f4bb842d SHA512 672c2ebf9a89e9b9965abced68d461e79d38f805a8075b1481c2aa9045d3ec05320c9e7f8941c5b12758af88f075f7403e45f7ae20fee59b0b424a433125f717
+EBUILD girara-9999.ebuild 970 BLAKE2B 0a889eb37c75ab98ceb942847b32f956a3ed781834c68b75fa7d1f180aa71d938d8b0bdb362131c48decad03a84712f96c091fd60464de176bd66626f4bb842d SHA512 672c2ebf9a89e9b9965abced68d461e79d38f805a8075b1481c2aa9045d3ec05320c9e7f8941c5b12758af88f075f7403e45f7ae20fee59b0b424a433125f717
 MISC metadata.xml 667 BLAKE2B 67e62f5e585aa25094c1b1610a1c2796db659db5dc667f96aca37eb5900c9d079655b542b9bd2fe5a8e9a3a34c5e9c83fb2f75100f488847ef23305fbe92d9f5 SHA512 3449fc93878dd48d23f608f03e70a11b498a88a823555bc706f50ccff0612eff0de86bc832f4ac980b0cd46367efd8c382a3e34f6b944b8d80582c8d0a5fe3ae
diff --git a/dev-libs/girara/girara-0.3.9.ebuild b/dev-libs/girara/girara-0.3.9.ebuild
new file mode 100644
index 000000000000..88dc773e88de
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 52f9e4952594..88dc773e88de 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
@@ -23,30 +23,22 @@ IUSE="doc libnotify test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/glib:2
-	 dev-libs/json-c:=
-	 >=x11-libs/gtk+-3.20:3
-	 >=x11-libs/pango-1.14
-	 libnotify? ( x11-libs/libnotify )"
-
-DEPEND="${RDEPEND}
-	 doc? ( app-doc/doxygen )
-	 test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
-}
+DEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
 
 src_configure() {
 	local emesonargs=(
 		-Djson=enabled
 		-Ddocs=$(usex doc enabled disabled)
 		-Dnotify=$(usex libnotify enabled disabled)
-		)
-		meson_src_configure
+	)
+	meson_src_configure
 }
 
 src_test() {