gentoo auto-resync : 06:10:2023 - 17:57:58

6 files changed, 126 insertions, 2 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 9f0638e9280d..f432b76b5c8d 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 045b1cd6ceb0..b8e692fb25e3 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -2,5 +2,5 @@ AUX xfce4-terminal-1.1.0-menu-accel.patch 2663 BLAKE2B 0b2aa19dfb9ae17b53f57cef2
 DIST xfce4-terminal-1.0.4.tar.bz2 1009367 BLAKE2B 48a618f8ea98ad0408d8e54d4489358874e9e0e3c6a7011f298d0fed21512783258598cc59013c7406128e68d7311ddf64fdb13f9517306a819db50edc0555cc SHA512 76ea8f296fe1c128dc70d8aabf23447300ba83405d52e844abec89049968bac51fe47fd7545a76e4a421275c6a2f230f326ed3a25083bf536f17fc3218b05fce
 DIST xfce4-terminal-1.1.0.tar.bz2 1021840 BLAKE2B 981d73362dd7e1122b893c0761ca8f758e9382bc49a5ad985d11a953aa17e65b0c372b8a6350ed2671665508e625fbfbf4532dadc88211c14b6848c195d247dc SHA512 c01f0e7a293c4e55b4ee151eb8beb5ff9634a8134b545452c87ee9fa9928507e73bda1a63634900f669a58353877c2cb3f48e7b95cf236bdc857ca311c73c86f
 EBUILD xfce4-terminal-1.0.4.ebuild 993 BLAKE2B 28ddc50f253b30a5e895fde4478b87733e3f7588415c19501c6e204d75a4c2c82670d185e6864968685d57103e481f4d01935a546583d1e1cf9ef8570be70717 SHA512 eeacd9a459369df9af02af0b26b4a01f504ea67ad70dc4d0c9e6b5cbdbb5a9357660b974e0871cef56b451270f140e569b22bd813f141c6ca992fbf2168315fd
-EBUILD xfce4-terminal-1.1.0-r1.ebuild 1130 BLAKE2B 0e441c3ea789e3ab6c672188e508c40e545829410af7c1277d52014631cfe9b622d179cef22c4c2ef5b81c12b616ac52736e58d5618da7d686928db0d0c2dd2b SHA512 4381f13c585e617e0f7c0b8dd7bce85fa7d11b259789433086899f454f74283faa42eccfcf50d820e752c198dd702ffc9a1c5609129bdd9d0ca0deb2cc99aa6c
+EBUILD xfce4-terminal-1.1.0-r1.ebuild 1126 BLAKE2B f6e435ca990f3a4ec053405063a45dfddf7c187b3fa5548267770934e29a40af8408f2eb94e042c54dab94586228771238276a73faef973ccf779203020cb6c7 SHA512 90943cce94731e90b29ff32a04195d534e4d6e56671d0061775745fd8ab48c595e460cd0b1413ddfcd23dbb1b120a750279c9f701fc9f328d76b173fcefa446b
 MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
index 656858903238..2847ab21be66 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter"
 
 RDEPEND="
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 38e7ef709c78..2cb8a7671a38 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,3 +1,4 @@
+AUX xterm-384-unconditional-gnusource.patch 566 BLAKE2B 5e08ba6d4c1dd676a918ac48506825d3a09de04561bb9f9396524b915bc3d86037e1c4dd5966ce221a0b6e10c1e42d0e7b593c3afb6535d8d4c96a07b1775b79 SHA512 f6790a627c8eb6a391e8bf33270ee6e22b38f16e8c451e7c2a86be3f90edde68d6069768cd8fa3ff20a70e6048c49b8ac68d692f8567b713de815a532a7bee4e
 DIST xterm-379.tgz 1531901 BLAKE2B 29691ccf4c84c9ad3d42e0f0fdb082d46425ccd3831d169b40cb16b82118f8a946ad3ea898c409c135531f50fedd0bc7c1aa27ade236918f28f93db647fee313 SHA512 69ec8fd7d425e934010543a4e6afcbec273ca1b0fafad3076af37d65fe369d6e0c5b3683003c1c41f70404d50a3ca1e826c98ee1b3ab0ab12dff22d0cb00a98b
 DIST xterm-379.tgz.asc 729 BLAKE2B 45a4dbfe5a0ee1a3b3f41ae5d5f422038b297d29e5806869f6e2ae604606c935efad3e1d6422869fc1025b516e13a13c5f9e72822a03ede842970cb142be5528 SHA512 e5146f28b30231de6d56072da31ffabe93233032d782c6dcc213517a1c33898b7ed8bbf99f33f866024084956d3ea234eacb8dd9890b4b5ab6554dc3c4a50351
 DIST xterm-380.tgz 1537369 BLAKE2B ef4114ef3e9a2c731839689f62a7aab9549302c4d86467b778260f9ca8edecb1d0785a24291c9499e5044bd42d61ceb4e50b1d99b9b532f60c0617564750e56c SHA512 cd901298af8df5f2eb5ee551d8810ac18a6b6298b29070529675af60b8aeaab05f78aaf9a13c22b88591b1e1ad7190d62dc10b9a59bbbfd884d1a436c9375dd4
@@ -15,5 +16,6 @@ EBUILD xterm-380.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4a
 EBUILD xterm-381.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 EBUILD xterm-382.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
 EBUILD xterm-383.ebuild 2923 BLAKE2B 19dba7f16c7fc600cf62d4117795727e6151a97e8e9d1b2c549ff99d983bbe4502a0984f0f98a5bd00c1d58b8f50f01308fe51b2d610725fd7368f833ca2e562 SHA512 a100938b7c97751b4064a2b0db5363d85fad53c42fd0493484541ee34974fc13a6215687cee0d908f096ac241189fa04aa6c9d9e4b0b2136f2867eb5923424d0
+EBUILD xterm-384-r1.ebuild 2998 BLAKE2B e30d80a630c88200785f665d847e8950c824bd43a677a735bb0d96caf693e3cef2bd4e1ef0b9f9c80f863efc8ba7edffb94b4214576c968d3aba570912409b20 SHA512 02baeca95e2a0868b8c50a240cd3fe7d2c2af842b62485677cfad7a88ba5ef42acaa73134c4cae9692b5f8d0277c94bb37e9f9537ec3adf6f0776594eb55912f
 EBUILD xterm-384.ebuild 2930 BLAKE2B 6bb426538a1dec8b3cc0f161c7d4171f88d44c2ad4aa23707f3cf7c5783d5a6c120e20b25d5ea024d0c948cd94b0d6ee5d88fdb503b7220f2ba4565f3c3e8e1d SHA512 5ad65ecefa828c2d1e5aefc1da96d326d6a1a433e77f2958726c2cccc95aa1e0ab7106381d93de0f5a6256f7a912461388f994aee5efaed8b7444558e924663c
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
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
+}