jlec 15/05/21 12:12:02 Modified: metadata.xml scribus-9999.ebuild ChangeLog Added: scribus-1.5.0.ebuild Removed: scribus-1.4.9999.ebuild Log: Version Bump (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.16 app-office/scribus/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?r1=1.15&r2=1.16 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/metadata.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- metadata.xml 20 May 2015 04:59:20 -0000 1.15 +++ metadata.xml 21 May 2015 12:12:02 -0000 1.16 @@ -7,13 +7,13 @@ <name>Justin Lecher</name> </maintainer> <use> - <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag> + <flag name="boost">Enable support for Boost based enhancement</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="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag> - <flag name="poppler">Native pdf import</flag> + <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag> + <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag> <flag name="scripts">Install the scripts</flag> + <flag name="templates">Document tamplates</flag> <flag name="tk">Install tk based scripts e.g. FontSample.py</flag> </use> </pkgmetadata> 1.15 app-office/scribus/scribus-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.14&r2=1.15 Index: scribus-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scribus-9999.ebuild 18 May 2015 16:56:51 -0000 1.14 +++ scribus-9999.ebuild 21 May 2015 12:12:02 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.14 2015/05/18 16:56:51 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.15 2015/05/21 12:12:02 jlec Exp $ EAPI=5 @@ -18,7 +18,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler scripts templates tk" +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_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW" @@ -33,6 +33,7 @@ COMMON_DEPEND=" ${PYTHON_DEPS} app-text/libmspub + >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge @@ -59,13 +60,12 @@ net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= - cairo? ( >=x11-libs/cairo-1.10.0[X,svg] ) - !cairo? ( media-libs/libart_lgpl ) + >=x11-libs/cairo-1.10.0[X,svg] + boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) - poppler? ( >=app-text/poppler-0.19.0:= ) scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) " @@ -75,7 +75,8 @@ virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.5.0-docs.patch + "${FILESDIR}"/${PN}-1.5.0-docdir.patch + "${FILESDIR}"/${PN}-1.5.0-fpic.patch ) src_prepare() { @@ -91,14 +92,13 @@ sed \ -e "/^\s*unzip\.[ch]/d" \ -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt || die + -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 - use amd64 && append-flags -fPIC - cmake-utils_src_prepare subversion_src_prepare } @@ -124,13 +124,11 @@ -DHAVE_PYTHON=ON -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" - -DWANT_NORPATH=ON - -DWANT_QTARTHUR=ON - -DWANT_QT3SUPPORT=OFF - -DGENTOOVERSION=${PVR} + -DWANT_DISTROBUILD=ON + -DDOCDIR="/usr/share/doc/${PF}/" -DWANT_GUI_LANG=${langs#;} $(cmake-utils_use_with pdf PODOFO) - $(cmake-utils_use_want cairo) + $(cmake-utils_use_with boost) $(cmake-utils_use_want graphicsmagick) $(cmake-utils_use_want osg) $(cmake-utils_use_want debug DEBUG) @@ -164,7 +162,12 @@ 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 + cat >> "${T}"/COPYING <<- EOF + ${PN} is licensed under the "${LICENSE}". + Please visit http://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} doicon resources/icons/scribus.png domenu scribus.desktop } @@ -183,12 +186,16 @@ case $1 in dir) if [[ -d "${2}" ]]; then + ebegin "Deleting ${2} recursively" rm -r "${2}" || die + eend $? fi ;; file) if [[ -f "${2}" ]]; then + ebegin "Deleting ${2}" rm "${2}" || die + eend $? fi ;; *) 1.208 app-office/scribus/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.208&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.208&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.207&r2=1.208 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- ChangeLog 20 May 2015 04:59:20 -0000 1.207 +++ ChangeLog 21 May 2015 12:12:02 -0000 1.208 @@ -1,6 +1,14 @@ # ChangeLog for app-office/scribus # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.207 2015/05/20 04:59:20 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.208 2015/05/21 12:12:02 jlec Exp $ + +*scribus-1.5.0 (21 May 2015) + + 21 May 2015; Justin Lecher <[email protected]> + +files/scribus-1.5.0-docdir.patch, +files/scribus-1.5.0-fpic.patch, + +scribus-1.5.0.ebuild, -scribus-1.4.9999.ebuild, metadata.xml, + scribus-9999.ebuild: + Version Bump 20 May 2015; Jeroen Roovers <[email protected]> -files/scribus-1.3.5.1-system-hyphen.patch, 1.1 app-office/scribus/scribus-1.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.5.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.5.0.ebuild?rev=1.1&content-type=text/plain Index: scribus-1.5.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0.ebuild,v 1.1 2015/05/21 12:12:02 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="http://www.scribus.net/"; SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~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_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW" IUSE+=" ${IUSE_LINGUAS// / linguas_}" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} tk? ( scripts )" # osg # couple of third_party libs bundled COMMON_DEPEND=" ${PYTHON_DEPS} app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/linguist:5 dev-qt/linguist-tools:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr 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 ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) " RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-docdir.patch "${FILESDIR}"/${P}-fpic.patch ) src_prepare() { rm -r codegen/cheetah || die 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 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 cmake-utils_src_prepare } src_configure() { local lang langs for lang in ${IUSE_LINGUAS}; do if use linguas_${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 file ./resources/dicts/README_${lang}.txt safe_delete file ./resources/dicts/README_hyph_${lang}.txt safe_delete file ./resources/dicts/hyph_${lang}.dic safe_delete file ./resources/loremipsum/${lang}.xml fi done local mycmakeargs=( -DHAVE_PYTHON=ON -DPYTHON_INCLUDE_PATH="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" -DWANT_DISTROBUILD=ON -DDOCDIR="/usr/share/doc/${PF}/" -DWANT_GUI_LANG=${langs#;} $(cmake-utils_use_with pdf PODOFO) $(cmake-utils_use_with boost) $(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) $(cmake-utils_use_want !examples NOEXAMPLES) $(cmake-utils_use_want !templates NOTEMPLATES) ) cmake-utils_src_configure } src_install() { cmake-utils_src_install local lang for lang in ${IUSE_LINGUAS}; do if ! use linguas_${lang}; then safe_delete dir "${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 ${PN} is licensed under the "${LICENSE}". Please visit http://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} doicon resources/icons/scribus.png domenu scribus.desktop } pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update } pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update } safe_delete () { case $1 in dir) if [[ -d "${2}" ]]; then ebegin "Deleting ${2} recursively" rm -r "${2}" || die eend $? fi ;; file) if [[ -f "${2}" ]]; then ebegin "Deleting ${2}" rm "${2}" || die eend $? fi ;; *) die "Wrong usage" esac }
