jlec 15/05/18 16:56:51
Modified: scribus-1.4.4-r1.ebuild scribus-1.4.9999.ebuild
scribus-9999.ebuild ChangeLog
Added: scribus-1.4.5-r1.ebuild
Log:
Build all 64bit arch with fPIC, bug #549746; Update live doc patch, bug
#548160; use LINGUAS for all localizable files in this app, bug #538238
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key
E9402A79B03529A2!)
Revision Changes Path
1.7 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.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild?r1=1.6&r2=1.7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scribus-1.4.4-r1.ebuild 18 Apr 2015 15:55:39 -0000 1.6
+++ scribus-1.4.4-r1.ebuild 18 May 2015 16:56:51 -0000 1.7
@@ -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.6
2015/04/18 15:55:39 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4-r1.ebuild,v 1.7
2015/05/18 16:56:51 jlec Exp $
EAPI=5
@@ -56,6 +56,7 @@
PATCHES=(
"${FILESDIR}"/${PN}-1.4.2-docs.patch
"${FILESDIR}"/${PN}-1.4.0-minizip.patch
+ "${FILESDIR}"/${P}-ppc64-fpic.patch
)
src_prepare() {
1.12 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.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild?r1=1.11&r2=1.12
Index: scribus-1.4.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribus-1.4.9999.ebuild 12 Apr 2015 14:51:58 -0000 1.11
+++ scribus-1.4.9999.ebuild 18 May 2015 16:56:51 -0000 1.12
@@ -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.11
2015/04/12 14:51:58 jlec Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.12
2015/05/18 16:56:51 jlec Exp $
EAPI=5
@@ -20,8 +20,8 @@
KEYWORDS=""
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"
+# a=$((ls resources/translations/po/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 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="
@@ -86,9 +86,16 @@
local lang langs
for lang in ${IUSE_LINGUAS}; do
if use linguas_${lang}; then
- langs+=",${lang}"
+ # 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 scribus/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
@@ -115,11 +122,10 @@
src_install() {
cmake-utils_src_install
- local lang file
+ local lang
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
+ if ! use linguas_${lang}; then
+ safe_delete dir "${ED}"/usr/share/man/${lang}
fi
done
@@ -153,3 +159,20 @@
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
+
+safe_delete () {
+ case $1 in
+ dir)
+ if [[ -d "${2}" ]]; then
+ rm -r "${2}" || die
+ fi
+ ;;
+ file)
+ if [[ -f "${2}" ]]; then
+ rm "${2}" || die
+ fi
+ ;;
+ *)
+ die "Wrong usage"
+ esac
+}
1.14 app-office/scribus/scribus-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.13&r2=1.14
Index: scribus-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scribus-9999.ebuild 12 Apr 2015 14:51:58 -0000 1.13
+++ scribus-9999.ebuild 18 May 2015 16:56:51 -0000 1.14
@@ -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.13 2015/04/12 14:51:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v
1.14 2015/05/18 16:56:51 jlec Exp $
EAPI=5
@@ -20,8 +20,8 @@
KEYWORDS=""
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"
+#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="
@@ -107,9 +107,16 @@
local lang langs
for lang in ${IUSE_LINGUAS}; do
if use linguas_${lang}; then
- langs+=",${lang}"
+ # 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
@@ -121,7 +128,7 @@
-DWANT_QTARTHUR=ON
-DWANT_QT3SUPPORT=OFF
-DGENTOOVERSION=${PVR}
- -DWANT_GUI_LANG=${langs#,}
+ -DWANT_GUI_LANG=${langs#;}
$(cmake-utils_use_with pdf PODOFO)
$(cmake-utils_use_want cairo)
$(cmake-utils_use_want graphicsmagick)
@@ -138,11 +145,10 @@
src_install() {
cmake-utils_src_install
- local lang file
+ local lang
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
+ if ! use linguas_${lang}; then
+ safe_delete dir "${ED}"/usr/share/man/${lang}
fi
done
@@ -152,8 +158,9 @@
rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
- use scripts && python_fix_shebang "${ED}"/usr/share/scribus/scripts
- use scripts && python_optimize "${ED}"/usr/share/scribus/scripts
+ 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
@@ -171,3 +178,20 @@
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
+
+safe_delete () {
+ case $1 in
+ dir)
+ if [[ -d "${2}" ]]; then
+ rm -r "${2}" || die
+ fi
+ ;;
+ file)
+ if [[ -f "${2}" ]]; then
+ rm "${2}" || die
+ fi
+ ;;
+ *)
+ die "Wrong usage"
+ esac
+}
1.204 app-office/scribus/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.204&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.204&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.203&r2=1.204
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog 18 Apr 2015 15:55:39 -0000 1.203
+++ ChangeLog 18 May 2015 16:56:51 -0000 1.204
@@ -1,6 +1,15 @@
# 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.203
2015/04/18 15:55:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.204
2015/05/18 16:56:51 jlec Exp $
+
+*scribus-1.4.5-r1 (18 May 2015)
+
+ 18 May 2015; Justin Lecher <[email protected]>
+ +files/scribus-1.4.4-ppc64-fpic.patch, +scribus-1.4.5-r1.ebuild,
+ files/scribus-1.5.0-docs.patch, scribus-1.4.4-r1.ebuild,
+ scribus-1.4.9999.ebuild, scribus-9999.ebuild:
+ Build all 64bit arch with fPIC, bug #549746; Update live doc patch, bug
+ #548160; use LINGUAS for all localizable files in this app, bug #538238
18 Apr 2015; Pacho Ramos <[email protected]> scribus-1.4.4-r1.ebuild:
x86 stable wrt bug #519890
1.1 app-office/scribus/scribus-1.4.5-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild?rev=1.1&content-type=text/plain
Index: scribus-1.4.5-r1.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-r1.ebuild,v
1.1 2015/05/18 16:56:51 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}'; 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 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 )"
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
# 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 scribus/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_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
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
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
rm -r "${2}" || die
fi
;;
file)
if [[ -f "${2}" ]]; then
rm "${2}" || die
fi
;;
*)
die "Wrong usage"
esac
}
