x11-terms/xterm: Bump to version 346

Added sixel USE flag.

Thanks-to: Patrice Levesque <gentoo.wayne@ptaff.ca>
Closes: https://bugs.gentoo.org/677978
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index ecbdaccbf7a0c0a4a1bff7ecc781d8da091ee653..5f2028d4cd73d20d5b346ed722cdb70b6e495d60 100644 (file)
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,2 +1,3 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
+DIST xterm-346.tgz 1366363 BLAKE2B 5ff790bb94b973fe4e5fd684c782d6e36cacc769bc6b0152820c7ca7d41a5b96b347c4b015b3c8a2342601f71d1381de1de399c9dfd9ccc9bb371b5b772d3607 SHA512 ef0db8132a88b8bd980343007a61ca3c4c1b7ece23ef8e72245a17fa8305fa4dfed9cdf0613d8daf60da53fb8b03d41acd22aee04f2d51aeffb4a340268f51f7

diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index 4db6d6f711d9286d9123c83f6b30d9e867ef7220..e3035595166c1cf06645be6d20e5372489aa95fe 100644 (file)
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -7,6 +7,7 @@
        </maintainer>
        <use>
                <flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
+               <flag name="sixel">Enable sixel graphics support</flag>
                <flag name="toolbar">Enable the xterm toolbar to be built</flag>
        </use>
 </pkgmetadata>

diff --git a/x11-terms/xterm/xterm-346.ebuild b/x11-terms/xterm/xterm-346.ebuild
new file mode 100644 (file)
index 0000000..f915dff
--- /dev/null
+++ b/x11-terms/xterm/xterm-346.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+BDEPEND="virtual/pkgconfig
+       x11-base/xorg-proto"
+DEPEND="kernel_linux? ( sys-libs/libutempter )
+       kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+       media-libs/fontconfig:1.0
+       >=sys-libs/ncurses-5.7-r7:0=
+       x11-apps/xmessage
+       x11-libs/libICE
+       x11-libs/libX11
+       x11-libs/libXaw
+       x11-libs/libXft
+       x11-libs/libxkbfile
+       x11-libs/libXmu
+       x11-libs/libXrender
+       x11-libs/libXt
+       unicode? ( x11-apps/luit )
+       Xaw3d? ( x11-libs/libXaw3d )
+       xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+       media-fonts/font-misc-misc
+       x11-apps/rgb"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+pkg_setup() {
+       DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+src_configure() {
+       # 454736
+       # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+       # something sane like pkg-config or ncurses5-config and stops guessing libs
+       # Everything gets linked against ncurses anyways, so don't shout
+       append-libs $(pkg-config --libs ncurses)
+
+       local myeconfargs=(
+               --disable-full-tgetent
+               --disable-imake
+               --disable-setgid
+               --disable-setuid
+               --enable-256-color
+               --enable-broken-osc
+               --enable-broken-st
+               --enable-dabbrev
+               --enable-exec-xterm
+               --enable-i18n
+               --enable-load-vt-fonts
+               --enable-logging
+               --enable-screen-dumps
+               --enable-warnings
+               --enable-wide-chars
+               --libdir="${EPREFIX}"/etc
+               --with-app-defaults="${DEFAULTS_DIR}"
+               --with-utempter
+               --with-x
+               $(use_enable openpty)
+               $(use_enable sixel sixel-graphics)
+               $(use_enable toolbar)
+               $(use_enable truetype freetype)
+               $(use_enable unicode luit)
+               $(use_enable unicode mini-luit)
+               $(use_with Xaw3d)
+               $(use_with xinerama)
+       )
+       econf "${myeconfargs[@]}"
+}
+
+src_install() {
+       default
+
+       docinto html
+       dodoc xterm.log.html
+       domenu *.desktop
+
+       # Fix permissions -- it grabs them from live system, and they can
+       # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+       # respectively (#69510).
+       # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+       fperms 0755 /usr/bin/xterm
+
+       # restore the navy blue
+       sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
+}