1 |
commit: c5a1059bbb719c64407f073cf3c194792ff68027 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 17 01:51:13 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 01:38:20 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a1059b |
7 |
|
8 |
app-arch/xdms: respect DESTDIR, fix man dest, Darwin build |
9 |
|
10 |
* EAPI 6->7 |
11 |
* Respect DESTDIR (similar patch to app-arch/cksfv, naturally) |
12 |
* Fix VariableScope issue (${ED} in src_configure, see point 1) |
13 |
* Fix man page destination |
14 |
* Fix build on Darwin (append standard undefined lookup flag) |
15 |
|
16 |
Bug: https://bugs.gentoo.org/721896 |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
app-arch/cksfv/cksfv-1.3.15.ebuild | 2 +- |
20 |
.../files/xdms-1.3.2-dont-compress-man-pages.patch | 13 +++++++ |
21 |
.../xdms/files/xdms-1.3.2-respect-DESTDIR.patch | 22 ++++++++++++ |
22 |
app-arch/xdms/xdms-1.3.2-r1.ebuild | 31 ----------------- |
23 |
app-arch/xdms/xdms-1.3.2-r2.ebuild | 40 ++++++++++++++++++++++ |
24 |
5 files changed, 76 insertions(+), 32 deletions(-) |
25 |
|
26 |
diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild b/app-arch/cksfv/cksfv-1.3.15.ebuild |
27 |
index f6c62153bb3..82027ff3bdc 100644 |
28 |
--- a/app-arch/cksfv/cksfv-1.3.15.ebuild |
29 |
+++ b/app-arch/cksfv/cksfv-1.3.15.ebuild |
30 |
@@ -1,4 +1,4 @@ |
31 |
-# Copyright 1999-2020 Gentoo Authors |
32 |
+# Copyright 1999-2021 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
EAPI=7 |
36 |
|
37 |
diff --git a/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch |
38 |
new file mode 100644 |
39 |
index 00000000000..3396b59a309 |
40 |
--- /dev/null |
41 |
+++ b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch |
42 |
@@ -0,0 +1,13 @@ |
43 |
+From: Sam James <sam@g.o> |
44 |
+Subject: [PATCH 2/2] Don't compress man pages |
45 |
+--- a/Makefile.in |
46 |
++++ b/Makefile.in |
47 |
+@@ -11,5 +11,4 @@ install: xdms |
48 |
+ install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/ |
49 |
+ chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms |
50 |
+ chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} |
51 |
+- gzip < xdms.1 > xdms.1.gz |
52 |
+- install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/ |
53 |
++ install xdms.1 ${DESTDIR}{PREFIX}/share/man/man1/ |
54 |
+-- |
55 |
+ |
56 |
|
57 |
diff --git a/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch |
58 |
new file mode 100644 |
59 |
index 00000000000..3db96993208 |
60 |
--- /dev/null |
61 |
+++ b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch |
62 |
@@ -0,0 +1,22 @@ |
63 |
+From: Sam James <sam@g.o> |
64 |
+Subject: [PATCH 1/2] Respect DESTDIR |
65 |
+--- a/Makefile.in |
66 |
++++ b/Makefile.in |
67 |
+@@ -6,10 +6,10 @@ clean: |
68 |
+ $(MAKE) -C src clean |
69 |
+ |
70 |
+ install: xdms |
71 |
+- mkdir -p {PREFIX}/bin {PREFIX}/share/doc/xdms-{VERSION} {PREFIX}/share/man/man1 |
72 |
+- install src/xdms {PREFIX}/bin/ |
73 |
+- install xdms.txt COPYING ChangeLog.txt {PREFIX}/share/doc/xdms-{VERSION}/ |
74 |
+- chmod og+rx {PREFIX}/bin {PREFIX}/bin/xdms |
75 |
+- chmod -R og+rX {PREFIX}/share/doc/xdms-{VERSION} |
76 |
++ mkdir -p ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} ${DESTDIR}{PREFIX}/share/man/man1 |
77 |
++ install src/xdms ${DESTDIR}{PREFIX}/bin/ |
78 |
++ install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/ |
79 |
++ chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms |
80 |
++ chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} |
81 |
+ gzip < xdms.1 > xdms.1.gz |
82 |
+- install xdms.1.gz {PREFIX}/share/man/man1/ |
83 |
++ install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/ |
84 |
+-- |
85 |
|
86 |
diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild b/app-arch/xdms/xdms-1.3.2-r1.ebuild |
87 |
deleted file mode 100644 |
88 |
index 14f419cd4b8..00000000000 |
89 |
--- a/app-arch/xdms/xdms-1.3.2-r1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,31 +0,0 @@ |
92 |
-# Copyright 1999-2020 Gentoo Authors |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=6 |
96 |
- |
97 |
-inherit toolchain-funcs |
98 |
- |
99 |
-DESCRIPTION="xDMS - Amiga DMS disk image decompressor" |
100 |
-HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms" |
101 |
-SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2" |
102 |
- |
103 |
-LICENSE="public-domain" |
104 |
-SLOT="0" |
105 |
-KEYWORDS="amd64 ~hppa ppc x86" |
106 |
-IUSE="" |
107 |
- |
108 |
-pkg_setup() { |
109 |
- tc-export CC |
110 |
-} |
111 |
- |
112 |
-src_prepare() { |
113 |
- default |
114 |
- sed -i Makefile.in \ |
115 |
- -e "s:COPYING::" \ |
116 |
- -e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die |
117 |
- sed -i -e "s:-O2::" src/Makefile.in || die |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- ./configure --prefix=/usr --package-prefix="${D}" || die |
122 |
-} |
123 |
|
124 |
diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild b/app-arch/xdms/xdms-1.3.2-r2.ebuild |
125 |
new file mode 100644 |
126 |
index 00000000000..a1bc96f7f59 |
127 |
--- /dev/null |
128 |
+++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild |
129 |
@@ -0,0 +1,40 @@ |
130 |
+# Copyright 1999-2021 Gentoo Authors |
131 |
+# Distributed under the terms of the GNU General Public License v2 |
132 |
+ |
133 |
+EAPI=7 |
134 |
+ |
135 |
+inherit flag-o-matic toolchain-funcs |
136 |
+ |
137 |
+DESCRIPTION="xDMS - Amiga DMS disk image decompressor" |
138 |
+HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms" |
139 |
+SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2" |
140 |
+ |
141 |
+LICENSE="public-domain" |
142 |
+SLOT="0" |
143 |
+KEYWORDS="amd64 ~hppa ppc x86" |
144 |
+ |
145 |
+PATCHES=( |
146 |
+ "${FILESDIR}"/${PN}-1.3.2-respect-DESTDIR.patch |
147 |
+ "${FILESDIR}"/${PN}-1.3.2-dont-compress-man-pages.patch |
148 |
+) |
149 |
+ |
150 |
+src_prepare() { |
151 |
+ default |
152 |
+ |
153 |
+ sed -i Makefile.in \ |
154 |
+ -e "s:COPYING::" \ |
155 |
+ -e "s:share/doc/xdms-{VERSION}:share/doc/${PF}:" || die |
156 |
+ |
157 |
+ sed -i -e "s:-O2::" src/Makefile.in || die |
158 |
+} |
159 |
+ |
160 |
+src_configure() { |
161 |
+ tc-export CC |
162 |
+ |
163 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
164 |
+ # Needed to avoid typical "Undefined symbols for architecture x86_64" |
165 |
+ append-ldflags -undefined dynamic_lookup |
166 |
+ fi |
167 |
+ |
168 |
+ ./configure --prefix="${EPREFIX}"/usr || die |
169 |
+} |