Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 518664 | Differences between
and this patch

Collapse All | Expand All

(-)libreoffice-9999-r2.ebuild (-16 / +34 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2014 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.219 2014/08/15 09:10:14 scarabeus Exp $
3
# $Header: $
4
4
5
EAPI=5
5
EAPI=5
6
6
Lines 60-65 Link Here
60
# If you want them gone, patches are welcome.
60
# If you want them gone, patches are welcome.
61
ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
61
ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
62
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
62
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
63
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
64
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
63
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
65
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
64
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
66
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
65
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
67
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
Lines 71-78 Link Here
71
unset EXT_URI
73
unset EXT_URI
72
unset ADDONS_SRC
74
unset ADDONS_SRC
73
75
74
IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
76
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
75
gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
77
+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
76
78
77
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
79
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
78
# Unpackaged separate extensions:
80
# Unpackaged separate extensions:
Lines 97-113 Link Here
97
	app-arch/unzip
99
	app-arch/unzip
98
	>=app-text/hunspell-1.3.2-r3
100
	>=app-text/hunspell-1.3.2-r3
99
	app-text/mythes
101
	app-text/mythes
100
	app-text/libabw
102
	>=app-text/libabw-0.1.0
101
	>=app-text/libexttextcat-3.2
103
	>=app-text/libexttextcat-3.2
102
	app-text/libebook
104
	>=app-text/libebook-0.1.1
103
	app-text/libetonyek
105
	>=app-text/libetonyek-0.1.1
104
	app-text/liblangtag
106
	app-text/liblangtag
105
	app-text/libmspub
107
	>=app-text/libmspub-0.1.0
106
	>=app-text/libmwaw-0.2
108
	>=app-text/libmwaw-0.3.1
107
	>=app-text/libodfgen-0.0.3
109
	>=app-text/libodfgen-0.1.0
108
	app-text/libwpd:0.9[tools]
110
	app-text/libwpd:0.10[tools]
109
	app-text/libwpg:0.2
111
	app-text/libwpg:0.3
110
	>=app-text/libwps-0.2.2
112
	>=app-text/libwps-0.3.0
111
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
113
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
112
	>=dev-cpp/clucene-2.3.3.4-r2
114
	>=dev-cpp/clucene-2.3.3.4-r2
113
	dev-cpp/libcmis:0.4
115
	dev-cpp/libcmis:0.4
Lines 118-123 Link Here
118
	>=dev-libs/icu-4.8.1.1:=
120
	>=dev-libs/icu-4.8.1.1:=
119
	>=dev-libs/libatomic_ops-7.2d
121
	>=dev-libs/libatomic_ops-7.2d
120
	>=dev-libs/liborcus-0.7.0:=
122
	>=dev-libs/liborcus-0.7.0:=
123
	>=dev-libs/librevenge-0.0.1
121
	>=dev-libs/nspr-4.8.8
124
	>=dev-libs/nspr-4.8.8
122
	>=dev-libs/nss-3.12.9
125
	>=dev-libs/nss-3.12.9
123
	>=dev-lang/perl-5.0
126
	>=dev-lang/perl-5.0
Lines 130-138 Link Here
130
	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
133
	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
131
	media-libs/lcms:2
134
	media-libs/lcms:2
132
	>=media-libs/libpng-1.4
135
	>=media-libs/libpng-1.4
133
	>=media-libs/libcdr-0.0.5
136
	>=media-libs/libcdr-0.1.0
134
	media-libs/libfreehand
137
	>=media-libs/libfreehand-0.1.0
135
	media-libs/libvisio
138
	>=media-libs/libvisio-0.1.0
136
	>=net-misc/curl-7.21.4
139
	>=net-misc/curl-7.21.4
137
	net-nds/openldap
140
	net-nds/openldap
138
	sci-mathematics/lpsolve
141
	sci-mathematics/lpsolve
Lines 142-151 Link Here
142
	x11-libs/libXrandr
145
	x11-libs/libXrandr
143
	x11-libs/libXrender
146
	x11-libs/libXrender
144
	bluetooth? ( net-wireless/bluez )
147
	bluetooth? ( net-wireless/bluez )
148
	coinmp? ( sci-libs/coinor-mp )
145
	cups? ( net-print/cups )
149
	cups? ( net-print/cups )
146
	dbus? ( >=dev-libs/dbus-glib-0.92 )
150
	dbus? ( >=dev-libs/dbus-glib-0.92 )
147
	eds? ( gnome-extra/evolution-data-server )
151
	eds? ( gnome-extra/evolution-data-server )
148
	firebird? ( >=dev-db/firebird-2.5 )
152
	firebird? ( >=dev-db/firebird-2.5 )
153
	gltf? ( media-libs/libgltf )
149
	gnome? ( gnome-base/gconf:2 )
154
	gnome? ( gnome-base/gconf:2 )
150
	gtk? (
155
	gtk? (
151
		x11-libs/gdk-pixbuf[X]
156
		x11-libs/gdk-pixbuf[X]
Lines 239-249 Link Here
239
PATCHES=(
244
PATCHES=(
240
	# not upstreamable stuff
245
	# not upstreamable stuff
241
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
246
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
247
248
	# staged for git master
249
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-gltf.patch"
250
	"${FILESDIR}/${PN}-4.3.1.2-handle-collada-libs-seperately.patch"
251
	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
252
	"${FILESDIR}/${PN}-4.3.1.2-upgrade-to-libgltf-0.0.1.patch"
253
# 	"${FILESDIR}/${PN}-4.3.1.2-fix-mergelibs-build.patch"	#no, still not fixed
242
)
254
)
243
255
244
REQUIRED_USE="
256
REQUIRED_USE="
245
	${PYTHON_REQUIRED_USE}
257
	${PYTHON_REQUIRED_USE}
246
	bluetooth? ( dbus )
258
	bluetooth? ( dbus )
259
	collada? ( gltf )
247
	gnome? ( gtk )
260
	gnome? ( gtk )
248
	eds? ( gnome )
261
	eds? ( gnome )
249
	telepathy? ( gtk )
262
	telepathy? ( gtk )
Lines 446-452 Link Here
446
		--enable-cairo-canvas \
459
		--enable-cairo-canvas \
447
		--enable-graphite \
460
		--enable-graphite \
448
		--enable-largefile \
461
		--enable-largefile \
449
		--enable-mergelibs \
450
		--enable-python=system \
462
		--enable-python=system \
451
		--enable-randr \
463
		--enable-randr \
452
		--enable-randr-link \
464
		--enable-randr-link \
Lines 462-467 Link Here
462
		--disable-report-builder \
474
		--disable-report-builder \
463
		--disable-kdeab \
475
		--disable-kdeab \
464
		--disable-kde \
476
		--disable-kde \
477
		--disable-mergelibs \
465
		--disable-online-update \
478
		--disable-online-update \
466
		--disable-systray \
479
		--disable-systray \
467
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
480
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
Lines 482-492 Link Here
482
		--with-helppack-integration \
495
		--with-helppack-integration \
483
		--without-sun-templates \
496
		--without-sun-templates \
484
		$(use_enable bluetooth sdremote-bluetooth) \
497
		$(use_enable bluetooth sdremote-bluetooth) \
498
		$(use_enable coinmp) \
499
		$(use_enable collada) \
485
		$(use_enable cups) \
500
		$(use_enable cups) \
486
		$(use_enable debug) \
501
		$(use_enable debug) \
487
		$(use_enable dbus) \
502
		$(use_enable dbus) \
488
		$(use_enable eds evolution2) \
503
		$(use_enable eds evolution2) \
489
		$(use_enable firebird firebird-sdbc) \
504
		$(use_enable firebird firebird-sdbc) \
505
		$(use_enable gltf) \
490
		$(use_enable gnome gconf) \
506
		$(use_enable gnome gconf) \
491
		$(use_enable gnome gio) \
507
		$(use_enable gnome gio) \
492
		$(use_enable gnome lockdown) \
508
		$(use_enable gnome lockdown) \
Lines 502-507 Link Here
502
		$(use_enable vba) \
518
		$(use_enable vba) \
503
		$(use_enable vlc) \
519
		$(use_enable vlc) \
504
		$(use_enable webdav neon) \
520
		$(use_enable webdav neon) \
521
		$(use_with coinmp system-coinmp) \
522
		$(use_with gltf system-libgltf) \
505
		$(use_with java) \
523
		$(use_with java) \
506
		$(use_with mysql system-mysql-cppconn) \
524
		$(use_with mysql system-mysql-cppconn) \
507
		$(use_with odk doxygen) \
525
		$(use_with odk doxygen) \

Return to bug 518664