* [gentoo-commits] repo/gentoo:master commit in: x11-terms/xterm/files/, x11-terms/xterm/
@ 2023-10-06 12:59 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2023-10-06 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 0b4de7cba8d0d3a8b1893fd4c6c757242eb82fea
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Sep 4 06:45:18 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 12:58:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4de7cb
x11-terms/xterm: Fix TAB3 undeclared here \w musl llvm
Closes: https://bugs.gentoo.org/895100
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32600
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/xterm-384-unconditional-gnusource.patch | 12 +++
x11-terms/xterm/xterm-384-r1.ebuild | 110 +++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch b/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch
new file mode 100644
index 000000000000..669970c4fbf7
--- /dev/null
+++ b/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/895100
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,7 +65,7 @@ EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
+ EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@
+
+ PIXMAPDIR_DEF = @no_pixmapdir@-DPIXMAP_ROOTDIR=\"@PIXMAPDIR@/\"
+-CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS)
++CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H -D_GNU_SOURCE @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS)
+ CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
+ LDFLAGS = @LDFLAGS@ @EXTRA_LDFLAGS@
+ LIBS = @LIBS@
diff --git a/x11-terms/xterm/xterm-384-r1.ebuild b/x11-terms/xterm/xterm-384-r1.ebuild
new file mode 100644
index 000000000000..575512bbf25c
--- /dev/null
+++ b/x11-terms/xterm/xterm-384-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+ kernel_linux? ( sys-libs/libutempter )
+ media-libs/fontconfig:1.0
+ >=sys-libs/ncurses-5.7-r7:=
+ 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"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+ virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
+)
+
+src_configure() {
+ DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+ # bug #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 $($(tc-getPKG_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-icon-theme=hicolor
+ --with-icondir="${EPREFIX}"/usr/share/icons
+ --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
+ sed -i -e 's/_48x48//g' *.desktop || die
+ 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:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/xterm/files/, x11-terms/xterm/
@ 2025-04-28 0:04 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-04-28 0:04 UTC (permalink / raw
To: gentoo-commits
commit: c48794f91c81baaec450bca187428e2dafdc1985
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 27 23:57:00 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 27 23:57:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48794f9
x11-terms/xterm: drop 393, 394, 395, 396
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-terms/xterm/Manifest | 8 --
.../files/xterm-384-unconditional-gnusource.patch | 12 ---
x11-terms/xterm/xterm-393.ebuild | 110 ---------------------
x11-terms/xterm/xterm-394.ebuild | 110 ---------------------
x11-terms/xterm/xterm-395.ebuild | 110 ---------------------
x11-terms/xterm/xterm-396.ebuild | 106 --------------------
6 files changed, 456 deletions(-)
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 5a6494d5c86e..6d497d01b578 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,10 +1,2 @@
-DIST xterm-393.tgz 1587657 BLAKE2B 795ce24cb72d376b375ef741eb6d8976151923dbf8043bd799b1be12c140e5e0415b172cd9c01778093f95db90eaed6051184167e1333abaaed1184591869867 SHA512 dcd7d22268332c0f0b7511c2de377c6098f18c443cee32472a897fe092e868e2198329e1922f2647245057a87054fc6af22ebd8dd5cd9195224cdca39b552522
-DIST xterm-393.tgz.asc 729 BLAKE2B 70cdc7903b864d242ae2e8b41e328147b76c3a88cf87d416f13828a0038509ee9c1def0d450c1bbf3d389a45e7abcc1091ed050bb247af1d1cb4000c568f0d85 SHA512 bf3a1fde22164f7ceca6bf817ed9039f013aaa68b6f7033be2c614457caf3b3affefc74edefdeab1263f4bb4937f054b4d48f3cf89f258bd823380c53d55d370
-DIST xterm-394.tgz 1590462 BLAKE2B 860d2eb32f68dc09cfb78bd0510751d847b8722674d7b846a93569f2a6e846934c4a25c4eb973419c723a757430f155d5507236998984bfbc159ebb1a23f89d7 SHA512 46989632c94506b4e86690eeebf07524a88f2850ea5fb48d0d7505d2d2241ec6ba6c3cf09baec8a5dce5531a1ef23560b1e4456fbf1dae1077e15ab69bf18e04
-DIST xterm-394.tgz.asc 729 BLAKE2B daa6710dceedbea84671d33ed6e08c4d73fb63f3c4de2c9a0b792e295be3c65f96758540b82c1dc1b01c2aa20d9ee19953bf6d98047636c725cdf871cd6635d0 SHA512 71540cf4f79d5e0fdd41625f002a6cc2d0c41ef0078f483956e00ded0a5906054e0902327d1af723c57003ad8d69507a6dcccf9ad6d99eb71e128b49dd856ca1
-DIST xterm-395.tgz 1580365 BLAKE2B 8183da30b491a0e43c34e2728586816e733a18aa8bf87d0ec60b43d47d625bc07395886b02afe08260cc527bc3efa67d04cb060254f0b9ffb7e5ff29b187f42f SHA512 a617f684f1e71eb7b7d33c505f408b90feaac604aa4ea70cb24d9b4eb78242f0eb4545aea81abcb2c51379ad54aa113ec88d445a9d290d5ff141ab0f1a009952
-DIST xterm-395.tgz.asc 729 BLAKE2B f87f732939a52aac55b51a0296144c600d87dca10c5140c39fa0c259e300a8bafe64721aa2c392bcb925521956eb55d11a9be21f6b21112b161db974f4442672 SHA512 c636e13e5c1122d3e9eeb92e013dbb8e9fedc25a7a42b2f2220b33a6a62ea37ae454e97447c65790b454b2c5fda074845e196339a3c861e01013739808dfccf2
-DIST xterm-396.tgz 1584505 BLAKE2B d57751d1f50f5c17a84f8e2fdb591929b6030c44e0fbadb92c8c2dad1f53e16b9fd33f864e35e3e669955622680a860ddc028bcf06b02731150420107bcae490 SHA512 a531acb6104f436c41aab1f7c363ff32fa85bc494caab9ad035bbef3091d82cbe67fda960606176b172b01869ba32cc251b15337e3c10a60c5a238bebae1c9d8
-DIST xterm-396.tgz.asc 729 BLAKE2B 520402ff23afc663472a7b55ae39b6de73160da4a70a0b4348e055063d6ee6b2e834f21e529dd657237ba11d0a4e14654ae413a6825a8c68d78d7aa8b7c4719b SHA512 d5c13f7616930d5e666419bf5359413a2819453bb6536b6186c4e60cf576c0176695cd04d1d9871974e912e7636158a729ce85600c6135c7f7a2670c2f00b51b
DIST xterm-397.tgz 1588389 BLAKE2B cce4054e83edb9b4203b53a34f7415d038202a10cb997d0c0fe53bb985399bd16626f3e2c5cfdfa8d9eea31d697e532fc858c74c0ba0649936814d5c91825c76 SHA512 cc9770f566199b5e0050c6443eb8382acda02501f14001027fafcaaa3146d9fe3185f304f784d8c61c571d57d33b84a771113658aa4e3aa7f3e66d129781eb73
DIST xterm-397.tgz.asc 729 BLAKE2B 1ea61c56ba3db5b1dcbaf67ea228b765c198dc8ac4bd66803f3f2c91b0f50551d7100a1f03870578ad8a204bb6da0101ca19c12f7e8e9d44aac4fd67ec9aa6b5 SHA512 3d825b7efdf7e52a98cf3ae050b04ae6652af47a9dad3a049be6ff93f4369c992c094b49ebf41320a6c0fe33d9247c9273fc4e377a130a5f98c2d8f82292a96f
diff --git a/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch b/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch
deleted file mode 100644
index 669970c4fbf7..000000000000
--- a/x11-terms/xterm/files/xterm-384-unconditional-gnusource.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug: https://bugs.gentoo.org/895100
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -65,7 +65,7 @@ EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
- EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@
-
- PIXMAPDIR_DEF = @no_pixmapdir@-DPIXMAP_ROOTDIR=\"@PIXMAPDIR@/\"
--CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS)
-+CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H -D_GNU_SOURCE @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS)
- CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
- LDFLAGS = @LDFLAGS@ @EXTRA_LDFLAGS@
- LIBS = @LIBS@
diff --git a/x11-terms/xterm/xterm-393.ebuild b/x11-terms/xterm/xterm-393.ebuild
deleted file mode 100644
index bda4a4a4a4cc..000000000000
--- a/x11-terms/xterm/xterm-393.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
- kernel_linux? ( sys-libs/libutempter )
- media-libs/fontconfig:1.0
- >=sys-libs/ncurses-5.7-r7:=
- 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"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
-)
-
-src_configure() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
- # bug #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 $($(tc-getPKG_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-icon-theme=hicolor
- --with-icondir="${EPREFIX}"/usr/share/icons
- --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
- sed -i -e 's/_48x48//g' *.desktop || die
- 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:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-394.ebuild b/x11-terms/xterm/xterm-394.ebuild
deleted file mode 100644
index bda4a4a4a4cc..000000000000
--- a/x11-terms/xterm/xterm-394.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
- kernel_linux? ( sys-libs/libutempter )
- media-libs/fontconfig:1.0
- >=sys-libs/ncurses-5.7-r7:=
- 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"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
-)
-
-src_configure() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
- # bug #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 $($(tc-getPKG_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-icon-theme=hicolor
- --with-icondir="${EPREFIX}"/usr/share/icons
- --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
- sed -i -e 's/_48x48//g' *.desktop || die
- 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:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-395.ebuild b/x11-terms/xterm/xterm-395.ebuild
deleted file mode 100644
index 066ba983d50d..000000000000
--- a/x11-terms/xterm/xterm-395.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
- kernel_linux? ( sys-libs/libutempter )
- media-libs/fontconfig:1.0
- >=sys-libs/ncurses-5.7-r7:=
- 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"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-384-unconditional-gnusource.patch
-)
-
-src_configure() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
- # bug #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 $($(tc-getPKG_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-icon-theme=hicolor
- --with-icondir="${EPREFIX}"/usr/share/icons
- --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
- sed -i -e 's/_48x48//g' *.desktop || die
- 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:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-396.ebuild b/x11-terms/xterm/xterm-396.ebuild
deleted file mode 100644
index 5e86e25d2c90..000000000000
--- a/x11-terms/xterm/xterm-396.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-DEPEND="
- kernel_linux? ( sys-libs/libutempter )
- media-libs/fontconfig:1.0
- >=sys-libs/ncurses-5.7-r7:=
- 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"
-DEPEND+=" x11-base/xorg-proto"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-src_configure() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
- # bug #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 $($(tc-getPKG_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-icon-theme=hicolor
- --with-icondir="${EPREFIX}"/usr/share/icons
- --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
- sed -i -e 's/_48x48//g' *.desktop || die
- 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:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-28 0:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-28 0:04 [gentoo-commits] repo/gentoo:master commit in: x11-terms/xterm/files/, x11-terms/xterm/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-06 12:59 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox