app-arch/unarj: Port to EAPI 6

Closes: https://bugs.gentoo.org/520478
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
David Seifert
2017-12-29 12:26:05 +01:00
parent 61e6e0542d
commit fe84e9cbdf
3 changed files with 80 additions and 15 deletions

View File

@@ -0,0 +1,66 @@
Bug: https://bugs.gentoo.org/520478
--- a/unarj.c
+++ b/unarj.c
@@ -699,7 +699,7 @@
}
if ((arj_flags & GARBLE_FLAG) != 0)
{
- printf(M_ENCRYPT);
+ puts(M_ENCRYPT);
printf(M_SKIPPED, filename);
skip();
return -1;
@@ -763,7 +763,7 @@
}
printf(M_EXTRACT, name);
if (host_os != OS && file_type == BINARY_TYPE)
- printf(M_DIFFHOST);
+ puts(M_DIFFHOST);
printf(" ");
crc = CRC_MASK;
@@ -779,10 +779,10 @@
set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
if ((crc ^ CRC_MASK) == file_crc)
- printf(M_CRCOK);
+ puts(M_CRCOK);
else
{
- printf(M_CRCERROR);
+ puts(M_CRCERROR);
error_count++;
}
return 1;
@@ -808,10 +808,10 @@
decode_f();
if ((crc ^ CRC_MASK) == file_crc)
- printf(M_CRCOK);
+ puts(M_CRCOK);
else
{
- printf(M_CRCERROR);
+ puts(M_CRCERROR);
error_count++;
}
return 1;
@@ -958,7 +958,7 @@
int i;
for (i = 0; M_USAGE[i] != NULL; i++)
- printf(M_USAGE[i]);
+ puts(M_USAGE[i]);
}
int
@@ -973,7 +973,7 @@
argc = ccommand(&argv);
#endif
- printf(M_VERSION);
+ puts(M_VERSION);
if (argc == 1)
{

View File

@@ -1,5 +1,5 @@
--- environ.c 2007-06-19 12:44:09 +0200
+++ environ.c.new 2007-06-19 12:44:37 +0200
--- a/environ.c
+++ b/environ.c
@@ -437,7 +437,6 @@
#endif

View File

@@ -1,7 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils toolchain-funcs
EAPI=6
inherit toolchain-funcs
DESCRIPTION="Utility for opening arj archives"
HOMEPAGE="http://www.arjsoftware.com/"
@@ -12,21 +14,18 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_unpack() {
unpack ${A}
cd "${S}"
PATCHES=(
"${FILESDIR}"/${P}-CAN-2004-0947.patch
"${FILESDIR}"/${P}-sanitation.patch
"${FILESDIR}"/${P}-gentoo-fbsd.patch
"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
)
epatch "${FILESDIR}"/${P}-CAN-2004-0947.patch
epatch "${FILESDIR}"/${P}-sanitation.patch
epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
}
src_compile() {
src_configure() {
tc-export CC
emake || die
}
src_install() {
dobin unarj || die 'dobin failed'
dodoc unarj.txt technote.txt || die 'dodoc failed'
dobin unarj
dodoc unarj.txt technote.txt
}