[gentoo-commits] repo/gentoo:master commit in: x11-misc/vnc2swf/

[Michał Górny]

commit:     16160d17d3a2b4357e38e9348ed0588a070f2c46
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 19:39:56 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 19:50:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16160d17

x11-misc/vnc2swf: Bump to EAPI 7

Closes: https://bugs.gentoo.org/697150
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild | 40 +++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild 
b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 8f9e37b5c91..63abdeceb57 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -1,47 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
 HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf";
 SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz";
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="x11vnc"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+       sys-libs/zlib
+       x11-libs/libX11
        x11-libs/libXaw
        x11-libs/libXext
        x11-libs/libXmu
-       x11-libs/libXt"
-DEPEND="${RDEPEND}
-       x11-base/xorg-proto
-       sys-apps/sed
-       sys-libs/zlib
+       x11-libs/libXt
        x11vnc? ( x11-misc/x11vnc )"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       sed -ie "s:docs:html:" README || die
-       sed -ie "s:-mouse ::" recordwin.sh || die
+src_prepare() {
+       default
+       sed -i -e "s:docs:html:" README || die
+       sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die
 }
 
 src_install() {
-       dobin vnc2swf || die
+       dobin vnc2swf
        if use x11vnc; then
                # this USE flag is needed because recordwin
                # only works on x11vnc
                newbin recordwin.sh recordwin
-               dosed "s:./vnc2swf:vnc2swf:" /usr/bin/recordwin || die
        fi
        insinto /etc/X11/app-defaults
-       newins Vnc2Swf.ad Vnc2Swf || die
-       dodoc README*  || die
-       dohtml -a html,swf docs/* || die
+       newins Vnc2Swf.ad Vnc2Swf
+       dodoc README*
+
+       docinto html
+       dodoc docs/*.{html,swf}
 }