diff options
author | Sam James <sam@gentoo.org> | 2021-05-13 15:51:08 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2021-05-13 15:51:08 +0200 |
commit | 5b09db61d88dd1b3b67ce6fcc7c85cf744532423 (patch) | |
tree | b57af8c7b0020919fa6047113293c5de1406d980 | |
parent | app-admin/apache-tools: add missing virtual/pkgconfig (B)DEPEND (diff) | |
download | gentoo-5b09db61d88dd1b3b67ce6fcc7c85cf744532423.tar.gz gentoo-5b09db61d88dd1b3b67ce6fcc7c85cf744532423.tar.bz2 gentoo-5b09db61d88dd1b3b67ce6fcc7c85cf744532423.zip |
sys-libs/libtermcap-compat: port to EAPI 7, drop epatch
All patches have been adjusted to use -p1 formatting and
also strip unnecessary date timestamps as is now standard
practice.
No actual content has changed in the patches. They have
been recompressed with xz given I needed to change them
anyway.
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r-- | sys-libs/libtermcap-compat/Manifest | 2 | ||||
-rw-r--r-- | sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild | 44 |
2 files changed, 32 insertions, 14 deletions
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest index aef10aad2339..915bc120cea3 100644 --- a/sys-libs/libtermcap-compat/Manifest +++ b/sys-libs/libtermcap-compat/Manifest @@ -1,3 +1,3 @@ -DIST termcap-2.0.8-patches-2.tar.bz2 11589 BLAKE2B 8fec4befa009a8dd53fd949435eba30a06523cf731ec35a7565608dd0fbcddcbb01b56c94815a79851e0e7afd75d31475cde682c0d419b86cb4750ec9a543bed SHA512 24d871007191a051dca604635f6d4e2dec67b675c2c9a0c728a0458a6a501ac268f5d4c4203356a6f64e718edba5c8ec970276c244435a25bef11c6fba0e837d +DIST termcap-2.0.8-patches-2.tar.xz 11116 BLAKE2B 537342e45333f0373754eb5390ef1c37369531f32e2ecc4004809c800c172d370690a232b3cbd0c3ef90f977a456d97ac306e55a42e13244a0c47f4973ad94a1 SHA512 0261a9c21385578507e5c8e8f7064879904ba2b0d1ff9dce90d77ed2ad5e0c7fc49880ddc4fbc77df70f425a3fe4765bbac827824d4b59e99d77374ab4183d0f DIST termcap-2.0.8.tar.bz2 211523 BLAKE2B 4ea7c4cdc26be4e1262a8e75e125b4349c75976c297c2389e034635d2d5324275486525fe93fd8628e8a5cd0980c7e97eba55f5a05d6b3b537337b2fb55cf2cd SHA512 1aca52f5bcda60933229143085416296fed1aa981bae4440f30424f1e2bd9d90e9836f05c5a5a53af77d20dbb1d2425bf2b7c5fa2952258e2b4a2a5babaddaad DIST termtypes.tc.gz 228329 BLAKE2B 988b91c6c3c624963e078b424f24b26eb37fe32ca34b0ece0ca4ddf734ee1513f399a4f584f41a92c6ef2edb64144c13820677b419e58b4bfaf0e0fa2c5686a7 SHA512 13a2ee2cd0bc349d69af7efb8e8122f655b67f4bcbe0dc5cbf8a9ba22649548086a097de8bc148fb71ceba1640434a6b94763410beb3b915e03c3a6b46e8a678 diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild index d89e95855853..9554b81a26a7 100644 --- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild +++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r4.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# we only want this for binary-only packages, so we will only be installing +# We only want this for binary-only packages, so we will only be installing # the lib used at runtime; no headers and no files to link against -EAPI="5" +EAPI=7 -inherit epatch multilib toolchain-funcs multilib-minimal +inherit toolchain-funcs multilib-minimal PATCHVER="2" @@ -15,23 +15,41 @@ DESCRIPTION="Compatibility package for old termcap-based programs" HOMEPAGE="http://www.catb.org/~esr/terminfo/" SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz mirror://gentoo/${MY_P}.tar.bz2 - mirror://gentoo/${MY_P}-patches-${PATCHVER}.tar.bz2" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCHVER}.tar.xz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2 LGPL-2 BSD" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ppc sparc x86" -IUSE="" -S=${WORKDIR}/${MY_P} +PATCHES=( + # Gentoo patchset + "${WORKDIR}"/patch/002_all_termcap-setuid.patch + "${WORKDIR}"/patch/003_all_termcap-inst-no-root.patch + "${WORKDIR}"/patch/004_all_termcap-compat-glibc21.patch + "${WORKDIR}"/patch/005_all_termcap-xref.patch + "${WORKDIR}"/patch/006_all_termcap-fix-tc.patch + "${WORKDIR}"/patch/007_all_termcap-ignore-p.patch + "${WORKDIR}"/patch/008_all_termcap-buffer.patch + "${WORKDIR}"/patch/009_all_termcap-bufsize--needs-011.patch + "${WORKDIR}"/patch/010_all_termcap-colon.patch + "${WORKDIR}"/patch/011_all_termcap-AAARGH.patch + "${WORKDIR}"/patch/012_all_libtermcap-compat-2.0.8-fPIC.patch + "${WORKDIR}"/patch/013_all_libtermcap-compat_bcopy_fix.patch + "${WORKDIR}"/patch/014_all_libtermcap-build-settings.patch + "${WORKDIR}"/patch/015_all_libtermcap-only-shared-lib.patch + # termcap + "${WORKDIR}"/patch/tc.file/001_all_termcap-linuxlat.patch + "${WORKDIR}"/patch/tc.file/002_all_termcap-xtermchanges.patch + "${WORKDIR}"/patch/tc.file/003_all_termcap-utf8.patch + "${WORKDIR}"/patch/tc.file/004_all_termcap-xterm-X11R6.patch + "${WORKDIR}"/patch/tc.file/005_all_termcap-Eterm.patch +) src_prepare() { - EPATCH_SOURCE="${WORKDIR}/patch" - EPATCH_SUFFIX="patch" - epatch "${EPATCH_SOURCE}" + mv "${WORKDIR}"/termtypes.tc "${S}"/termcap || die - cd "${WORKDIR}" - mv termtypes.tc termcap || die - epatch "${EPATCH_SOURCE}"/tc.file + default multilib_copy_sources } @@ -47,7 +65,7 @@ multilib_src_install() { multilib_src_install_all() { insinto /etc - doins "${WORKDIR}"/termcap + doins "${WORKDIR}"/patch/termcap dodoc ChangeLog README } |