gentoo resync : 28.04.2021

2 files changed, 24 insertions, 15 deletions

diff --git a/app-office/multitalk/Manifest b/app-office/multitalk/Manifest
index d0b5cb3502f8..fb4e80f2399f 100644
--- a/app-office/multitalk/Manifest
+++ b/app-office/multitalk/Manifest
@@ -1,4 +1,4 @@
 AUX 99multitalk 37 BLAKE2B 81ec83f120a473235b30cf4d9728a34f5597bd1a501bcc620b5b4f940b1d486a58255ecd9839888cd6f51f80a5422bf333503deedad8ecb90891137246e6fc56 SHA512 671e75f07864c8254290062171a622478b5a1a3afd3ddfe04741d37dc6e644bc53fcba99d94eb64c7eacd3a670e2d5e0ef2d294295a4e48c40ea42207fd943f7
 DIST multitalk-1.4.tar.gz 1735886 BLAKE2B c71e1e28458c485a742870f7451d78596e9bf9d1175a5eaa2db1b463511f3ce28ae9e9a7b0a06b1a671102258d2df735f842ca5f5aad6f933da92a3901c6e3d5 SHA512 47e38766485b2dd9faed97fc596e2d625fe86afa9606b9d6136fd337e96588707e14f7a3db00c01f7fc8adf07a3de63b94b85f1fa08a3f7817c35820f0ac9719
-EBUILD multitalk-1.4-r1.ebuild 1163 BLAKE2B f8b46aafa7fe2742ea5de97c34b9b2d9df6487e3dc850f308ebfcd0ad4cb3684e11c7f1d769448a38a4eafb0b92cbe53072282ebb5e329f9ec87d367ab398070 SHA512 202cd16cc3607df0d278adddfef4dc4e206767b764e4c732f0a56db8b981422dea1dcbfa9f252a6e65a39020b7956452413db1190ae67e2c252fde9abef7e513
+EBUILD multitalk-1.4-r1.ebuild 1223 BLAKE2B b701796fe95e970e3b97b7f297d4dffb8ece87551e3bd82d8c3ddbdb191240bc7ae888749a4c1be1d45e3b0fe4d1cdc02ae80354165106d27a8ff036c7b48713 SHA512 5de6d7682dcf48546a295dc96a2674711811cf07e65a48da81b4a7bb57fa8e5ee2df4b2671ead3812d6252c30a6e6420c82cf714cf67c583a63d50be4716c33f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-office/multitalk/multitalk-1.4-r1.ebuild b/app-office/multitalk/multitalk-1.4-r1.ebuild
index 513dcc050404..09b70c0e23f3 100644
--- a/app-office/multitalk/multitalk-1.4-r1.ebuild
+++ b/app-office/multitalk/multitalk-1.4-r1.ebuild
@@ -1,36 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs readme.gentoo
+EAPI=7
 
-DESCRIPTION="A new type of presentation program"
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="New type of presentation program"
 HOMEPAGE="http://www.srcf.ucam.org/~dmi1000/multitalk/"
 SRC_URI="http://www.srcf.ucam.org/~dmi1000/multitalk/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples latex"
 
-DEPEND=">=media-libs/libsdl-1.2.7
+DEPEND="
+	>=media-libs/libsdl-1.2.7
+	>=media-libs/sdl-gfx-2.0.13
 	>=media-libs/sdl-image-1.2.3
 	>=media-libs/sdl-ttf-2.0.6
-	>=media-libs/sdl-gfx-2.0.13"
-
-RDEPEND="${DEPEND}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
 	latex? (
 		virtual/imagemagick-tools
 		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${PN}"
+	)
+"
 
 DOC_CONTENTS="
-	You will have to source /etc/profile (or logout and back in).
-	See also /usr/share/doc/${PF}/${PN}.pdf."
+You will have to source /etc/profile (or logout and back in).
+See also /usr/share/doc/${PF}/${PN}.pdf.
+"
 
 src_prepare() {
+	default
 	sed -i \
 		-e "s:g++:$(tc-getCXX) ${CXXFLAGS}:" \
 		-e "s:-L\${HOME}/lib:${LDFLAGS}:" \
@@ -39,7 +44,7 @@ src_prepare() {
 
 src_install() {
 	dodir /usr/bin
-	emake SYSPREFIX="${D}usr" install
+	emake SYSPREFIX="${D}/usr" install
 
 	insinto /usr/share/${PN}/examples
 	doins examples/about.{graph,talk}
@@ -50,3 +55,7 @@ src_install() {
 
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}