[gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/, sys-boot/plymouth/files/

[Gilles Dartiguelongue]

commit:     0bb05cf38855b0e72b6ce7c8a16b1401cb70f097
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 22:40:26 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 22:41:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb05cf3

sys-boot/plymouth: fix build with newer glibc, bug #604480

Fix missing dependency on xsltproc and XSL stylesheets as required to
build man pages, bug #628078.

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 .../plymouth/files/0.9.3-glibc-sysmacros.patch     | 45 ++++++++++++++++++++++
 ...ymouth-9999.ebuild => plymouth-0.9.3-r1.ebuild} |  8 +++-
 sys-boot/plymouth/plymouth-9999.ebuild             |  3 +-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch 
b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
new file mode 100644
index 00000000000..8969161bb19
--- /dev/null
+++ b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
@@ -0,0 +1,45 @@
+From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001
+From: Kjell Claesson <kjell.claes...@epost.tidanet.se>
+Date: Fri, 18 Aug 2017 00:25:56 +0200
+Subject: [PATCH] Fix build with newer glibc
+
+Signed-off-by: Gilles Dartiguelongue <e...@gentoo.org>
+---
+ configure.ac                          | 1 +
+ src/libply-splash-core/ply-terminal.c | 8 ++++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c32697f..8376789 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools)
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
++AC_HEADER_MAJOR
+ AC_PROG_AWK
+ AC_PROG_CC_STDC
+ AM_PROG_CC_C_O
+diff --git a/src/libply-splash-core/ply-terminal.c 
b/src/libply-splash-core/ply-terminal.c
+index a0954f2..ef62bf8 100644
+--- a/src/libply-splash-core/ply-terminal.c
++++ b/src/libply-splash-core/ply-terminal.c
+@@ -36,6 +36,14 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ 
++/* major()/minor() */
++#ifdef MAJOR_IN_MKDEV
++#    include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++#    include <sys/sysmacros.h>
++#endif
++
+ #include <linux/kd.h>
+ #include <linux/major.h>
+ #include <linux/vt.h>
+-- 
+2.14.1
+

diff --git a/sys-boot/plymouth/plymouth-9999.ebuild 
b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
similarity index 89%
copy from sys-boot/plymouth/plymouth-9999.ebuild
copy to sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index 45f6e2cec40..3f5694b8600 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png";
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth";
+       EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth"
        inherit git-r3
 else
        SRC_URI="${SRC_URI} 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
@@ -33,6 +33,8 @@ CDEPEND="
        pango? ( >=x11-libs/pango-1.21 )
 "
 DEPEND="${CDEPEND}
+       app-text/docbook-xsl-stylesheets
+       dev-libs/libxslt
        virtual/pkgconfig
 "
 # Block due bug #383067
@@ -47,6 +49,7 @@ DOC_CONTENTS="
 "
 
 PATCHES=(
+       "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
 )
 
 src_configure() {
@@ -54,6 +57,7 @@ src_configure() {
        myconf="--with-system-root-install=no
        --localstatedir=/var
        --without-rhgb-compat-link
+       --enable-documentation
        --enable-systemd-integration
        --with-systemdunitdir="$(systemd_get_systemunitdir)"
        $(use_enable !static-libs shared)

diff --git a/sys-boot/plymouth/plymouth-9999.ebuild 
b/sys-boot/plymouth/plymouth-9999.ebuild
index 45f6e2cec40..49ce1012fe8 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png";
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth";
@@ -47,6 +47,7 @@ DOC_CONTENTS="
 "
 
 PATCHES=(
+       "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
 )
 
 src_configure() {