Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/gentoo-functions/files/, sys-apps/gentoo-functions/
Date: Thu, 08 Oct 2020 02:17:30
Message-Id: 1602123389.7b05fe46328060611df260888d7aa05d9347eda0.gyakovlev@gentoo
1 commit: 7b05fe46328060611df260888d7aa05d9347eda0
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 8 02:15:31 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 02:16:29 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b05fe46
7
8 sys-apps/gentoo-functions: drop, ::gentoo version works fine.
9
10 Closes: https://bugs.gentoo.org/690426
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-apps/gentoo-functions/Manifest | 1 -
14 .../files/gentoo-functions-sysmacros.patch | 32 ----------------------
15 .../gentoo-functions/gentoo-functions-0.12.ebuild | 32 ----------------------
16 sys-apps/gentoo-functions/metadata.xml | 21 --------------
17 4 files changed, 86 deletions(-)
18
19 diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
20 deleted file mode 100644
21 index 34ce1ac..0000000
22 --- a/sys-apps/gentoo-functions/Manifest
23 +++ /dev/null
24 @@ -1 +0,0 @@
25 -DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
26
27 diff --git a/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch b/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch
28 deleted file mode 100644
29 index 7358ecd..0000000
30 --- a/sys-apps/gentoo-functions/files/gentoo-functions-sysmacros.patch
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -From 1518beca0b5a2730a87da9ce82299ef6469bfe8a Mon Sep 17 00:00:00 2001
34 -From: "Anthony G. Basile" <blueness@g.o>
35 -Date: Fri, 23 Aug 2019 11:29:06 -0400
36 -Subject: [PATCH] consoletype.c: update header to <sys/sysmacros.h>
37 -
38 -This is an update to commit 53b60b4. Recent changes in musl have
39 -removed the inclusion of <sys/sysmacros.h> from <sys/types.h>.
40 -Now the macros major()/minor() require the inclusion of the former
41 -header. This change does not affect glibc nor earlier versions of
42 -musl, but is required for musl 1.1.23 and later.
43 -
44 -Signed-off-by: Anthony G. Basile <blueness@g.o>
45 ----
46 - consoletype.c | 2 +-
47 - 1 file changed, 1 insertion(+), 1 deletion(-)
48 -
49 -diff --git a/consoletype.c b/consoletype.c
50 -index 0eb7a07..ece0d5f 100644
51 ---- a/consoletype.c
52 -+++ b/consoletype.c
53 -@@ -13,7 +13,7 @@
54 - #include <string.h>
55 - #include <sys/ioctl.h>
56 - #include <sys/stat.h>
57 --#include <sys/types.h>
58 -+#include <sys/sysmacros.h>
59 - #include "headers.h"
60 -
61 - enum termtype {
62 ---
63 -2.21.0
64 -
65
66 diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
67 deleted file mode 100644
68 index 382477b..0000000
69 --- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
70 +++ /dev/null
71 @@ -1,32 +0,0 @@
72 -# Copyright 1999-2020 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI="7"
76 -
77 -if [[ ${PV} == 9999* ]]; then
78 - inherit git-r3
79 - EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
80 -else
81 - SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
82 - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
83 -fi
84 -
85 -inherit toolchain-funcs flag-o-matic
86 -
87 -DESCRIPTION="base functions required by all Gentoo systems"
88 -HOMEPAGE="https://www.gentoo.org"
89 -
90 -LICENSE="GPL-2"
91 -SLOT="0"
92 -IUSE=""
93 -
94 -src_prepare() {
95 - tc-export CC
96 - append-lfs-flags
97 - eapply "${FILESDIR}"/${PN}-sysmacros.patch
98 - eapply_user
99 -}
100 -
101 -src_install() {
102 - emake install DESTDIR="${ED}"
103 -}
104
105 diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
106 deleted file mode 100644
107 index 1cc4955..0000000
108 --- a/sys-apps/gentoo-functions/metadata.xml
109 +++ /dev/null
110 @@ -1,21 +0,0 @@
111 -<?xml version="1.0" encoding="UTF-8"?>
112 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
113 -<pkgmetadata>
114 -<maintainer type="person">
115 - <email>williamh@g.o</email>
116 -</maintainer>
117 -<maintainer type="person">
118 - <email>blueness@g.o</email>
119 -</maintainer>
120 -<maintainer type="project">
121 - <email>base-system@g.o</email>
122 - <name>Gentoo Base System</name>
123 -</maintainer>
124 -<longdescription lang="en">
125 - This package contains base shell functions which are required by
126 - all Gentoo systems.
127 -</longdescription>
128 -<upstream>
129 - <remote-id type="github">gentoo/gentoo-functions</remote-id>
130 -</upstream>
131 -</pkgmetadata>