| 1 |
commit: ab0f66c57803c952e7230583e92401054b3f985b |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 19:14:23 2016 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 19:14:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0f66c5 |
| 7 |
|
| 8 |
app-office/scribus: Update live ebuild. Add qt-5.7.0 patch. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-office/scribus/scribus-1.5.0-r1.ebuild | 6 ++++- |
| 13 |
app-office/scribus/scribus-1.5.2.ebuild | 2 +- |
| 14 |
app-office/scribus/scribus-9999.ebuild | 41 +++++++++++++++++------------- |
| 15 |
3 files changed, 30 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild |
| 18 |
index 80f8a77..aae0c4c 100644 |
| 19 |
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild |
| 20 |
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
@@ -97,6 +97,10 @@ src_prepare() { |
| 28 |
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ |
| 29 |
-i resources/templates/CMakeLists.txt || die |
| 30 |
|
| 31 |
+ if has_version ">=dev-qt/qtcore-5.7.0" ; then |
| 32 |
+ append-cxxflags "-std=c++11" #bug 591948 |
| 33 |
+ fi |
| 34 |
+ |
| 35 |
cmake-utils_src_prepare |
| 36 |
} |
| 37 |
|
| 38 |
|
| 39 |
diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild |
| 40 |
index 4faa8de..ea8ec9e 100644 |
| 41 |
--- a/app-office/scribus/scribus-1.5.2.ebuild |
| 42 |
+++ b/app-office/scribus/scribus-1.5.2.ebuild |
| 43 |
@@ -167,7 +167,7 @@ src_install() { |
| 44 |
EOF |
| 45 |
dodoc "${T}"/COPYING |
| 46 |
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} |
| 47 |
- doicon resources/iconsets/1_5_0/scribus.png |
| 48 |
+ doicon resources/iconsets/*/scribus.png |
| 49 |
domenu scribus.desktop |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
| 54 |
index 333a994..59b904e 100644 |
| 55 |
--- a/app-office/scribus/scribus-9999.ebuild |
| 56 |
+++ b/app-office/scribus/scribus-9999.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2015 Gentoo Foundation |
| 59 |
+# Copyright 1999-2016 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
# $Id$ |
| 62 |
|
| 63 |
@@ -64,7 +64,7 @@ COMMON_DEPEND=" |
| 64 |
hunspell? ( app-text/hunspell ) |
| 65 |
graphicsmagick? ( media-gfx/graphicsmagick ) |
| 66 |
osg? ( dev-games/openscenegraph ) |
| 67 |
- pdf? ( app-text/podofo ) |
| 68 |
+ pdf? ( app-text/podofo:0= ) |
| 69 |
scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) |
| 70 |
tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) |
| 71 |
" |
| 72 |
@@ -74,7 +74,9 @@ DEPEND="${COMMON_DEPEND} |
| 73 |
dev-qt/linguist-tools:5 |
| 74 |
virtual/pkgconfig" |
| 75 |
|
| 76 |
-PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch ) |
| 77 |
+PATCHES=( |
| 78 |
+ "${FILESDIR}"/${PN}-1.5.0-docdir.patch |
| 79 |
+ ) |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
rm -r codegen/cheetah || die |
| 83 |
@@ -96,6 +98,10 @@ src_prepare() { |
| 84 |
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ |
| 85 |
-i resources/templates/CMakeLists.txt || die |
| 86 |
|
| 87 |
+ if has_version ">=dev-qt/qtcore-5.7.0" ; then |
| 88 |
+ append-cxxflags "-std=c++11" #bug 591948 |
| 89 |
+ fi |
| 90 |
+ |
| 91 |
cmake-utils_src_prepare |
| 92 |
subversion_src_prepare |
| 93 |
} |
| 94 |
@@ -103,9 +109,9 @@ src_prepare() { |
| 95 |
src_configure() { |
| 96 |
local lang langs |
| 97 |
for lang in ${IUSE_LINGUAS}; do |
| 98 |
- if use linguas_${lang}; then |
| 99 |
+ if use linguas_${lang} || [[ ${lang} == "en" ]]; then |
| 100 |
# From the CMakeLists.txt |
| 101 |
- # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc" |
| 102 |
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" |
| 103 |
langs+=";${lang}" |
| 104 |
else |
| 105 |
# Don't install localized documentation |
| 106 |
@@ -123,7 +129,7 @@ src_configure() { |
| 107 |
-DPYTHON_LIBRARY="$(python_get_library_path)" |
| 108 |
-DWANT_DISTROBUILD=ON |
| 109 |
-DDOCDIR="/usr/share/doc/${PF}/" |
| 110 |
- -DWANT_GUI_LANG=${langs#;} |
| 111 |
+ -DWANT_GUI_LANG="${langs#;};en" |
| 112 |
$(cmake-utils_use_with pdf PODOFO) |
| 113 |
$(cmake-utils_use_with boost) |
| 114 |
$(cmake-utils_use_want graphicsmagick) |
| 115 |
@@ -180,21 +186,22 @@ pkg_postrm() { |
| 116 |
} |
| 117 |
|
| 118 |
safe_delete () { |
| 119 |
- if path_exists $2; then |
| 120 |
- case $1 in |
| 121 |
- dir) |
| 122 |
+ case $1 in |
| 123 |
+ dir) |
| 124 |
+ if [[ -d "${2}" ]]; then |
| 125 |
ebegin "Deleting ${2} recursively" |
| 126 |
rm -r "${2}" || die |
| 127 |
eend $? |
| 128 |
- ;; |
| 129 |
- file) |
| 130 |
+ fi |
| 131 |
+ ;; |
| 132 |
+ file) |
| 133 |
+ if [[ -f "${2}" ]]; then |
| 134 |
ebegin "Deleting ${2}" |
| 135 |
rm "${2}" || die |
| 136 |
eend $? |
| 137 |
- ;; |
| 138 |
- *) |
| 139 |
- die "Wrong usage" |
| 140 |
- ;; |
| 141 |
- esac |
| 142 |
- fi |
| 143 |
+ fi |
| 144 |
+ ;; |
| 145 |
+ *) |
| 146 |
+ die "Wrong usage" |
| 147 |
+ esac |
| 148 |
} |
Archives