[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 212b6096dbd83f3465cc547990359efb87dabd48
Author: Akinori Hattori gentoo org>
AuthorDate: Mon Oct 11 12:48:52 2021 +
Commit: Akinori Hattori gentoo org>
CommitDate: Mon Oct 11 12:48:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212b6096
app-i18n/fbterm: amd64/x86 stable
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index 408aa38f9e1..fa95d577d19 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="gpm video_cards_vesa"
RDEPEND="media-libs/fontconfig
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: ff4292a66a916974fdec86ba74f2358d3b92ec41
Author: Akinori Hattori gentoo org>
AuthorDate: Wed Oct 6 14:47:19 2021 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed Oct 6 14:47:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4292a6
app-i18n/fbterm: fix build with >=sys-devel/autoconf-2.68
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 10 ++
app-i18n/fbterm/files/fbterm-autoconf-2.68.patch | 24
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index c6271dc437c..408aa38f9e1 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -16,13 +16,15 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
-BDEPEND="virtual/pkgconfig"
-DEPEND="media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
media-libs/freetype:2
>=sys-libs/ncurses-6.1
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-autoconf-2.68.patch )
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
new file mode 100644
index 000..826f3cd3c6b
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
b/configure.ac
+@@ -85,16 +85,16 @@
+
+ if test x"$EPOLL" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+-AC_LANG_PROGRAM([[#include ]],
+- [[if (epoll_create(10) >= 0) return 0; return 1;]]),
++[AC_LANG_PROGRAM([[#include ]],
++ [[if (epoll_create(10) >= 0) return 0; return 1;]])],
+ [EPOLL=yes]
+ )
+ fi
+
+ if test x"$SIGNALFD" = xauto -a x"$cross_compiling" = xno; then
+ AC_RUN_IFELSE(
+-AC_LANG_PROGRAM([[#include ]],
+- [[sigset_t mask; if (signalfd(-1, , 0) >= 0) return 0; return
1;]]),
++[AC_LANG_PROGRAM([[#include ]],
++ [[sigset_t mask; if (signalfd(-1, , 0) >= 0) return 0; return
1;]])],
+ [SIGNALFD=yes]
+ )
+ fi
+install-data-local:
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: c734c81452b05151fe024eb0309c9d63525fda96
Author: Alexey Sokolov google com>
AuthorDate: Sun May 24 10:04:54 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed May 27 12:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c734c814
app-i18n/fbterm: add missing RDEPEND
Closes: https://github.com/gentoo/gentoo/pull/15943
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov google.com>
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index b8c3d875a61..c6271dc437c 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -16,12 +16,13 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
+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 )"
-BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}"
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 22a5feb0e634e942d3e4f516f7d5735a8f47f637
Author: Akinori Hattori gentoo org>
AuthorDate: Wed May 20 13:53:14 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed May 20 13:53:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a5feb0
app-i18n/fbterm: tidy
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 3 +--
app-i18n/fbterm/metadata.xml| 14 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index 1c56f62e76b..b8c3d875a61 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -9,8 +9,7 @@ EGIT_COMMIT="ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df"
DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
HOMEPAGE="https://github.com/gjedeer/fbterm;
-
-SRC_URI="https://github.com/gjedeer/fbterm/archive/${EGIT_COMMIT}.tar.gz ->
${P}.tar.gz"
+SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml
index ca241aea349..d76dd2993d2 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,11 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-c...@gentoo.org
-Cjk
-
-
-gjedeer/fbterm
-
+
+ c...@gentoo.org
+ Cjk
+
+
+ gjedeer/fbterm
+
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/, app-i18n/fbterm/files/
commit: 2e4777c9a097c8cb1c88f09a556f7af4827cc38f
Author: Akinori Hattori gentoo org>
AuthorDate: Wed May 20 13:47:29 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed May 20 13:47:29 2020 +
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 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..000
--- 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..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: d9e8bbccdce70a295fff39af4f7cbac5c48902e6
Author: Alexey Sokolov google com>
AuthorDate: Sun Apr 26 11:08:19 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed May 20 13:45:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e8bbcc
app-i18n/fbterm: call ar through tc
Closes: https://bugs.gentoo.org/718356
Closes: https://github.com/gentoo/gentoo/pull/15467
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov google.com>
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index 92924b9b17b..1c56f62e76b 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -3,30 +3,26 @@
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://github.com/gjedeer/fbterm;
-MY_COMMIT="ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df"
-SRC_URI="https://github.com/gjedeer/fbterm/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
-S="${WORKDIR}/fbterm-${MY_COMMIT}"
+SRC_URI="https://github.com/gjedeer/fbterm/archive/${EGIT_COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
-DEPEND="
- media-libs/fontconfig
+DEPEND="media-libs/fontconfig
media-libs/freetype:2
>=sys-libs/ncurses-6.1
gpm? ( sys-libs/gpm )
- video_cards_vesa? ( dev-libs/libx86 )
-"
-BDEPEND="
- virtual/pkgconfig
-"
+ video_cards_vesa? ( dev-libs/libx86 )"
+BDEPEND="virtual/pkgconfig"
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
@@ -46,6 +42,10 @@ src_configure() {
$(use_enable video_cards_vesa vesa)
}
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
src_install() {
default
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 3294fec1ed5a4aefb2f5dd5bf6e85bc3dee41b0e
Author: Alexey Sokolov google com>
AuthorDate: Wed Apr 22 09:34:37 2020 +
Commit: Akinori Hattori gentoo org>
CommitDate: Wed May 20 13:45:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3294fec1
app-i18n/fbterm: version bump to 1.7_p20190503
An example improvement: a correct TERM value inside the terminal
("fbterm" instead of "linux")
Closes: https://bugs.gentoo.org/714002
Closes: https://github.com/gentoo/gentoo/pull/15467
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov google.com>
Signed-off-by: Akinori Hattori gentoo.org>
app-i18n/fbterm/Manifest| 1 +
app-i18n/fbterm/fbterm-1.7_p20190503.ebuild | 63 +
app-i18n/fbterm/metadata.xml| 2 +-
3 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index 4b231d16f15..da167298d65 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1 +1,2 @@
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_p20190503.ebuild
b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
new file mode 100644
index 000..92924b9b17b
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools fcaps
+
+DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
+HOMEPAGE="https://github.com/gjedeer/fbterm;
+
+MY_COMMIT="ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df"
+SRC_URI="https://github.com/gjedeer/fbterm/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/fbterm-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpm video_cards_vesa"
+
+DEPEND="
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=sys-libs/ncurses-6.1
+ gpm? ( sys-libs/gpm )
+ video_cards_vesa? ( dev-libs/libx86 )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+FILECAPS=(
+ cap_sys_tty_config+ep usr/bin/${PN}
+)
+
+src_prepare() {
+ # bug #648472
+ sed -i "s/terminfo//" Makefile.am || die "Can't remove terminfo"
+
+ 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/metadata.xml b/app-i18n/fbterm/metadata.xml
index 165c6df0ed2..ca241aea349 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -6,6 +6,6 @@
Cjk
-fbterm
+gjedeer/fbterm
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/, app-i18n/fbterm/files/
commit: 65a109b101e0250a5dfbf21751998dcb36e1cf77
Author: Akinori Hattori gentoo org>
AuthorDate: Mon May 7 12:57:41 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Mon May 7 12:57:41 2018 +
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..000
--- a/app-i18n/fbterm/files/fbterm-noterminfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-commit 77c90022233634a3c891dc778585c526d9d846a1
-Author: Alexey Sokolov
-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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: 7e17670a886d15ab6a0ba40c906cbbe0dce5d066
Author: Alexey Sokolov google com>
AuthorDate: Sun Apr 1 10:54:14 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Mon May 7 12:51:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e17670a
app-i18n/fbterm: fix file collision with sys-libs/ncurses-6.1
Bug: https://bugs.gentoo.org/648472
Closes: https://github.com/gentoo/gentoo/pull/7764
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r4.ebuild} | 8 +---
.../fbterm/{fbterm-1.7-r3.ebuild => fbterm-1.7-r5.ebuild} | 14 +++---
app-i18n/fbterm/files/fbterm-noterminfo.patch | 15 +++
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
b/app-i18n/fbterm/fbterm-1.7-r4.ebuild
similarity index 88%
copy from app-i18n/fbterm/fbterm-1.7-r3.ebuild
copy to app-i18n/fbterm/fbterm-1.7-r4.ebuild
index 2138ece5ef1..8b906331dde 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
+COMMON_DEPEND="media-libs/fontconfig
media-libs/freetype:2
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ !>=sys-libs/ncurses-6.1"
+DEPEND="${COMMON_DEPEND}
sys-libs/ncurses
virtual/pkgconfig"
diff --git a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
b/app-i18n/fbterm/fbterm-1.7-r5.ebuild
similarity index 80%
rename from app-i18n/fbterm/fbterm-1.7-r3.ebuild
rename to app-i18n/fbterm/fbterm-1.7-r5.ebuild
index 2138ece5ef1..a4b174a1f85 100644
--- a/app-i18n/fbterm/fbterm-1.7-r3.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r5.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"
@@ -17,20 +17,21 @@ IUSE="gpm video_cards_vesa"
RDEPEND="media-libs/fontconfig
media-libs/freetype:2
gpm? ( sys-libs/gpm )
- video_cards_vesa? ( dev-libs/libx86 )"
+ video_cards_vesa? ( dev-libs/libx86 )
+ >=sys-libs/ncurses-6.1"
DEPEND="${RDEPEND}
- sys-libs/ncurses
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-gcc6.patch
+ "${FILESDIR}"/${PN}-noterminfo.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
}
@@ -42,7 +43,6 @@ src_configure() {
}
src_install() {
- dodir /usr/share/terminfo
default
use filecaps || fperms u+s /usr/bin/${PN}
diff --git a/app-i18n/fbterm/files/fbterm-noterminfo.patch
b/app-i18n/fbterm/files/fbterm-noterminfo.patch
new file mode 100644
index 000..76cf9fc7792
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-noterminfo.patch
@@ -0,0 +1,15 @@
+commit 77c90022233634a3c891dc778585c526d9d846a1
+Author: Alexey Sokolov
+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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 6eb1afc43e7221380664b30974b883bdd91582c3
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 12 15:48:01 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 12 15:48:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb1afc4
app-i18n/fbterm: fix terminfo install
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/{fbterm-1.7-r2.ebuild => fbterm-1.7-r3.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r3.ebuild
similarity index 97%
rename from app-i18n/fbterm/fbterm-1.7-r2.ebuild
rename to app-i18n/fbterm/fbterm-1.7-r3.ebuild
index f23bea99932..2138ece5ef1 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r3.ebuild
@@ -42,6 +42,7 @@ src_configure() {
}
src_install() {
+ dodir /usr/share/terminfo
default
use filecaps || fperms u+s /usr/bin/${PN}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: c70e17dea89ffbe04e8ea898be490b64c8c0e8e5
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:08:25 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:08:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70e17de
app-i18n/fbterm: update patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild | 4 ++--
.../fbterm/files/{fbterm-1.7-gcc6.patch => fbterm-gcc6.patch} | 8 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index a7b4e419e54..5685cd6a76e 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -27,7 +27,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
DOCS=( AUTHORS NEWS README )
PATCHES=(
- "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${PN}-gcc6.patch
)
src_configure() {
diff --git a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
b/app-i18n/fbterm/files/fbterm-gcc6.patch
similarity index 90%
rename from app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
rename to app-i18n/fbterm/files/fbterm-gcc6.patch
index 26d39f0c5bc..aa19fac9672 100644
--- a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
+++ b/app-i18n/fbterm/files/fbterm-gcc6.patch
@@ -1,5 +1,9 @@
fbterm-1.7/src/lib/vterm_states.cpp.old2016-09-24 00:44:29.981247206
-0400
-+++ fbterm-1.7/src/lib/vterm_states.cpp2016-09-24 00:48:40.463777924
-0400
+https://bugs.gentoo.org/show_bug.cgi?id=594308
+
+Author: Peter Levine
+
+--- a/src/lib/vterm_states.cpp
b/src/lib/vterm_states.cpp
@@ -39,14 +39,14 @@
{ 0x1B, 0, ESesc },
{ 0x7F, 0, ESkeep },
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 868f612bb48712e77205955d6a409d4e92944e53
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:09:28 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:09:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868f612b
app-i18n/fbterm: update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild | 53 +---
app-i18n/fbterm/metadata.xml | 11 +---
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index 5685cd6a76e..536c70f0606 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -1,60 +1,57 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit autotools-utils
+EAPI="6"
+
+inherit autotools
DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
HOMEPAGE="https://fbterm.googlecode.com/;
-SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz;
+SRC_URI="https://${PN}.googlecode.com/files/${P}.0.tar.gz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="caps gpm video_cards_vesa"
-RDEPEND="caps? ( sys-libs/libcap )
+RDEPEND="media-libs/fontconfig
+ media-libs/freetype:2
+ caps? ( sys-libs/libcap )
gpm? ( sys-libs/gpm )
- video_cards_vesa? ( dev-libs/libx86 )
- media-libs/fontconfig
- media-libs/freetype:2"
+ video_cards_vesa? ( dev-libs/libx86 )"
DEPEND="${RDEPEND}
sys-libs/ncurses
virtual/pkgconfig"
-AUTOTOOLS_IN_SOURCE_BUILD=1
+PATCHES=( "${FILESDIR}"/${PN}-gcc6.patch )
-DOCS=( AUTHORS NEWS README )
+src_prepare() {
+ sed -i "s|tic|tic -o '\$(DESTDIR)\$(datadir)/terminfo'|"
terminfo/Makefile.am
-PATCHES=(
- "${FILESDIR}"/${PN}-gcc6.patch
-)
+ default
+ eautoreconf
+}
src_configure() {
- local myeconfargs=(
- $(use_enable gpm)
+ econf \
+ $(use_enable gpm) \
$(use_enable video_cards_vesa vesa)
- )
- autotools-utils_src_configure
}
src_install() {
- autotools-utils_src_install
- $(type -P tic) -o "${ED}/usr/share/terminfo/" \
- "${S}"/terminfo/fbterm || die "Failed to generate terminfo
database"
+ default
+
if use caps; then
- setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/fbterm
+ setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/${PN}
else
- fperms u+s /usr/bin/fbterm
+ fperms u+s /usr/bin/${PN}
fi
}
pkg_postinst() {
- einfo
- einfo " ${PN} won't work with vga16fb. You have to use other native"
- einfo " framebuffer drivers or vesa driver."
- einfo " See ${EPREFIX}/usr/share/doc/${P}/README for details."
- einfo " To use ${PN}, ensure you are in video group."
- einfo " To input CJK merge app-i18n/fbterm-ucimf"
- einfo
+ 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/metadata.xml b/app-i18n/fbterm/metadata.xml
index c921b96adf6..165c6df0ed2 100644
--- a/app-i18n/fbterm/metadata.xml
+++ b/app-i18n/fbterm/metadata.xml
@@ -1,8 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- c...@gentoo.org
- Cjk
-
+
+c...@gentoo.org
+Cjk
+
+
+fbterm
+
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 3cf62dcec3a68b9adc1c8c460ea943d26b0a66f8
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:05:39 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:05:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf62dce
app-i18n/fbterm: drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r1.ebuild | 56
1 file changed, 56 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
b/app-i18n/fbterm/fbterm-1.7-r1.ebuild
deleted file mode 100644
index ff834875c8f..000
--- a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools-utils
-
-DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://fbterm.googlecode.com/;
-SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gpm video_cards_vesa"
-
-RDEPEND="caps? ( sys-libs/libcap )
- gpm? ( sys-libs/gpm )
- video_cards_vesa? ( dev-libs/libx86 )
- media-libs/fontconfig
- media-libs/freetype:2"
-DEPEND="${RDEPEND}
- sys-libs/ncurses
- virtual/pkgconfig"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable gpm)
- $(use_enable video_cards_vesa vesa)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- $(type -P tic) -o "${ED}/usr/share/terminfo/" \
- "${S}"/terminfo/fbterm || die "Failed to generate terminfo
database"
- if use caps; then
- setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/fbterm
- else
- fperms u+s /usr/bin/fbterm
- fi
-}
-
-pkg_postinst() {
- einfo
- einfo " ${PN} won't work with vga16fb. You have to use other native"
- einfo " framebuffer drivers or vesa driver."
- einfo " See ${EPREFIX}/usr/share/doc/${P}/README for details."
- einfo " To use ${PN}, ensure you are in video group."
- einfo " To input CJK merge app-i18n/fbterm-ucimf"
- einfo
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 89a7f788bbec9f05cc9a81dba76482daff70f72d
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:11:06 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:11:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a7f788
app-i18n/fbterm: update HOMEPAGE and SRC_URI
Gentoo-Bug: 626552
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index 536c70f0606..a371d7db068 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
inherit autotools
DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
-HOMEPAGE="https://fbterm.googlecode.com/;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.0.tar.gz;
+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"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 95a831d738dae3bfb016f4ac2f1e2cb070b1
Author: Akinori Hattori gentoo org>
AuthorDate: Sat Aug 5 13:12:43 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Sat Aug 5 13:12:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a831d7
app-i18n/fbterm: inherit fcaps
Gentoo-Bug: 566458
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
index a371d7db068..f23bea99932 100644
--- a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit autotools
+inherit autotools fcaps
DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
HOMEPAGE="https://code.google.com/p/fbterm;
@@ -12,11 +12,10 @@
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gpm video_cards_vesa"
+IUSE="gpm video_cards_vesa"
RDEPEND="media-libs/fontconfig
media-libs/freetype:2
- caps? ( sys-libs/libcap )
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
DEPEND="${RDEPEND}
@@ -25,6 +24,10 @@ DEPEND="${RDEPEND}
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
@@ -41,14 +44,12 @@ src_configure() {
src_install() {
default
- if use caps; then
- setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/${PN}
- else
- fperms u+s /usr/bin/${PN}
- fi
+ 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."
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/files/, app-i18n/fbterm/
commit: f732d20204713d7d89c230263d48ec691a34fe51
Author: Yixun Lan gentoo org>
AuthorDate: Mon Sep 26 15:13:57 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Sep 26 15:14:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f732d202
app-i18n/fbterm: fix gcc6 build err
thanks Peter Levine for providing patches
Gentoo-Bug: 594308
Package-Manager: portage-2.3.1
app-i18n/fbterm/fbterm-1.7-r2.ebuild| 61 ++
app-i18n/fbterm/files/fbterm-1.7-gcc6.patch | 68 +
2 files changed, 129 insertions(+)
diff --git a/app-i18n/fbterm/fbterm-1.7-r2.ebuild
b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
new file mode 100644
index ..15f6b83
--- /dev/null
+++ b/app-i18n/fbterm/fbterm-1.7-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools-utils
+
+DESCRIPTION="Fast terminal emulator for the Linux framebuffer"
+HOMEPAGE="https://fbterm.googlecode.com/;
+SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gpm video_cards_vesa"
+
+RDEPEND="caps? ( sys-libs/libcap )
+ gpm? ( sys-libs/gpm )
+ video_cards_vesa? ( dev-libs/libx86 )
+ media-libs/fontconfig
+ media-libs/freetype:2"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable gpm)
+ $(use_enable video_cards_vesa vesa)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+ $(type -P tic) -o "${ED}/usr/share/terminfo/" \
+ "${S}"/terminfo/fbterm || die "Failed to generate terminfo
database"
+ if use caps; then
+ setcap "cap_sys_tty_config+ep" "${ED}"/usr/bin/fbterm
+ else
+ fperms u+s /usr/bin/fbterm
+ fi
+}
+
+pkg_postinst() {
+ einfo
+ einfo " ${PN} won't work with vga16fb. You have to use other native"
+ einfo " framebuffer drivers or vesa driver."
+ einfo " See ${EPREFIX}/usr/share/doc/${P}/README for details."
+ einfo " To use ${PN}, ensure you are in video group."
+ einfo " To input CJK merge app-i18n/fbterm-ucimf"
+ einfo
+}
diff --git a/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
b/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
new file mode 100644
index ..26d39f0
--- /dev/null
+++ b/app-i18n/fbterm/files/fbterm-1.7-gcc6.patch
@@ -0,0 +1,68 @@
+--- fbterm-1.7/src/lib/vterm_states.cpp.old2016-09-24 00:44:29.981247206
-0400
fbterm-1.7/src/lib/vterm_states.cpp2016-09-24 00:48:40.463777924
-0400
+@@ -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
+ { '[', ::clear_param, ESsquare },
+@@ -65,7 +65,7 @@
+ { '8', ::restore_cursor, ESnormal },
+ { '>', ::keypad_numeric, ESnormal },
+ { '=', ::keypad_application, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESsquare
+ { '[', 0, ESfunckey },
+@@ -104,7 +104,7 @@
+ { '`', ::cursor_position_col, ESnormal },
+ { ']', ::linux_specific, ESnormal },
+ { '}', ::fbterm_specific, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESnonstd
+ { '0' | ADDSAME(9), ::set_palette,ESkeep },
+@@ -112,25 +112,25 @@
+ { 'a' | ADDSAME(5), ::set_palette,ESkeep },
+ { 'P', ::begin_set_palette, ESkeep },
+ { 'R', ::reset_palette, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESpercent
+ { '@', ::clear_utf8, ESnormal },
+ { 'G', ::set_utf8,ESnormal },
+ { '8', ::set_utf8,ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // EScharset
+ { '0', ::set_charset, ESnormal },
+ { 'B', ::set_charset, ESnormal },
+ { 'U', ::set_charset, ESnormal },
+ { 'K', ::set_charset, ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // EShash
+ { '8', ::screen_align,ESnormal },
+- { -1 },
++ { (u16) -1 },
+
+ // ESfunckey
+- { -1 },
++ { (u16) -1 },
+ };
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 42f7dfc2b85f277142a6bfe407f9e99db9be8d6b
Author: Markus Meier gentoo org>
AuthorDate: Sun Aug 14 19:30:11 2016 +
Commit: Markus Meier gentoo org>
CommitDate: Sun Aug 14 19:30:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f7dfc2
app-i18n/fbterm: add ~arm, bug #588484
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="arm"
app-i18n/fbterm/fbterm-1.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
b/app-i18n/fbterm/fbterm-1.7-r1.ebuild
index 1375af4..b083f60 100644
--- a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="caps gpm video_cards_vesa"
RDEPEND="caps? ( sys-libs/libcap )
[gentoo-commits] repo/gentoo:master commit in: app-i18n/fbterm/
commit: 1ecd26a838de831760183608a498013c38c3aab4
Author: Steev Klimaszewski gentoo org>
AuthorDate: Wed Mar 23 21:18:07 2016 +
Commit: Stephen Klimaszewski gentoo org>
CommitDate: Wed Mar 23 21:23:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecd26a8
app-i18n/fbterm: Add ~arm64 keyword
Package-Manager: portage-2.2.28
app-i18n/fbterm/fbterm-1.7-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
b/app-i18n/fbterm/fbterm-1.7-r1.ebuild
index 69f680c..1375af4 100644
--- a/app-i18n/fbterm/fbterm-1.7-r1.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="caps gpm video_cards_vesa"
RDEPEND="caps? ( sys-libs/libcap )
