1 |
xmw 15/02/26 13:53:42 |
2 |
|
3 |
Modified: mupdf-9999.ebuild mupdf-1.5-r1.ebuild ChangeLog |
4 |
Added: mupdf-1.6.ebuild |
5 |
Log: |
6 |
Version bump (thanks sping, bug 526508), update ebuilds. |
7 |
|
8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
9 |
|
10 |
Revision Changes Path |
11 |
1.50 app-text/mupdf/mupdf-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.50&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?rev=1.50&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild?r1=1.49&r2=1.50 |
16 |
|
17 |
Index: mupdf-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v |
20 |
retrieving revision 1.49 |
21 |
retrieving revision 1.50 |
22 |
diff -u -r1.49 -r1.50 |
23 |
--- mupdf-9999.ebuild 10 Oct 2014 13:50:49 -0000 1.49 |
24 |
+++ mupdf-9999.ebuild 26 Feb 2015 13:53:42 -0000 1.50 |
25 |
@@ -1,6 +1,6 @@ |
26 |
-# Copyright 1999-2014 Gentoo Foundation |
27 |
+# Copyright 1999-2015 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.49 2014/10/10 13:50:49 xmw Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.50 2015/02/26 13:53:42 xmw Exp $ |
31 |
|
32 |
EAPI=5 |
33 |
|
34 |
@@ -12,7 +12,8 @@ |
35 |
#EGIT_HAS_SUBMODULES=1 |
36 |
|
37 |
LICENSE="AGPL-3" |
38 |
-SLOT="0/1.5" |
39 |
+MY_SOVER=1.6 |
40 |
+SLOT="0/${MY_SOVER}" |
41 |
KEYWORDS="" |
42 |
IUSE="X vanilla curl openssl static static-libs" |
43 |
|
44 |
@@ -67,6 +68,7 @@ |
45 |
-e "1ibuild = debug" \ |
46 |
-e "1iprefix = ${ED}usr" \ |
47 |
-e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
48 |
+ -e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
49 |
-e "1iHAVE_X11 = $(usex X)" \ |
50 |
-e "1iWANT_OPENSSL = $(usex openssl)" \ |
51 |
-e "1iWANT_CURL = $(usex curl)" \ |
52 |
@@ -81,14 +83,14 @@ |
53 |
-i "${S}"-static/Makerules || die |
54 |
fi |
55 |
|
56 |
- my_soname=libmupdf.so.1.5 |
57 |
- my_soname_js_none=libmupdf-js-none.so.1.5 |
58 |
+ my_soname=libmupdf.so.${MY_SOVER} |
59 |
+ my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
60 |
sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
61 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
62 |
-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
63 |
-e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
64 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
65 |
- -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \ |
66 |
+ -e "/install/s: COPYING : :" \ |
67 |
-i Makefile || die |
68 |
} |
69 |
|
70 |
|
71 |
|
72 |
|
73 |
1.3 app-text/mupdf/mupdf-1.5-r1.ebuild |
74 |
|
75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild?rev=1.3&view=markup |
76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild?rev=1.3&content-type=text/plain |
77 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild?r1=1.2&r2=1.3 |
78 |
|
79 |
Index: mupdf-1.5-r1.ebuild |
80 |
=================================================================== |
81 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v |
82 |
retrieving revision 1.2 |
83 |
retrieving revision 1.3 |
84 |
diff -u -r1.2 -r1.3 |
85 |
--- mupdf-1.5-r1.ebuild 26 Feb 2015 13:35:32 -0000 1.2 |
86 |
+++ mupdf-1.5-r1.ebuild 26 Feb 2015 13:53:42 -0000 1.3 |
87 |
@@ -1,6 +1,6 @@ |
88 |
# Copyright 1999-2015 Gentoo Foundation |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.2 2015/02/26 13:35:32 xmw Exp $ |
91 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.3 2015/02/26 13:53:42 xmw Exp $ |
92 |
|
93 |
EAPI=5 |
94 |
|
95 |
@@ -11,7 +11,8 @@ |
96 |
SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz" |
97 |
|
98 |
LICENSE="AGPL-3" |
99 |
-SLOT="0/1.5" |
100 |
+MY_SOVER=1.5 |
101 |
+SLOT="0/${MY_SOVER}" |
102 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
103 |
IUSE="X vanilla +curl +openssl static static-libs" |
104 |
|
105 |
@@ -81,8 +82,8 @@ |
106 |
-i "${S}"-static/Makerules || die |
107 |
fi |
108 |
|
109 |
- my_soname=libmupdf.so.1.5 |
110 |
- my_soname_js_none=libmupdf-js-none.so.1.5 |
111 |
+ my_soname=libmupdf.so.${MY_SOVER} |
112 |
+ my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
113 |
sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
114 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
115 |
-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
116 |
|
117 |
|
118 |
|
119 |
1.115 app-text/mupdf/ChangeLog |
120 |
|
121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.115&view=markup |
122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?rev=1.115&content-type=text/plain |
123 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/ChangeLog?r1=1.114&r2=1.115 |
124 |
|
125 |
Index: ChangeLog |
126 |
=================================================================== |
127 |
RCS file: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v |
128 |
retrieving revision 1.114 |
129 |
retrieving revision 1.115 |
130 |
diff -u -r1.114 -r1.115 |
131 |
--- ChangeLog 26 Feb 2015 13:35:32 -0000 1.114 |
132 |
+++ ChangeLog 26 Feb 2015 13:53:42 -0000 1.115 |
133 |
@@ -1,6 +1,12 @@ |
134 |
# ChangeLog for app-text/mupdf |
135 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
136 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.114 2015/02/26 13:35:32 xmw Exp $ |
137 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.115 2015/02/26 13:53:42 xmw Exp $ |
138 |
+ |
139 |
+*mupdf-1.6 (26 Feb 2015) |
140 |
+ |
141 |
+ 26 Feb 2015; Michael Weber <xmw@g.o> +mupdf-1.6.ebuild, |
142 |
+ mupdf-1.5-r1.ebuild, mupdf-9999.ebuild: |
143 |
+ Version bump (thanks sping, bug 526508), update ebuilds. |
144 |
|
145 |
26 Feb 2015; Michael Weber <xmw@g.o> mupdf-1.5-r1.ebuild: |
146 |
Drop COPYING and force /usr/share/doc/${PF} (thanks Roger, bug 526508) |
147 |
|
148 |
|
149 |
|
150 |
1.1 app-text/mupdf/mupdf-1.6.ebuild |
151 |
|
152 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.6.ebuild?rev=1.1&view=markup |
153 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/mupdf-1.6.ebuild?rev=1.1&content-type=text/plain |
154 |
|
155 |
Index: mupdf-1.6.ebuild |
156 |
=================================================================== |
157 |
# Copyright 1999-2015 Gentoo Foundation |
158 |
# Distributed under the terms of the GNU General Public License v2 |
159 |
# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.6.ebuild,v 1.1 2015/02/26 13:53:42 xmw Exp $ |
160 |
|
161 |
EAPI=5 |
162 |
|
163 |
inherit eutils multilib toolchain-funcs vcs-snapshot |
164 |
|
165 |
DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" |
166 |
HOMEPAGE="http://mupdf.com/" |
167 |
SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=9268b59ffcb5e5a276324d692c9d63c0e2f1e3ce;sf=tgz -> ${P}.tar.gz" |
168 |
|
169 |
LICENSE="AGPL-3" |
170 |
MY_SOVER=1.6 |
171 |
SLOT="0/${MY_SOVER}" |
172 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
173 |
IUSE="X vanilla +curl +openssl static static-libs" |
174 |
|
175 |
LIB_DEPEND="dev-libs/openssl[static-libs?] |
176 |
media-libs/freetype:2[static-libs?] |
177 |
media-libs/jbig2dec[static-libs?] |
178 |
media-libs/openjpeg:2[static-libs?] |
179 |
net-misc/curl[static-libs?] |
180 |
virtual/jpeg[static-libs?] |
181 |
X? ( x11-libs/libX11[static-libs?] |
182 |
x11-libs/libXext[static-libs?] )" |
183 |
RDEPEND="${LIB_DEPEND}" |
184 |
DEPEND="${RDEPEND} |
185 |
virtual/pkgconfig |
186 |
static-libs? ( ${LIB_DEPEND} ) |
187 |
static? ( ${LIB_DEPEND//?} |
188 |
app-arch/bzip2[static-libs] |
189 |
x11-libs/libXau[static-libs] |
190 |
x11-libs/libXdmcp[static-libs] |
191 |
x11-libs/libxcb[static-libs] )" |
192 |
|
193 |
src_prepare() { |
194 |
rm -rf thirdparty || die |
195 |
|
196 |
epatch \ |
197 |
"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \ |
198 |
"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ |
199 |
"${FILESDIR}"/${PN}-1.3-pkg-config.patch \ |
200 |
"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch |
201 |
|
202 |
if has_version ">=media-libs/openjpeg-2.1:2" ; then |
203 |
epatch \ |
204 |
"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch |
205 |
fi |
206 |
|
207 |
sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ |
208 |
-e "/^prefix=/s:=.*:=${EROOT}/usr:" \ |
209 |
-i platform/debian/${PN}.pc || die |
210 |
|
211 |
use vanilla || epatch \ |
212 |
"${FILESDIR}"/${PN}-1.3-zoom-2.patch |
213 |
|
214 |
#http://bugs.ghostscript.com/show_bug.cgi?id=693467 |
215 |
sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ |
216 |
-i platform/debian/${PN}.desktop || die |
217 |
|
218 |
sed -e "1iOS = Linux" \ |
219 |
-e "1iCC = $(tc-getCC)" \ |
220 |
-e "1iLD = $(tc-getCC)" \ |
221 |
-e "1iAR = $(tc-getAR)" \ |
222 |
-e "1iverbose = yes" \ |
223 |
-e "1ibuild = debug" \ |
224 |
-e "1iprefix = ${ED}usr" \ |
225 |
-e "1ilibdir = ${ED}usr/$(get_libdir)" \ |
226 |
-e "1idocdir = ${ED}usr/share/doc/${PF}" \ |
227 |
-e "1iHAVE_X11 = $(usex X)" \ |
228 |
-e "1iWANT_OPENSSL = $(usex openssl)" \ |
229 |
-e "1iWANT_CURL = $(usex curl)" \ |
230 |
-i Makerules || die |
231 |
|
232 |
if use static-libs || use static ; then |
233 |
cp -a "${S}" "${S}"-static || die |
234 |
#add missing Libs.private for xcb and freetype |
235 |
sed -e 's:\(pkg-config --libs\):\1 --static:' \ |
236 |
-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ |
237 |
-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ |
238 |
-i "${S}"-static/Makerules || die |
239 |
fi |
240 |
|
241 |
my_soname=libmupdf.so.${MY_SOVER} |
242 |
my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} |
243 |
sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ |
244 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ |
245 |
-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ |
246 |
-e "\$a\$(MUPDF_JS_NONE_LIB):" \ |
247 |
-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ |
248 |
-e "/install/s: COPYING : :" \ |
249 |
-i Makefile || die |
250 |
} |
251 |
|
252 |
src_compile() { |
253 |
emake XCFLAGS="-fpic" |
254 |
use static-libs && \ |
255 |
emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a |
256 |
use static && \ |
257 |
emake -C "${S}"-static XLIBS="-static" |
258 |
} |
259 |
|
260 |
src_install() { |
261 |
if use X ; then |
262 |
domenu platform/debian/${PN}.desktop |
263 |
doicon platform/debian/${PN}.xpm |
264 |
else |
265 |
rm docs/man/${PN}.1 |
266 |
fi |
267 |
|
268 |
emake install |
269 |
dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so |
270 |
|
271 |
use static-libs && \ |
272 |
dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a |
273 |
if use static ; then |
274 |
dobin "${S}"-static/build/debug/mu{tool,draw} |
275 |
use X && dobin "${S}"-static/build/debug/${PN}-x11 |
276 |
fi |
277 |
use X && dosym ${PN}-x11 /usr/bin/${PN} |
278 |
|
279 |
insinto /usr/$(get_libdir)/pkgconfig |
280 |
doins platform/debian/${PN}.pc |
281 |
|
282 |
dodoc README docs/*.{txt,c} |
283 |
} |