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>

diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
index cf14e8474c8c9c0a8b3a6a07e9d721a732811f49..ba8748351802f2c86893b2e3eaa5c415f897f606 100644 (file)
--- 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 ccf7d012c40b9ab9a5b5b9d51d175fae8cbdf4ba..a6f3687b3c41a7e3ec95163d141dd381b7ac36e3 100644 (file)
--- 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 ccf7d012c40b9ab9a5b5b9d51d175fae8cbdf4ba..a6f3687b3c41a7e3ec95163d141dd381b7ac36e3 100644 (file)
--- 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[*]}"