gentoo resync : 08.05.2018

3 files changed, 66 insertions, 4 deletions

diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index c405b7b5572d..46d15435b0f1 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,4 +1,5 @@
 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-r3.ebuild 1303 BLAKE2B bc7a8d851e9e6b1920b2384126111c6d796f4c4edb6863f750946cf20f6b3be50aa7a06a3aa21918639599efd8017dfd6fe763e77f06703b5f4a9a30ac9bb3d7 SHA512 3773a4a119c3c73803cf6c3dec3d91195388aa0048cadf23cbe51c85b4d371f62e432ca4efb5d02b2c4190e996e0936d3590a9719d4c6f9cdc5a02e212a58c50
+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
diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
index 2138ece5ef1e..b8952a615af8 100644
--- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,11 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="gpm video_cards_vesa"
 
-RDEPEND="media-libs/fontconfig
+CDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	gpm? ( sys-libs/gpm )
 	video_cards_vesa? ( dev-libs/libx86 )"
-DEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
+	!>=sys-libs/ncurses-6.1"
+DEPEND="${CDEPEND}
 	sys-libs/ncurses
 	virtual/pkgconfig"
 
diff --git a/app-i18n/fbterm/fbterm-1.7-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
new file mode 100644
index 000000000000..45117addebe2
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
@@ -0,0 +1,59 @@
+# 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."
+}