gentoo auto-resync : 18:09:2023 - 05:05:05

5 files changed, 77 insertions, 9 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 95ae78c6fe26..4ad9b01ca82d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 1dc625db5bcf..5d0147fc3f52 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,7 +1,9 @@
 DIST gnote-44.1.tar.xz 3330072 BLAKE2B ff86fa34bdfff61eceb25abef1c73377f888082e70e539172849bf9425eada1c11000c1a75f69eb74fdbc2fc6d45ad3c58c843bf769279a026dd5298a07abc68 SHA512 89364d161d6ecc11822b89dec0353d0e20bc08d883573f324e4980ff2420361ddeb326213eb668fba4ce8de7d5d9668a1a058666ad2b81658ef94f8a65b87363
 DIST gnote-45.alpha.tar.xz 3320968 BLAKE2B d53d16f97cb737159c2888d0ffb3f4f6ec1f759a927ed4a50c2abb9ac0c9162e811cf976383c23a4f642b08370037d8d00197e6628528bff51ae1cc93803c07e SHA512 479dfe13cf1680bfdc65cb3ffc40c27bedf11519d38142a276e019062030e946d9a2b10badb0a230d1818aad665c1704e5f9bf8592fff11f9a0f0a6374fade1e
 DIST gnote-45.beta.tar.xz 3248536 BLAKE2B 2730ae4addd80ec4eb4777786952595ab2d422eb55832f66cb5d86dbdbc4572f9249984b3270ec69ee236c1acb5063e6fec8529cbaf0930821ac73c6e0c69e4a SHA512 1d3394a00720e334af695182abfc7e39ea5cd94e7958d5e53173c0f6f1b93f242118415bbd7f886edbb8ceb805e6b73835f851e3614db76f113478e85b97ed7a
+DIST gnote-45.rc.tar.xz 3273864 BLAKE2B 8ab5340e0659c4119c279dd1130fd1a591dd496c8eb96cbfe8171f02192a86a5a3cf6b8c075fd195373885271585c1e6ece1af8fdeb0b75442ddc911b29a7b6f SHA512 cb7b8b47ee724f206258b2dd72fb79c5da45c1f3bd1eca754adc57e8f6f9620a98c56d96867ed455511b78d6dac0d6ecac6968bb29e1964aeac233ff191c6072
 EBUILD gnote-44.1.ebuild 1467 BLAKE2B 94ec94b7ca56f9adea99504ef6f2fda297c4cc3d0e9fd886e9454e5e251d82c075e2e16367ebba848b05f041b0b7de83f12aeb8ecc6727e7bd5e05f9682398b0 SHA512 ff3ad289bdeea8f9b9e8151f45877eeae5d77c18a2109b5d27a596ca6ff2ec06efe0dbb755cde80e2177ac2a654d3a1d8287b4906402a638a9b93c00934f0d28
 EBUILD gnote-45_alpha.ebuild 1441 BLAKE2B b4f62bbd1c8fd1192ddbb02787b6541d643568efcdef71ea371934a74f3919bf9eab3a1b2718e581a8603a9884346d03a232955a49332218f0e06886d9eaed73 SHA512 ca23cb59dd4cb6fe3cdddbd25b3a7246c0280565d3d3185627f28ad3a3033d5c0b0cab53afd7487d80f67da8d529694fb146c9a5ba19fd358ede06645d9a9cec
 EBUILD gnote-45_beta.ebuild 1441 BLAKE2B b4f62bbd1c8fd1192ddbb02787b6541d643568efcdef71ea371934a74f3919bf9eab3a1b2718e581a8603a9884346d03a232955a49332218f0e06886d9eaed73 SHA512 ca23cb59dd4cb6fe3cdddbd25b3a7246c0280565d3d3185627f28ad3a3033d5c0b0cab53afd7487d80f67da8d529694fb146c9a5ba19fd358ede06645d9a9cec
+EBUILD gnote-45_rc.ebuild 1441 BLAKE2B b4f62bbd1c8fd1192ddbb02787b6541d643568efcdef71ea371934a74f3919bf9eab3a1b2718e581a8603a9884346d03a232955a49332218f0e06886d9eaed73 SHA512 ca23cb59dd4cb6fe3cdddbd25b3a7246c0280565d3d3185627f28ad3a3033d5c0b0cab53afd7487d80f67da8d529694fb146c9a5ba19fd358ede06645d9a9cec
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-45_rc.ebuild b/app-misc/gnote/gnote-45_rc.ebuild
new file mode 100644
index 000000000000..62d3c9902709
--- /dev/null
+++ b/app-misc/gnote/gnote-45_rc.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.74:2[dbus]
+	>=dev-cpp/glibmm-2.74:2.68
+	>=dev-cpp/gtkmm-4.0.0:4.0
+	>=app-crypt/libsecret-0.8
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16
+	test? ( dev-libs/unittest++ )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Build system requires UnitTest++ >=1.5.1, but the .pc file doesn't
+	# specify a version
+	sed -i -e "/UnitTest++/ s/version: [^,]*,//" meson.build || die
+	if ! use test; then
+		sed -i -e "/unit_test_pp/ s/ = .*/ = disabler()/" meson.build || die
+	fi
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index b481f92efcee..2b493cc82a8d 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -3,5 +3,5 @@ AUX graphlcd-base-2.0.3-cpp.patch 20195 BLAKE2B 5b9c3db6af66ed2b5dedb4d7acc7238c
 AUX graphlcd-base-2.0.3-imagemagick7.patch 12180 BLAKE2B 26f41a9bfaf83b1c065afd9bc77a5552a5d0183b0458fa9a136ad5ce6dc8b8420341e4fe3c474e70ba71f4990077e78c36e825d0b69ebd65e8a6b2f6ba5dee8e SHA512 04edc28a859850bc40c9f18bad3a8e5a33fb889713f24b85d9d78b2a3c7d9c397abf3bb36bb89c1ddcc6d9a4fcddc0c985c946b7ac24532bdc37d2112ad3a1d9
 AUX graphlcd-base-2.0.3-musl.patch 879 BLAKE2B 096867a3095f6e2b6ac8d8cfb4695bfb417f1d72a3b2e2b42d5bb3bc9a309076d2b3d1ff103092076dd38ed3ac88ab368c2b1fe0580ce54045396f60e837fad4 SHA512 0cce578b26a9e85524ef8b7dda4a09fe757a2d778ed2b03c41e1b7e995b306dbe069ac03043f6f1051b29f55d71aa644d84e79a17a957ae6bfb58d43e4d8543d
 DIST graphlcd-base-2.0.3.tar.bz2 523229 BLAKE2B cfdca5a6a73e8a3858d694aa997037b56471feb20541a328210a106d22c97f57e20f0798411e5a92ca616e5991ec167a8986730b985d0aefcbbb6c6454ab78c2 SHA512 dd0d6a1f1d43405d6ff2e531010f97d47081e3e8e9ccd238adc1084912c99838e80e85b8bd6b37d6462859c3c96229fd83e5ac93fb4068ffe5c30cff3787d138
-EBUILD graphlcd-base-2.0.3-r3.ebuild 2391 BLAKE2B 0388fff40f8f27881cee93b197290ae10385a309b57ebc4790f31f950c61c78aa5115a06a3b38bbd9181f587c15c09ead6e923d5fdc101b8aecffe36ca862b33 SHA512 fd7fc4a824b76da4d1ee9f023e854616e4049735b62b241fbbebadb6b5eeea742cd08c14e878fcf8cc74f7f92f140287960b3010f923e98c426372410e1caa77
+EBUILD graphlcd-base-2.0.3-r3.ebuild 2379 BLAKE2B 959f699abcb6046bc3be5064116e288b50f6eb3137a616f675fc7bb49595abeb7ae056049c03886ac24f890523cc0ce93cdc5cf3c29b8d2bdd1b10b72853960a SHA512 1b59fbf4926c02a62a43783001590c6fa7653a7f482955970424b90dbb534d5f4ffc09d5ede8cb79f205a81ca8e935a990f06128e483f61a46e7f32adc40d96a
 MISC metadata.xml 1010 BLAKE2B edb76fc1024e7dc42a14155d892a126d611cf3157604b1a12590c97e4c3270dfb66f49962b08780c6bc53874f94acb1188cc275221e27b2e83ed3b02c343dbad SHA512 d623de28fc64e351373fbb6005393e6bded18f163ec771d1f6854b87fe022250fb88447c919c6a88379fb23d4fc057a2a752365a7759ce621c5ab8059d471aab
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
index df811179a910..785f2ca47f73 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,15 +13,16 @@ KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 
 RDEPEND="
 	dev-libs/libhid
 	net-libs/libvncserver
 	freetype? ( media-libs/freetype:2= )
 	fontconfig? ( media-libs/fontconfig:1.0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
-	imagemagick? ( media-gfx/imagemagick:= )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
+	)
 	lcd_devices_ax206dpf? ( virtual/libusb:0 )
 	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
 "
@@ -71,11 +72,13 @@ src_configure() {
 	if ! use fontconfig; then
 		sed -e "50s:HAVE:#HAVE:" -i Make.config || die
 	fi
-	if use graphicsmagick; then
-		sed -e "57s:#::" -i Make.config || die
-	fi
+
 	if use imagemagick; then
-		sed -e "56s:#::" -i Make.config || die
+		if use graphicsmagick; then
+			sed -e "57s:#::" -i Make.config || die
+		else
+			sed -e "56s:#::" -i Make.config || die
+		fi
 	fi
 }