jlec        15/04/12 14:51:58

  Modified:             scribus-1.4.9999.ebuild scribus-9999.ebuild
                        scribus-1.4.4-r1.ebuild scribus-1.4.3.ebuild
                        ChangeLog
  Added:                scribus-1.4.5.ebuild
  Log:
  Version Bump
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.11                 app-office/scribus/scribus-1.4.9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?r1=1.10&r2=1.11

Index: scribus-1.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scribus-1.4.9999.ebuild     28 Jan 2015 08:51:40 -0000      1.10
+++ scribus-1.4.9999.ebuild     12 Apr 2015 14:51:58 -0000      1.11
@@ -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-1.4.9999.ebuild,v 1.10 
2015/01/28 08:51:40 jlec Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.11 
2015/04/12 14:51:58 jlec Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@
        media-libs/tiff:0
        net-print/cups
        sys-libs/zlib[minizip]
-       virtual/jpeg
+       virtual/jpeg:0=
        cairo? ( x11-libs/cairo[X,svg] )
        !cairo? ( media-libs/libart_lgpl )
        hunspell? ( app-text/hunspell )



1.13                 app-office/scribus/scribus-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.12&r2=1.13

Index: scribus-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribus-9999.ebuild 17 Feb 2015 12:05:45 -0000      1.12
+++ scribus-9999.ebuild 12 Apr 2015 14:51:58 -0000      1.13
@@ -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.12 2015/02/17 12:05:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 
1.13 2015/04/12 14:51:58 jlec Exp $
 
 EAPI=5
 
@@ -58,7 +58,7 @@
        media-libs/tiff:0
        net-print/cups
        sys-libs/zlib[minizip]
-       virtual/jpeg
+       virtual/jpeg:0=
        cairo? ( >=x11-libs/cairo-1.10.0[X,svg] )
        !cairo? ( media-libs/libart_lgpl )
        hunspell? ( app-text/hunspell )



1.5                  app-office/scribus/scribus-1.4.4-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild?r1=1.4&r2=1.5

Index: scribus-1.4.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scribus-1.4.4-r1.ebuild     2 Mar 2015 09:29:17 -0000       1.4
+++ scribus-1.4.4-r1.ebuild     12 Apr 2015 14:51:58 -0000      1.5
@@ -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-1.4.4-r1.ebuild,v 1.4 
2015/03/02 09:29:17 ago Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.5 
2015/04/12 14:51:58 jlec Exp $
 
 EAPI=5
 
@@ -40,7 +40,7 @@
        media-libs/tiff:0
        net-print/cups
        sys-libs/zlib[minizip]
-       virtual/jpeg
+       virtual/jpeg:0=
        cairo? ( x11-libs/cairo[X,svg] )
        !cairo? ( media-libs/libart_lgpl )
        hunspell? ( app-text/hunspell )



1.11                 app-office/scribus/scribus-1.4.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild?r1=1.10&r2=1.11

Index: scribus-1.4.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scribus-1.4.3.ebuild        8 Apr 2015 07:30:36 -0000       1.10
+++ scribus-1.4.3.ebuild        12 Apr 2015 14:51:58 -0000      1.11
@@ -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-1.4.3.ebuild,v 
1.10 2015/04/08 07:30:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 
1.11 2015/04/12 14:51:58 jlec Exp $
 
 EAPI=5
 
@@ -40,7 +40,7 @@
        media-libs/tiff:0
        net-print/cups
        sys-libs/zlib[minizip]
-       virtual/jpeg
+       virtual/jpeg:0=
        cairo? ( x11-libs/cairo[X,svg] )
        !cairo? ( media-libs/libart_lgpl )
        hunspell? ( app-text/hunspell )



1.202                app-office/scribus/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.202&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.202&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.201&r2=1.202

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- ChangeLog   8 Apr 2015 07:30:36 -0000       1.201
+++ ChangeLog   12 Apr 2015 14:51:58 -0000      1.202
@@ -1,6 +1,13 @@
 # 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.201 
2015/04/08 07:30:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.202 
2015/04/12 14:51:58 jlec Exp $
+
+*scribus-1.4.5 (12 Apr 2015)
+
+  12 Apr 2015; Justin Lecher <[email protected]> +scribus-1.4.5.ebuild,
+  scribus-1.4.3.ebuild, scribus-1.4.4-r1.ebuild, scribus-1.4.9999.ebuild,
+  scribus-9999.ebuild:
+  Version Bump
 
   08 Apr 2015; Michał Górny <[email protected]> scribus-1.4.3.ebuild:
   Remove old Python implementations



1.1                  app-office/scribus/scribus-1.4.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.5.ebuild?rev=1.1&content-type=text/plain

Index: scribus-1.4.5.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.4.5.ebuild,v 
1.1 2015/04/12 14:51:58 jlec Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"

inherit cmake-utils fdo-mime python-single-r1

DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/";
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"

# 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 eo 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}
        tk? ( scripts )"

COMMON_DEPEND="
        ${PYTHON_DEPS}
        dev-libs/boost
        dev-libs/hyphen
        dev-libs/libxml2
        dev-qt/qtcore:4
        dev-qt/qtgui:4
        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]
        virtual/jpeg:0=
        cairo? ( x11-libs/cairo[X,svg] )
        !cairo? ( media-libs/libart_lgpl )
        hunspell? ( app-text/hunspell )
        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}"/${PN}-1.4.2-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

        cmake-utils_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="$(python_get_library_path)"
                -DWANT_NORPATH=ON
                -DWANT_QT3SUPPORT=OFF
                -DGENTOOVERSION=${PVR}
                -DWANT_GUI_LANG=${langs#,}
                $(cmake-utils_use_with pdf PODOFO)
                $(cmake-utils_use_want cairo)
                $(cmake-utils_use_want !cairo QTARTHUR)
                $(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 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

        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

        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
}




Reply via email to