From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- app-office/scribus/Manifest | 5 +- app-office/scribus/scribus-1.5.4-r1.ebuild | 246 --------------------- .../scribus/scribus-1.5.5_pre20190124.ebuild | 2 +- 3 files changed, 2 insertions(+), 251 deletions(-) delete mode 100644 app-office/scribus/scribus-1.5.4-r1.ebuild (limited to 'app-office/scribus') diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 14906129f610..4e9f75bf1b68 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,9 +1,6 @@ AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 -DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568 -DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403 DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a -EBUILD scribus-1.5.4-r1.ebuild 7187 BLAKE2B 477cbf6e32b2b05eb2a66429fc80dbee31733bb80b035b8b52a0c830415ccf75648ecaf5b9f3e1c002aa6f2414cef2f83e8d5bd0711172ab8d0ba683aa83ee02 SHA512 be389ba247a5e4ebc583314c13b612bd7e7ff5496683cc373b35df84bf2fc38441435db5bcdbf6ca986291d1aa99eca80eb01f7ef324c27d5ba1e5e6c89e4b21 -EBUILD scribus-1.5.5_pre20190124.ebuild 6748 BLAKE2B 2832a2ac471f9cf539d027f89ed0de0899c9a347616785c766f3c0b2a5a3310c01d8cad3d6bfe88508bbd778ac9cc5a3846dddcfd9c67d54a8fa5b27fb9806e9 SHA512 dc4f43fd50d86d73df8886fe3f887bbb3b776821d3560e92c440a371256e2dcb97f8ee976026da2e1ca2a4f105f5ea09e4926f12ba703c52da3d16d566db6549 +EBUILD scribus-1.5.5_pre20190124.ebuild 6747 BLAKE2B 8d6e459e6168bda2702ed9729602ebf31c0f90f3140f58fd9f02ce34a453fec108aeb98d0fd77febf7aaab322bc0e91448285db30f271137e403ed6519beb59d SHA512 bd8b75b386e11a9b7fc7b19f930453a5e9ca130add472cb0177928bcd50b6f5010b635bca9612b9b591dc6e0708b14cd5bb8ebe5007c2c532ff587331390bf50 EBUILD scribus-9999.ebuild 6643 BLAKE2B c1c8ea9bb6f97b3f37c8bf10dd974e2ecf2330d564108b30351c3f126bd699b8e3ebcdba5e4e4254edacaeb28e78801d954986531379a4b8fc312c2a9d332dee SHA512 6461c89f4ef4fda64e6c31420889fe51666930d3efb5fcb6142329249b314b12ae20feca11800afe735c69e4eeb695f587ab2b9710ae74a3a71c75053d2750c8 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1 diff --git a/app-office/scribus/scribus-1.5.4-r1.ebuild b/app-office/scribus/scribus-1.5.4-r1.ebuild deleted file mode 100644 index be1d49e219d0..000000000000 --- a/app-office/scribus/scribus-1.5.4-r1.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk?" -CMAKE_MAKEFILE_GENERATOR=ninja - -inherit cmake-utils desktop eutils flag-o-matic gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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 -# 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} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -COMMON_DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/poppler:= - dev-libs/hyphen - >=dev-libs/icu-58.2:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/tiff:0 - net-print/cups - sys-libs/zlib[minizip] - virtual/jpeg:0= - >=x11-libs/cairo-1.10.0[X,svg] - boost? ( >=dev-libs/boost-1.62:= ) - hunspell? ( app-text/hunspell ) - graphicsmagick? ( media-gfx/graphicsmagick ) - osg? ( dev-games/openscenegraph ) - pdf? ( app-text/podofo:0= ) - scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) - tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} - app-text/ghostscript-gpl -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.3-docdir.patch - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036 -) - -src_prepare() { - rm -r codegen/cheetah || die - cat > cmake/modules/FindZLIB.cmake <<- EOF || die - find_package(PkgConfig) - pkg_check_modules(ZLIB minizip zlib) - SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} ) - SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} ) - MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR ) - EOF - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - # required for ${P}-poppler-0.64.0.patch - edos2unix \ - scribus/plugins/import/pdf/slaoutput.{cpp,h} \ - scribus/plugins/import/pdf/importpdf.{cpp,h} - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test - - cmake-utils_src_prepare -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local _lang lang langs - 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}" - else - # Don't install localized documentation - sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_${_lang}.txt \ - ./resources/dicts/README_hyph_${_lang}.txt \ - ./resources/dicts/hyph_${_lang}.dic \ - ./resources/loremipsum/${_lang}.xml - fi - sed -e "/en_EN/d" -i doc/CMakeLists.txt || die - safe_delete \ - ./resources/dicts/README_en_EN.txt \ - ./resources/dicts/README_hyph_en_EN.txt \ - ./resources/dicts/hyph_en_EN.dic \ - ./resources/loremipsum/en_EN.xml - done - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DWANT_DISTROBUILD=ON - -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/" - -DWANT_GUI_LANG="${langs#;};en" - -DWANT_CPP11=ON - -DWITH_PODOFO="$(usex pdf)" - -DWITH_BOOST="$(usex boost)" - -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)" - -DWANT_NOOSG="$(usex !osg)" - -DWANT_DEBUG="$(usex debug)" - -DWANT_HEADERINSTALL="$(usex !minimal)" - -DWANT_HUNSPELL="$(usex hunspell)" - -DWANT_NOEXAMPLES="$(usex !examples)" - -DWANT_NOTEMPLATES="$(usex !templates)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - local lang _lang - # en_EN can be deleted always - for _lang in ${IUSE_L10N}; do - lang=$(map_lang ${_lang}) - if ! use l10n_${lang}; then - safe_delete "${ED%/}"/usr/share/man/${_lang} - fi - done - - if ! use scripts; then - rm "${ED%/}"/usr/share/scribus/scripts/*.py || die - elif ! use tk; then - rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - - use scripts && \ - python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \ - python_optimize "${ED%/}"/usr/share/scribus/scripts - - mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - local size - for size in 16 32 128 256; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -safe_delete () { - local x - for x in ${@}; do - if [[ -d "${x}" ]]; then - ebegin "Deleting ${x} recursively" - rm -r "${x}" || die - eend $? - elif [[ -f "${x}" ]]; then - ebegin "Deleting ${x}" - rm "${x}" || die - eend $? - fi - done -} diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild index 7814487f4173..76be599564da 100644 --- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild +++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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 -- cgit v1.2.3