From 323afedd6e46d273457add43d92f166ffba5acbf Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 27 Oct 2019 02:33:04 +0100
Subject: Fix building of some legacy ebuilds
---
x11-terms/xterm/Manifest | 2 +-
x11-terms/xterm/xterm-278-r2.ebuild | 113 ----------------------------------
x11-terms/xterm/xterm-278-r3.ebuild | 118 ++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 114 deletions(-)
delete mode 100644 x11-terms/xterm/xterm-278-r2.ebuild
create mode 100644 x11-terms/xterm/xterm-278-r3.ebuild
(limited to 'x11-terms/xterm')
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 49869e4..6df523d 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -18,4 +18,4 @@ AUX xterm-ds-sm.patch 3587 BLAKE2B cb6d5649617723e691650e31722bc74468dd25202f02e
AUX xterm-ds-utf8mode.patch 476 BLAKE2B 5b17c0ac6da348bb1666bce8a83a3f1bc43a2fbc21ae596f8627b1cc4716b1c73d52113a993bc56fdcb4ff92546f00d9590a57d8c773c5ed530807f9cc746a7a SHA512 38f3de8f682bbf9adece113538eec5cfd4285a477c9c6d7c282dc71808ea39f641bf50ca97884ecb0d3c67e4ba1a86fc89a3f974f58cbceaf8a6f0277b7be5c0
AUX xterm215-ds-copy.patch 1460 BLAKE2B 7b5e27479f4710c298ad347809c95cc561b2088d6addac7058e27a86123af0e3a05ac21884cea2f6fbac989e37f144d589b636e425aca205dee8d164aae358f7 SHA512 7030d834ae057cc2834cb919798ff5e45d6bebaaa2122c8b5620138cd67cf3d7c6baebaa6aba79904611bc9d373f76258a92d0b2939f24806ea9e6070ec12420
DIST xterm-278.tgz 996716 BLAKE2B b51f0ef61fb80f2d00e5af925cd70411ad4160877dd64ece848f6fd105a0befea2932e3765f42454921191b66fb108bfebff8081bc8d935a2cc7b0c5ea6bc56b SHA512 4ddbf2003b54c2d2a082465d3ef160840dd1d27f253ba57c9c033477f6d005653093c506cd216072cf032e2ccb136de647b031a6999d8c5ccd5cfb641c50c994
-EBUILD xterm-278-r2.ebuild 3168 BLAKE2B 1586b9a5fffb620e250936299796260a54ea869c2ee6c14feac6ce9ed3b927411d395bdd3540d15e7cb071ada803d2c057445d2017fedd87a2d57dfba80d2b31 SHA512 673852242ec522641e7379786a8a0743f24ed35dd63ba0c2581e68aaf9892675643bae5df0f3b2f67477f33df0be7b1289c70213ffbd15a05857599ec8b753c5
+EBUILD xterm-278-r3.ebuild 3356 BLAKE2B 5f6a212227f4849b4f6cfb1ca05d0e9cfe32baee856e64259aed2df5a00b63f8cd579e001a3b98d250fe95bf8c2b0b785b9094d242da55884b6bad2157ba4e66 SHA512 203a9bd437de7353ae2c1fa9c1a3f1d9a03ebaecef4e323c62ed98a22e6c4ab22608aef67907a32b355853275d1b56ba5ff1742f2d8872b523250a88aca07d3f
diff --git a/x11-terms/xterm/xterm-278-r2.ebuild b/x11-terms/xterm/xterm-278-r2.ebuild
deleted file mode 100644
index 1c0f721..0000000
--- a/x11-terms/xterm/xterm-278-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-278.ebuild,v 1.1 2012/01/19 19:01:38 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="toolbar truetype unicode Xaw3d"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
- kernel_FreeBSD? ( sys-libs/libutempter )
- >=sys-libs/ncurses-5.7-r7
- 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 )"
-RDEPEND="${COMMON_DEPEND}
- media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPEND}
- dev-util/pkgconfig
- x11-base/xorg-proto"
-
-pkg_setup() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-#SDS
-src_unpack() {
- unpack ${A}
- cd ${S}
-
-#MDK
-# epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
-# epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
-# epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
-
-#DarkLin
- epatch ${FILESDIR}/xterm-ds-config-278.patch || die
- epatch ${FILESDIR}/xterm-ds-paste-278.patch || die
- epatch ${FILESDIR}/xterm-ds-input-225.patch || die
- epatch ${FILESDIR}/xterm-ds-copy-243.patch || die
-# Embedded in SM patch
-## epatch ${FILESDIR}/xterm-ds-utf8mode.patch
-# Since 278 is provided internaly
-## epatch ${FILESDIR}/xterm-ds-sm-243.patch || die
-# Incorporated into the config patch
-## epatch ${FILESDIR}/xterm-ds-metaesc.patch || die
-}
-#EDS
-
-src_configure() {
- # looking for reason why crosscompile failed? try restoring this:
- # --x-libraries="${ROOT}usr/$(get_libdir)"
- # -ssuominen, 2011
-
-#SDS
- --disable-maximize
-#EDS
- econf \
- --libdir="${EPREFIX}"/etc \
- --disable-full-tgetent \
- --with-app-defaults=${DEFAULTS_DIR} \
- --disable-setuid \
- --disable-setgid \
- --with-utempter \
- --with-x \
- $(use_with Xaw3d) \
- --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 toolbar) \
- $(use_enable unicode mini-luit) \
- $(use_enable unicode luit) \
- --enable-wide-chars \
- --enable-dabbrev \
- --disable-maximize \
- --enable-warnings
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README{,.i18n} ctlseqs.txt
- 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 <spyderous@gentoo.org>
- fperms 0755 /usr/bin/xterm
-
- # restore the navy blue
- sed -i -e "s:blue2$:blue:" "${ED}"${DEFAULTS_DIR}/XTerm-color
-}
diff --git a/x11-terms/xterm/xterm-278-r3.ebuild b/x11-terms/xterm/xterm-278-r3.ebuild
new file mode 100644
index 0000000..b01588b
--- /dev/null
+++ b/x11-terms/xterm/xterm-278-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-278.ebuild,v 1.1 2012/01/19 19:01:38 ssuominen Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="toolbar truetype unicode Xaw3d"
+
+COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
+ kernel_FreeBSD? ( sys-libs/libutempter )
+ >=sys-libs/ncurses-5.7-r7
+ 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 )"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig
+ x11-base/xorg-proto"
+
+pkg_setup() {
+ DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+}
+
+#SDS
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+#MDK
+# epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
+# epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
+# epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
+
+#DarkLin
+ epatch ${FILESDIR}/xterm-ds-config-278.patch || die
+ epatch ${FILESDIR}/xterm-ds-paste-278.patch || die
+ epatch ${FILESDIR}/xterm-ds-input-225.patch || die
+ epatch ${FILESDIR}/xterm-ds-copy-243.patch || die
+# Embedded in SM patch
+## epatch ${FILESDIR}/xterm-ds-utf8mode.patch
+# Since 278 is provided internaly
+## epatch ${FILESDIR}/xterm-ds-sm-243.patch || die
+# Incorporated into the config patch
+## epatch ${FILESDIR}/xterm-ds-metaesc.patch || die
+}
+#EDS
+
+src_configure() {
+ # looking for reason why crosscompile failed? try restoring this:
+ # --x-libraries="${ROOT}usr/$(get_libdir)"
+ # -ssuominen, 2011
+
+ econf \
+ --libdir="${EPREFIX}"/etc \
+ --disable-full-tgetent \
+ --with-app-defaults=${DEFAULTS_DIR} \
+ --disable-setuid \
+ --disable-setgid \
+ --with-utempter \
+ --with-x \
+ $(use_with Xaw3d) \
+ --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 toolbar) \
+ $(use_enable unicode mini-luit) \
+ $(use_enable unicode luit) \
+ --enable-wide-chars \
+ --enable-dabbrev \
+ --disable-maximize \
+ --enable-warnings
+
+#SDS
+# Add
+# --disable-maximize
+
+ sed -i'' Makefile -e 's#^LIBS\s*=.*$#LIBS = -lfontconfig -lfreetype -lXft -lXmu -lXt -lX11 -lXaw7 -lXt -lX11 -lSM -lICE -lXt -lX11 -lutempter -ltinfo#' || die
+#EDS
+
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc README{,.i18n} ctlseqs.txt
+ 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 <spyderous@gentoo.org>
+ fperms 0755 /usr/bin/xterm
+
+ # restore the navy blue
+ sed -i -e "s:blue2$:blue:" "${ED}"${DEFAULTS_DIR}/XTerm-color
+}
--
cgit v1.2.3