gentoo auto-resync : 26:06:2023 - 19:33:07

5 files changed, 2 insertions, 113 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4e7da8ab52bc..36e71e82f4ff 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 77252a2bc89f..fc0194fb8520 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,5 @@
 AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
-DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
-EBUILD fontforge-20220308-r1.ebuild 2782 BLAKE2B e606ee0c6542c488e6af89dc2b6cd064b07b1e7c8e055d34682261be5da5531e12c57b20889bc85d37f7bbf21aedbe9a739323c58f389ddd0ed6745b87b8245a SHA512 af5a9009e57f75e77e1b1bcfffbee3ce31bea35e6732c655b21f5a9d8777c74467d53aa4930852a66e42f6098dfe569711c618778ac7256b1161bed3ae405d12
 EBUILD fontforge-20230101.ebuild 2876 BLAKE2B 558dd465be9929cc2a9c6b728f46e9f3035f58f991e6c57be8726db73c1950302532fa06c3a7c52cb3a21a6c38c802458aa07d37ed589ab7750166fae2419404 SHA512 954952689766a1b65ccd97ff93fac89ef58c3ad79d6e42b6538378a5a95560749cdc20f8b25be31607280b785c12abd6f5b204b152b75fdb148fac1d587ba7d2
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/fontforge-20220308-r1.ebuild b/media-gfx/fontforge/fontforge-20220308-r1.ebuild
deleted file mode 100644
index bf9f7d2ae49e..000000000000
--- a/media-gfx/fontforge/fontforge-20220308-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2004-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-r1 xdg cmake
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="https://fontforge.org/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.67:2
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	gif? ( media-libs/giflib:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( >=x11-libs/gtk+-3.10:3 )
-	!gtk? (
-		X? (
-			>=x11-libs/cairo-1.6:0=
-			>=x11-libs/pango-1.10:0=[X]
-			x11-libs/libX11:=
-			x11-libs/libXi:=
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	woff2? ( media-libs/woff2:0= )
-"
-DEPEND="${RDEPEND}
-	!gtk? ( X? ( x11-base/xorg-proto ) )
-"
-BDEPEND="
-	sys-devel/gettext
-	doc? ( >=dev-python/sphinx-2 )
-	python? ( ${PYTHON_DEPS} )
-	test? ( ${RDEPEND} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(usex doc ON OFF)
-		-DENABLE_LIBGIF=$(usex gif ON OFF)
-		-DENABLE_LIBJPEG=$(usex jpeg ON OFF)
-		-DENABLE_LIBPNG=$(usex png ON OFF)
-		-DENABLE_LIBREADLINE=$(usex readline ON OFF)
-		-DENABLE_LIBSPIRO=OFF # No package in Gentoo
-		-DENABLE_LIBTIFF=$(usex tiff ON OFF)
-		-DENABLE_MAINTAINER_TOOLS=OFF
-		-DENABLE_PYTHON_EXTENSION=$(usex python ON OFF)
-		-DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF)
-		-DENABLE_TILE_PATH=ON
-		-DENABLE_WOFF2=$(usex woff2 ON OFF)
-	)
-
-	if use gtk || use X; then
-		mycmakeargs+=(
-			-DENABLE_GUI=ON
-			# Prefer GTK over X11 if both USE flage are enabled
-			-DENABLE_X11=$(usex gtk OFF ON)
-		)
-	else
-		mycmakeargs+=( -DENABLE_GUI=OFF )
-	fi
-
-	if use python; then
-		python_setup
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	if use truetype-debugger ; then
-		local ft2="${ESYSROOT}/usr/include/freetype2"
-		local ft2i="${ft2}/internal4fontforge"
-		mycmakeargs+=(
-			-DENABLE_FREETYPE_DEBUGGER="${ft2}"
-			-DFreeTypeSource_INCLUDE_DIRS="${ft2};${ft2i}/include;${ft2i}/include/freetype;${ft2i}/src/truetype"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	docompress -x /usr/share/doc/${PF}/html
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index edc28bddf776..2915e1e2174c 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,3 @@
 DIST graphviz-8.0.5.tar.xz 21426200 BLAKE2B 0b84dd788c2e8ee54941c9093ad8b9208d30bb42f1b6c62afd136ddc4616c2a851ce78b62631ec8023b39bdb861c3aa3ecc89b1804dbd77f56530a1ab8217a5d SHA512 1bcde81cd8bb370e6b843b02eecc96459d7567ff982a2fc4a97b50b43dad45ac2d4d5fb5f5f629562585600256878dd81c7b4c51ab1691cb3b6f4dcc054c7443
-EBUILD graphviz-8.0.5.ebuild 6030 BLAKE2B d0283b4c391a1cba4ee0cacb7c06cce0047ae36d34fb1bba7d174b5a594e8a938ef55680f8f53f44f1b2e257ac2b1912ae086ec96d34a0f8e25f3aca7a06047f SHA512 46dc91d942f8442e94c1a235ffb6170130a7bb8b0807b492c7507217fa31e6e327a2a676bffa64afc6be40042e9ad4db46824b43eb215d94628b650d2b48c4f7
+EBUILD graphviz-8.0.5.ebuild 6057 BLAKE2B ecc94d020ea95ab7d92d0807801a9a38ff186c208db70399ca1b261971777e032df819446756357ab42dec60848776797b2316cefd446a7844e289b6ba35cc11 SHA512 8c051bf8a9947ffaf62560c084347fa06d437b64d8d60911e7c5509df4d14a21c28254def43f2fbe73f86c80236c5239ce55aa36dcfa28dd4f5f7f156c8adb98
 MISC metadata.xml 2324 BLAKE2B 206e5312317fb7bf8f4bba64196a6fa89a8a9e30be3b5e0bf598485cdc2a862e1cc302024b9d170aa6c8ebbbd429ab839d296076bc6f1ac3b154678773cd4d5f SHA512 8eb9a1508823a06fbb180755a7dd173cb2365d7d90e25ad211d56645ee213ee825a991ba56b3f1c8d952c0a7baaa1ea3f8d8d35bdedbffbdce608d66645dd2b0
diff --git a/media-gfx/graphviz/graphviz-8.0.5.ebuild b/media-gfx/graphviz/graphviz-8.0.5.ebuild
index da7fcf0e13d4..73b63c95369e 100644
--- a/media-gfx/graphviz/graphviz-8.0.5.ebuild
+++ b/media-gfx/graphviz/graphviz-8.0.5.ebuild
@@ -187,6 +187,7 @@ src_configure() {
 		# libtool file collision, bug #276609
 		--without-included-ltdl
 		--disable-ltdl-install
+		QMAKE=$(usev qt5 qmake5)
 	)
 	econf "${myconf[@]}"
 }