diff options
Diffstat (limited to 'app-office/scribus')
-rw-r--r-- | app-office/scribus/ChangeLog | 6 | ||||
-rw-r--r-- | app-office/scribus/Manifest | 16 | ||||
-rw-r--r-- | app-office/scribus/metadata.xml | 2 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.4.2-r3.ebuild | 5 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.4.9999.ebuild | 28 | ||||
-rw-r--r-- | app-office/scribus/scribus-9999.ebuild | 91 |
6 files changed, 93 insertions, 55 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index 97643dbe1b69..5419c86df699 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/scribus # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.175 2013/05/29 08:18:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.176 2013/05/29 09:32:40 jlec Exp $ + + 29 May 2013; Justin Lecher <jlec@gentoo.org> scribus-1.4.2-r3.ebuild, + scribus-1.4.9999.ebuild, scribus-9999.ebuild, metadata.xml: + Update live ebuilds *scribus-1.4.2-r3 (29 May 2013) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index b7b6272a68fe..9c5cf8f4911c 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -15,15 +15,15 @@ DIST scribus-1.4.1.tar.xz 63039820 SHA256 6853fc40cd178d0dcefcc9305fba6824bbe7fd DIST scribus-1.4.2.tar.xz 64405272 SHA256 b951d47913e800b31675fec94ae4e81dc2ee0247506a9218211db62da6386563 SHA512 17c65b39974bfb54d494afd687fc3284350b68da3d4c41cd874101a26d42a03a55b1110d3e14bda25ced1078c825576d8de61c8813a5026a680173a7e74bc63a WHIRLPOOL 570976044e7cfd3386dca5f8895f9b147bf2ee1610d70a133731b5b0a0f75fe5704b9c28ea059f14d1c4ca8947b9526edbef2e7ff4a685ca3e4f4ca6f85590f6 EBUILD scribus-1.4.1-r1.ebuild 3287 SHA256 a8201e5c6e22b046bb0d0b301221853e2e66099ffe5d69f849e9795b7c09e814 SHA512 29f8ce9678e7e25faf642e0518d878b9bbcbfcccb85aff3edc29ea400a1e333bd1f3bed103c59fcd8031f74cd5a1e5913249b8af63e639811323a375da5e5084 WHIRLPOOL 20a25b7488b05424be16ebfad50594c63923aae93bf3a92b75fe1f7133ee58172f9a2992f14f25f6e82b886db18d3c35e8a524cc1efe4b5d84e065e7af64b834 EBUILD scribus-1.4.2-r2.ebuild 3482 SHA256 cb548f680dc28f331ddb1d558b0011b90ed52aa7ac8e7ebbd18bc65c8ccd2715 SHA512 43fba03d724b146680b55251ebf58e76995f3f048a3bc646bc16a5036d8e6381f8d00cdea5b613eb1248235bdb8023cca907eade2fe75a95531ba3df8f65f227 WHIRLPOOL d28e26661ae9111280a43bf05af4c04d64dd69667a80a6fd50d38a81f8b2440d1ba82f9462a30126404d5f786a5906fccd880a43e2e9254c13d96fd8cf22c612 -EBUILD scribus-1.4.2-r3.ebuild 3512 SHA256 70cf15d921b2e1a2b9c7bb8447ac7b03799227c5e57e872f13bc63418384f2bf SHA512 5616c4bc998c669087ada6535c75f28e514dff94c336edd2a233fee0bf80459f3c89bce0dc8d358e0a749da33d649caa514fc1379774007622fdfdb7d200636f WHIRLPOOL 597abf2d9f22c15d73cbe0de24c10eb8e4af98bc4b7fab0564973ade233bf5715782aa4f532c1ce68ad1cb58dfcdb7eb9a9f1b2205771fbfcf744999398a8f15 -EBUILD scribus-1.4.9999.ebuild 3328 SHA256 3f07c003fd4445a642c67be4265a6353c16c897d199119c15d6ee024a2a820b5 SHA512 3cfd44ae73766a31d7924b501385e6535864b87a91c8a4f67dbd1722393bb595a535fae9a19909719437581b83e2ef7269409946f044e3078891784d1f54cc3e WHIRLPOOL b1334c3ffb5be1e64932f5ce4fe98a9acadf9bfad46790545758d7a8524a0266fe39a6cda88bccfe2d64ed359e9f08fe95eaf6601df10afa429bf3c52b46e261 -EBUILD scribus-9999.ebuild 2964 SHA256 8e2d7bb68b8b4ce01f376a6761308539eef868ae5f4992c662bccfb628b25b88 SHA512 4a374f75bfe64c525216507494c8283b50a1a36929fa3013fbf434488c7f616d591e16f931a409ce500834e6b59b312fb067569d0f7fcd7fe800061a14a7be47 WHIRLPOOL 50f33f7ceaa1c725a5f640ab0ecdc39b2b663784bd786317f94a7f9394c00aea72d6fa2a06aa9466e79854a8077c6afb1dc1bab855a763c5974f1091806b0fff -MISC ChangeLog 23183 SHA256 4fc9567c04428c91f976f0feb787334ba61191ef9d81059db2a702e94698c934 SHA512 01d4de252049428702bdca26d7789e3a408fa7ad0498e4dfecae9dd6067d69239bf1bad0c66219f438f0338220e183cdeb055e034b175469288b11291c96c712 WHIRLPOOL 73ef6b6efe35c11777b69a1fac6d34364c2d3799c433e4c53fdc2e0207a987458827cead8b459b4b6a9d3b6ace2a51a3506a0fb434dc0ee21ef69ab4e3017541 -MISC metadata.xml 1374 SHA256 3b5e8534116f35269fcfe3467dbc091849a8f4d1ec1187a0345641409b3c02a4 SHA512 77db22fcb557893b2b9ab9f703d673934aba1c841c4d7c0167773ffa5fa3f8c73b2037fa56b174c2507c019b6131693ba6b0a0075aa329d908d7e85c27823100 WHIRLPOOL 6f92cd4eed296c7355ae1eb3fb940a2141dc09e557ecfdd345712ef7899e9b8b97a0b81bd32a1d688454df2d70c074bdeb1125c06a342ee73c90c2c6b42f21f0 +EBUILD scribus-1.4.2-r3.ebuild 3567 SHA256 4ff3a4a2153ff5bc63f41e864ca99c8c7d734387ab0787e0d1ce17fa00f9b8d6 SHA512 a3e652e5892c8a8829b07edbf1d9ebb1d3e0d65dd36cd7b8a588aac451ec9174b2a09bc5921e12d5a1270434a0198517a92af2e481ccc357c25887249c22580b WHIRLPOOL 500907f3781873773a08a93b1ef8bfe42e4d64b00fc807a0c2468626de95fac7d2ab3f4b7c73408a433e7af6c00a48316e1b3918d1392019702a6e434f043b74 +EBUILD scribus-1.4.9999.ebuild 3582 SHA256 c0f3455277abaf4b515e5525c95f78724731cc805b7a964636d4cb273ea06ac8 SHA512 02638c34791fe7800510e2497778091c77a8136680f4a9b519a824073a6bcf5622fd40f7bbe6b39f35e7359ddb1c121a110040694767dfc201a5090ce926c15d WHIRLPOOL dc2386c8652fdbd073f5f366f24d89759769aecd154a44df9db97c978213f0644054099b5347216c612fb435d3ad99574cdb49656bf6bb6d034830030fe54359 +EBUILD scribus-9999.ebuild 3705 SHA256 a69c12518efea844af46421416c2eaa9b8ab1273a30490c2adc08b2f2406ea11 SHA512 2d4c5f662f502e9a9a16e3ba78235ec5ed2a791d42cffa394051330fff31b4e040eb982f09139f02965f61fba428b133332e60e4d81ca357019062ec62efcb24 WHIRLPOOL fb17fbb18892867f591bc819251ca6a41f0629f9a07fac1d95bd5a4d0efba041b793b38376edc8a2c50b5683ccd4a1dea62bbbe2f3f5c1f078b7bd9e2af2369d +MISC ChangeLog 23340 SHA256 02effb178b9e04cab3019c0d634d6f473fb5d804c36618ea03330c571d0e82ae SHA512 bc0dce3d90e8cf3b50307ddbf56a5f552af7b4a1dfb1cd525c3d88c0223bcf44bea1fa181e544c5c8390f49bd3f0a39e3c5070eb64139569ca57b97dc2b776a8 WHIRLPOOL a672587479331f78aac7cfb592345aa318ca949b6a792ccd887f128e57b4f2e22adcc04b3ebaf76a2ea77fae81b3b0cd087b83de39861d349e71cbd79e27d6ab +MISC metadata.xml 1545 SHA256 40cac0fa9ea70dc84dc61ee9ab4cc52b2dec88fc48aafd35b4879d07aa73b4d7 SHA512 c91047ef0be3915fa5e566fa0accd648c0d0d9cd472a0bde92430f6e11052f5060dca17f019925203db6eea79e8b8339a8bd1a549fb241778a1e7b2d10f29905 WHIRLPOOL 9bf06e78c36ab70508483e35cb91d8bfeaa6896d6e2d51252642580eed0ecc4132ff40a1a0adc0055c3dd9b8224402dd9a4b89c811d259a899388ac5e53baeec -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREKAAYFAlGlucMACgkQgAnW8HDreRZDigCgxytQq1Q69CwhWnzC9sjim6Ew -WKsAoMDcDD9K5YX2hDwOQnjpGs9OSvr4 -=oGdI +iEYEAREKAAYFAlGlyzkACgkQgAnW8HDreRbVywCgmtWjDVkuWHjBu53VkgR/XP52 +WiMAni0cWncgh0IXWwSYBc61yXtWIUg6 +=sRPj -----END PGP SIGNATURE----- diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 83a43683a8e9..c320019e314e 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -12,6 +12,8 @@ </maintainer> <use> <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag> + <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag> + <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag> <flag name="templates">Document tamplates</flag> <flag name="aspell">Enable support for spell checking with <pkg>app-text/aspell</pkg></flag> <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag> diff --git a/app-office/scribus/scribus-1.4.2-r3.ebuild b/app-office/scribus/scribus-1.4.2-r3.ebuild index d9844848fb8f..e95a78bfea6f 100644 --- a/app-office/scribus/scribus-1.4.2-r3.ebuild +++ b/app-office/scribus/scribus-1.4.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.1 2013/05/29 08:18:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.2 2013/05/29 09:32:40 jlec Exp $ EAPI=5 @@ -22,7 +22,10 @@ IUSE="aspell cairo debug examples hunspell +minimal +pdf templates" IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" IUSE+=" ${IUSE_LINGUAS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + COMMON_DEPEND=" + ${PYTHON_DEPS} dev-python/imaging[tk,${PYTHON_USEDEP}] dev-libs/boost dev-libs/hyphen diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild index ae5192bd2d8f..319cc5c641fd 100644 --- a/app-office/scribus/scribus-1.4.9999.ebuild +++ b/app-office/scribus/scribus-1.4.9999.ebuild @@ -1,29 +1,34 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE=tk inherit cmake-utils fdo-mime multilib python-single-r1 subversion DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="http://www.scribus.net/" -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" SRC_URI="" ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus" +ESVN_PROJECT=Scribus-1.4 LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="cairo debug examples hunspell +minimal +pdf spell templates" +IUSE="aspell cairo debug examples hunspell +minimal +pdf templates" # 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 de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" IUSE+=" ${IUSE_LINGUAS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + COMMON_DEPEND=" + ${PYTHON_DEPS} + dev-python/imaging[tk,${PYTHON_USEDEP}] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 @@ -37,12 +42,14 @@ COMMON_DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/jpeg - spell? ( app-text/aspell ) + cairo? ( x11-libs/cairo[X,svg] ) pdf? ( app-text/podofo ) - cairo? ( x11-libs/cairo[X,svg] )" + aspell? ( app-text/aspell ) + hunspell? ( app-text/hunspell )" RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl" -DEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.2-docs.patch @@ -87,11 +94,12 @@ src_configure() { -DWANT_QT3SUPPORT=OFF -DGENTOOVERSION=${PVR} -DWANT_GUI_LANG=${langs#,} - $(cmake-utils_use_has spell ASPELL) - $(cmake-utils_use_has pdf PODOFO) + $(cmake-utils_use_with aspell ASPELL) + $(cmake-utils_use_with pdf PODOFO) $(cmake-utils_use_want cairo) - $(cmake-utils_use_want minimal NOHEADERINSTALL) $(cmake-utils_use_want debug DEBUG) + $(cmake-utils_use_want minimal NOHEADERINSTALL) + $(cmake-utils_use_want hunspell HUNSPELL) ) use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON) use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON) @@ -117,9 +125,11 @@ src_install() { } pkg_postinst() { + fdo-mime_desktop_database_update fdo-mime_mime_database_update } pkg_postrm() { + fdo-mime_desktop_database_update fdo-mime_mime_database_update } diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index fc7ced96e2c3..90618f96519f 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,29 +1,35 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE=tk -inherit cmake-utils fdo-mime multilib python subversion +inherit cmake-utils fdo-mime multilib python-single-r1 subversion DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="http://www.scribus.net/" -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" SRC_URI="" ESVN_REPO_URI="svn://scribus.net/trunk/Scribus" +ESVN_PROJECT=Scribus-1.5 LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="cairo debug examples +minimal +pdf spell templates" +IUSE="aspell cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates" # 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 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_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" IUSE+=" ${IUSE_LINGUAS// / linguas_}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + COMMON_DEPEND=" + ${PYTHON_DEPS} + dev-python/imaging[tk,${PYTHON_USEDEP}] + dev-libs/boost dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig @@ -32,39 +38,40 @@ COMMON_DEPEND=" media-libs/libpng:0 media-libs/tiff:0 net-print/cups - sys-libs/zlib + sys-libs/zlib[minizip] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 virtual/jpeg - spell? ( app-text/aspell ) + cairo? ( x11-libs/cairo[X,svg] ) + graphicsmagick? ( media-gfx/graphicsmagick ) + osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) - cairo? ( x11-libs/cairo[X,svg] )" + aspell? ( app-text/aspell ) + hunspell? ( app-text/hunspell )" RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl" DEPEND="${COMMON_DEPEND} - dev-libs/boost" + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docs.patch ) -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - src_prepare() { - if use templates; then - sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die - fi - if use examples; then - sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die - fi + cat > cmake/modules/FindZLIB.cmake <<- EOF + 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 + + rm scribus/{ioapi,unzip}.[ch] || die sed \ - -e '1i#define OF(x) x' \ - -i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die + -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ + -i resources/templates/CMakeLists.txt || die base_src_prepare subversion_src_prepare @@ -73,30 +80,47 @@ src_prepare() { src_configure() { local lang langs for lang in ${IUSE_LINGUAS}; do - use linguas_${lang} && langs+=",${lang}" + if use linguas_${lang}; then + langs+=",${lang}" + else + sed -e "/${lang}/d" -i doc/CMakeLists.txt || die + fi done local mycmakeargs=( -DHAVE_PYTHON=ON -DPYTHON_INCLUDE_PATH=$(python_get_includedir) - -DPYTHON_LIBRARY=$(python_get_library) + -DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so" -DWANT_NORPATH=ON -DWANT_QTARTHUR=ON -DWANT_QT3SUPPORT=OFF -DGENTOOVERSION=${PVR} -DWANT_GUI_LANG=${langs#,} - $(cmake-utils_use_has spell ASPELL) - $(cmake-utils_use_has pdf PODOFO) + $(cmake-utils_use_with aspell ASPELL) + $(cmake-utils_use_with pdf PODOFO) $(cmake-utils_use_want cairo) - $(cmake-utils_use_want minimal NOHEADERINSTALL) + $(cmake-utils_use_want graphicsmagick) + $(cmake-utils_use_want osg) $(cmake-utils_use_want debug DEBUG) + $(cmake-utils_use_want minimal NOHEADERINSTALL) + $(cmake-utils_use_want hunspell HUNSPELL) ) + use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON) + use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON) cmake-utils_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 + rm "${file}" || die + fi + done + mv "${ED}"/usr/share/doc/${PF}/{en,html} || die ln -sf html "${ED}"/usr/share/doc/${PF}/en || die docompress -x /usr/share/doc/${PF}/en @@ -104,17 +128,12 @@ src_install() { domenu scribus.desktop } -pkg_preinst() { - # 399595 - rm -vf "${ED}"/usr/share/doc/${PF}/en* || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en - subversion_pkg_preinst -} - pkg_postinst() { + fdo-mime_desktop_database_update fdo-mime_mime_database_update } pkg_postrm() { + fdo-mime_desktop_database_update fdo-mime_mime_database_update } |