gentoo resync : 30.12.2017

4 files changed, 57 insertions, 5 deletions

diff --git a/app-arch/tapeutils/Manifest b/app-arch/tapeutils/Manifest
index e32e873452ed..6bf3520f4e40 100644
--- a/app-arch/tapeutils/Manifest
+++ b/app-arch/tapeutils/Manifest
@@ -1,3 +1,5 @@
+AUX tapeutils-0.4-fix-C-decl.patch 700 BLAKE2B c3786edd42d711a528b7fc81c6c9569e2cd265aae7c4205fc642d8ee088d756f2b810197af3fd4aa2c0303e310ced41a9013d76ceb84cb9d5adf5a91ad4227c6 SHA512 bb38dd764d94279894f2ed76b8e882622a30db6b68bfb48ef882422fc326274842961fc0d27b2d812444382dd19aaee64788f8a4a604c2506961c405d4f20621
+AUX tapeutils-0.4-fix-build-system.patch 201 BLAKE2B b0c4d271b1a52ce613d57c7006f485f63e93dba380fb2a8e6db0da50cbc752b2cbe115f05e9b0c475a690ec2dfda87bc9d0beab33a8292cb2af2779c69f271a0 SHA512 c286c5592874a147341182fa98f13181937fd5ef0f581b8ebdd790f156dcc1c358e1b69240cf8fbccd2d3d34c319e29b2a9e8a3674fede6b712c4f12538710ff
 DIST tapeutils-0.4.tar.gz 14116 BLAKE2B 1eb633ef1593b6f50142ae0128438a4346fafdaa4a847ff9e21caf278f1123844af16dc2c04d3d0cc2c015d0ec7fc15eaab48e6be9ae7c18d3cd2972434f2617 SHA512 b87b725c3f1610f5a116263120ffea84a7e81146cc9e46be69391388bb0b3bf4814d16428bfabd285557a0f72a3607f138e454b61989f2606697875e30c948bd
-EBUILD tapeutils-0.4.ebuild 596 BLAKE2B fe4d890a3403a21700c9bf8592749d56afd7941044b274a7c8e42a1bbb1602fad9ec6386789961bafb4d90e612b753a85e35ab41232781769a463d2d49810444 SHA512 c0f70db3528c69bbdbb5d2f770eb891e7ae5d5cf79cf82539e38308a490b3e65b3a62d985388e02df5728243bcb33f8f2599fad978f87d3e9a2e516ea45d0a3b
+EBUILD tapeutils-0.4.ebuild 655 BLAKE2B 3f59c8b660b90afd9f51c510069a4c85e298eb88ffb71588119335e18701b8fb33fd619288e0eb96c938fd2fbe2b866554df20eda27d0f037d5ee18703b57255 SHA512 43386adefd194fe12d0430de17b57a3992b694c1c1520daa89a94e2eaadbdabcaac843a6b759bbaca706523a5c9d2d5e641513bdadcbb3ee2fe67eef3c2c6f3d
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
new file mode 100644
index 000000000000..ee07c252d168
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
@@ -0,0 +1,31 @@
+--- a/tapecopy.c
++++ b/tapecopy.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+--- a/tapedump.c
++++ b/tapedump.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+@@ -158,7 +160,7 @@
+       len = getrec (src, buf, MAX_REC_LEN);
+       if (len == 0)
+ 	{
+-	  printf ("total length of file %d = %d records, %d bytes\n",
++	  printf ("total length of file %d = %d records, %lu bytes\n",
+ 		  file, record, filebytes);
+ 	  tapebytes += filebytes;
+ 	  file++;
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
new file mode 100644
index 000000000000..e1670a47fe2b
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,6 @@
+ # options
+ # -----------------------------------------------------------------------------
+ 
+-CFLAGS = -O2
+-LDFLAGS = 
+ 
+ # CFLAGS = -g
+ # LDFLAGS = -g
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4.ebuild
index b70a469e36db..50e3aac72747 100644
--- a/app-arch/tapeutils/tapeutils-0.4.ebuild
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="Utilities for manipulation of tapes and tape image files"
@@ -12,13 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DEPEND=""
 RDEPEND="!app-emulation/hercules"
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.4-fix-C-decl.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin tapecopy tapedump || die
+	dobin tapecopy tapedump
 	# no docs to install
 }