summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/Manifest.gzbin9752 -> 9741 bytes
-rw-r--r--app-office/libreoffice/Manifest4
-rw-r--r--app-office/libreoffice/libreoffice-6.0.9999.ebuild25
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild1
-rw-r--r--app-office/scribus/Manifest7
-rw-r--r--app-office/scribus/files/scribus-1.5.3-x86-fpic.patch16
-rw-r--r--app-office/scribus/scribus-1.4.6.ebuild47
-rw-r--r--app-office/scribus/scribus-1.5.3-r1.ebuild45
-rw-r--r--app-office/scribus/scribus-9999.ebuild46
9 files changed, 115 insertions, 76 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ca29a5811872..313cadceb038 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 99d20d611c2c..3fb05e7286ea 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,6 @@ DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84b
EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
-EBUILD libreoffice-6.0.9999.ebuild 16816 BLAKE2B 8a87c931db0b1e672f9f3c171faae5a7a216a650a36e2c49cb5df11a27f1f0dccfa4c903b3b32f33f4f38ceb17c0a5c71a79191b3a994c2292fae7e7fe7a8b5b SHA512 129d1823e47534741fe38d08e61044b2d86f306a0ce410286811df76fa254fd33fcc63adf92d322b3beefa18fb097479675aecc70a10dc9a7ee57f8558d07a5b
-EBUILD libreoffice-9999.ebuild 16729 BLAKE2B dfd7c65cb13718cacf7ab4a845e43473bc3a4d96ca81ca4f31b8528485825dd15653a9a2f1dfcfe449274aedf6c8706f5dfc1e8fd4a3d832ecb051ee7187ddaf SHA512 51567c3a9066b0a17a62c94225e6700458dca4ffe6f3148e955f384c1260097d4bc5a4af47694a69db8981d1264f01f4dd19dd75756a714622e9a71d9bfaa099
+EBUILD libreoffice-6.0.9999.ebuild 16469 BLAKE2B dc113589f06ccf9d5521d2663a07d756a759bb0c339c30318912b29fd2b7cbb091dabbcf6fd9b50ae15f72bd40fd4dd54a4147a637b6694999d8ebb1caa6cb88 SHA512 f1848d7709e544fd6f082e3cd912049b046ef979c713aa1f165b4c6893595448f6033f688872b413e46bedc7d99ac764a7a34f395c7445380f299aabee23d780
+EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5fca4ae10c01..5b58caa856a0 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- qt4? (
+ kde? (
dev-qt/qtcore:4
dev-qt/qtgui:4
kde-frameworks/kdelibs
)
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- kde-frameworks/kcoreaddons:5
- )
"
RDEPEND="${COMMON_DEPEND}
@@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
- qt4? ( kde )
"
PATCHES=(
@@ -254,9 +247,6 @@ PATCHES=(
)
pkg_pretend() {
- use qt5 && \
- ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
-
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -369,17 +359,12 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- if use qt4; then
+ if use kde; then
# bug 544108, bug 599076
export QMAKE4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
- if use qt5; then
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
@@ -413,6 +398,7 @@ src_configure() {
--disable-gstreamer-0-10
--disable-online-update
--disable-pdfium
+ --disable-qt5
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
--with-build-version="Gentoo official package"
@@ -446,8 +432,7 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable qt4 kde4)
- $(use_enable qt5)
+ $(use_enable kde kde4)
$(use_enable vlc)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ba7d38f7d304..664bacbda8ea 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -249,7 +249,6 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 1b077a841550..93960a060369 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,11 +3,12 @@ AUX scribus-1.5.3-cmake-openssl.patch 737 BLAKE2B 276d3ad6804506ef4d4c041ce1e0bb
AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c8c2dd8f15f40da5a20f9d09a652191c77dc103640357dc5928fbfeae90031762e288221c13115da97a7d307b676f697510d SHA512 e9ad65c1c20ca6efd204829bec141336d250c073ebed08f74f07c416213bf46204826abc410510f7a72df21a00a43f7e1793847107612981dedbe96a5927956d
+AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
-EBUILD scribus-1.4.6.ebuild 4201 BLAKE2B f0a9f6c762ac9284f310ba312c380812d1d31c80525afeb86e9dce9f8ac7c015510243360f9c2df9c86e055d6425703ba1015b20d8f32e4131b1243db027280e SHA512 cc1b338a59557e15c17eee40b1d5f77153264705287a5ed36dcf5c503f1909268d63ba1b759f669a7a9a79226e9058457f2aa412ae85b0facf7250939f5a6239
-EBUILD scribus-1.5.3-r1.ebuild 6757 BLAKE2B 94fdc8728a21f4f8274c8ef1822f15313cf2c9144842c4e1d69f6b2a3a1ca79dc7d022f9f83952c532a1eb9c35cd5b8217f3449f5ef837874823680e36571dd1 SHA512 4692901e1a8f6760e2c70ded61d520f83d4bf8d0ad79bfc42d4981ef93786ba8aa9cbfade0302b1fd4876fffc336640fbca6fa3ccbba13781379dc0c77729f43
-EBUILD scribus-9999.ebuild 6694 BLAKE2B 29e67d0590d1a3839ddbc5cd240cdbe678b2b0584d84e49d8fdf05057fc01a76abb0ca551c76e2f24094246272937e25d8775d009f82e95158ca64368da25a2c SHA512 5476ae71b3b05fb99456fd330ef5e9f342f2c457744cc3c9d1ba015c2f8d5bcfca05d339390b96aa79599953dbc60a66ff70481f1e6bece90f6af24043150d26
+EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
+EBUILD scribus-1.5.3-r1.ebuild 7027 BLAKE2B 5b25c5f90dca16433427427d257d36ab4a8d587f8a71e0a95f717628ae11a69e9d0861ca45aed2db10406e312c7b5aa1086d242e0949a4958504d43c3322a0ba SHA512 fd96085999ccc2354b671e603357d396031d0a697b0fc20b4f8ce91c75cdf8c22e0dc52c180da85bbe7a5b81d62d3c25609fbd84a5e7d75f07bc09c74f8462fd
+EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
MISC metadata.xml 895 BLAKE2B 9f470d1d5f1eec9f76aca47dce40a3b276f3c7646f0a89ecc69f09f2644af7622655eadbe76486e3f1312fc282400592d7bfcddf3fe4c12b865c7642f61174b6 SHA512 a4b3ba4d363b674e781faa22cab86ef0455b235d9aa1bc4da12b4cc1ae4f23b954f81fdd4ca2348057d2c5108b141a4d6f3307eaf8ff79f76a2754538b80faa1
diff --git a/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
new file mode 100644
index 000000000000..03d4dc4daa3c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-x86-fpic.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt 2017-05-28 11:10:27.000000000 +0200
++++ b/CMakeLists.txt 2018-01-09 14:26:14.494922353 +0100
+@@ -155,11 +155,11 @@
+ set(ARCH_HPPA 1)
+ endif()
+
+-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, hppa and x86. See:
+ # http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
+
+-if (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++if (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+ set(CMAKE_CXX_FLAGS_FPIC "-fPIC")
+ endif()
+
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index 71e5719cdb10..090843846790 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,8 +18,27 @@ KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de@1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
+done
+unset l prev_l
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -76,9 +95,9 @@ src_prepare() {
src_configure() {
local _lang lang langs
- for lang in ${IUSE_LINGUAS}; do
- _lang=$(translate_lang ${lang})
- if use linguas_${lang}; then
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if use l10n_${lang}; then
langs+=",${_lang}"
else
sed -e "/${_lang}/d" -i scribus/doc/CMakeLists.txt || die
@@ -110,10 +129,11 @@ src_configure() {
src_install() {
cmake-utils_src_install
- local lang file
- for lang in ${IUSE_LINGUAS}; do
- file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
- if ! use linguas_${lang} && [[ -f "${file}" ]]; then
+ local _lang lang file
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ file="${ED}"/usr/share/scribus/translations/scribus.${_lang}.qm
+ if ! use l10n_${lang} && [[ -f "${file}" ]]; then
rm "${file}" || die
fi
done
@@ -149,10 +169,3 @@ pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
-
-translate_lang() {
- _lang=${1}
- [[ ${1} == "ru_RU" ]] && _lang+=_0
- [[ ${1} == "de@1901" ]] && _lang=de_1901
- echo ${_lang}
-}
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 98015e52135b..e1ed169825aa 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,8 +19,27 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
+done
+unset l prev_l
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -77,6 +96,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fpic.patch
"${FILESDIR}"/${P}-cmake-openssl.patch
"${FILESDIR}"/${P}-poppler-0.58.patch
+ "${FILESDIR}"/${P}-x86-fpic.patch
)
src_prepare() {
@@ -109,9 +129,9 @@ src_configure() {
append-cppflags -DHAVE_MEMRCHR
local _lang lang langs
- for lang in ${IUSE_LINGUAS}; do
- _lang=$(translate_lang ${lang})
- if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if use l10n_${lang}; then
# From the CMakeLists.txt
# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
langs+=";${_lang}"
@@ -162,9 +182,9 @@ src_install() {
local lang _lang
# en_EN can be deleted always
- for lang in ${IUSE_LINGUAS}; do
- if ! use linguas_${lang}; then
- _lang=$(translate_lang ${lang})
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if ! use l10n_${lang}; then
safe_delete "${ED%/}"/usr/share/man/${_lang}
fi
done
@@ -226,10 +246,3 @@ safe_delete () {
fi
done
}
-
-translate_lang() {
- _lang=${1}
- [[ ${1} == "ru_RU" ]] && _lang+=_0
- [[ ${1} == "de@1901" ]] && _lang=de_1901
- echo ${_lang}
-}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index b76eeed83eeb..f9c847c7aa6d 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,6 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
-CMAKE_MIN_VERSION=3.2.0
inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
@@ -22,8 +21,27 @@ KEYWORDS=""
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+ local lang=${1/_/-}
+ case $1 in
+ # Retain the following, which have a specific subtag
+ de_*|en_*|pt_*|zh_*) ;;
+ # Consider all other xx_XX as duplicates of the generic xx tag
+ *_*) lang=${1%%_*} ;;
+ esac
+ echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+ l=$(map_lang ${l})
+ [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+ prev_l=${l}
+done
+unset l prev_l
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -78,6 +96,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
"${FILESDIR}"/${P}-fpic.patch
+ "${FILESDIR}"/${PN}-1.5.3-x86-fpic.patch
)
src_prepare() {
@@ -110,9 +129,9 @@ src_configure() {
append-cppflags -DHAVE_MEMRCHR
local _lang lang langs
- for lang in ${IUSE_LINGUAS}; do
- _lang=$(translate_lang ${lang})
- if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if use l10n_${lang}; then
# From the CMakeLists.txt
# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
langs+=";${_lang}"
@@ -163,9 +182,9 @@ src_install() {
local lang _lang
# en_EN can be deleted always
- for lang in ${IUSE_LINGUAS}; do
- if ! use linguas_${lang}; then
- _lang=$(translate_lang ${lang})
+ for _lang in ${IUSE_L10N}; do
+ lang=$(map_lang ${_lang})
+ if ! use l10n_${lang}; then
safe_delete "${ED%/}"/usr/share/man/${_lang}
fi
done
@@ -227,10 +246,3 @@ safe_delete () {
fi
done
}
-
-translate_lang() {
- _lang=${1}
- [[ ${1} == "ru_RU" ]] && _lang+=_0
- [[ ${1} == "de@1901" ]] && _lang=de_1901
- echo ${_lang}
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 21:25:05 +0000