From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- x11-terms/xterm/Manifest | 6 +-- x11-terms/xterm/metadata.xml | 5 +-- x11-terms/xterm/xterm-330.ebuild | 93 -------------------------------------- x11-terms/xterm/xterm-333.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 100 deletions(-) delete mode 100644 x11-terms/xterm/xterm-330.ebuild create mode 100644 x11-terms/xterm/xterm-333.ebuild (limited to 'x11-terms/xterm') diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest index 13072c364de7..591acc0a20ac 100644 --- a/x11-terms/xterm/Manifest +++ b/x11-terms/xterm/Manifest @@ -1,7 +1,7 @@ DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672 -DIST xterm-330.tgz 1273183 BLAKE2B 5a73e251d3c19ed8591962eb280922c89ad8c67b6970d33e83a8900c6aa349e042ef911ccbdecb8d00addbd0f748bca79c34480bccc746675f837313bab3bfd3 SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62 DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347 +DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0 EBUILD xterm-327.ebuild 2614 BLAKE2B d820ce29ccccb7dcc18cbcfd9da635fba82650c8c113b845339d65551238c84e5febb10e509ebede3cd9205e8065ddb499917c073ab895a53d04bfeedee37530 SHA512 597ada4fc3639e0211a5e01f4505617c7869b97bdaf3edee55934b68e8f9e068f0b7ce24d1088810faa48f431c71b32fdc62ee2915fa9ca84fa7990b5687bf59 -EBUILD xterm-330.ebuild 2623 BLAKE2B 984864f72ce99691a4c30e2a47d80235226397aef5783539ce0e47232aa1d4a957db008b655d23a6283f97dcf790210577964b093c166675c78a67809d6daa08 SHA512 5bcca036b43e2a8b33cc6ec86f90c51e51416f730bdf8006c92ecbb3fd07a347cc155ed4e795562264327a29057bf27fd8c577cee25b8bd4c894a987e1a419e4 EBUILD xterm-331.ebuild 2623 BLAKE2B 984864f72ce99691a4c30e2a47d80235226397aef5783539ce0e47232aa1d4a957db008b655d23a6283f97dcf790210577964b093c166675c78a67809d6daa08 SHA512 5bcca036b43e2a8b33cc6ec86f90c51e51416f730bdf8006c92ecbb3fd07a347cc155ed4e795562264327a29057bf27fd8c577cee25b8bd4c894a987e1a419e4 -MISC metadata.xml 404 BLAKE2B 675f80c795392f88f38bde9e8cfc1a83632e830245baf8d35bc0836fb302897c0eb5065156733831e2b23da0ce916fe6353efa3aebe2b90159fc9b1e587264cb SHA512 2f6acf3970872f23aa82f12b76fce6758d579aaaf7d988b8a2b75d9d845528fef5d50faafa5de1d3e49262dda8b706107902beac035a5ff1fb171d35aaa2dd08 +EBUILD xterm-333.ebuild 2655 BLAKE2B aaf859480694c5bf7d937ec1a1156afa6356145460be8754323eed631940c3312e6471f44f761a420b589eb25e960ea307f5c041558eb2bf69beea900e0035e2 SHA512 78add9193408614fed49677ef23e945a5319051f03d1b73fa6ff31243a033f2ffff3a62074da43f793e681011cb1706766adec8fcdc7277b169bdabba776fcaf +MISC metadata.xml 332 BLAKE2B f04ff2b116cf7da45f77cce44225667348aa9394757c8b762f588ea26cbfe262f1719851d465aebfa9ca8c4974f58d23d9573c2d2e260637cc0b090bbad2d049 SHA512 2ed5e055e0462b75c28a186e8aa4eaf4eb1fd8d8c8fba31d61b35a7847ea0a27ec28552b5e96df486476e56c5f88b4c18b70642c0abf35f6e6b72a0099b586a0 diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml index 717e3b6fdfa4..6563e54a2c04 100644 --- a/x11-terms/xterm/metadata.xml +++ b/x11-terms/xterm/metadata.xml @@ -1,10 +1,7 @@ - - x11@gentoo.org - X11 - + Use openpty() in preference to posix_openpt() Enable the xterm toolbar to be built diff --git a/x11-terms/xterm/xterm-330.ebuild b/x11-terms/xterm/xterm-330.ebuild deleted file mode 100644 index 9682b587b223..000000000000 --- a/x11-terms/xterm/xterm-330.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+openpty toolbar truetype unicode Xaw3d xinerama" - -COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) - >=sys-libs/ncurses-5.7-r7:0= - x11-apps/xmessage - 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="${COMMON_DEPEND} - media-fonts/font-misc-misc - x11-apps/rgb" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -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) - - econf \ - --libdir="${EPREFIX}"/etc \ - --disable-full-tgetent \ - --with-app-defaults="${DEFAULTS_DIR}" \ - --disable-setuid \ - --disable-setgid \ - --with-utempter \ - --with-x \ - $(use_with Xaw3d) \ - $(use_with xinerama) \ - --disable-imake \ - --enable-256-color \ - --enable-broken-osc \ - --enable-broken-st \ - --enable-exec-xterm \ - $(use_enable truetype freetype) \ - --enable-i18n \ - --enable-load-vt-fonts \ - --enable-logging \ - $(use_enable openpty) \ - $(use_enable toolbar) \ - $(use_enable unicode mini-luit) \ - $(use_enable unicode luit) \ - --enable-wide-chars \ - --enable-dabbrev \ - --enable-warnings -} - -src_install() { - default - - dohtml 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 - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die -} diff --git a/x11-terms/xterm/xterm-333.ebuild b/x11-terms/xterm/xterm-333.ebuild new file mode 100644 index 000000000000..3a2102c7e83d --- /dev/null +++ b/x11-terms/xterm/xterm-333.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+openpty toolbar truetype unicode Xaw3d xinerama" + +COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) + >=sys-libs/ncurses-5.7-r7:0= + x11-apps/xmessage + 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="${COMMON_DEPEND} + media-fonts/font-misc-misc + x11-apps/rgb" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +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 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 + fperms 0755 /usr/bin/xterm + + # restore the navy blue + sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die +} -- cgit v1.2.3