gentoo resync : 07.01.2022

3 files changed, 90 insertions, 7 deletions

diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index adf27a5d8e2b..41fae118b27e 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,6 +1,8 @@
 AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
+DIST st-0.8.5.tar.gz 47829 BLAKE2B 9c036b39605dcc69c03fd5a67e911545eb41e3e748efbcf4761770b2a9bf9f158fc1da1fc140b84fb9939fcb35ce126de444cd567806c350e8e2905907bdf645 SHA512 45cc51f9fc343bd80a48f23f5b00e41e0cc01a538474e0578dd02f02ce92cb560e0e7464ec47fd7de4d39483b23fda212c3e7c64233e8a3f4ab6862144d76323
 EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
 EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
-EBUILD st-9999.ebuild 1368 BLAKE2B f71916b6b4d68e39140eb241d5384857645f7bd15c07e418ebeb4ec19dcb60d9baa5fb17244c574ae5dd0efa66bf8dd4a9ead92daa7180a0c7507aed489b3d58 SHA512 b9383a140252f7dd4bf5c1bfa218fd07f4d49f33ec6b904ba35afdb53d3cc126a0db7a2e8ff0de1c88cb28617444a94f911fcb7285e653c62dd3253b1efb855a
+EBUILD st-0.8.5.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
+EBUILD st-9999.ebuild 1524 BLAKE2B c4d60cd20119173a35ab7c9e4d8a1aa40f7a12c148adf5cb30807421ac808c700b1ce371af6563d19ff7f8bb1beb96b66b9a9b2d12bf47011202074713c6b04c SHA512 26c9ea44a3d848bc3fd0078e2c960370c5b012e8055c09c56df050c185703295457f3aa1c4d31f12dfb269fc7be14196fee9cc1ec3cf3a8bbd12904fef1413a9
 MISC metadata.xml 254 BLAKE2B aabbd5365abdb36c7ee6418a30169bc87cdd6cf8175a1f3c5d4e27f84b4309f34a42342887ea5e73eeef602a69582854266900794cc81d8e951d2e5f0480b650 SHA512 030e3a92db3cdca585debc6b26403cc6679a4b5f87bdc188a9dfaf4779adca1b4e8445a755618abe5a43157300292a596c5a6850ebe6f6f7f400d3f46ef2e0f9
diff --git a/x11-terms/st/st-0.8.5.ebuild b/x11-terms/st/st-0.8.5.ebuild
new file mode 100644
index 000000000000..defaa3e758e2
--- /dev/null
+++ b/x11-terms/st/st-0.8.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 525453f3d78e..defaa3e758e2 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop git-r3 savedconfig toolchain-funcs
+inherit desktop savedconfig toolchain-funcs
 
-DESCRIPTION="simple terminal implementation for X"
+DESCRIPTION="Simple terminal implementation for X"
 HOMEPAGE="https://st.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/${PN}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/${PN}"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS=""
-IUSE="savedconfig"
 
 RDEPEND="
 	>=sys-libs/ncurses-6.0:0=
 	media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXft
+	~x11-terms/st-terminfo-${PV}
 "
 DEPEND="
 	${RDEPEND}