summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-04-19 22:54:26 +0200
committerJohannes Huber <johu@gentoo.org>2016-04-19 22:54:40 +0200
commita175a69c03799377f75e5b41706d7de62e3886c7 (patch)
tree89f9dfa4a7dd408bfc15927ce67293fc344ecb52
parentfix <pkg/> reference in metadata.xml (diff)
downloadgentoo-a175a69c03799377f75e5b41706d7de62e3886c7.tar.gz
gentoo-a175a69c03799377f75e5b41706d7de62e3886c7.tar.bz2
gentoo-a175a69c03799377f75e5b41706d7de62e3886c7.zip
sys-block/kvpm: Fix build with future glibc
Gentoo-bug: 579920 Package-Manager: portage-2.2.28
-rw-r--r--sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch55
-rw-r--r--sys-block/kvpm/kvpm-0.9.9.ebuild6
2 files changed, 59 insertions, 2 deletions
diff --git a/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch b/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch
new file mode 100644
index 000000000000..8b8c1be2972b
--- /dev/null
+++ b/sys-block/kvpm/files/kvpm-0.9.9-glibc-sysmacros.patch
@@ -0,0 +1,55 @@
+diff -Naur kvpm-0.9.9.orig/kvpm/logvol.cpp kvpm-0.9.9/kvpm/logvol.cpp
+--- kvpm-0.9.9.orig/kvpm/logvol.cpp 2014-09-09 01:34:06.000000000 +0200
++++ kvpm-0.9.9/kvpm/logvol.cpp 2016-04-19 20:44:09.775924549 +0200
+@@ -16,6 +16,7 @@
+ #include "logvol.h"
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -Naur kvpm-0.9.9.orig/kvpm/misc.cpp kvpm-0.9.9/kvpm/misc.cpp
+--- kvpm-0.9.9.orig/kvpm/misc.cpp 2014-01-29 07:39:53.000000000 +0100
++++ kvpm-0.9.9/kvpm/misc.cpp 2016-04-19 20:42:32.496964783 +0200
+@@ -15,6 +15,7 @@
+ #include "misc.h"
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff -Naur kvpm-0.9.9.orig/kvpm/processprogress.cpp kvpm-0.9.9/kvpm/processprogress.cpp
+--- kvpm-0.9.9.orig/kvpm/processprogress.cpp 2014-01-29 20:48:04.000000000 +0100
++++ kvpm-0.9.9/kvpm/processprogress.cpp 2016-04-19 20:43:20.139434830 +0200
+@@ -19,6 +19,7 @@
+ #include "progressbox.h"
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <signal.h>
+
+ #include <KApplication>
+diff -Naur kvpm-0.9.9.orig/kvpm/storagebase.cpp kvpm-0.9.9/kvpm/storagebase.cpp
+--- kvpm-0.9.9.orig/kvpm/storagebase.cpp 2014-01-29 07:39:53.000000000 +0100
++++ kvpm-0.9.9/kvpm/storagebase.cpp 2016-04-19 20:43:36.869599894 +0200
+@@ -14,6 +14,7 @@
+
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <kde_file.h>
+
+ #include <QByteArray>
+diff -Naur kvpm-0.9.9.orig/kvpm/storagepartition.cpp kvpm-0.9.9/kvpm/storagepartition.cpp
+--- kvpm-0.9.9.orig/kvpm/storagepartition.cpp 2014-01-29 07:39:53.000000000 +0100
++++ kvpm-0.9.9/kvpm/storagepartition.cpp 2016-04-19 20:43:56.465793229 +0200
+@@ -17,6 +17,7 @@
+ #include "storagepartition.h"
+
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <kde_file.h>
+
+ #include <QDebug>
diff --git a/sys-block/kvpm/kvpm-0.9.9.ebuild b/sys-block/kvpm/kvpm-0.9.9.ebuild
index 65a1b06adde5..6a5a2306238f 100644
--- a/sys-block/kvpm/kvpm-0.9.9.ebuild
+++ b/sys-block/kvpm/kvpm-0.9.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_DOC_DIRS="docbook"
KDE_HANDBOOK="optional"
@@ -23,3 +23,5 @@ RDEPEND="
>=sys-fs/lvm2-2.02.98
"
DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-glibc-sysmacros.patch" )