jlec 14/08/14 07:15:15
Modified: scribus-1.4.9999.ebuild ChangeLog metadata.xml
scribus-9999.ebuild
Added: scribus-1.4.3.ebuild
Log:
app-office/scribus: Drop old, update live ebuilds
(Portage version: 2.2.12/cvs/Linux x86_64, RepoMan options: --force, signed
Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.9 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.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?r1=1.8&r2=1.9
Index: scribus-1.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scribus-1.4.9999.ebuild 17 Sep 2013 15:58:17 -0000 1.8
+++ scribus-1.4.9999.ebuild 14 Aug 2014 07:15:15 -0000 1.9
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.8
2013/09/17 15:58:17 jlec Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.9
2014/08/14 07:15:15 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
inherit cmake-utils fdo-mime multilib python-single-r1 subversion
@@ -18,17 +18,18 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="cairo debug examples hunspell +minimal +pdf templates"
+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 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}"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
COMMON_DEPEND="
${PYTHON_DEPS}
- virtual/python-imaging[tk,${PYTHON_USEDEP}]
dev-libs/boost
dev-libs/hyphen
dev-libs/libxml2
@@ -43,8 +44,12 @@
sys-libs/zlib[minizip]
virtual/jpeg
cairo? ( x11-libs/cairo[X,svg] )
+ !cairo? ( media-libs/libart_lgpl )
+ hunspell? ( app-text/hunspell )
pdf? ( app-text/podofo )
- hunspell? ( app-text/hunspell )"
+ scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+ tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
RDEPEND="${COMMON_DEPEND}
app-text/ghostscript-gpl"
DEPEND="${COMMON_DEPEND}
@@ -52,7 +57,6 @@
PATCHES=(
"${FILESDIR}"/${PN}-1.4.2-docs.patch
- "${FILESDIR}"/${PN}-1.4.0-minizip.patch
)
src_prepare() {
@@ -65,6 +69,10 @@
EOF
rm scribus/{ioapi,unzip}.[ch] || die
+ sed \
+ -e "/^\s*unzip\.[ch]/d" \
+ -e "/^\s*ioapi\.[ch]/d" \
+ -i scribus/CMakeLists.txt || die
sed \
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
@@ -86,21 +94,21 @@
local mycmakeargs=(
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
+ -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
-DWANT_NORPATH=ON
- -DWANT_QTARTHUR=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)
)
- use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
- use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
cmake-utils_src_configure
}
@@ -115,6 +123,15 @@
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
docompress -x /usr/share/doc/${PF}/en
1.192 app-office/scribus/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.192&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.192&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.191&r2=1.192
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ChangeLog 14 Aug 2014 06:24:56 -0000 1.191
+++ ChangeLog 14 Aug 2014 07:15:15 -0000 1.192
@@ -1,6 +1,11 @@
# ChangeLog for app-office/scribus
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.191
2014/08/14 06:24:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.192
2014/08/14 07:15:15 jlec Exp $
+
+ 14 Aug 2014; Justin Lecher <[email protected]> +scribus-1.4.3.ebuild,
+ scribus-1.4.9999.ebuild, scribus-9999.ebuild, files/scribus-1.5.0-docs.patch,
+ metadata.xml:
+ Drop old, update live ebuilds
14 Aug 2014; Justin Lecher <[email protected]> -scribus-1.4.1-r1.ebuild,
-scribus-1.4.3.ebuild:
1.14 app-office/scribus/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/metadata.xml?r1=1.13&r2=1.14
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml 3 Jun 2014 02:17:30 -0000 1.13
+++ metadata.xml 14 Aug 2014 07:15:15 -0000 1.14
@@ -22,6 +22,7 @@
<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>
+ <flag name="poppler">Native pdf import</flag>
<flag name="scripts">Install the scripts</flag>
<flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
</use>
1.10 app-office/scribus/scribus-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.9&r2=1.10
Index: scribus-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scribus-9999.ebuild 17 Sep 2013 15:58:17 -0000 1.9
+++ scribus-9999.ebuild 14 Aug 2014 07:15:15 -0000 1.10
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.9 2013/09/17 15:58:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
1.10 2014/08/14 07:15:15 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
inherit cmake-utils fdo-mime multilib python-single-r1 subversion
@@ -18,17 +18,18 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates"
+IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler
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 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}"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
COMMON_DEPEND="
${PYTHON_DEPS}
- virtual/python-imaging[tk,${PYTHON_USEDEP}]
dev-libs/boost
dev-libs/hyphen
dev-libs/libxml2
@@ -43,10 +44,15 @@
sys-libs/zlib[minizip]
virtual/jpeg
cairo? ( x11-libs/cairo[X,svg] )
+ !cairo? ( media-libs/libart_lgpl )
+ hunspell? ( app-text/hunspell )
graphicsmagick? ( media-gfx/graphicsmagick )
osg? ( dev-games/openscenegraph )
pdf? ( app-text/podofo )
- hunspell? ( app-text/hunspell )"
+ poppler? ( app-text/poppler )
+ scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+ tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
RDEPEND="${COMMON_DEPEND}
app-text/ghostscript-gpl"
DEPEND="${COMMON_DEPEND}
@@ -65,7 +71,6 @@
MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
EOF
- rm scribus/{ioapi,unzip}.[ch] || die
sed \
-e "/^\s*unzip\.[ch]/d" \
-e "/^\s*ioapi\.[ch]/d" \
@@ -91,8 +96,8 @@
local mycmakeargs=(
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
+ -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
-DWANT_NORPATH=ON
-DWANT_QTARTHUR=ON
-DWANT_QT3SUPPORT=OFF
@@ -105,9 +110,9 @@
$(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)
)
- use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
- use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
cmake-utils_src_configure
}
@@ -122,6 +127,15 @@
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
docompress -x /usr/share/doc/${PF}/en
1.9 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.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild?r1=1.8&r2=1.9
