commit:     6c92304798f4ccb6b27b9248fc150f7085247711
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 00:18:21 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 00:18:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=6c923047

sys-apps/gentoo-functions: bug #690426

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-apps/gentoo-functions/Manifest                 |  1 +
 .../files/gentoo-functions-sysmacros.patch         | 32 ++++++++++++++++++++++
 .../gentoo-functions/gentoo-functions-0.12.ebuild  | 32 ++++++++++++++++++++++
 sys-apps/gentoo-functions/metadata.xml             | 21 ++++++++++++++
 4 files changed, 86 insertions(+)

diff --git a/sys-apps/gentoo-functions/Manifest 
b/sys-apps/gentoo-functions/Manifest
new file mode 100644
index 0000000..34ce1ac
--- /dev/null
+++ b/sys-apps/gentoo-functions/Manifest
@@ -0,0 +1 @@
+DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 
88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9
 SHA512 
181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705

diff --git a/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch 
b/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch
new file mode 100644
index 0000000..7358ecd
--- /dev/null
+++ b/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch
@@ -0,0 +1,32 @@
+From 1518beca0b5a2730a87da9ce82299ef6469bfe8a Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <bluen...@gentoo.org>
+Date: Fri, 23 Aug 2019 11:29:06 -0400
+Subject: [PATCH] consoletype.c: update header to <sys/sysmacros.h>
+
+This is an update to commit 53b60b4.  Recent changes in musl have
+removed the inclusion of <sys/sysmacros.h> from <sys/types.h>.
+Now the macros major()/minor() require the inclusion of the former
+header.  This change does not affect glibc nor earlier versions of
+musl, but is required for musl 1.1.23 and later.
+
+Signed-off-by: Anthony G. Basile <bluen...@gentoo.org>
+---
+ consoletype.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/consoletype.c b/consoletype.c
+index 0eb7a07..ece0d5f 100644
+--- a/consoletype.c
++++ b/consoletype.c
+@@ -13,7 +13,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include "headers.h"
+ 
+ enum termtype {
+-- 
+2.21.0
+

diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild 
b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
new file mode 100644
index 0000000..03e8d9d
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == 9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/gentoo/${PN}.git";
+else
+       SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="base functions required by all Gentoo systems"
+HOMEPAGE="https://www.gentoo.org";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+       tc-export CC
+       append-lfs-flags
+       eapply "${FILESDIR}"/${PN}-sysmacros.patch
+       eapply_user
+}
+
+src_install() {
+       emake install DESTDIR="${ED}"
+}

diff --git a/sys-apps/gentoo-functions/metadata.xml 
b/sys-apps/gentoo-functions/metadata.xml
new file mode 100644
index 0000000..1cc4955
--- /dev/null
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<maintainer type="person">
+       <email>willi...@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+       <email>bluen...@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+       <email>base-sys...@gentoo.org</email>
+       <name>Gentoo Base System</name>
+</maintainer>
+<longdescription lang="en">
+       This package contains base shell functions which are required by
+       all Gentoo systems.
+</longdescription>
+<upstream>
+       <remote-id type="github">gentoo/gentoo-functions</remote-id>
+</upstream>
+</pkgmetadata>

Reply via email to