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

Collapse All | Expand All

(-)a/libreoffice-9999-r2.ebuild (-22 / +24 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2015 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.236 2014/12/29 20:05:21 dilfridge Exp $
3
# $Header: $
4
4
5
EAPI=5
5
EAPI=5
6
6
Lines 27-33 Link Here
27
# PATCHSET="${P}-patchset-01.tar.xz"
27
# PATCHSET="${P}-patchset-01.tar.xz"
28
28
29
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
29
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
30
inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
30
inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
31
unset SCM_ECLASS
31
unset SCM_ECLASS
32
32
33
DESCRIPTION="LibreOffice, a full office productivity suite"
33
DESCRIPTION="LibreOffice, a full office productivity suite"
Lines 61-67 Link Here
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 )"
63
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
64
ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )"
65
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
64
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
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_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
67
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
66
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
Lines 74-80 Link Here
74
unset ADDONS_SRC
73
unset ADDONS_SRC
75
74
76
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
75
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
77
+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc"
76
+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
78
77
79
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
78
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
80
# Unpackaged separate extensions:
79
# Unpackaged separate extensions:
Lines 93-100 Link Here
93
[[ ${PV} == *9999* ]] || \
92
[[ ${PV} == *9999* ]] || \
94
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
93
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
95
94
96
# FIXME: collada? ( media-libs/opencollada )
97
#        how to configure system-collada?
98
COMMON_DEPEND="
95
COMMON_DEPEND="
99
	${PYTHON_DEPS}
96
	${PYTHON_DEPS}
100
	app-arch/zip
97
	app-arch/zip
Lines 107-122 Link Here
107
	>=app-text/libetonyek-0.1.1
104
	>=app-text/libetonyek-0.1.1
108
	app-text/liblangtag
105
	app-text/liblangtag
109
	>=app-text/libmspub-0.1.0
106
	>=app-text/libmspub-0.1.0
110
	>=app-text/libmwaw-0.3.1
107
	>=app-text/libmwaw-0.3.4
111
	>=app-text/libodfgen-0.1.0
108
	>=app-text/libodfgen-0.1.0
112
	app-text/libwpd:0.10[tools]
109
	app-text/libwpd:0.10[tools]
113
	app-text/libwpg:0.3
110
	app-text/libwpg:0.3
114
	>=app-text/libwps-0.3.0
111
	>=app-text/libwps-0.3.0
115
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
112
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
116
	>=dev-cpp/clucene-2.3.3.4-r2
113
	>=dev-cpp/clucene-2.3.3.4-r2
117
	dev-cpp/libcmis:0.4
114
	dev-cpp/libcmis:0.5
118
	dev-db/unixODBC
115
	dev-db/unixODBC
119
	>=dev-libs/boost-1.46:=
116
	>=dev-libs/boost-1.47:=
120
	dev-libs/expat
117
	dev-libs/expat
121
	>=dev-libs/hyphen-2.7.1
118
	>=dev-libs/hyphen-2.7.1
122
	>=dev-libs/icu-4.8.1.1:=
119
	>=dev-libs/icu-4.8.1.1:=
Lines 136-141 Link Here
136
	>=media-libs/libpng-1.4
133
	>=media-libs/libpng-1.4
137
	>=media-libs/libcdr-0.1.0
134
	>=media-libs/libcdr-0.1.0
138
	>=media-libs/libfreehand-0.1.0
135
	>=media-libs/libfreehand-0.1.0
136
	media-libs/libpagemaker
139
	>=media-libs/libvisio-0.1.0
137
	>=media-libs/libvisio-0.1.0
140
	>=net-misc/curl-7.21.4
138
	>=net-misc/curl-7.21.4
141
	net-libs/neon
139
	net-libs/neon
Lines 146-153 Link Here
146
	x11-libs/libXinerama
144
	x11-libs/libXinerama
147
	x11-libs/libXrandr
145
	x11-libs/libXrandr
148
	x11-libs/libXrender
146
	x11-libs/libXrender
147
	virtual/glu
148
	virtual/opengl
149
	bluetooth? ( net-wireless/bluez )
149
	bluetooth? ( net-wireless/bluez )
150
	coinmp? ( sci-libs/coinor-mp )
150
	coinmp? ( sci-libs/coinor-mp )
151
	collada? ( >=media-libs/opencollada-0_p20150131 )
151
	cups? ( net-print/cups )
152
	cups? ( net-print/cups )
152
	dbus? ( >=dev-libs/dbus-glib-0.92 )
153
	dbus? ( >=dev-libs/dbus-glib-0.92 )
153
	eds? ( gnome-extra/evolution-data-server )
154
	eds? ( gnome-extra/evolution-data-server )
Lines 174-183 Link Here
174
		dev-java/tomcat-servlet-api:3.0
175
		dev-java/tomcat-servlet-api:3.0
175
	)
176
	)
176
	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
177
	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
177
	opengl? (
178
		virtual/glu
179
		virtual/opengl
180
	)
181
	postgres? ( >=dev-db/postgresql-9.0[kerberos] )
178
	postgres? ( >=dev-db/postgresql-9.0[kerberos] )
182
	telepathy? (
179
	telepathy? (
183
		dev-libs/glib:2
180
		dev-libs/glib:2
Lines 245-251 Link Here
245
242
246
PATCHES=(
243
PATCHES=(
247
	# not upstreamable stuff
244
	# not upstreamable stuff
248
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
245
	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
249
)
246
)
250
247
251
REQUIRED_USE="
248
REQUIRED_USE="
Lines 340-345 Link Here
340
	export PYTHON_CFLAGS=$(python_get_CFLAGS)
337
	export PYTHON_CFLAGS=$(python_get_CFLAGS)
341
	export PYTHON_LIBS=$(python_get_LIBS)
338
	export PYTHON_LIBS=$(python_get_LIBS)
342
339
340
	if use collada; then
341
		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
342
		export OPENCOLLADA_LIBS="-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
343
	fi
344
343
	# patchset
345
	# patchset
344
	if [[ -n ${PATCHSET} ]]; then
346
	if [[ -n ${PATCHSET} ]]; then
345
		EPATCH_FORCE="yes" \
347
		EPATCH_FORCE="yes" \
Lines 359-365 Link Here
359
		-e "s:%eprefix%:${EPREFIX}:g" \
361
		-e "s:%eprefix%:${EPREFIX}:g" \
360
		-e "s:%libdir%:$(get_libdir):g" \
362
		-e "s:%libdir%:$(get_libdir):g" \
361
		-i pyuno/source/module/uno.py \
363
		-i pyuno/source/module/uno.py \
362
		-i scripting/source/pyprov/officehelper.py || die
364
		-i pyuno/source/officehelper.py || die
363
	# sed in the tests
365
	# sed in the tests
364
	sed -i \
366
	sed -i \
365
		-e 's#all : build unitcheck#all : build#g' \
367
		-e 's#all : build unitcheck#all : build#g' \
Lines 441-447 Link Here
441
	# --enable-extension-integration: enable any extension integration support
443
	# --enable-extension-integration: enable any extension integration support
442
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
444
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
443
	# --disable-report-builder: too much java packages pulled in without pkgs
445
	# --disable-report-builder: too much java packages pulled in without pkgs
444
	# FIXME: $(use_with collada system-opencollada)
445
	econf \
446
	econf \
446
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
447
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
447
		--with-system-headers \
448
		--with-system-headers \
Lines 499-515 Link Here
499
		$(use_enable gnome gconf) \
500
		$(use_enable gnome gconf) \
500
		$(use_enable gnome gio) \
501
		$(use_enable gnome gio) \
501
		$(use_enable gnome lockdown) \
502
		$(use_enable gnome lockdown) \
502
		$(use_enable gstreamer) \
503
		$(use_enable gstreamer gstreamer-1-0) \
503
		$(use_enable gtk) \
504
		$(use_enable gtk) \
504
		$(use_enable gtk3) \
505
		$(use_enable gtk3) \
505
		$(use_enable kde kde4) \
506
		$(use_enable kde kde4) \
506
		$(use_enable mysql ext-mariadb-connector) \
507
		$(use_enable mysql ext-mariadb-connector) \
507
		$(use_enable odk) \
508
		$(use_enable odk) \
508
		$(use_enable opengl) \
509
		$(use_enable postgres postgresql-sdbc) \
509
		$(use_enable postgres postgresql-sdbc) \
510
		$(use_enable telepathy) \
510
		$(use_enable telepathy) \
511
		$(use_enable vlc) \
511
		$(use_enable vlc) \
512
		$(use_with coinmp system-coinmp) \
512
		$(use_with coinmp system-coinmp) \
513
		$(use_with collada system-opencollada) \
513
		$(use_with gltf system-libgltf) \
514
		$(use_with gltf system-libgltf) \
514
		$(use_with java) \
515
		$(use_with java) \
515
		$(use_with mysql system-mysql-cppconn) \
516
		$(use_with mysql system-mysql-cppconn) \
Lines 567-575 Link Here
567
		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
568
		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
568
	fi
569
	fi
569
570
570
	# symlink the nsplugin to proper location
571
	# use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
572
573
	# Hack for offlinehelp, this needs fixing upstream at some point.
571
	# Hack for offlinehelp, this needs fixing upstream at some point.
574
	# It is broken because we send --without-help
572
	# It is broken because we send --without-help
575
	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
573
	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
Lines 579-584 Link Here
579
	# Remove desktop files for support to old installs that can't parse mime
577
	# Remove desktop files for support to old installs that can't parse mime
580
	rm -rf "${ED}"/usr/share/mimelnk/
578
	rm -rf "${ED}"/usr/share/mimelnk/
581
579
580
	# FIXME: Hack add missing file
581
	insinto /usr/$(get_libdir)/${PN}/program
582
	doins "${S}"/instdir/program/libsaxlo.so
583
582
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
584
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
583
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
585
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
584
}
586
}

Return to bug 533138