diff options
-rw-r--r-- | app-office/scribus/ChangeLog | 10 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.4.2-docs.patch | 29 | ||||
-rw-r--r-- | app-office/scribus/metadata.xml | 47 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.4.2.ebuild | 122 | ||||
-rw-r--r-- | app-office/scribus/scribus-1.4.9999.ebuild | 61 |
5 files changed, 213 insertions, 56 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index f64eb0cf2a45..bbfc64df06da 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/scribus -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.168 2012/12/10 08:07:51 jlec Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.169 2013/01/21 16:39:29 jlec Exp $ + +*scribus-1.4.2 (21 Jan 2013) + + 21 Jan 2013; Justin Lecher <jlec@gentoo.org> +scribus-1.4.2.ebuild, + +files/scribus-1.4.2-docs.patch, scribus-1.4.9999.ebuild, metadata.xml: + Version Bump 10 Dec 2012; Justin Lecher <jlec@gentoo.org> -scribus-1.4.0-r2.ebuild, -scribus-1.4.1.ebuild: diff --git a/app-office/scribus/files/scribus-1.4.2-docs.patch b/app-office/scribus/files/scribus-1.4.2-docs.patch new file mode 100644 index 000000000000..977bfe0e2559 --- /dev/null +++ b/app-office/scribus/files/scribus-1.4.2-docs.patch @@ -0,0 +1,29 @@ + CMakeLists.txt | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f34048..4880594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") + ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) + IF(NOT WANT_VERSIONING) +- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") ++ SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/") + ELSE(NOT WANT_VERSIONING) + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") + ENDIF(NOT WANT_VERSIONING) +@@ -801,12 +801,11 @@ INSTALL(FILES + BUILDING + ChangeLog + ChangeLogSVN +- COPYING + LINKS + NEWS + PACKAGING + README + TODO + TRANSLATION + DESTINATION ${DOCDIR} + ) diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 08bff7ce5327..543beb3061d4 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>desktop-misc</herd> - <maintainer> - <email>hanno@gentoo.org</email> - <name>Hanno Boeck</name> - </maintainer> - <maintainer> - <email>jlec@gentoo.org</email> - <name>Justin Lecher</name> - </maintainer> - <use> - <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag> - <flag name="templates">Document tamplates</flag> - <flag name="linguas_cs_CZ">Language support for cs_CZ</flag> - <flag name="linguas_da_DK">Language support for da_DK</flag> - <flag name="linguas_de_1901">Language support for de_1901</flag> - <flag name="linguas_de_CH">Language support for de_CH</flag> - <flag name="linguas_en_AU">Language support for en_AU</flag> - <flag name="linguas_lt_LT">Language support for lt_LT</flag> - <flag name="linguas_pl_PL">Language support for pl_PL</flag> - <flag name="linguas_sa">Language support for sa</flag> - <flag name="linguas_sk_SK">Language support for sk_SK</flag> - <flag name="linguas_th_TH">Language support for th_TH</flag> - </use> + <herd>desktop-misc</herd> + <maintainer> + <email>hanno@gentoo.org</email> + <name>Hanno Boeck</name> + </maintainer> + <maintainer> + <email>jlec@gentoo.org</email> + <name>Justin Lecher</name> + </maintainer> + <use> + <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag> + <flag name="templates">Document tamplates</flag> + <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag> + <flag name="linguas_cs_CZ">Language support for cs_CZ</flag> + <flag name="linguas_da_DK">Language support for da_DK</flag> + <flag name="linguas_de_1901">Language support for de_1901</flag> + <flag name="linguas_de_CH">Language support for de_CH</flag> + <flag name="linguas_en_AU">Language support for en_AU</flag> + <flag name="linguas_lt_LT">Language support for lt_LT</flag> + <flag name="linguas_pl_PL">Language support for pl_PL</flag> + <flag name="linguas_sa">Language support for sa</flag> + <flag name="linguas_sk_SK">Language support for sk_SK</flag> + <flag name="linguas_th_TH">Language support for th_TH</flag> + </use> </pkgmetadata> diff --git a/app-office/scribus/scribus-1.4.2.ebuild b/app-office/scribus/scribus-1.4.2.ebuild new file mode 100644 index 000000000000..a612db249804 --- /dev/null +++ b/app-office/scribus/scribus-1.4.2.ebuild @@ -0,0 +1,122 @@ +# 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.ebuild,v 1.1 2013/01/21 16:39:29 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit cmake-utils fdo-mime multilib python-single-r1 + +DESCRIPTION="Desktop publishing (DTP) and layout program" +HOMEPAGE="http://www.scribus.net/" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="cairo debug examples hunspell +minimal +pdf spell 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_}" + +COMMON_DEPEND=" + dev-libs/boost + dev-libs/hyphen + dev-libs/libxml2 + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0 + media-libs/tiff:0 + net-print/cups + sys-libs/zlib[minizip] + x11-libs/qt-core:4 + x11-libs/qt-gui:4 + virtual/jpeg + spell? ( app-text/aspell ) + pdf? ( app-text/podofo ) + cairo? ( x11-libs/cairo[X,svg] )" +RDEPEND="${COMMON_DEPEND} + app-text/ghostscript-gpl" +DEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${PN}-1.4.0-minizip.patch + ) + +src_prepare() { + 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 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ + -i resources/templates/CMakeLists.txt || die + + base_src_prepare +} + +src_configure() { + local lang langs + for lang in ${IUSE_LINGUAS}; do + if use linguas_${lang}; then + langs+=",${lang}" + else + sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die + fi + done + + local mycmakeargs=( + -DHAVE_PYTHON=ON + -DPYTHON_INCLUDE_PATH=$(python_get_includedir) + -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_want cairo) + $(cmake-utils_use_want minimal NOHEADERINSTALL) + $(cmake-utils_use_want debug DEBUG) + ) + 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 + doicon resources/icons/scribus.png + domenu scribus.desktop +} + +pkg_postinst() { + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_mime_database_update +} diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild index 1d38ab33717e..8d02c7ac22f2 100644 --- a/app-office/scribus/scribus-1.4.9999.ebuild +++ b/app-office/scribus/scribus-1.4.9999.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.2 2012/04/30 07:45:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.3 2013/01/21 16:39:29 jlec Exp $ -EAPI=4 +EAPI=5 -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python{2_6,2_7} ) -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="mirror://sourceforge/${PN}/${P}.tar.xz" SRC_URI="" ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="cairo debug examples +minimal +pdf spell templates" +IUSE="cairo debug examples hunspell +minimal +pdf spell 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_}" COMMON_DEPEND=" + dev-libs/boost dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig @@ -41,19 +42,13 @@ COMMON_DEPEND=" cairo? ( x11-libs/cairo[X,svg] )" RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl" -DEPEND="${COMMON_DEPEND} - dev-libs/boost" +DEPEND="${COMMON_DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch + "${FILESDIR}"/${PN}-1.4.2-docs.patch "${FILESDIR}"/${PN}-1.4.0-minizip.patch ) -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - src_prepare() { cat > cmake/modules/FindZLIB.cmake <<- EOF find_package(PkgConfig) @@ -65,12 +60,9 @@ src_prepare() { rm scribus/{ioapi,unzip}.[ch] || die - 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 + sed \ + -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ + -i resources/templates/CMakeLists.txt || die base_src_prepare subversion_src_prepare @@ -79,13 +71,17 @@ 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 scribus/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 @@ -97,12 +93,22 @@ src_configure() { $(cmake-utils_use_want minimal NOHEADERINSTALL) $(cmake-utils_use_want debug DEBUG) ) + 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 @@ -110,13 +116,6 @@ 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_mime_database_update } |