1 |
commit: cf00950c7689d1358698606820aa6dde43882a5f |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 4 12:27:43 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 4 12:34:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf00950c |
7 |
|
8 |
app-text/openjade: Bump EAPI |
9 |
|
10 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
app-text/openjade/files/openjade-1.3.2-chmod.patch | 4 +- |
14 |
.../files/openjade-1.3.2-no-undefined.patch | 4 +- |
15 |
.../files/openjade-1.3.2-wchar_t-uint.patch | 4 +- |
16 |
app-text/openjade/openjade-1.3.2-r7.ebuild | 53 ++++++++++++---------- |
17 |
app-text/openjade/openjade-1.3.2-r8.ebuild | 32 ++++++------- |
18 |
5 files changed, 50 insertions(+), 47 deletions(-) |
19 |
|
20 |
diff --git a/app-text/openjade/files/openjade-1.3.2-chmod.patch b/app-text/openjade/files/openjade-1.3.2-chmod.patch |
21 |
index bafc798f111..ca8abbd50da 100644 |
22 |
--- a/app-text/openjade/files/openjade-1.3.2-chmod.patch |
23 |
+++ b/app-text/openjade/files/openjade-1.3.2-chmod.patch |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- Makefile.comm.in.orig 2017-07-11 20:14:20.459014115 +0700 |
26 |
-+++ Makefile.comm.in 2017-07-11 20:14:31.724715876 +0700 |
27 |
+--- a/Makefile.comm.in.orig 2017-07-11 20:14:20.459014115 +0700 |
28 |
++++ b/Makefile.comm.in 2017-07-11 20:14:31.724715876 +0700 |
29 |
@@ -53,7 +53,7 @@ |
30 |
.m4.cxx: |
31 |
rm -f $@ |
32 |
|
33 |
diff --git a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch |
34 |
index 1b298f88a6f..4e5aefc3a86 100644 |
35 |
--- a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch |
36 |
+++ b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch |
37 |
@@ -1,5 +1,5 @@ |
38 |
---- Makefile.lib.in.orig 2016-05-19 17:20:25.164931700 +0200 |
39 |
-+++ Makefile.lib.in 2016-05-19 17:20:56.539989400 +0200 |
40 |
+--- a/Makefile.lib.in.orig 2016-05-19 17:20:25.164931700 +0200 |
41 |
++++ b/Makefile.lib.in 2016-05-19 17:20:56.539989400 +0200 |
42 |
@@ -24,7 +24,7 @@ |
43 |
|
44 |
lib$(LIB).la: $(LT_OBJS) |
45 |
|
46 |
diff --git a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch |
47 |
index 62dcb02cd2e..920cff248d6 100644 |
48 |
--- a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch |
49 |
+++ b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch |
50 |
@@ -1,7 +1,7 @@ |
51 |
This fixes Cygwin, where wchar_t is ushort. |
52 |
|
53 |
---- grove/Node.h |
54 |
-+++ grove/Node.h |
55 |
+--- a/grove/Node.h |
56 |
++++ b/grove/Node.h |
57 |
@@ -8,6 +8,7 @@ |
58 |
#endif |
59 |
|
60 |
|
61 |
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild |
62 |
index 15297e07904..95ece1c5ef2 100644 |
63 |
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild |
64 |
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild |
65 |
@@ -1,9 +1,8 @@ |
66 |
-# Copyright 1999-2018 Gentoo Foundation |
67 |
+# Copyright 1999-2018 Gentoo Authors |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
-EAPI=5 # sgml-catalog inherits base, banned in 6 |
71 |
- |
72 |
-inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs |
73 |
+EAPI=7 |
74 |
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs |
75 |
|
76 |
DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents" |
77 |
HOMEPAGE="http://openjade.sourceforge.net" |
78 |
@@ -14,20 +13,26 @@ SLOT="0" |
79 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
80 |
IUSE="static-libs" |
81 |
|
82 |
-RDEPEND="app-text/sgml-common |
83 |
- >=app-text/opensp-1.5.1" |
84 |
-DEPEND="dev-lang/perl |
85 |
- ${RDEPEND}" |
86 |
+RDEPEND=" |
87 |
+ app-text/sgml-common |
88 |
+ >=app-text/opensp-1.5.1 |
89 |
+" |
90 |
+DEPEND="${RDEPEND} |
91 |
+ dev-lang/perl |
92 |
+" |
93 |
|
94 |
src_prepare() { |
95 |
- epatch "${FILESDIR}"/${P}-deplibs.patch |
96 |
- epatch "${FILESDIR}"/${P}-ldflags.patch |
97 |
- epatch "${FILESDIR}"/${P}-msggen.pl.patch |
98 |
- epatch "${FILESDIR}"/${P}-respect-ldflags.patch |
99 |
- epatch "${FILESDIR}"/${P}-libosp-la.patch |
100 |
- epatch "${FILESDIR}"/${P}-gcc46.patch |
101 |
- epatch "${FILESDIR}"/${P}-no-undefined.patch |
102 |
- epatch "${FILESDIR}"/${P}-wchar_t-uint.patch |
103 |
+ default |
104 |
+ |
105 |
+ eapply "${FILESDIR}"/${P}-deplibs.patch |
106 |
+ eapply "${FILESDIR}"/${P}-ldflags.patch |
107 |
+ eapply "${FILESDIR}"/${P}-msggen.pl.patch |
108 |
+ eapply "${FILESDIR}"/${P}-respect-ldflags.patch |
109 |
+ eapply "${FILESDIR}"/${P}-libosp-la.patch |
110 |
+ eapply "${FILESDIR}"/${P}-gcc46.patch |
111 |
+ eapply "${FILESDIR}"/${P}-no-undefined.patch |
112 |
+ eapply "${FILESDIR}"/${P}-wchar_t-uint.patch |
113 |
+ eapply "${FILESDIR}"/${P}-chmod.patch #487218 |
114 |
|
115 |
# Please note! Opts are disabled. If you know what you're doing |
116 |
# feel free to remove this line. It may cause problems with |
117 |
@@ -68,9 +73,7 @@ src_configure() { |
118 |
} |
119 |
|
120 |
src_compile() { |
121 |
- # Bug 412725. |
122 |
- unset INCLUDE |
123 |
- |
124 |
+ unset INCLUDE #412725 |
125 |
emake -j1 SHELL="${BASH}" |
126 |
} |
127 |
|
128 |
@@ -82,7 +85,7 @@ src_install() { |
129 |
libdir="${EPREFIX}"/usr/$(get_libdir) \ |
130 |
install install-man |
131 |
|
132 |
- prune_libtool_files |
133 |
+ use static-libs || find "${D}" -name '*.la' -delete || die |
134 |
|
135 |
dosym openjade /usr/bin/jade |
136 |
dosym onsgmls /usr/bin/nsgmls |
137 |
@@ -98,14 +101,14 @@ src_install() { |
138 |
insinto /usr/share/sgml/${P}/dsssl |
139 |
doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd} |
140 |
newins "${FILESDIR}"/${P}.dsssl-catalog catalog |
141 |
-# Breaks sgml2xml among other things |
142 |
-# insinto /usr/share/sgml/${P}/unicode |
143 |
-# doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl} |
144 |
+ |
145 |
+ # Breaks sgml2xml among other things |
146 |
+ #insinto /usr/share/sgml/${P}/unicode |
147 |
+ #doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl} |
148 |
insinto /usr/share/sgml/${P}/pubtext |
149 |
doins pubtext/* |
150 |
|
151 |
- dodoc NEWS README VERSION |
152 |
- dohtml doc/*.htm |
153 |
+ HTML_DOCS="doc/*.htm" einstalldocs |
154 |
|
155 |
insinto /usr/share/doc/${PF}/jadedoc |
156 |
doins jadedoc/*.htm |
157 |
|
158 |
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild |
159 |
index 5ffa1d2ee20..af2595cbebd 100644 |
160 |
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild |
161 |
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild |
162 |
@@ -1,9 +1,8 @@ |
163 |
# Copyright 1999-2018 Gentoo Authors |
164 |
# Distributed under the terms of the GNU General Public License v2 |
165 |
|
166 |
-EAPI=5 # sgml-catalog inherits base, banned in 6 |
167 |
- |
168 |
-inherit autotools sgml-catalog epatch flag-o-matic multilib toolchain-funcs |
169 |
+EAPI=7 |
170 |
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs |
171 |
|
172 |
DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents" |
173 |
HOMEPAGE="http://openjade.sourceforge.net" |
174 |
@@ -18,20 +17,22 @@ RDEPEND=" |
175 |
app-text/sgml-common |
176 |
>=app-text/opensp-1.5.1 |
177 |
" |
178 |
-DEPEND="dev-lang/perl |
179 |
- ${RDEPEND} |
180 |
+DEPEND="${RDEPEND} |
181 |
+ dev-lang/perl |
182 |
" |
183 |
|
184 |
src_prepare() { |
185 |
- epatch "${FILESDIR}"/${P}-deplibs.patch |
186 |
- epatch "${FILESDIR}"/${P}-ldflags.patch |
187 |
- epatch "${FILESDIR}"/${P}-msggen.pl.patch |
188 |
- epatch "${FILESDIR}"/${P}-respect-ldflags.patch |
189 |
- epatch "${FILESDIR}"/${P}-libosp-la.patch |
190 |
- epatch "${FILESDIR}"/${P}-gcc46.patch |
191 |
- epatch "${FILESDIR}"/${P}-no-undefined.patch |
192 |
- epatch "${FILESDIR}"/${P}-wchar_t-uint.patch |
193 |
- epatch "${FILESDIR}"/${P}-chmod.patch #487218 |
194 |
+ default |
195 |
+ |
196 |
+ eapply "${FILESDIR}"/${P}-deplibs.patch |
197 |
+ eapply "${FILESDIR}"/${P}-ldflags.patch |
198 |
+ eapply "${FILESDIR}"/${P}-msggen.pl.patch |
199 |
+ eapply "${FILESDIR}"/${P}-respect-ldflags.patch |
200 |
+ eapply "${FILESDIR}"/${P}-libosp-la.patch |
201 |
+ eapply "${FILESDIR}"/${P}-gcc46.patch |
202 |
+ eapply "${FILESDIR}"/${P}-no-undefined.patch |
203 |
+ eapply "${FILESDIR}"/${P}-wchar_t-uint.patch |
204 |
+ eapply "${FILESDIR}"/${P}-chmod.patch #487218 |
205 |
|
206 |
# Please note! Opts are disabled. If you know what you're doing |
207 |
# feel free to remove this line. It may cause problems with |
208 |
@@ -107,8 +108,7 @@ src_install() { |
209 |
insinto /usr/share/sgml/${P}/pubtext |
210 |
doins pubtext/* |
211 |
|
212 |
- dodoc NEWS README VERSION |
213 |
- dohtml doc/*.htm |
214 |
+ HTML_DOCS="doc/*.htm" einstalldocs |
215 |
|
216 |
insinto /usr/share/doc/${PF}/jadedoc |
217 |
doins jadedoc/*.htm |