gentoo resync : 31.01.2018

3 files changed, 31 insertions, 3 deletions

diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index f1b5738adebb..ade9578ed98a 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -1,3 +1,4 @@
-DIST libdsk-1.5.5.tar.gz 1211603 BLAKE2B 678f2fd4f7c275e413f3626858368ba631a03ba06079e0e5a76b792fd664e09df8bab3c7773365bbda4d2cbe27730fc2d46d4e4bf68828e0beab30b87147088d SHA512 58d5f78e7c83870f62804278ab4a801086763c5fda7bf8740edec3b9e69b35ececa98c9c6689dcd4b31053fa392952362ac461956b00f6f17a5da4b56aa6342b
-EBUILD libdsk-1.5.5.ebuild 448 BLAKE2B dd1aa87a7283d8cf659171960ecf39045062ba1cfcf97c928a9e0113395a0fb12096cfbe89190877c051d62a6bd30f8d8c4dae2062f82437d267fba4f8a0684a SHA512 1fffcc2c770274b3017599f1c0bedf3a7724e5d8de4bf2345d4ffceb3d5c6cebb06812e3b7af2ed2959a398d94090a217a9077d7f2010cc77c8b5418304c3c75
+AUX libdsk-1.5.6-include-sysmacros.patch 676 BLAKE2B 7617b02bac41a86e292009b7a651eb3bbc94b3409f8391c9345ce74558d9f526c7f1210c80e0d738d57a867f6cb3f6cb780ea6aa37a911eebc3a6be7671c78f4 SHA512 d4a38e7be2f3835c14c8d2be9dd4ae6cd75653efe65b0276e3f009895e35b257b0f819a711f1ac623dfe80d462676ac4eccfaf1ac68011db61e4992dde2450f5
+DIST libdsk-1.5.6.tar.gz 1212346 BLAKE2B 4b456fa4cba759898e045706ee13b3b7a8b520adc559d28541217e208788aaddee79bde949b71d2af4100c2696768e9568d73faaa7d900dc8ad52a58f593b922 SHA512 042d876dbc7598ea54a8acec44ad3417ddf69e96000219fd3effc5e0f76a9571839fbd15107578e312759cca732b86e68bc9fd2cef28cc41b0ae094ea9667a89
+EBUILD libdsk-1.5.6.ebuild 531 BLAKE2B 17517364097e44f51c6d052d88cc419e666325b6267d6275b08178bb6596c3bcc52e96d1a465215a5283a0ff7072792dc33c54132e8710565c0fae7d15e22112 SHA512 21680fc3205934cae2beadf503f9e8a5d6aecc446fcd6b10a6572a023d30f47f8bb12e7e11518e0531d51457e5d8cf482f1178a7b0e6dcd1da2460515b893351
 MISC metadata.xml 250 BLAKE2B 4d107336753f39398ae054c9c143bd7a5528a3cecf12ac4f32ba37b2ed15ccefbbd4462239b98b5b239fc3fd2588ea313c2e68c06e889a16a16162af54348295 SHA512 edfbc7db743ecc341349b3ebd5c1367e100dd1999194001f6de526be5fbf340daf8ebb9a70b4b4b069178219c37a8c4e161afc2650997070dd3be113d091d077
diff --git a/app-emulation/libdsk/files/libdsk-1.5.6-include-sysmacros.patch b/app-emulation/libdsk/files/libdsk-1.5.6-include-sysmacros.patch
new file mode 100644
index 000000000000..e52b92bf2e33
--- /dev/null
+++ b/app-emulation/libdsk/files/libdsk-1.5.6-include-sysmacros.patch
@@ -0,0 +1,22 @@
+diff -Nuar a/lib/compress.c b/lib/compress.c
+--- a/lib/compress.c	2017-02-13 20:34:21.000000000 +0100
++++ b/lib/compress.c	2018-01-28 15:22:15.571892254 +0100
+@@ -23,6 +23,7 @@
+ #include "drvi.h"   /* For LINUXFLOPPY and WIN32FLOPPY */

+ #include "compi.h"

+ #include "comp.h"

++#include <sys/sysmacros.h>

+ /* LibDsk generalised compression support */

+ #ifdef HAVE_SYS_STAT_H

+ #include <sys/stat.h>

+diff -Nuar a/lib/drvlinux.c b/lib/drvlinux.c
+--- a/lib/drvlinux.c	2017-02-26 01:43:39.000000000 +0100
++++ b/lib/drvlinux.c	2018-01-28 15:22:08.661892284 +0100
+@@ -26,6 +26,7 @@
+ 
+ #include "drvi.h"
+ #include "drvlinux.h"
++#include <sys/sysmacros.h>
+ 
+ #ifdef LINUXFLOPPY
+ 
diff --git a/app-emulation/libdsk/libdsk-1.5.5.ebuild b/app-emulation/libdsk/libdsk-1.5.6.ebuild
index d7b91ae18fbb..f3f60beebc78 100644
--- a/app-emulation/libdsk/libdsk-1.5.5.ebuild
+++ b/app-emulation/libdsk/libdsk-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-include-sysmacros.patch
+	eapply_user
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	DOCS="doc/${PN}.txt doc/${PN}.pdf" einstalldocs