1 |
commit: 7850b6efbe383aec9b63d9ed44e2af8d845ee261 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 15:19:03 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 15:19:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7850b6ef |
7 |
|
8 |
app-arch/pax: in tree version works |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
app-arch/pax/Manifest | 1 - |
13 |
.../pax/files/pax-20160306-glibc-to-linux.patch | 38 -------------- |
14 |
app-arch/pax/metadata.xml | 5 -- |
15 |
app-arch/pax/pax-20161104.ebuild | 61 ---------------------- |
16 |
4 files changed, 105 deletions(-) |
17 |
|
18 |
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest |
19 |
deleted file mode 100644 |
20 |
index a31ca15..0000000 |
21 |
--- a/app-arch/pax/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce |
25 |
|
26 |
diff --git a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch b/app-arch/pax/files/pax-20160306-glibc-to-linux.patch |
27 |
deleted file mode 100644 |
28 |
index f864729..0000000 |
29 |
--- a/app-arch/pax/files/pax-20160306-glibc-to-linux.patch |
30 |
+++ /dev/null |
31 |
@@ -1,38 +0,0 @@ |
32 |
---- pax/cache.c.old 2016-03-06 08:12:52.000000000 -0600 |
33 |
-+++ pax/cache.c 2016-04-17 13:01:26.461307830 -0500 |
34 |
-@@ -195,7 +195,7 @@ |
35 |
- * No entry for this uid, we will add it |
36 |
- */ |
37 |
- if (!pwopn) { |
38 |
--#if defined(__GLIBC__) |
39 |
-+#if defined(__GLIBC__) || defined(__linux__) |
40 |
- setpwent(); |
41 |
- #elif !defined(__INTERIX) |
42 |
- setpassent(1); |
43 |
-@@ -265,7 +265,7 @@ |
44 |
- * No entry for this gid, we will add it |
45 |
- */ |
46 |
- if (!gropn) { |
47 |
--#if defined(__GLIBC__) |
48 |
-+#if defined(__GLIBC__) || defined(__linux__) |
49 |
- setgrent(); |
50 |
- #elif !defined(__INTERIX) && !defined(__CYGWIN__) |
51 |
- setgroupent(1); |
52 |
-@@ -336,7 +336,7 @@ |
53 |
- } |
54 |
- |
55 |
- if (!pwopn) { |
56 |
--#if defined(__GLIBC__) |
57 |
-+#if defined(__GLIBC__) || defined(__linux__) |
58 |
- setpwent(); |
59 |
- #elif !defined(__INTERIX) |
60 |
- setpassent(1); |
61 |
-@@ -403,7 +403,7 @@ |
62 |
- } |
63 |
- |
64 |
- if (!gropn) { |
65 |
--#if defined(__GLIBC__) |
66 |
-+#if defined(__GLIBC__) || defined(__linux__) |
67 |
- setgrent(); |
68 |
- #elif !defined(__INTERIX) && !defined(__CYGWIN__) |
69 |
- setgroupent(1); |
70 |
|
71 |
diff --git a/app-arch/pax/metadata.xml b/app-arch/pax/metadata.xml |
72 |
deleted file mode 100644 |
73 |
index 6f49eba..0000000 |
74 |
--- a/app-arch/pax/metadata.xml |
75 |
+++ /dev/null |
76 |
@@ -1,5 +0,0 @@ |
77 |
-<?xml version="1.0" encoding="UTF-8"?> |
78 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
79 |
-<pkgmetadata> |
80 |
-<!-- maintainer-needed --> |
81 |
-</pkgmetadata> |
82 |
|
83 |
diff --git a/app-arch/pax/pax-20161104.ebuild b/app-arch/pax/pax-20161104.ebuild |
84 |
deleted file mode 100644 |
85 |
index a280ff0..0000000 |
86 |
--- a/app-arch/pax/pax-20161104.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,61 +0,0 @@ |
89 |
-# Copyright 1999-2018 Gentoo Authors |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=6 |
93 |
-inherit unpacker toolchain-funcs |
94 |
- |
95 |
-DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool" |
96 |
-HOMEPAGE="https://www.mirbsd.org/pax.htm" |
97 |
-SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz" |
98 |
- |
99 |
-LICENSE="BSD" |
100 |
-SLOT="0" |
101 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
102 |
- |
103 |
-RDEPEND=" |
104 |
- dev-libs/libbsd |
105 |
- elibc_musl? ( sys-libs/fts-standalone ) |
106 |
-" |
107 |
-DEPEND=" |
108 |
- ${RDEPEND} |
109 |
- $(unpacker_src_uri_depends) |
110 |
-" |
111 |
-PATCHES=( |
112 |
- "${FILESDIR}/${PN}-20160306-glibc-to-linux.patch" |
113 |
-) |
114 |
-S=${WORKDIR}/${PN} |
115 |
- |
116 |
-src_prepare() { |
117 |
- # Newer C libraries omit this include from sys/types.h. |
118 |
- sed -i '1i#include <sys/sysmacros.h>' extern.h || die |
119 |
- default |
120 |
-} |
121 |
- |
122 |
-src_configure() { |
123 |
- tc-export CC PKG_CONFIG |
124 |
-} |
125 |
- |
126 |
-src_compile() { |
127 |
- # We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support. |
128 |
- set -- \ |
129 |
- ${CC} ${CPPFLAGS} ${CFLAGS} \ |
130 |
- -DPAX_SAFE_PATH=\"/bin:/usr/bin\" \ |
131 |
- -DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \ |
132 |
- -DLONG_OFF_T -DHAVE_LINKAT \ |
133 |
- $(${PKG_CONFIG} --cflags libbsd-overlay) \ |
134 |
- -Wall ${LDFLAGS} *.c -o ${PN} $(usex elibc_musl '-lfts' '')\ |
135 |
- $(${PKG_CONFIG} --libs libbsd-overlay) |
136 |
- echo "$@" |
137 |
- "$@" || die |
138 |
-} |
139 |
- |
140 |
-src_install() { |
141 |
- dobin ${PN} |
142 |
- doman ${PN}.1 |
143 |
- |
144 |
- dosym pax /usr/bin/paxcpio |
145 |
- newman cpio.1 paxcpio.1 |
146 |
- |
147 |
- dosym pax /usr/bin/paxtar |
148 |
- newman tar.1 paxtar.1 |
149 |
-} |