gentoo resync : 30.09.2018

1 files changed, 19 insertions, 20 deletions

diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
index 251eb649d276..862cdd7871b6 100644
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="PkZip cipher breaker"
@@ -13,38 +13,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
-DEPEND="test? ( app-arch/zip[crypt] )"
 RDEPEND="!<app-text/html-xml-utils-5.3"
+BDEPEND="test? ( app-arch/zip[crypt] )"
 
 DOCS=(
-	../doc/KNOWN_BUGS
-	../doc/appnote.iz.txt
-	../doc/README.W32
-	../doc/pkzip.ps.gz
-	../doc/CHANGES
-	../doc/LIESMICH
-	../doc/README.html
-	../doc/README
+	doc/KNOWN_BUGS
+	doc/appnote.iz.txt
+	doc/README.W32
+	doc/pkzip.ps.gz
+	doc/CHANGES
+	doc/LIESMICH
+	doc/README.html
+	doc/README
 )
 
-S="${WORKDIR}/${P}/src"
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
 
-src_prepare() {
-	default
-	sed -i -e "s/^CC=.*/CC=$(tc-getCC)/" \
-		-e "/^CFLAGS=.*/d" \
-		-e "s/CFLAGS/LDFLAGS/" \
-		Makefile
-	sed -i -e "s:void main:int main:" *.c
+src_compile() {
+	cd src
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_test() {
-	cd "${S}/../test"
-	make CC="$(tc-getCC)" all
+	cd test
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
 }
 
 src_install() {
 	einstalldocs
+	cd src
 	dobin pkcrack zipdecrypt findkey makekey
 	newbin extract "$PN-extract"
 }