* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/, app-i18n/fbterm/files/
@ 2018-05-07 12:58 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2018-05-07 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 65a109b101e0250a5dfbf21751998dcb36e1cf77
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 12:57:41 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 7 12:57:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a109b1
app-i18n/fbterm: tidy
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-i18n/fbterm/fbterm-1.7-r4.ebuild | 6 +++---
app-i18n/fbterm/fbterm-1.7-r5.ebuild | 8 ++++----
app-i18n/fbterm/files/fbterm-noterminfo.patch | 15 ---------------
3 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
index 8b906331dde..b8952a615af 100644
--- a/app-i18n/fbterm/fbterm-1.7-r4.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
@@ -14,13 +14,13 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
-COMMON_DEPEND="media-libs/fontconfig
+CDEPEND="media-libs/fontconfig
media-libs/freetype:2
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
!>=sys-libs/ncurses-6.1"
-DEPEND="${COMMON_DEPEND}
+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
index a4b174a1f85..45117addebe 100644
--- a/app-i18n/fbterm/fbterm-1.7-r5.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
@@ -22,16 +22,16 @@ RDEPEND="media-libs/fontconfig
DEPEND="${RDEPEND}
virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}"/${PN}-gcc6.patch
- "${FILESDIR}"/${PN}-noterminfo.patch
-)
+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
}
diff --git a/app-i18n/fbterm/files/fbterm-noterminfo.patch b/app-i18n/fbterm/files/fbterm-noterminfo.patch
deleted file mode 100644
index 76cf9fc7792..00000000000
--- a/app-i18n/fbterm/files/fbterm-noterminfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-commit 77c90022233634a3c891dc778585c526d9d846a1
-Author: Alexey Sokolov <sokolov@google.com>
-Date: Sun Apr 1 11:33:20 2018 +0100
-
- Don't install terminfo: ncurses-6.1 supports fbterm itself
-
- https://bugs.gentoo.org/648472
-
-diff --git a/Makefile.am b/Makefile.am
-index 10814b6..8adcd57 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = src im terminfo doc
-+SUBDIRS = src im doc
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/, app-i18n/fbterm/files/
@ 2020-05-20 13:47 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2020-05-20 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 2e4777c9a097c8cb1c88f09a556f7af4827cc38f
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 13:47:29 2020 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed May 20 13:47:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4777c9
app-i18n/fbterm: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/fbterm/Manifest | 1 -
app-i18n/fbterm/fbterm-1.7-r4.ebuild | 61 ----------------------------
app-i18n/fbterm/fbterm-1.7-r5.ebuild | 59 ---------------------------
app-i18n/fbterm/files/fbterm-gcc6.patch | 72 ---------------------------------
4 files changed, 193 deletions(-)
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index da167298d65..d6788ae8c34 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,2 +1 @@
-DIST fbterm-1.7.0.tar.gz 188642 BLAKE2B 2f4e0a989a58d6dd67e7696786d820f15b18039d8912b967de55b09aa03c723cad1d76171a264c41487171f6650089f8a7e02e50bed267f2465fc8a6af62c57e SHA512 ba78b5118b5e4c65046f7f91ce88cb4f828e2debb34358df8518e1907a8d601a2be4dfcf144e84494dc30e4828d333574debe8dd3ffb59e2169c3e48ba1f6a10
DIST fbterm-1.7_p20190503.tar.gz 187225 BLAKE2B 9efa290c73dae49e12bb53d44c502a58fa5baaf517248b18ae1218285a3785fe276bf028613eac0a78ccee51c8b392153533dffd1e2b88201cccf8badb6d34e1 SHA512 13a57f8c5fff1d9c70021cd01f554a76e5465ae49b05a5aa49949caf31eb2b8fc231bdfba6ac42840542b73edc4ab66e487eebd0fa9d92761c7193294edadf81
diff --git a/app-i18n/fbterm/fbterm-1.7-r4.ebuild b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
deleted file mode 100644
index b8952a615af..00000000000
--- a/app-i18n/fbterm/fbterm-1.7-r4.ebuild
+++ /dev/null
@@ -1,61 +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"
-
-CDEPEND="media-libs/fontconfig
- media-libs/freetype:2
- 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 )
-
-FILECAPS=(
- cap_sys_tty_config+ep usr/bin/${PN}
-)
-
-src_prepare() {
- sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|" terminfo/Makefile.am
-
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable gpm) \
- $(use_enable video_cards_vesa vesa)
-}
-
-src_install() {
- dodir /usr/share/terminfo
- 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-r5.ebuild b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
deleted file mode 100644
index 45117addebe..00000000000
--- 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/files/fbterm-gcc6.patch b/app-i18n/fbterm/files/fbterm-gcc6.patch
deleted file mode 100644
index aa19fac9672..00000000000
--- 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 },
- };
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-20 13:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-20 13:47 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/, app-i18n/fbterm/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2018-05-07 12:58 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox