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

(-)libreoffice-9999-r2.ebuild
Lines 75-81 Link Here
(-)libreoffice-9999-r2.ebuild (-13 / +17 lines)
Lines 93-98 Link Here
93
[[ ${PV} == *9999* ]] || \
93
[[ ${PV} == *9999* ]] || \
94
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
94
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
95
95
96
# FIXME: collada? ( media-libs/opencollada )
97
#        how to configure system-collada?
96
COMMON_DEPEND="
98
COMMON_DEPEND="
97
	${PYTHON_DEPS}
99
	${PYTHON_DEPS}
98
	app-arch/zip
100
	app-arch/zip
Lines 105-120 Link Here
105
	>=app-text/libetonyek-0.1.1
107
	>=app-text/libetonyek-0.1.1
106
	app-text/liblangtag
108
	app-text/liblangtag
107
	>=app-text/libmspub-0.1.0
109
	>=app-text/libmspub-0.1.0
108
	>=app-text/libmwaw-0.3.1
110
	>=app-text/libmwaw-0.3.3
109
	>=app-text/libodfgen-0.1.0
111
	>=app-text/libodfgen-0.1.0
110
	app-text/libwpd:0.10[tools]
112
	app-text/libwpd:0.10[tools]
111
	app-text/libwpg:0.3
113
	app-text/libwpg:0.3
112
	>=app-text/libwps-0.3.0
114
	>=app-text/libwps-0.3.0
113
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
115
	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
114
	>=dev-cpp/clucene-2.3.3.4-r2
116
	>=dev-cpp/clucene-2.3.3.4-r2
115
	dev-cpp/libcmis:0.4
117
	dev-cpp/libcmis:0.5
116
	dev-db/unixODBC
118
	dev-db/unixODBC
117
	>=dev-libs/boost-1.46:=
119
	>=dev-libs/boost-1.47:=
118
	dev-libs/expat
120
	dev-libs/expat
119
	>=dev-libs/hyphen-2.7.1
121
	>=dev-libs/hyphen-2.7.1
120
	>=dev-libs/icu-4.8.1.1:=
122
	>=dev-libs/icu-4.8.1.1:=
Lines 134-139 Link Here
134
	>=media-libs/libpng-1.4
136
	>=media-libs/libpng-1.4
135
	>=media-libs/libcdr-0.1.0
137
	>=media-libs/libcdr-0.1.0
136
	>=media-libs/libfreehand-0.1.0
138
	>=media-libs/libfreehand-0.1.0
139
	media-libs/libpagemaker
137
	>=media-libs/libvisio-0.1.0
140
	>=media-libs/libvisio-0.1.0
138
	>=net-misc/curl-7.21.4
141
	>=net-misc/curl-7.21.4
139
	net-libs/neon
142
	net-libs/neon
Lines 144-149 Link Here
144
	x11-libs/libXinerama
147
	x11-libs/libXinerama
145
	x11-libs/libXrandr
148
	x11-libs/libXrandr
146
	x11-libs/libXrender
149
	x11-libs/libXrender
150
	virtual/glu
151
	virtual/opengl
147
	bluetooth? ( net-wireless/bluez )
152
	bluetooth? ( net-wireless/bluez )
148
	coinmp? ( sci-libs/coinor-mp )
153
	coinmp? ( sci-libs/coinor-mp )
149
	cups? ( net-print/cups )
154
	cups? ( net-print/cups )
Lines 172-181 Link Here
172
		dev-java/tomcat-servlet-api:3.0
177
		dev-java/tomcat-servlet-api:3.0
173
	)
178
	)
174
	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
179
	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
175
	opengl? (
176
		virtual/glu
177
		virtual/opengl
178
	)
179
	postgres? ( >=virtual/postgresql-9.0[kerberos] )
180
	postgres? ( >=virtual/postgresql-9.0[kerberos] )
180
	telepathy? (
181
	telepathy? (
181
		dev-libs/glib:2
182
		dev-libs/glib:2
Lines 243-249 Link Here
243
244
244
PATCHES=(
245
PATCHES=(
245
	# not upstreamable stuff
246
	# not upstreamable stuff
246
	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
247
	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
247
)
248
)
248
249
249
REQUIRED_USE="
250
REQUIRED_USE="
Lines 357-363 Link Here
357
		-e "s:%eprefix%:${EPREFIX}:g" \
358
		-e "s:%eprefix%:${EPREFIX}:g" \
358
		-e "s:%libdir%:$(get_libdir):g" \
359
		-e "s:%libdir%:$(get_libdir):g" \
359
		-i pyuno/source/module/uno.py \
360
		-i pyuno/source/module/uno.py \
360
		-i scripting/source/pyprov/officehelper.py || die
361
		-i pyuno/source/officehelper.py || die
361
	# sed in the tests
362
	# sed in the tests
362
	sed -i \
363
	sed -i \
363
		-e 's#all : build unitcheck#all : build#g' \
364
		-e 's#all : build unitcheck#all : build#g' \
Lines 443-448 Link Here
443
	# --enable-extension-integration: enable any extension integration support
444
	# --enable-extension-integration: enable any extension integration support
444
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
445
	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
445
	# --disable-report-builder: too much java packages pulled in without pkgs
446
	# --disable-report-builder: too much java packages pulled in without pkgs
447
	# FIXME: $(use_with collada system-opencollada)
446
	econf \
448
	econf \
447
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
449
		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
448
		--with-system-headers \
450
		--with-system-headers \
Lines 452-457 Link Here
452
		--enable-cairo-canvas \
454
		--enable-cairo-canvas \
453
		--enable-graphite \
455
		--enable-graphite \
454
		--enable-largefile \
456
		--enable-largefile \
457
		--enable-mergelibs \
455
		--enable-neon \
458
		--enable-neon \
456
		--enable-python=system \
459
		--enable-python=system \
457
		--enable-randr \
460
		--enable-randr \
Lines 468-474 Link Here
468
		--disable-report-builder \
471
		--disable-report-builder \
469
		--disable-kdeab \
472
		--disable-kdeab \
470
		--disable-kde \
473
		--disable-kde \
471
		--disable-mergelibs \
472
		--disable-online-update \
474
		--disable-online-update \
473
		--disable-systray \
475
		--disable-systray \
474
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
476
		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
Lines 500-515 Link Here
500
		$(use_enable gnome gconf) \
502
		$(use_enable gnome gconf) \
501
		$(use_enable gnome gio) \
503
		$(use_enable gnome gio) \
502
		$(use_enable gnome lockdown) \
504
		$(use_enable gnome lockdown) \
503
		$(use_enable gstreamer) \
505
		$(use_enable gstreamer gstreamer-1-0) \
504
		$(use_enable gtk) \
506
		$(use_enable gtk) \
505
		$(use_enable gtk3) \
507
		$(use_enable gtk3) \
506
		$(use_enable kde kde4) \
508
		$(use_enable kde kde4) \
507
		$(use_enable mysql ext-mariadb-connector) \
509
		$(use_enable mysql ext-mariadb-connector) \
508
		$(use_enable odk) \
510
		$(use_enable odk) \
509
		$(use_enable opengl) \
510
		$(use_enable postgres postgresql-sdbc) \
511
		$(use_enable postgres postgresql-sdbc) \
511
		$(use_enable telepathy) \
512
		$(use_enable telepathy) \
512
		$(use_enable vba) \
513
		$(use_enable vlc) \
513
		$(use_enable vlc) \
514
		$(use_with coinmp system-coinmp) \
514
		$(use_with coinmp system-coinmp) \
515
		$(use_with gltf system-libgltf) \
515
		$(use_with gltf system-libgltf) \
Lines 580-585 Link Here
580
	# Remove desktop files for support to old installs that can't parse mime
580
	# Remove desktop files for support to old installs that can't parse mime
581
	rm -rf "${ED}"/usr/share/mimelnk/
581
	rm -rf "${ED}"/usr/share/mimelnk/
582
582
583
	# FIXME: Hack add missing file
584
	insinto /usr/$(get_libdir)/${PN}/program
585
	doins "${S}"/instdir/program/libsaxlo.so
586
583
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
587
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
584
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
588
	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
585
}
589
}

Return to bug 533138