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

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

[David Seifert]

commit:     4cc76e18945d3d9030d3c7cf18b5900b39ade4f2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 22:17:36 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 22:17:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc76e18

media-gfx/fim: Remove old

Closes: https://bugs.gentoo.org/651266
Closes: https://github.com/gentoo/gentoo/pull/11658
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/fim/Manifest                     |  1 -
 media-gfx/fim/files/fim-0.4_rc3-gcc6.patch | 44 --------------
 media-gfx/fim/fim-0.4_rc3-r2.ebuild        | 94 ------------------------------
 3 files changed, 139 deletions(-)

diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 590f31a3f2c..a9d84d33ea7 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,2 +1 @@
-DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306

diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
deleted file mode 100644
index 7f5388b63b3..00000000000
--- a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/595832
-Commit: http://svn.savannah.gnu.org/viewvc/fbi-improved?view=revision&revision=735
-
---- a/src/fim.cpp
-+++ b/src/fim.cpp
-@@ -114,7 +114,7 @@
-     {"device",     required_argument, NULL, 'd',"specify a {framebuffer device}","{framebuffer device}",
- "Framebuffer device to use. Default is the one your vc is mapped to (as in fbi)."
-     },
--    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0xd15cbab3,"dump reference info","[=man]",
-+    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0x6472690a,"dump reference info","[=man]",
- "Will dump to stdout the language reference help."
-     },
-     {"dump-default-fimrc",      no_argument,       NULL, 'D',"dump on standard output the default configuration",NULL,
-@@ -182,7 +182,7 @@
- /* FIXME: shall document this */
- #endif /* FIM_WITH_LIBIMLIB2 */
-     },
--    {"offset",      required_argument,       NULL,  0xFFD8FFE0,"will open the first image file at the specified offset","{bytes-offset}",
-+    {"offset",      required_argument,       NULL,  0x6f66660a, "will open the first image file at the specified offset","{bytes-offset}",
- "Will use the specified \\fBoffset\\fP (in bytes) for opening the specified files (useful for viewing images on damaged file systems; however, since the internal variables representation is sizeof(int) bytes based, you have a limited offset range: using already chopped image files may be a workaround to this limitation)."
-     },/* NEW */
-     {"text-reading",      no_argument,       NULL, 'P',"proceed scrolling as reading through a text document",NULL,
-@@ -979,9 +979,8 @@
- 		    cc.pre_autocmd_add(FIM_VID_SCALE_STYLE"='1';" "autocmd \"" FIM_ACM_POSTSCALE "\" \"\" \"" FIM_FLT_DISPLAY "'resize';\";");
- 	#endif /* FIM_AUTOCMDS */
- 		    break;
--		case 0xFFD8FFE0:
--		    //fbi's
--	 	    // NEW
-+		case 0x6f66660a:
-+		    //fim's
- 	#ifdef FIM_AUTOCMDS
- 		{
- 			int ipeppe_offset;
-@@ -1191,7 +1190,7 @@
- 			}
- #endif /* FIM_WANT_OUTPUT_DEVICE_STRING_CASE_INSENSITIVE */
- 		    break;
--		case 0xd15cbab3:
-+		case 0x6472690a:
- 		    //fim's
- 		{
- 			args_t args;
\ No newline at end of file

diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
deleted file mode 100644
index 8f78c3df9c2..00000000000
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
-HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
-SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pdf png postscript readline sdl static svg tiff xfig"
-
-RDEPEND="media-fonts/terminus-font
-	aalib? ( media-libs/aalib[slang] )
-	dia? ( app-office/dia )
-	djvu? ( app-text/djvu )
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.31 )
-	png? ( media-libs/libpng:0 )
-	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff:0 )
-	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-poppler031.patch"
-	epatch "${FILESDIR}/${PN}-0.4_rc3-gcc6.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable aalib aa) \
-		$(use_enable dia) \
-		$(use_enable djvu) \
-		$(use_enable exif) \
-		$(use_enable fbcon framebuffer) \
-		$(use_enable gif) \
-		$(use_enable graphicsmagick) \
-		$(use_enable imagemagick convert) \
-		$(use_enable pdf poppler) \
-		$(use_enable png) \
-		$(use_enable postscript ps) \
-		$(use_enable readline) \
-		$(use_enable sdl) \
-		$(use_enable static) \
-		$(use_enable svg inkscape) \
-		$(use_enable tiff) \
-		$(use_enable xfig) \
-		--disable-hardcoded-font \
-		--disable-imlib2 \
-		--disable-matrices-rendering \
-		--disable-xcftopnm \
-		--enable-fimrc \
-		--enable-history \
-		--enable-loader-string-specification \
-		--enable-mark-and-dump \
-		--enable-output-console \
-		--enable-raw-bits-rendering \
-		--enable-read-dirs \
-		--enable-recursive-dirs \
-		--enable-resize-optimizations \
-		--enable-scan-consolefonts \
-		--enable-screen \
-		--enable-scripting \
-		--enable-seek-magic \
-		--enable-stdin-image-reading \
-		--enable-unicode \
-		--enable-warnings \
-		--enable-windows \
-		--with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-}

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

[Sam James]

commit:     bdb615e918a51a6190c7f81a020a78ac3c71a9e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 18:48:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 18:48:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb615e9

media-gfx/fim: update EAPI 6 -> 7

Closes: https://bugs.gentoo.org/723462
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch | 14 ++++++++++++++
 media-gfx/fim/fim-0.5_rc3.ebuild                 | 12 ++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch
new file mode 100644
index 00000000000..dd34f80cbaa
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/723462
+--- a/src/fim.cpp
++++ b/src/fim.cpp
+@@ -343,8 +343,8 @@
+  .P
+  .nf
+  Shift+D         delete image
+- R               rotate 90° clockwise
+- L               rotate 90° counter-clock wise
++ R               rotate 90 degree clockwise
++ L               rotate 90 degree counter-clock wise
+  .fi
+  .P
+  The delete function actually wants a capital letter 'D', thus you have

diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index dc44d837674..777a28a7dd6 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
 HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
 SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
+S="${WORKDIR}"/${P/_rc/-rc}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,17 +32,16 @@ RDEPEND="media-fonts/terminus-font
 	svg? ( media-gfx/inkscape )
 	tiff? ( media-libs/tiff:0 )
 	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison
 	sys-devel/flex"
 
-S=${WORKDIR}/${P/_rc/-rc}
-
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-deg-symbol.patch"
 )
 
 src_prepare() {