summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-03-19 19:09:55 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-03-19 21:52:47 +0100
commitf6fd70b8256797e3240e0c2c7b6ad8110d86f3b2 (patch)
treea40c37a7b6a1672d9153e0d7e985da8d827c8f68
parentapp-antivirus/clamav: security cleanup (bug #702010) (diff)
downloadgentoo-f6fd70b8256797e3240e0c2c7b6ad8110d86f3b2.tar.gz
gentoo-f6fd70b8256797e3240e0c2c7b6ad8110d86f3b2.tar.bz2
gentoo-f6fd70b8256797e3240e0c2c7b6ad8110d86f3b2.zip
app-office/libreoffice: unconditional tarballs before optional ones
Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--app-office/libreoffice/libreoffice-6.4.2.2.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-6.4.9999.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild4
3 files changed, 6 insertions, 6 deletions
diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
index cf14e8474c8c..ba8748351802 100644
--- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index ccf7d012c40b..a6f3687b3c41 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ccf7d012c40b..a6f3687b3c41 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"