gentoo resync : 30.05.2020

5 files changed, 27 insertions, 158 deletions

diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index 46d15435b0f1..4260ab5c342d 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,5 +1,3 @@
-AUX fbterm-gcc6.patch 1627 BLAKE2B 80167f0616e8e17669f98347884b6d793f1f2331aa3d4341e99b6e44b1f66cfbd811921e488b29f3ba1a194150d0decfd97992bc6f0509dfe6e423b7ff413944 SHA512 742969c5b568006d0592e1c71480f38d63437f50ec4a213f561325ba7570f5ed7d7d6e700b4973bda4d74b8c4992e25f731fb69efb450eff2ed97fcd49d713b9
-DIST fbterm-1.7.0.tar.gz 188642 BLAKE2B 2f4e0a989a58d6dd67e7696786d820f15b18039d8912b967de55b09aa03c723cad1d76171a264c41487171f6650089f8a7e02e50bed267f2465fc8a6af62c57e SHA512 ba78b5118b5e4c65046f7f91ce88cb4f828e2debb34358df8518e1907a8d601a2be4dfcf144e84494dc30e4828d333574debe8dd3ffb59e2169c3e48ba1f6a10
-EBUILD fbterm-1.7-r4.ebuild 1349 BLAKE2B 151ef78477b5ccb1a2fb33684eca050431fb5cdaedd07c8bdb4e6113607ccfa72c2b47f9d72588a700a3b9a2bb97d95adca099bcf6ab618328c43641e3823ba4 SHA512 6f565086806d41c514b8084208c406f607fcc8f2ebaa843d5241f48b5734ecc564c85d10af13fa710aced02346519bac2b0a8386235e2c927ce83715d45d1327
-EBUILD fbterm-1.7-r5.ebuild 1253 BLAKE2B bab40d86a2589cc4e1295dcd0c8c4d2a6a55a9c88ce18a43d86cd03b5cd10f45e419b51cbea0ef5c4e2889387a275ced3d6242de097bae6457d53227f8499915 SHA512 9c019a5916cf66747c7fe07fa3915d7a991eb2da3cfbf2d2a22321a8c362897c85aaf56278be51b5bc6a6bdf772069d7ce69c117708fe44c4b31149b6d24fb47
-MISC metadata.xml 320 BLAKE2B e927f9410ab7cc7b6528a9b1b3dfcda79e208783786f7c9a8906328d8644f52c7c1aeea32abce83bd4f5b9c907adb4364577f3053200de2d202c031c3bb9c0ff SHA512 c6a430df744723fb4a59ea103f5a379d7d533b84a4286573dc29acb61cba3210b48f31c2b30b3c190bf0135a475f69fe51309ea68f10709715007e3d37646892
+DIST fbterm-1.7_p20190503.tar.gz 187225 BLAKE2B 9efa290c73dae49e12bb53d44c502a58fa5baaf517248b18ae1218285a3785fe276bf028613eac0a78ccee51c8b392153533dffd1e2b88201cccf8badb6d34e1 SHA512 13a57f8c5fff1d9c70021cd01f554a76e5465ae49b05a5aa49949caf31eb2b8fc231bdfba6ac42840542b73edc4ab66e487eebd0fa9d92761c7193294edadf81
+EBUILD fbterm-1.7_p20190503.ebuild 1352 BLAKE2B 89de8a5b38761d10f4ffb9ee068473d730d323573e1c4bf6b7f07a7ede104c9e7d0db38342cce16c8ef36331214a2f7f68b7c0b73c540f678785634173780a99 SHA512 4b9ba3b2e374a591d60d49db989fdc71454ea239d8cf86895d55e32c2fcc9648564c5e0ed36eb99165a9d44d8241eb0faa5e493e0acb9c48387bb0c40535106b
+MISC metadata.xml 313 BLAKE2B 75b2f15a670ffc2bf3aa397e6ee043442f326d0f9764e469e591dc495022b9df9df533bb2fe2b6715830c1ef780f0ce97fd635e00c2ba8def1e27bf222f0d59d SHA512 f5f73637bd468db6f5b40acd14c2cba5d4d27183099ee300e40ebf6d67673fa1b3f06410f1cbeca304cc321ec57f64bd0af23be8899dad0afefa63c636bcd1f7
diff --git a/app-i18n/fbterm/fbterm-1.7-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
deleted file mode 100644
index 45117addebe2..000000000000
--- a/app-i18n/fbterm/fbterm-1.7-r5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools fcaps
-
-DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://code.google.com/p/fbterm"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gpm video_cards_vesa"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	gpm? ( sys-libs/gpm )
-	video_cards_vesa? ( dev-libs/libx86 )
-	>=sys-libs/ncurses-6.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
-
-FILECAPS=(
-	cap_sys_tty_config+ep usr/bin/${PN}
-)
-
-src_prepare() {
-	# bug #648472
-	sed -i "s/terminfo//" Makefile.am
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gpm) \
-		$(use_enable video_cards_vesa vesa)
-}
-
-src_install() {
-	default
-
-	use filecaps || fperms u+s /usr/bin/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	elog "${PN} won't work with vga16fb. You have to use other native"
-	elog "framebuffer drivers or vesa driver."
-	elog "See ${EPREFIX}/usr/share/doc/${P}/README for details."
-	elog
-	elog "To use ${PN}, ensure you are in video group."
-}
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index b8952a615af8..c6271dc437cd 100644
--- a/app-i18n/fbterm/fbterm-1.7-r4.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit autotools fcaps
+inherit autotools fcaps toolchain-funcs vcs-snapshot
+
+EGIT_COMMIT="ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df"
 
 DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://code.google.com/p/fbterm"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.0.tar.gz"
+HOMEPAGE="https://github.com/gjedeer/fbterm"
+SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="gpm video_cards_vesa"
 
-CDEPEND="media-libs/fontconfig
+BDEPEND="virtual/pkgconfig"
+DEPEND="media-libs/fontconfig
 	media-libs/freetype:2
+	>=sys-libs/ncurses-6.1
 	gpm? ( sys-libs/gpm )
 	video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${CDEPEND}
-	!>=sys-libs/ncurses-6.1"
-DEPEND="${CDEPEND}
-	sys-libs/ncurses
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+RDEPEND="${DEPEND}"
 
 FILECAPS=(
 	cap_sys_tty_config+ep usr/bin/${PN}
 )
 
 src_prepare() {
-	sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
+	# bug #648472
+	sed -i "s/terminfo//" Makefile.am || die "Can't remove terminfo"
 
 	default
 	eautoreconf
@@ -43,8 +42,11 @@ src_configure() {
 		$(use_enable video_cards_vesa vesa)
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
-	dodir /usr/share/terminfo
 	default
 
 	use filecaps || fperms u+s /usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-gcc6.patch b/app-i18n/fbterm/files/fbterm-gcc6.patch
deleted file mode 100644
index aa19fac96723..000000000000
--- a/app-i18n/fbterm/files/fbterm-gcc6.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=594308
-
-Author: Peter Levine <plevine457@gmail.com>
-
---- a/src/lib/vterm_states.cpp
-+++ b/src/lib/vterm_states.cpp
-@@ -39,14 +39,14 @@
- 	{ 0x1B, 0,	ESesc },
- 	{ 0x7F, 0,	ESkeep },
- 	{ 0x9B, 0,	ESsquare },
--	{ -1}
-+	{ (u16) -1}
- };
- 
- const VTerm::Sequence VTerm::escape_sequences[] = {
- 	{   0, 0, ESnormal },
- 
- 	// ESnormal
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESesc
- 	{ '[', &VTerm::clear_param,	ESsquare },
-@@ -65,7 +65,7 @@
- 	{ '8', &VTerm::restore_cursor,	ESnormal },
- 	{ '>', &VTerm::keypad_numeric,	ESnormal },
- 	{ '=', &VTerm::keypad_application,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESsquare
- 	{ '[', 0,	ESfunckey },
-@@ -104,7 +104,7 @@
- 	{ '`', &VTerm::cursor_position_col,	ESnormal },
- 	{ ']', &VTerm::linux_specific, ESnormal },
- 	{ '}', &VTerm::fbterm_specific, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESnonstd
- 	{ '0' | ADDSAME(9), &VTerm::set_palette,    ESkeep },
-@@ -112,25 +112,25 @@
- 	{ 'a' | ADDSAME(5), &VTerm::set_palette,    ESkeep },
- 	{ 'P', &VTerm::begin_set_palette, ESkeep },
- 	{ 'R', &VTerm::reset_palette, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESpercent
- 	{ '@', &VTerm::clear_utf8,	ESnormal },
- 	{ 'G', &VTerm::set_utf8,	ESnormal },
- 	{ '8', &VTerm::set_utf8,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// EScharset
- 	{ '0', &VTerm::set_charset, ESnormal },
- 	{ 'B', &VTerm::set_charset, ESnormal },
- 	{ 'U', &VTerm::set_charset, ESnormal },
- 	{ 'K', &VTerm::set_charset, ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// EShash
- 	{ '8', &VTerm::screen_align,	ESnormal },
--	{ -1 },
-+	{ (u16) -1 },
- 
- 	// ESfunckey
--	{ -1 },
-+	{ (u16) -1 },
- };
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
index 165c6df0ed29..d76dd2993d24 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">fbterm</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gjedeer/fbterm</remote-id>
+	</upstream>
 </pkgmetadata>