From: Michael Haubenwallner <haubi@gentoo.org>
Date: Wed, 16 Oct 2019 09:01:28 +0000 (+0200)
Subject: dev-util/confix-wrapper: bump to EAPI 7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=01ff6b3e2a7898b1f51f87b30ddf3ae9074deb62;p=gentoo.git

dev-util/confix-wrapper: bump to EAPI 7

Closes: https://bugs.gentoo.org/697324
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>
---

diff --git a/dev-util/confix-wrapper/confix-wrapper-0.ebuild b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
similarity index 70%
rename from dev-util/confix-wrapper/confix-wrapper-0.ebuild
rename to dev-util/confix-wrapper/confix-wrapper-1.ebuild
index e8f8dcb4d2cb..685b1b97161d 100644
--- a/dev-util/confix-wrapper/confix-wrapper-0.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Wrapper to select either confix1.py or confix2.py"
 HOMEPAGE="http://confix.sourceforge.net"
@@ -10,10 +10,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
+S=${WORKDIR}
 
-src_install() {
-	dodir /usr/bin
-	cat >> "${ED:-${D}}"usr/bin/confix <<EOF
+src_unpack() {
+	cat >> confix <<EOF || die
 #! ${EPREFIX:-}/bin/sh
 confixpy=
 if [ -f ./Confix2.dir ]; then
@@ -28,6 +28,8 @@ case \$# in
 *) exec \${confixpy} "\$@" ;;
 esac
 EOF
-	fperms a+x /usr/bin/confix || die "cannot set permissions"
-	dosym confix /usr/bin/confix.py || die "cannot create 'confix' symlink"
+}
+
+src_install() {
+	dobin confix
 }