[gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/, media-gfx/fontforge/files/

[Mike Gilbert]

commit:     3496905e28d0656a662d0d19f605f65d56838867
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 18:13:19 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 18:13:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3496905e

media-gfx/fontforge: remove old

Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 media-gfx/fontforge/Manifest                      |   1 -
 media-gfx/fontforge/files/20190317-gdk_init.patch |  39 --------
 media-gfx/fontforge/fontforge-20190317-r3.ebuild  | 116 ----------------------
 3 files changed, 156 deletions(-)

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index eab92735ad6..663096d134c 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,3 @@
-DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11

diff --git a/media-gfx/fontforge/files/20190317-gdk_init.patch b/media-gfx/fontforge/files/20190317-gdk_init.patch
deleted file mode 100644
index 060e6957748..00000000000
--- a/media-gfx/fontforge/files/20190317-gdk_init.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4577ad7205c600c6c8e809e10d51eb2118cb66b5 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-Date: Sun, 24 Mar 2019 18:12:21 -0400
-Subject: [PATCH] Defer gdk_init() until after CheckIsScript()
-
-This allows fontforge to run without an X server available.
-
-Fixes: https://github.com/fontforge/fontforge/issues/3582
----
- fontforgeexe/startui.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
-index 1bb5fd8ca..ae15afbf2 100644
---- a/fontforgeexe/startui.c
-+++ b/fontforgeexe/startui.c
-@@ -900,9 +900,6 @@ int fontforge_main( int argc, char **argv ) {
- #if !(GLIB_CHECK_VERSION(2, 35, 0))
-     g_type_init();
- #endif
--#ifdef FONTFORGE_CAN_USE_GDK
--    gdk_init(&argc, &argv);
--#endif
- 
-     /* Must be done before we cache the current directory */
-     /* Change to HOME dir if specified on the commandline */
-@@ -1093,6 +1090,9 @@ int fontforge_main( int argc, char **argv ) {
-     CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */
- 					/* If there is no UI, there is always a script */
- 			                /*  and we will never return from the above */
-+#ifdef FONTFORGE_CAN_USE_GDK
-+    gdk_init(&argc, &argv);
-+#endif
-     if ( load_prefs==NULL ||
- 	    (strcasecmp(load_prefs,"Always")!=0 &&	/* Already loaded */
- 	     strcasecmp(load_prefs,"Never")!=0 ))
--- 
-2.21.0
-

diff --git a/media-gfx/fontforge/fontforge-20190317-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
deleted file mode 100644
index 3116cb1b793..00000000000
--- a/media-gfx/fontforge/fontforge-20190317-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="http://fontforge.github.io/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	cairo? ( png )
-	gtk? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( png python )
-"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	cairo? (
-		>=x11-libs/cairo-1.6:0=
-		x11-libs/pango:0=
-	)
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( >=x11-libs/gtk+-3.10:3 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXi:0=
-		>=x11-libs/pango-1.10:0=[X]
-	)
-	!media-gfx/pfaedit
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Needs keywording on many arches.
-#	zeromq? (
-#		>=net-libs/czmq-2.2.0:0=
-#		>=net-libs/zeromq-4.0.4:0=
-#	)
-
-PATCHES=(
-	"${FILESDIR}"/20170731-gethex-unaligned.patch
-	"${FILESDIR}"/20190317-gdk_init.patch
-	"${FILESDIR}"/CVE-2020-5395.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
-		$(use_enable python python-extension)
-		$(use_enable python python-scripting)
-		--enable-tile-path
-		--enable-gb12345
-		$(use_with cairo)
-		$(use_with gif giflib)
-		$(use_with jpeg libjpeg)
-		$(use_with png libpng)
-		$(use_with readline libreadline)
-		--without-libspiro
-		$(use_with tiff libtiff)
-		$(use_with unicode libuninameslist)
-		#$(use_with zeromq libzmq)
-		--without-libzmq
-		$(use_with X x)
-	)
-	if use gtk; then
-		# broken AC_ARG_ENABLE usage
-		# https://bugs.gentoo.org/681550
-		myeconfargs+=( --enable-gdk=gdk3 )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Build system deps are broken
-	emake -C plugins HTDOCS_SUBDIR=/html
-	emake HTDOCS_SUBDIR=/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" HTDOCS_SUBDIR=/html install
-	docompress -x /usr/share/doc/${PF}/html
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}