gentoo resync : 23.09.2020

3 files changed, 25 insertions, 22 deletions

diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index ec3375c5f0bb..a072caa98e89 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
-AUX mit-krb5-appl-tinfo.patch 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
+AUX mit-krb5-appl-tinfo.patch 579 BLAKE2B 8db4885b88e2eb155ea80ce8d4e7f320ae39a9183e70de452081a452c51ba9ae3dfad4ea000582b3f3f361e17de02b0720cd794473c974c5551b69afde869445 SHA512 3b90b4f9539b94ddc8a0483dc156f61d33b436a01d32d8e66de13a82e653ec51c7996e3e5b4f5d8e1edf6a21d6c4fe09f4a4382e2f918edff070e71bfcee0951
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1639 BLAKE2B 70ac99cb842b5868542fda3db627bf948d928041c14e3827e7a4f69df5776eb75e3d77c2d3559df3bcfa7d835e9c027dbb8672463fec179aab2ebd54e30e3568 SHA512 3a110a77ca241205da721b47b721d41799296762c958197cfc5226147b45b92f8980cd36631aaea09a55fe00e4e40435b24f0fee8df562a47f2692070a098b50
+EBUILD mit-krb5-appl-1.0.3.ebuild 1635 BLAKE2B 192ab9ee291f87518bfecb86a565636470e0a7c3112da5327f9c8654e67d51b695d7e0b1dd9659f4bf90f3eec9d07ca90d50d57929575f504ad06754579fe19a SHA512 865cb3867f641a6bb1cd8a1e9afedf786a788241f6f93676f68822b20b4f57c6312684005ff85ad3a374920f787c49968df78ba8b297fd4f777b8822cb430eed
 MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
index 54c18665d336..7a81f244cfb0 100644
--- a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
@@ -1,5 +1,5 @@
---- configure.ac	2011-07-11 22:34:17.000000000 +0300
-+++ configure.ac	2013-02-28 15:12:24.693841664 +0200
+--- a/configure.ac	2011-07-11 22:34:17.000000000 +0300
++++ b/configure.ac	2013-02-28 15:12:24.693841664 +0200
 @@ -152,7 +152,8 @@
               [AC_DEFINE(TERMCAP,1,[Define if termcap library is available])
                LIBS="$LIBS -ltermcap"])
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 73a6522b4699..6493b2d6f54e 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
+MAJOR_MINOR="$(ver_cut 1-2)"
 DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
 SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
 	sys-libs/e2fsprogs-libs
 	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${PN}-tinfo.patch"
+	"${FILESDIR}/${PN}-sig_t.patch"
+)
 
 src_unpack() {
 	unpack ${A}
@@ -30,9 +33,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-tinfo.patch"
-	epatch "${FILESDIR}/${PN}-sig_t.patch"
-	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
+	default
+
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac || die
 	eautoreconf
 }
 
@@ -44,19 +47,19 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 	for i in {telnetd,ftpd} ; do
-		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
+		mv "${ED}"/usr/share/man/man8/${i}.8 "${ED}"/usr/share/man/man8/k${i}.8 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/sbin/${i} "${ED}"/usr/sbin/k${i} || die "mv failed"
 	done
 
 	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
-		|| die "mv failed (man)"
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
+		mv "${ED}"/usr/share/man/man1/${i}.1 "${ED}"/usr/share/man/man1/k${i}.1 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/k${i} || die "mv failed"
 	done
 
-	rm "${D}"/usr/share/man/man1/tmac.doc
+	rm "${ED}"/usr/share/man/man1/tmac.doc || die
 	dodoc README
 }