gentoo auto-resync : 02:09:2022 - 22:17:13

4 files changed, 15 insertions, 10 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 45030cf34c34..1f4e40ca0e01 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -40,7 +40,7 @@ DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20228 BLAKE2B cb29a34f5c74e4edd871f36b469242de2bfe4b29c31eb61248855cf29925c5d2303e9fa0bc6e64d09833f9a44e70ebc9c140fe60b0bf33e25a815365d4fdb9be SHA512 b0ea4d4225cf32915a6c57a9644439b841b3c171680dbe187592cd9c12522e98c085f23e3594a37b5d18afe118b0137c68e66790408a1fadaedeb30a0ae552b8
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19845 BLAKE2B 3bfd2994d25e0be0e751ac273b311cc6172cd117526acbb149dde34c114767c8860d79f1f4616d60256e4052d69f80779dc9607ef77fe08ab9ed3b75f047216a SHA512 2902c88f6dad6b37e8de0770d556cd6c55e04431f85daf6a889c3b4a9d6d282882da48670a951cd2500f7cd5ddf6de1da0aee77e8cb389d497c4353cea7d4006
-EBUILD libreoffice-7.3.5.2.ebuild 19536 BLAKE2B da70eb18e9d5958db91db7788c1af0b352e0c3ac12db134f15817cd4b200ec2415d7d7c29e6a9f3d4d721043c360f64fd905f0297d298695ec635be20fc275a0 SHA512 5fde33cd504872550bf6160c942c698ddb4c8ebcabae0cb357dd86a1d6349049978ac30a37f47ed581f98cea8d83537f55b47d3174d03f575f481a23cedf1096
-EBUILD libreoffice-7.3.9999.ebuild 19460 BLAKE2B 7248df0a3c14b9f8d906a604d28da23f792752204eeb7023fbbfee6234b744cfd553e59a1c0a5bd13fe765488ee276bfba7cc209a405e195e6e3fa86c95b1185 SHA512 9a830c095364c73ef632efc2ff191e6f2d5cec855bcdd3da926b6da462279be46c2d671c21ff0122aa0129b8b0abd70d094851feda0efe43d710f0416c8a8c97
-EBUILD libreoffice-9999.ebuild 19402 BLAKE2B 5df5971e4858fdf107ef6d67fb994c1edcf6a6e2754beb6dd9ea53637508aaf92a1f8556e82d96f558af333f64d5cf70167e97f2a0ca1cb2c46f60ba4141b740 SHA512 3b4ef56789ce84254e29b50a32d21fadd20c1d437df6e25eaca3a6c4f8afb08cecff1e93fb8ad6b0805fe20d3c7003fe21018f4131d2293828577018ca6cef5e
+EBUILD libreoffice-7.3.5.2.ebuild 19559 BLAKE2B e641a98dda5493ae82fbb9398ec1ff01a7211931f9e0840bd36abcb80d15004256d3380137a9e0bce775dc6b9a9307e0ee0b7a524cdfff323a3e7315f5174e8b SHA512 967d55540c4ab445852e86a766df03abe35f61878955b8691845bfc171fbb675b61f0cbeca7503d7c0f852a46e9013500a9fb806a99a2f9c8de27ba6bc03b68a
+EBUILD libreoffice-7.3.9999.ebuild 19568 BLAKE2B 02ae012f98d8fd8e85d3f7d71878d2ea5c7dd41db09841df0aa7c3ec3dfe9240cba36a7769de3cfeaa4a249e490c7fc6720830ab1a56de7d5f9a37e9eb33d7fa SHA512 e038dfaa5ee98fcde73b24210a5801161f3e6a3ac2a42d9f597bbfb18e34111ba285a2ff15b1c7f798582b14f1795a774870259c8aa37ddf14ddfa820f5b6e78
+EBUILD libreoffice-9999.ebuild 19409 BLAKE2B 790c5d9dac7520f514c20e735f21b094ebc2134508382cac29b9a761401f32cd01de031b3caa39881b74576b53cbb1318fc49dee49d0b330447158bd3a119384 SHA512 62d4b076ee2d0119e82bfb5c1793014e80d397b34e7bf1277df45ca7fab462e4ff7c6be7f896b5def896bce069ba695a3fad1c45d056c537912ad7d721cc3a83
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 92051c1009c6..83d67af61341 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -294,8 +294,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
-	# Upstream
+	# 7.4 branch
 	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+	# pending upstream
 	"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
 )
 
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 69651435d7d7..607738de58fc 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
 
 [[ ${MY_PV} == *9999* ]] && inherit git-r3
 inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
 SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
 
 # Split modules following git/tarballs; Core MUST be first!
 # Help is used for the image generator
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -287,15 +287,18 @@ else
 fi
 
 PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
-	# Upstream
+	# 7.4 branch
 	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+	# pending upstream
+	"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f7ff3494a447..decb622507ab 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
 #[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip