public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin/
Date: Thu, 13 Feb 2025 09:58:57 +0000 (UTC)	[thread overview]
Message-ID: <1739440672.c457c9dd713c383e1bcea3d2c1b443f961266fd8.sam@gentoo> (raw)

commit:     c457c9dd713c383e1bcea3d2c1b443f961266fd8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 11:13:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 09:57:52 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c457c9dd

app-office/libreoffice-bin: add 25.2.0 (switch to upstream binaries)

Switch to upstream built binaries.

This aligns us with, say, www-client/firefox-bin and provides some benefits:
* Not needing to manually rebuild the new binaries when e.g. new Boost
  is stabilised.
* This version is parallel-installable with app-office/libreoffice, so
  testing can be done to compare our builds with upstream's when investigating
  bug reports.
* We can update it ahead of app-office/libreoffice when bumping requires
  more labour.

The primary downside is having less control over dependencies, but
app-office/libreoffice-bin was always heavy on dependencies even when we
built it, and IMO, beggars cannot be choosers.

Closes: https://bugs.gentoo.org/949193
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/libreoffice-bin/Manifest                |   1 +
 .../libreoffice-bin/libreoffice-bin-25.2.0.ebuild  | 128 +++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index a3864c2064da..e00d66d663a7 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,3 +1,4 @@
+DIST LibreOffice_25.2.0_Linux_x86-64_deb.tar.gz 207070838 BLAKE2B 066ea5f4144bd82c5af32ace7663ecba2821832a168a107d585e1107a08f8c09699e3a18dbcce3e9f2834cde586b13ef7351b54c232f59e2f623c3488750e52c SHA512 ab5f6b977abb7517500f64d9a534ac6afe2e66b1fcb12fdbbf2e2c8eb854225d5cb2520e4214ef6665ab1d0475d439dfa04b175f4c032740ebb5d894ae4ac5a6
 DIST amd64-bin-libreoffice-24.2.7.2.tar.xz 155436428 BLAKE2B adfa8c683d00ecf028f5e9aa2d128cbb0e2010cbdc2a99b4c4a05317955869177d6411335529997ac66ea55db3ec19a8b7bf1b2d09d6f2720d92f26514a1fa4a SHA512 ae912280a7529aa4df95e95340b4c9a6ce655d0e24d0eac76dbfdf0d81acadff621555ee76aa8fd83f577d9ce1b81cf8486c4f48468d401166db9939fb611d89
 DIST amd64-bin-libreoffice-gnome-24.2.7.2.xd3 2398948 BLAKE2B 104421683a356c40a79253b91d777f217ec9608c5e0fa69f6ef4d6f418298863a87ee2785b2dbf6a8207f6b3f024c71c6e798e396b2d2993af2fecf7dc87ef2c SHA512 aa13197c75c859256472f786fb938d7c3da68989e53da10d9b7d9ee211b894c9d5ce768038b266feb8e5f50da490252e1addfbcc1e4f8b7f8be87a2b33992d7d
 DIST amd64-bin-libreoffice-gnome-java-24.2.7.2.xd3 32292082 BLAKE2B 1ce76e1c893d6e5b27cf0c01ad7c5d66a8fa6cec54d142f3f5f03e3c64a4bfbbf7471c3393d1b1f0410b89da6ccbd0f44d515e07379d6a95d84c4404cbcbc921 SHA512 fe1d5774856fb8f698b568ffb795776d3c959c0c4c589a7784672e42a7286a008a1679e6bbbda12e7135d21f01995bfb5c9965fef4049b1246fe7eda50a25683

diff --git a/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild
new file mode 100644
index 000000000000..852e1f699e2a
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-25.2.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-opt-2 prefix unpacker xdg
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	https://download.documentfoundation.org/libreoffice/stable/${PV}/deb/x86_64/LibreOffice_${PV}_Linux_x86-64_deb.tar.gz
+"
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="java gnome python"
+
+RDEPEND="
+	acct-group/libreoffice
+	acct-user/libreoffice
+	app-accessibility/at-spi2-core:2
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/mit-krb5
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/dconf
+	media-fonts/liberation-fonts
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/mesa[egl(+)]
+	net-dns/avahi
+	net-print/cups
+	sys-apps/dbus
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/zlib
+	virtual/libcrypt
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	gnome? (
+		dev-libs/glib:2
+		>=gnome-base/dconf-0.40.0
+		gnome-extra/evolution-data-server
+	)
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( virtual/jre:11 )
+"
+
+# TODO: l10n
+PDEPEND=""
+RESTRICT="test strip"
+
+QA_PREBUILT="opt/* usr/*"
+
+src_unpack() {
+	default
+
+	BINPKG_BASE=$(find "${WORKDIR}" -mindepth 1 -maxdepth 1 -name 'LibreOffice_*' -type d -print || die)
+	BINPKG_BASE="${BINPKG_BASE##${WORKDIR}}"
+	[[ -z ${BINPKG_BASE} ]] && die "Failed to detect binary package directory!"
+
+	# We don't package Firebird anymore
+	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-firebird*_amd64.deb || die
+
+	if ! use java ; then
+		rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-gnome-integration*_amd64.deb || die
+	fi
+
+	# Requires KF5 as of 25.2.0, so we choose not to use it.
+	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-kde-integration*_amd64.deb || die
+
+	# Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency.
+	if ! use python ; then
+		rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%%.0*}-python-script-provider*_amd64.deb || die
+	fi
+
+	# The downloaded .deb has a DEBS/ directory with e.g. libreoffice25.2_25.2.0.3-3_amd64.deb
+	# and many other .debs for each component.
+	readarray -t -d '' debs < <(find "${WORKDIR}" -name '*.deb' -type f -print0 || die)
+
+	local deb
+	for deb in "${debs[@]}" ; do
+		unpack_deb "${deb}"
+	done
+}
+
+src_prepare() {
+	default
+
+	cat <<-EOF > "${T}"/50-${PN} || die
+	SEARCH_DIRS_MASK="@GENTOO_PORTAGE_EPREFIX@/opt/libreoffice${PV%%.0*}"
+	EOF
+	eprefixify "${T}"/50-${PN}
+}
+
+src_install() {
+	dodir /usr /opt
+	mv "${S}"/usr/local/* "${S}"/usr || die
+	cp -aR "${S}"/opt/* "${ED}"/opt/ || die
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+	rmdir "${ED}"/usr/local || die
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild
+	doins "${T}/50-${PN}"
+}


             reply	other threads:[~2025-02-13  9:59 UTC|newest]

Thread overview: 204+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-13  9:58 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-13 10:12 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin/ Sam James
2025-02-13 10:10 Sam James
2025-02-13 10:10 Sam James
2025-02-13 10:10 Sam James
2024-12-17 21:44 Andreas Sturmlechner
2024-12-17  9:31 Sam James
2024-12-11 23:37 Andreas K. Hüttel
2024-09-12 22:04 Sam James
2024-08-30 13:11 Andreas Sturmlechner
2024-08-30  6:18 Arthur Zamarin
2024-08-29 23:44 Sam James
2024-08-29 18:47 Andreas K. Hüttel
2024-02-20 20:49 Andreas Sturmlechner
2024-02-20  5:56 Sam James
2024-02-12 10:31 Sam James
2024-02-07 21:23 Andreas K. Hüttel
2024-01-07  9:40 Andreas Sturmlechner
2024-01-07  9:19 Andreas Sturmlechner
2024-01-07  9:19 Andreas Sturmlechner
2023-11-21 22:12 Andreas K. Hüttel
2023-11-06 18:13 Andreas Sturmlechner
2023-11-05 19:14 Arthur Zamarin
2023-10-24 19:36 Arthur Zamarin
2023-10-17 18:23 Andreas K. Hüttel
2023-08-20 12:00 Andreas Sturmlechner
2023-08-19 12:39 Arthur Zamarin
2023-08-19 12:19 Arthur Zamarin
2023-08-18 19:45 Andreas K. Hüttel
2023-08-18 19:45 Andreas K. Hüttel
2023-06-09 14:31 Andreas K. Hüttel
2023-06-09  6:53 Arthur Zamarin
2023-06-02 16:13 Arthur Zamarin
2023-05-14 21:10 Andreas K. Hüttel
2023-05-13  7:15 Arthur Zamarin
2023-05-13  7:15 Arthur Zamarin
2023-05-07 19:42 Andreas K. Hüttel
2023-05-03 17:59 Andreas K. Hüttel
2023-05-03 11:31 Andreas Sturmlechner
2023-05-01  1:43 Sam James
2023-04-30 17:16 Andreas Sturmlechner
2023-04-29 17:16 Arthur Zamarin
2023-04-25 21:54 Andreas K. Hüttel
2023-02-08 17:13 Sam James
2023-02-04 17:26 Sam James
2023-01-21  6:53 Sam James
2023-01-20 23:59 Andreas K. Hüttel
2022-12-02 18:47 Arthur Zamarin
2022-11-23  2:26 Sam James
2022-11-10 19:34 Andreas K. Hüttel
2022-11-02  8:37 Andreas Sturmlechner
2022-10-31 16:41 Agostino Sarubbo
2022-10-20 19:00 Jakov Smolić
2022-10-15 14:09 Andreas K. Hüttel
2022-08-15 10:43 Andreas Sturmlechner
2022-07-27  7:56 Agostino Sarubbo
2022-07-26  4:46 Sam James
2022-07-24 18:26 Andreas K. Hüttel
2022-06-14 15:20 Andreas Sturmlechner
2022-06-01 16:10 Andreas K. Hüttel
2022-05-18  1:22 Andreas K. Hüttel
2022-05-08 13:35 Andreas Sturmlechner
2022-05-01 23:36 Sam James
2022-04-17 22:23 Sam James
2022-04-01 22:43 Andreas K. Hüttel
2022-02-25 20:56 Andreas K. Hüttel
2022-02-05 20:46 Andreas Sturmlechner
2022-02-03  3:42 Sam James
2022-02-03  3:42 Sam James
2022-01-18 22:12 Andreas K. Hüttel
2021-12-03 11:11 Andreas Sturmlechner
2021-12-02 19:52 Sam James
2021-11-25 20:23 Andreas K. Hüttel
2021-09-18 19:16 Andreas Sturmlechner
2021-09-18 18:36 Sam James
2021-09-18 18:36 Sam James
2021-09-04 15:44 Andreas K. Hüttel
2021-06-10 15:34 Andreas Sturmlechner
2021-06-01  9:00 Sam James
2021-06-01  9:00 Sam James
2021-05-30 10:57 Andreas K. Hüttel
2021-05-29 23:36 Andreas K. Hüttel
2021-03-21 21:15 Andreas Sturmlechner
2021-03-07 15:54 Thomas Deutschmann
2021-03-07 13:18 Mikle Kolyada
2021-02-24 19:48 Andreas K. Hüttel
2021-01-20 19:32 Andreas Sturmlechner
2021-01-10  9:06 Sam James
2021-01-09 21:16 Sam James
2020-12-30 13:36 Andreas K. Hüttel
2020-12-12 21:59 Andreas Sturmlechner
2020-12-12 21:31 Sam James
2020-12-10 21:41 Thomas Deutschmann
2020-12-08 18:33 Andreas K. Hüttel
2020-12-05  0:46 Andreas K. Hüttel
2020-10-18 15:47 Andreas Sturmlechner
2020-10-18 15:47 Andreas Sturmlechner
2020-10-18 15:11 Thomas Deutschmann
2020-10-04  0:34 Sam James
2020-09-27 18:52 Andreas K. Hüttel
2020-09-12 23:06 Andreas K. Hüttel
2020-05-31 21:09 Andreas Sturmlechner
2020-05-31 15:40 Mikle Kolyada
2020-05-19 19:36 Mikle Kolyada
2020-05-19  8:31 Andreas K. Hüttel
2020-04-24 20:54 Andreas K. Hüttel
2020-04-24 20:54 Andreas K. Hüttel
2020-04-04 21:45 Andreas K. Hüttel
2020-03-28 14:12 Andreas K. Hüttel
2020-01-17  2:50 Andreas Sturmlechner
2020-01-16  8:14 Mikle Kolyada
2020-01-16  8:12 Mikle Kolyada
2020-01-15  8:06 Andreas K. Hüttel
2020-01-14  5:05 Andreas K. Hüttel
2019-11-02 15:23 Andreas Sturmlechner
2019-11-01 22:34 Piotr Karbowski
2019-10-31 23:50 Thomas Deutschmann
2019-10-29 17:39 Andreas Sturmlechner
2019-10-26 18:23 Andreas K. Hüttel
2019-10-14 14:30 Andreas K. Hüttel
2019-07-18 15:30 Andreas Sturmlechner
2019-07-18 14:32 Thomas Deutschmann
2019-07-17 10:19 Mikle Kolyada
2019-07-07 16:46 Andreas Sturmlechner
2019-07-07 16:19 Andreas K. Hüttel
2019-06-27 10:48 Andreas Sturmlechner
2019-06-18 18:24 Thomas Deutschmann
2019-06-16 21:57 Andreas Sturmlechner
2019-06-16 13:53 Andreas K. Hüttel
2019-06-08  2:50 Andreas K. Hüttel
2019-03-01 19:04 Andreas Sturmlechner
2019-02-17 17:58 Mikle Kolyada
2019-02-17 15:33 Mikle Kolyada
2019-02-09 19:39 Andreas K. Hüttel
2019-02-01 20:42 Andreas Sturmlechner
2019-01-08 19:56 Thomas Deutschmann
2019-01-02  9:57 Mikle Kolyada
2018-12-28 18:26 Andreas K. Hüttel
2018-09-30 15:59 Andreas Sturmlechner
2018-09-29 19:00 Mikle Kolyada
2018-09-21 20:12 Andreas Hüttel
2018-05-29 11:17 Thomas Deutschmann
2018-05-22 16:42 Mikle Kolyada
2018-05-21 21:54 Andreas Hüttel
2018-05-05  1:26 Aaron Bauman
2018-02-16 11:41 Agostino Sarubbo
2018-02-12 21:36 Thomas Deutschmann
2018-02-12 14:56 Andreas Hüttel
2018-02-12 14:56 Andreas Hüttel
2018-02-03 13:37 Michael Palimaka
2018-02-01 20:37 Thomas Deutschmann
2018-01-29 14:45 Andreas Hüttel
2017-12-16 17:24 Tobias Klausmann
2017-12-12 16:35 Thomas Deutschmann
2017-12-11 14:10 Andreas Hüttel
2017-12-11 12:46 Andreas Hüttel
2017-11-16  1:36 Thomas Deutschmann
2017-11-14 13:28 Agostino Sarubbo
2017-11-09 22:17 Andreas Hüttel
2017-11-09 21:55 Andreas Hüttel
2017-06-01  9:13 Agostino Sarubbo
2017-05-29 11:30 Agostino Sarubbo
2017-05-27 21:35 Andreas Hüttel
2017-05-26 14:39 Andreas Hüttel
2017-05-22  6:49 Agostino Sarubbo
2017-05-21 10:50 Andreas Hüttel
2017-05-21 10:46 Andreas Hüttel
2017-04-23 12:40 Agostino Sarubbo
2017-04-20  7:59 David Seifert
2017-04-13 20:10 Andreas Hüttel
2017-03-10 21:36 Andreas Hüttel
2017-03-10 21:36 Andreas Hüttel
2017-01-25 12:06 Agostino Sarubbo
2017-01-25 10:40 Agostino Sarubbo
2017-01-02 19:01 Andreas Hüttel
2016-12-29 13:04 Andreas Hüttel
2016-11-29 19:55 Andreas Hüttel
2016-11-29 18:41 Agostino Sarubbo
2016-11-29 18:40 Agostino Sarubbo
2016-11-26 18:10 Andreas Hüttel
2016-10-13 21:22 Zac Medico
2016-10-13 20:47 Zac Medico
2016-10-13 19:26 Zac Medico
2016-07-28 15:18 Andreas Hüttel
2016-07-28 14:08 Agostino Sarubbo
2016-07-28  8:43 Agostino Sarubbo
2016-07-20 22:03 Andreas Hüttel
2016-05-07 11:52 Pacho Ramos
2016-04-22 20:12 Andreas Hüttel
2016-04-20 20:10 Andreas Hüttel
2016-03-03  0:43 Andreas Hüttel
2016-03-03  0:03 Andreas Hüttel
2016-03-02 17:05 Agostino Sarubbo
2016-03-02 17:05 Agostino Sarubbo
2016-02-29 13:03 Andreas Hüttel
2016-02-28 22:05 Andreas Hüttel
2015-11-28  0:13 Andreas Hüttel
2015-11-24 23:13 Agostino Sarubbo
2015-11-24 23:12 Agostino Sarubbo
2015-11-23 23:26 Andreas Hüttel
2015-09-26 21:08 Andreas Hüttel
2015-09-05 18:03 Agostino Sarubbo
2015-09-05 18:03 Agostino Sarubbo
2015-09-02 21:49 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1739440672.c457c9dd713c383e1bcea3d2c1b443f961266fd8.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox