[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2015-10-01 14:21 Michael Palimaka
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Palimaka @ 2015-10-01 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5fc62e85a23aca9959c62c49d5fd2a777a154c27
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 14:19:56 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 14:20:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc62e85

app-office/scribus: dev-qt/linguist-tools is a build-time dependency

Also, dev-qt/linguist is not used at all.

Package-Manager: portage-2.2.20.1

 app-office/scribus/scribus-1.5.0-r1.ebuild | 3 +--
 app-office/scribus/scribus-9999.ebuild     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index 028a10f..6b5b643 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -36,8 +36,6 @@ COMMON_DEPEND="
 	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
@@ -70,6 +68,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 PATCHES=(

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 003c009..6cdd970 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -39,8 +39,6 @@ COMMON_DEPEND="
 	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
@@ -73,6 +71,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 PATCHES=(


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2015-10-16 13:04 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2015-10-16 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     98aa7f806be8c939dda474da29ca61b6c2bb2365
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 12:34:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 13:04:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98aa7f80

app-office/scribus: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/metadata.xml         |   2 +-
 app-office/scribus/scribus-1.4.5.ebuild | 150 ++++++++++++++++++++++++++++++++
 3 files changed, 152 insertions(+), 1 deletion(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 3440d32..517756d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1,3 @@
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
+DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index d6bbfec..80e31d3 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
new file mode 100644
index 0000000..1b16771
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.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 https://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
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-01-14  9:53 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2016-01-14  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     187c5630dcab29fca836cc08fe3d6bb82dbe51c2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 08:58:45 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 09:53:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187c5630

app-office/scribus: Version Bump

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/Manifest                        |  1 +
 app-office/scribus/scribus-1.4.5.ebuild            | 13 +++++------
 .../{scribus-1.4.5.ebuild => scribus-1.4.6.ebuild} | 25 +++++++++++-----------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 517756d..70f4809 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
+DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index 246e7fc..a123e31 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -120,13 +120,14 @@ src_install() {
 
 	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
+	else
+		if ! 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
 	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

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
similarity index 85%
copy from app-office/scribus/scribus-1.4.5.ebuild
copy to app-office/scribus/scribus-1.4.6.ebuild
index 246e7fc..a60d73f 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +19,7 @@ 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_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de 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_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
 REQUIRED_USE="
@@ -54,9 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-docs.patch
 	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.patch
 	)
 
 src_prepare() {
@@ -93,8 +91,10 @@ src_configure() {
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DWANT_NORPATH=ON
 		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
+		-IUSE_LINGUAS=ON
 		-DWANT_GUI_LANG=${langs#,}
+		-DCMAKE_INSTALL_DATAROOTDIR="${EPREFIX}/usr/share"
+		-DTAG_VERSION=-${PVR}
 		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_want cairo)
 		$(cmake-utils_use_want !cairo QTARTHUR)
@@ -119,14 +119,15 @@ src_install() {
 	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
+		rm "${ED}"/usr/share/${PF}/scripts/*.py || die
+	else
+		if ! use tk; then
+			rm "${ED}"/usr/share/${PF}/scripts/{FontSample,CalendarWizard}.py* || die
+		fi
+		python_fix_shebang "${ED}"/usr/share/${PF}/scripts
+		python_optimize "${ED}"/usr/share/${PF}/scripts
 	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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-01-15  9:03 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2016-01-15  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3f98c7aeedf7ce2728ec17aca0133dd876ccf726
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:03:30 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:03:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f98c7ae

app-office/scribus: amd64 stable wrt bug #571252

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index a123e31..27c99c2 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-01-17 17:02 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2016-01-17 17:02 UTC (permalink / raw
  To: gentoo-commits

commit:     3782024da1fb9e135f5bbb219630479490ebe550
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 17:01:29 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 17:01:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3782024d

app-office/scribus: ppc stable wrt bug #571252

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index 27c99c2..2a9e903 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-01-23  7:25 Jeroen Roovers
  0 siblings, 0 replies; 133+ messages in thread
From: Jeroen Roovers @ 2016-01-23  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4e92bfae3baf7a4bb59bd410473d3d9692ea1b91
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 07:18:08 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 07:25:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e92bfae

app-office/scribus: Stable for HPPA PPC64 (bug #550040).

Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches

 app-office/scribus/scribus-1.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index 2a9e903..e41e96c 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-02-14 10:11 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2016-02-14 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     54d219fcecca90045b33e9f390ac48e2f0ae798e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 10:07:39 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:10:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d219fc

app-office/scribus: x86 stable wrt bug #571252

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index e41e96c..85396dc 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc ~x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-02-14 17:54 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2016-02-14 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9994a66dcbef16f725e8dc28203eb7648edb6ca1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:50:59 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:54:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9994a66d

app-office/scribus: Drop old

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/Manifest                |   1 -
 app-office/scribus/scribus-1.4.4-r1.ebuild | 150 -----------------------------
 2 files changed, 151 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 70f4809..a05535c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,3 @@
-DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca

diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
deleted file mode 100644
index 0e6c569..0000000
--- a/app-office/scribus/scribus-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.xz"
-
-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 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? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[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
-	"${FILESDIR}"/${P}-ppc64-fpic.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 https://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
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-05-04  5:26 Jeroen Roovers
  0 siblings, 0 replies; 133+ messages in thread
From: Jeroen Roovers @ 2016-05-04  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     3525ee399548c589eb2fee1d437de4314a10f4f3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 05:26:08 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May  4 05:26:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3525ee39

app-office/scribus: Set maintainership straight.

Package-Manager: portage-2.2.28

 app-office/scribus/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index a7f4444..e5dc2c7 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-05-17  9:04 Austin English
  0 siblings, 0 replies; 133+ messages in thread
From: Austin English @ 2016-05-17  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     12eed82b910174ed05b66b75ef346ac6bc745a86
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 09:01:43 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Tue May 17 09:03:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12eed82b

app-office/scribus: add missing maintainer-needed

 app-office/scribus/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index e5dc2c7..745ba20 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!-- maintainer-needed -->
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-08-03  8:15 Michael Weber
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Weber @ 2016-08-03  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     1ab2ef6578a5f857c7f1426f2cabf9938d3eda5c
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 08:14:50 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 08:15:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab2ef65

app-office/scribus: Version bump (bug 576018).

Package-Manager: portage-2.2.28

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/scribus-1.5.1.ebuild | 200 ++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a05535c..3adeae8 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
+DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9

diff --git a/app-office/scribus/scribus-1.5.1.ebuild b/app-office/scribus/scribus-1.5.1.ebuild
new file mode 100644
index 0000000..b9563b0
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.0-QObject.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} || [[ ${lang} == "en" ]]; 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#;};en"
+		$(cmake-utils_use_with pdf PODOFO)
+		$(cmake-utils_use_with boost)
+		$(cmake-utils_use_want graphicsmagick)
+		$(cmake-utils_use !osg WANT_NOOSG)
+		$(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 https://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/iconsets/1_5_0/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
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-08-22 18:48 Michael Weber
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Weber @ 2016-08-22 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ae85ac4c11bea6296ae9221571a343d29cc24e2d
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 18:47:24 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 18:48:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae85ac4c

app-office/scribus: Version bump (bug 590386).

Package-Manager: portage-2.2.28

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/scribus-1.5.2.ebuild | 199 ++++++++++++++++++++++++++++++++
 2 files changed, 200 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 3adeae8..7460f6b 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,3 +2,4 @@ DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd368
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
 DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9
+DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7

diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild
new file mode 100644
index 0000000..7a0f15c
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-docdir.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} || [[ ${lang} == "en" ]]; 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#;};en"
+		$(cmake-utils_use_with pdf PODOFO)
+		$(cmake-utils_use_with boost)
+		$(cmake-utils_use_want graphicsmagick)
+		$(cmake-utils_use !osg WANT_NOOSG)
+		$(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 https://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/iconsets/1_5_0/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
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-09-24 12:27 Jeroen Roovers
  0 siblings, 0 replies; 133+ messages in thread
From: Jeroen Roovers @ 2016-09-24 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1ad034cc27238a273c1cc8b5b6040c658d9bcda8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 12:25:57 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 12:25:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad034cc

app-office/scribus: Stable for HPPA PPC64 (bug #582334).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 app-office/scribus/scribus-1.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index ec00eac..5d2dad6 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-09-27 18:34 Michael Weber
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Weber @ 2016-09-27 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     33da3942f20352ab04649354be84df5e65e1ea7e
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 18:33:40 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 18:34:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33da3942

app-office/scribus: Fix CXXFLAGS+=-std=c++11 for qt-5.7.0 (bug 591948, thanks Juergen Rose).

Package-Manager: portage-2.2.28

 app-office/scribus/scribus-1.5.2.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild
index 7a0f15c..4faa8de 100644
--- a/app-office/scribus/scribus-1.5.2.ebuild
+++ b/app-office/scribus/scribus-1.5.2.ebuild
@@ -95,6 +95,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	if has_version ">=dev-qt/qtcore-5.7.0" ; then
+		append-cxxflags "-std=c++11" #bug 591948
+	fi
+
 	cmake-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-09-27 19:15 Michael Weber
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Weber @ 2016-09-27 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ab0f66c57803c952e7230583e92401054b3f985b
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 19:14:23 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 19:14:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0f66c5

app-office/scribus: Update live ebuild. Add qt-5.7.0 patch.

Package-Manager: portage-2.2.28

 app-office/scribus/scribus-1.5.0-r1.ebuild |  6 ++++-
 app-office/scribus/scribus-1.5.2.ebuild    |  2 +-
 app-office/scribus/scribus-9999.ebuild     | 41 +++++++++++++++++-------------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index 80f8a77..aae0c4c 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -97,6 +97,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	if has_version ">=dev-qt/qtcore-5.7.0" ; then
+		append-cxxflags "-std=c++11" #bug 591948
+	fi
+
 	cmake-utils_src_prepare
 }
 

diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild
index 4faa8de..ea8ec9e 100644
--- a/app-office/scribus/scribus-1.5.2.ebuild
+++ b/app-office/scribus/scribus-1.5.2.ebuild
@@ -167,7 +167,7 @@ src_install() {
 	EOF
 	dodoc "${T}"/COPYING
 	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	doicon resources/iconsets/1_5_0/scribus.png
+	doicon resources/iconsets/*/scribus.png
 	domenu scribus.desktop
 }
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 333a994..59b904e 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,7 +64,7 @@ COMMON_DEPEND="
 	hunspell? ( app-text/hunspell )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo )
+	pdf? ( app-text/podofo:0= )
 	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
@@ -74,7 +74,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
+	)
 
 src_prepare() {
 	rm -r codegen/cheetah || die
@@ -96,6 +98,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	if has_version ">=dev-qt/qtcore-5.7.0" ; then
+		append-cxxflags "-std=c++11" #bug 591948
+	fi
+
 	cmake-utils_src_prepare
 	subversion_src_prepare
 }
@@ -103,9 +109,9 @@ src_prepare() {
 src_configure() {
 	local lang langs
 	for lang in ${IUSE_LINGUAS}; do
-		if use linguas_${lang}; then
+		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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"
+			# "#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
@@ -123,7 +129,7 @@ src_configure() {
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG=${langs#;}
+		-DWANT_GUI_LANG="${langs#;};en"
 		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_with boost)
 		$(cmake-utils_use_want graphicsmagick)
@@ -180,21 +186,22 @@ pkg_postrm() {
 }
 
 safe_delete () {
-	if path_exists $2; then
-		case $1 in
-			dir)
+	case $1 in
+		dir)
+			if [[ -d "${2}" ]]; then
 				ebegin "Deleting ${2} recursively"
 				rm -r "${2}" || die
 				eend $?
-				;;
-			file)
+			fi
+			;;
+		file)
+			if [[ -f "${2}" ]]; then
 				ebegin "Deleting ${2}"
 				rm "${2}" || die
 				eend $?
-				;;
-			*)
-				die "Wrong usage"
-				;;
-		esac
-	fi
+			fi
+			;;
+		*)
+			die "Wrong usage"
+	esac
 }


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-11-06  8:25 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2016-11-06  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d630e898b4b9765254f1c43165930e833dd3fcc2
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Nov  1 21:01:41 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 08:24:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d630e898

app-office/scribus: Drop old

Package-Manager: portage-2.3.0

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.2-r1.ebuild | 217 -----------------------------
 1 file changed, 217 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.2-r1.ebuild b/app-office/scribus/scribus-1.5.2-r1.ebuild
deleted file mode 100644
index b924a96..00000000
--- a/app-office/scribus/scribus-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-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_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 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/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols: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:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-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
-
-	if has_version ">=dev-qt/qtcore-5.7.0" ; then
-		append-cxxflags "-std=c++11" #bug 591948
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	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#;};en"
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang)
-			safe_delete "${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 https://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/iconsets/*/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 () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		else
-			ewarn "${x} not found"
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2016-11-06  8:41 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2016-11-06  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2cd515167d20d4c4e1efdc9da65809149e61ed2d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 08:41:01 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 08:41:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd51516

app-office/scribus: Fix dos2unix incompatibility

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.2-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
index ec8714e..1a91852 100644
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
+inherit cmake-utils eutils fdo-mime flag-o-matic multilib python-single-r1
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -100,6 +100,8 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	edos2unix scribus/ui/propertiespalette_utils.cpp
+
 	cmake-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-01-05 19:53 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-01-05 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2f6a34be45332551da371600ba49d0aa368088a8
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Wed Jan  4 22:07:30 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 19:52:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f6a34be

app-office/scribus: Avoid excessive amounts of warnings

Closes: https://github.com/gentoo/gentoo/pull/3331

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.2-r2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
index 5a5a5eb..a556642 100644
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r2.ebuild
@@ -157,7 +157,7 @@ src_install() {
 	# en_EN can be deleted always
 	for lang in ${IUSE_LINGUAS}; do
 		if ! use linguas_${lang}; then
-			_lang=$(translate_lang)
+			_lang=$(translate_lang ${lang})
 			safe_delete "${ED%/}"/usr/share/man/${_lang}
 		fi
 	done
@@ -205,8 +205,6 @@ safe_delete () {
 			ebegin "Deleting ${x}"
 			rm "${x}" || die
 			eend $?
-		else
-			ewarn "${x} not found"
 		fi
 	done
 }


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-02-25 19:43 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-02-25 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f40090d2792eab90cd2b74bf7eac6c6bfb44d136
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Sat Jan  7 16:46:24 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 19:43:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40090d2

app-office/scribus: install a set of icons into hicolor theme

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3362

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.2-r3.ebuild | 228 +++++++++++++++++++++++++++++
 1 file changed, 228 insertions(+)

diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
new file mode 100644
index 0000000000..77aa050eaa
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.2-r3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 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_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 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:=
+	dev-libs/hyphen
+	dev-libs/librevenge
+	dev-libs/libxml2
+	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/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-1.62:= )
+	hunspell? ( app-text/hunspell )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	osg? ( dev-games/openscenegraph )
+	pdf? ( app-text/podofo:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
+	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-cmake-qt57.patch
+	"${FILESDIR}"/${P}-qt57-build.patch
+	"${FILESDIR}"/${P}-cxx-build.patch
+	"${FILESDIR}"/${P}-gcc6-warn.patch
+)
+
+src_prepare() {
+	rm -r codegen/cheetah || die
+	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+	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
+
+	edos2unix scribus/ui/propertiespalette_utils.cpp
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local _lang lang langs
+	for lang in ${IUSE_LINGUAS}; do
+		_lang=$(translate_lang ${lang})
+		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
+				./resources/dicts/README_${_lang}.txt \
+				./resources/dicts/README_hyph_${_lang}.txt \
+				./resources/dicts/hyph_${_lang}.dic \
+				./resources/loremipsum/${_lang}.xml
+		fi
+		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+		safe_delete \
+			./resources/dicts/README_en_EN.txt \
+			./resources/dicts/README_hyph_en_EN.txt \
+			./resources/dicts/hyph_en_EN.dic \
+			./resources/loremipsum/en_EN.xml
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG="${langs#;};en"
+		-DWANT_CPP11=ON
+		-DWITH_PODOFO="$(usex pdf)"
+		-DWITH_BOOST="$(usex boost)"
+		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+		-DWANT_NOOSG="$(usex !osg)"
+		-DWANT_DEBUG="$(usex debug)"
+		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HUNSPELL="$(usex hunspell)"
+		-DWANT_NOEXAMPLES="$(usex !examples)"
+		-DWANT_NOTEMPLATES="$(usex !templates)"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang _lang
+	# en_EN can be deleted always
+	for lang in ${IUSE_LINGUAS}; do
+		if ! use linguas_${lang}; then
+			_lang=$(translate_lang ${lang})
+			safe_delete "${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 || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+	local size
+	for size in 16 32 128 256; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+safe_delete () {
+	local x
+	for x in ${@}; do
+		if [[ -d "${x}" ]]; then
+			ebegin "Deleting ${x} recursively"
+			rm -r "${x}" || die
+			eend $?
+		elif [[ -f "${x}" ]]; then
+			ebegin "Deleting ${x}"
+			rm "${x}" || die
+			eend $?
+		fi
+	done
+}
+
+translate_lang() {
+	_lang=${1}
+	[[ ${1} == "ru_RU" ]] && _lang+=_0
+	[[ ${1} == "de@1901" ]] && _lang=de_1901
+	echo ${_lang}
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-04-05 20:25 Michael Weber
  0 siblings, 0 replies; 133+ messages in thread
From: Michael Weber @ 2017-04-05 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0a4dba8677074b25bd57cb034076b2f57b5ae03d
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 20:20:56 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 20:24:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4dba86

app-office/scribus: add ~ppc64 keyword (bug 550040)

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"

 app-office/scribus/scribus-1.5.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
index 818b7a110a7..5bfee854447 100644
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-04-20  7:30 Jeroen Roovers
  0 siblings, 0 replies; 133+ messages in thread
From: Jeroen Roovers @ 2017-04-20  7:30 UTC (permalink / raw
  To: gentoo-commits

commit:     45e0aa901dddbdf56aaee549ad4e938e092dfeb6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 07:29:42 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 07:30:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e0aa90

app-office/scribus: Fix bug #550818. Compile in src_compile().

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-office/scribus/scribus-1.5.2-r3.ebuild | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
index 3cee37bb192..1a4f09c1400 100644
--- a/app-office/scribus/scribus-1.5.2-r3.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r3.ebuild
@@ -104,6 +104,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
 	local _lang lang langs
 	for lang in ${IUSE_LINGUAS}; do
 		_lang=$(translate_lang ${lang})
@@ -149,6 +152,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+}
+
 src_install() {
 	cmake-utils_src_install
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-04-20  8:26 Jeroen Roovers
  0 siblings, 0 replies; 133+ messages in thread
From: Jeroen Roovers @ 2017-04-20  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     764bdb3160febadded0dcd537b30cc391e7ffc0d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 08:24:04 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 08:26:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764bdb31

app-office/scribus: Mark ~hppa ~ppc64 (bug #550040).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 app-office/scribus/scribus-1.5.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
index 1a4f09c1400..7fdeb184998 100644
--- a/app-office/scribus/scribus-1.5.2-r3.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-07-26  8:20 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2017-07-26  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e949b074ad1d950afc12c84d12a39810bcbcda32
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 08:17:52 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 08:19:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e949b074

app-office/scribus: ppc keyworded, bug #550040 (thanks to ernsteiswuerfel)

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 app-office/scribus/scribus-1.5.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
index 5bfee854447..824cec778e9 100644
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-07-31 23:05 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2017-07-31 23:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a6a36667443cb97adee593869e2c10e4c7c42bcb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 23:05:33 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 23:05:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a36667

app-office/scribus: restore ~ppc keywords

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-office/scribus/scribus-1.5.2-r3.ebuild | 2 +-
 app-office/scribus/scribus-1.5.3.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
index 7fdeb184998..43bee267eac 100644
--- a/app-office/scribus/scribus-1.5.2-r3.ebuild
+++ b/app-office/scribus/scribus-1.5.2-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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

diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index c783c2a9610..ef3ef1f94e2 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-08-24  7:33 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2017-08-24  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     2909b3ee79408df3bdc3e3515eb939e423c81139
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 07:32:45 2017 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 07:33:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2909b3ee

app-office/scribus: added missing subversion inherit to version 9999

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-office/scribus/scribus-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 3c14d44fe7b..4d31199ef77 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 subversion
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-10-22 11:24 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-10-22 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b889679d69f7eace20c712e2819ddcc25ac1c67d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 11:33:25 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:23:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b889679d

app-office/scribus: Drop old

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/Manifest                |   2 -
 app-office/scribus/scribus-1.5.0-r1.ebuild | 217 --------------------------
 app-office/scribus/scribus-1.5.2-r2.ebuild | 216 --------------------------
 app-office/scribus/scribus-1.5.2-r3.ebuild | 234 -----------------------------
 4 files changed, 669 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c3bf0b2d0e3..ce486cd2ecf 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,2 @@
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
-DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
-DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
 DIST scribus-1.5.3.tar.xz 74222084 SHA256 73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980 WHIRLPOOL 0e4c36089e00f7bfc582f2138f4b402f26ca22ea6c7ecd1adce066e1b8741b839d34e769c2a7c4806e79279627d678223332cf36609d68716d32515f3389a48a

diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
deleted file mode 100644
index c55e97393ae..00000000000
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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_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 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/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:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-QObject.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
-
-	if has_version ">=dev-qt/qtcore-5.7.0" ; then
-		append-cxxflags "-std=c++11" #bug 591948
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	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#;};en"
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_with boost)
-		$(cmake-utils_use_want graphicsmagick)
-		$(cmake-utils_use !osg WANT_NOOSG)
-		$(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 _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang)
-			safe_delete "${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 https://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 () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		else
-			ewarn "${x} not found"
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}

diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
deleted file mode 100644
index 824cec778e9..00000000000
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils 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 ~ppc ~ppc64 ~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_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 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:=
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	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/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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-cmake-qt57.patch
-	"${FILESDIR}"/${P}-qt57-build.patch
-	"${FILESDIR}"/${P}-cxx-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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/iconsets/*/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 () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}

diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
deleted file mode 100644
index 43bee267eac..00000000000
--- a/app-office/scribus/scribus-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 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 ~hppa ~ppc ~ppc64 ~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_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 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:=
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	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/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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-cmake-qt57.patch
-	"${FILESDIR}"/${P}-qt57-build.patch
-	"${FILESDIR}"/${P}-cxx-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-10-22 11:24 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-10-22 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     82ddd5d4ef324aa01cde9abcebd7513d08c1d74e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 11:37:06 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:23:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ddd5d4

app-office/scribus: migrated to xdg-utils.eclass

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.3.ebuild | 10 +++++-----
 app-office/scribus/scribus-9999.ebuild  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index ef3ef1f94e2..5719c5b9f5c 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -197,14 +197,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 4d31199ef77..e439d142420 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 subversion
+inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -199,14 +199,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-10-22 11:24 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-10-22 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     5c9cf110bd61fa287a5c536760b5d8ed13f65d52
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 11:46:13 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:23:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9cf110

app-office/scribus: Add missing deps

Closes: https://bugs.gentoo.org/633698
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-office/scribus/scribus-1.5.3.ebuild | 2 ++
 app-office/scribus/scribus-9999.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index 5719c5b9f5c..a6585de00ff 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -46,6 +47,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libpagemaker

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index e439d142420..940b81ce23c 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -48,6 +49,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libpagemaker


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-10-30 23:33 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-10-30 23:33 UTC (permalink / raw
  To: gentoo-commits

commit:     24a7f7c5676da197c2f869269ecb30ced368f91c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 21:44:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 23:31:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a7f7c5

app-office/scribus: De-stabilise hppa

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-office/scribus/scribus-1.4.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index 2965bff878d..71e5719cdb1 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+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}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-20 21:34 Justin Lecher
  0 siblings, 0 replies; 133+ messages in thread
From: Justin Lecher @ 2017-12-20 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     de11ac2eb41f0f90829b4a73dc1ac377c30aa195
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:26:59 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 21:34:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de11ac2e

app-office/scribus: fix eclass function names

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index a6585de00ff..9f7a0a8ca01 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -199,13 +199,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-25 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     073c7e87368fac4106402598cb2bf881248b045a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 14:36:45 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:19:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073c7e87

app-office/scribus: Switch HOMEPAGE to https

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 app-office/scribus/scribus-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 84dfa68cf39..145861f5eeb 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -11,7 +11,7 @@ CMAKE_MIN_VERSION=3.2.0
 inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
+HOMEPAGE="https://www.scribus.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index dd9134e3f94..b76eeed83ee 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -11,7 +11,7 @@ CMAKE_MIN_VERSION=3.2.0
 inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
+HOMEPAGE="https://www.scribus.net/"
 SRC_URI=""
 ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
 ESVN_PROJECT=Scribus-1.5


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-25 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     fca99336183c639b9e4ba63f7b338b4fad38b223
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 14:35:44 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:19:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca99336

app-office/scribus: fix eclass function names

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index af1d918410c..dd9134e3f94 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -202,13 +202,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-25 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     95a967fd51c99526eab8a00cdb56234156939e5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 14:31:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:19:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a967fd

app-office/scribus: Add media-libs/libfreehand DEPEND

Closes: https://bugs.gentoo.org/635170
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../{scribus-9999.ebuild => scribus-1.5.3-r1.ebuild}       | 14 +++++++-------
 app-office/scribus/scribus-9999.ebuild                     |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
similarity index 96%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.3-r1.ebuild
index 940b81ce23c..b6bac44b0c0 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -8,17 +8,15 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 subversion xdg-utils
+inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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
@@ -52,6 +50,7 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
+	media-libs/libfreehand
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio
@@ -77,6 +76,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-cmake-openssl.patch
 )
 
 src_prepare() {
@@ -201,13 +201,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-xdg_desktop_database_update
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 940b81ce23c..c8a8fc3bff0 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
+	media-libs/libfreehand
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-25 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     87561d5f5c2ec41ee9601a67feea4b349a1cf5c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 14:38:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:19:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87561d5f

app-office/scribus: Drop 1.5.3 (r0)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3.ebuild | 234 --------------------------------
 1 file changed, 234 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
deleted file mode 100644
index d28665aead7..00000000000
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-CMAKE_MIN_VERSION=3.2.0
-
-inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 xdg-utils
-
-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 ~hppa ~ppc ~ppc64 ~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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te 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:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	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/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-cmake-openssl.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; 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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-25 15:20 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b150557331a9f601591e4e0a5d0446ca0baf499d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 14:34:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:19:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1505573

app-office/scribus: Drop unused multilib.eclass

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 app-office/scribus/scribus-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index b6bac44b0c0..84dfa68cf39 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 xdg-utils
+inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index c8a8fc3bff0..af1d918410c 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 subversion xdg-utils
+inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-26  1:02 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-26  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     19290e33adc0f6c7651bc6b50bc86e557497b825
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 00:52:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 01:02:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19290e33

app-office/scribus: Drop obsolete CMAKE_MIN_VERSION

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 4b50af54e96..98015e52135 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
-CMAKE_MIN_VERSION=3.2.0
 
 inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2017-12-26  1:02 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2017-12-26  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     5033b7c210e5b051f97123c0c46f9b7aa252af81
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 00:50:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 01:02:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5033b7c2

app-office/scribus: Fix USE=minimal

Upstream commit 45478d86d487b9eb024a3b7a6feb9968b8874b57

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 2f05a227d5f..4b50af54e96 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -146,7 +146,7 @@ src_configure() {
 		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
 		-DWANT_NOOSG="$(usex !osg)"
 		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
 		-DWANT_HUNSPELL="$(usex hunspell)"
 		-DWANT_NOEXAMPLES="$(usex !examples)"
 		-DWANT_NOTEMPLATES="$(usex !templates)"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-01-09 13:38 Ulrich Müller
  0 siblings, 0 replies; 133+ messages in thread
From: Ulrich Müller @ 2018-01-09 13:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5af70a56a0427d0ca27a8812dc271fbe0cf26f38
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 10:12:18 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 13:37:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af70a56

app-office/scribus: Migrate from LINGUAS to L10N.

Closes: https://bugs.gentoo.org/643708
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.4.6.ebuild    | 47 +++++++++++++++++++-----------
 app-office/scribus/scribus-1.5.3-r1.ebuild | 44 ++++++++++++++++++----------
 app-office/scribus/scribus-9999.ebuild     | 44 ++++++++++++++++++----------
 3 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index 71e5719cdb1..09084384679 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,27 @@ 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@1901 de_CH de 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_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de 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_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -76,9 +95,9 @@ src_prepare() {
 
 src_configure() {
 	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang}; then
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${lang}; then
 			langs+=",${_lang}"
 		else
 			sed -e "/${_lang}/d" -i scribus/doc/CMakeLists.txt || die
@@ -110,10 +129,11 @@ 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
+	local _lang lang file
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		file="${ED}"/usr/share/scribus/translations/scribus.${_lang}.qm
+		if ! use l10n_${lang} && [[ -f "${file}" ]]; then
 			rm "${file}" || die
 		fi
 	done
@@ -149,10 +169,3 @@ pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 98015e52135..0c8f8171b5e 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,8 +19,27 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -109,9 +128,9 @@ src_configure() {
 	append-cppflags -DHAVE_MEMRCHR
 
 	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${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}"
@@ -162,9 +181,9 @@ src_install() {
 
 	local lang _lang
 	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if ! use l10n_${lang}; then
 			safe_delete "${ED%/}"/usr/share/man/${_lang}
 		fi
 	done
@@ -226,10 +245,3 @@ safe_delete () {
 		fi
 	done
 }
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index b76eeed83ee..b65e60a412b 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,27 @@ KEYWORDS=""
 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -110,9 +129,9 @@ src_configure() {
 	append-cppflags -DHAVE_MEMRCHR
 
 	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${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}"
@@ -163,9 +182,9 @@ src_install() {
 
 	local lang _lang
 	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if ! use l10n_${lang}; then
 			safe_delete "${ED%/}"/usr/share/man/${_lang}
 		fi
 	done
@@ -227,10 +246,3 @@ safe_delete () {
 		fi
 	done
 }
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-01-17  5:11 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2018-01-17  5:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d5aa9ca32c58632edb604dd1bd41fa6e720a1d23
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 04:58:04 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 04:58:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5aa9ca3

app-office/scribus: x86 stable (bug #631800)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 2faefea4a25..98fa959de9c 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-02-11 10:25 Michał Górny
  0 siblings, 0 replies; 133+ messages in thread
From: Michał Górny @ 2018-02-11 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0aee827b30430152aac482e376e46c3126f7b9e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 10:21:05 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 10:24:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aee827b

app-office/scribus: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 app-office/scribus/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 75f4aa1b792..02d7f56a4fe 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>jlec@gentoo.org</email>
-    <description>Primary maintainer</description>
   </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-03-04 22:30 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2018-03-04 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e98b28dbb28cde128a6442223504f59ffa38423a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 22:26:10 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 22:29:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e98b28db

app-office/scribus: stable 1.5.3-r1 for ppc, bug #631800

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 98fa959de9c..85a102a443d 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-03-12  5:37 Matt Turner
  0 siblings, 0 replies; 133+ messages in thread
From: Matt Turner @ 2018-03-12  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     36ae686e47f55376b904739cadfd771ce4454193
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 05:28:01 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 05:37:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ae686e

app-office/scribus-1.5.3-r1: ppc64 stable, bug 631800

 app-office/scribus/scribus-1.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index 85a102a443d..b65910862d8 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-04-12 10:04 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2018-04-12 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     770377224bcdc90293cff39acc0bc406f9b11d0d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 10:03:45 2018 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 10:04:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77037722

app-office/scribus-9999: removed patch that does not apply

that patch is also not needed anymore

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-office/scribus/scribus-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index f9c847c7aa6..e0fb1c4035f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -96,7 +96,6 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
 	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.3-x86-fpic.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-06-20 16:31 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2018-06-20 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     402f130003a7d3ca58863ba2b8a9430f569f0d5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 14:41:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 16:30:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402f1300

app-office/scribus: 1.5.4 version bump, fix build with poppler-0.64.0

Closes: https://bugs.gentoo.org/656036
Closes: https://bugs.gentoo.org/657802
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/scribus/Manifest                        |  2 ++
 .../{scribus-9999.ebuild => scribus-1.5.4.ebuild}  | 36 ++++++++++------------
 app-office/scribus/scribus-9999.ebuild             | 26 +++++-----------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index deea45c88c3..5fa3548de6d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,3 @@
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
+DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
+DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
similarity index 91%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.4.ebuild
index 742448b2738..4a0a3138ca5 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -7,17 +7,16 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop eutils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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
@@ -49,8 +48,7 @@ REQUIRED_USE="
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
@@ -88,14 +86,17 @@ COMMON_DEPEND="
 	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
+	app-text/ghostscript-gpl
+"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036
 )
 
 src_prepare() {
@@ -118,7 +119,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
-	edos2unix scribus/ui/propertiespalette_utils.cpp
+	# required for ${P}-poppler-0.64.0.patch
+	edos2unix \
+		scribus/plugins/import/pdf/slaoutput.{cpp,h} \
+		scribus/plugins/import/pdf/importpdf.{cpp,h}
 
 	cmake-utils_src_prepare
 }
@@ -164,18 +168,14 @@ src_configure() {
 		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
 		-DWANT_NOOSG="$(usex !osg)"
 		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
 		-DWANT_HUNSPELL="$(usex hunspell)"
 		-DWANT_NOEXAMPLES="$(usex !examples)"
 		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
+	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -215,10 +215,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 742448b2738..b2939a8c47f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -49,8 +49,7 @@ REQUIRED_USE="
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
@@ -88,10 +87,12 @@ COMMON_DEPEND="
 	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
+	app-text/ghostscript-gpl
+"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
@@ -118,8 +119,6 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
 	cmake-utils_src_prepare
 }
 
@@ -158,24 +157,19 @@ src_configure() {
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
 		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
 		-DWITH_PODOFO="$(usex pdf)"
 		-DWITH_BOOST="$(usex boost)"
 		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
 		-DWANT_NOOSG="$(usex !osg)"
 		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
 		-DWANT_HUNSPELL="$(usex hunspell)"
 		-DWANT_NOEXAMPLES="$(usex !examples)"
 		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
+	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -215,10 +209,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-08-14  0:52 Mikle Kolyada
  0 siblings, 0 replies; 133+ messages in thread
From: Mikle Kolyada @ 2018-08-14  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     6a7089cb29af14a2a86bda0592a855d443263bf4
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 14 00:52:37 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 00:52:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7089cb

app-office/scribus: amd64 stable wrt bug #659942

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/scribus/scribus-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index 745a1ba36b0..bde39564eaa 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-08-16  0:39 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2018-08-16  0:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d34bcc1abfacc347442ca2f5f727035746f233f9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 00:15:07 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 00:15:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d34bcc1a

app-office/scribus: x86 stable (bug #659942)

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 app-office/scribus/scribus-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index bde39564eaa..2802775877c 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-08-30 18:25 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2018-08-30 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     3d08041583df72d04f07aff574de9fc079052d25
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Aug 30 15:55:55 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 18:24:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d080415

app-office/scribus: keyworded 1.5.4 for sparc

Closes: https://bugs.gentoo.org/550040
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 app-office/scribus/scribus-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index 2802775877c..6f845248837 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-10-06 19:12 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2018-10-06 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f69789e54e2d44bf4cb33e37c55d5559fb7047f4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 19:12:10 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 19:12:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69789e5

app-office/scribus: stable 1.5.4 for ppc, bug #659942

Tested-by: ernsteiswuerfel
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 app-office/scribus/scribus-1.5.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index 6f845248837..8fe01e20f22 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-10-06 20:45 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2018-10-06 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     af46709f45c341bda83387568230b9a2ab7eb825
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 19:54:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 20:45:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af46709f

app-office/scribus: Drop 1.5.3-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-office/scribus/Manifest                |   2 -
 app-office/scribus/scribus-1.5.3-r1.ebuild | 250 -----------------------------
 2 files changed, 252 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index cbfcaf580cf..b9ba104e93f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,2 @@
-DIST scribus-1.5.3.patches.tar.xz 5332 BLAKE2B 3e7702da61a0698873175011115d86bc473a4d2d59be4bca894bbde41844029707dda7307f1d07033fde501da03097aed21dcf12991bb978df1156cb6654077a SHA512 aeb8142eca826a3f9cbd25e8e2276a352f24fe65241a2fe737fd26597419ad9a7180b337f77fb6ba6ac83f378b235d38b1eb6fd85d10985d3a1dbd21bbe4773f
-DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403

diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
deleted file mode 100644
index b962ce4b717..00000000000
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 xdg-utils
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}.patches.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 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
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	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/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${WORKDIR}"/${P}-cmake-openssl.patch
-	"${WORKDIR}"/${P}-poppler-0.58.patch
-	"${WORKDIR}"/${P}-x86-fpic.patch
-	"${WORKDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2018-12-06 11:04 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2018-12-06 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2c810d78a8d50093558a22dcfb5033a83ff38b20
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 10:40:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 11:04:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c810d78

app-office/scribus: Drop unused DEPEND after disabling bogus dir

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../scribus/{scribus-1.5.4.ebuild => scribus-1.5.4-r1.ebuild}      | 5 ++++-
 app-office/scribus/scribus-9999.ebuild                             | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4-r1.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.5.4.ebuild
rename to app-office/scribus/scribus-1.5.4-r1.ebuild
index 8fe01e20f22..be1d49e219d 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4-r1.ebuild
@@ -60,7 +60,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-libs/fontconfig
@@ -124,6 +123,10 @@ src_prepare() {
 		scribus/plugins/import/pdf/slaoutput.{cpp,h} \
 		scribus/plugins/import/pdf/importpdf.{cpp,h}
 
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+
 	cmake-utils_src_prepare
 }
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index b2939a8c47f..3dc73f4dbe9 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,7 +61,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-libs/fontconfig
@@ -119,6 +118,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+
 	cmake-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-01-11  1:23 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2019-01-11  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     647389856f8b5bcc23adc7e3a11a41a0f28b9e1e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 01:16:06 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 01:23:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64738985

app-office/scribus: 1.5.5_pre20181227 snapshot bump (no keywords)

We can't wait forever for them to make a new release, fixes build with
poppler up to at least 0.72.0.

Add missing deps.
Add missing slot ops.

Bug: https://bugs.gentoo.org/616088
Bug: https://bugs.gentoo.org/663682
Bug: https://bugs.gentoo.org/674804
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/Manifest                        |  1 +
 ...999.ebuild => scribus-1.5.5_pre20181227.ebuild} | 26 +++++++++++-----------
 app-office/scribus/scribus-9999.ebuild             | 16 ++++++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index b9ba104e93f..ee5658be540 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1,3 @@
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
+DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
similarity index 93%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.5_pre20181227.ebuild
index 3dc73f4dbe9..b92edd436ae 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,14 +6,12 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils
+COMMIT=d857c1a3430acf207cdde2512db6822c45e98732
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -43,21 +41,21 @@ for l in ${IUSE_L10N}; do
 done
 unset l prev_l
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tk? ( scripts )"
 
 # osg
 # couple of third_party libs bundled
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
+	app-text/libqxp
 	app-text/poppler:=
 	dev-libs/hyphen
 	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -72,18 +70,18 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio
+	media-libs/libzmf
 	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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
+	hunspell? ( app-text/hunspell:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl
@@ -98,6 +96,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 )
 
+S="${WORKDIR}"/${PN}-${COMMIT}
+
 src_prepare() {
 	rm -r codegen/cheetah || die
 	cat > cmake/modules/FindZLIB.cmake <<- EOF || die

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 3dc73f4dbe9..372e9412ba4 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,21 +43,21 @@ for l in ${IUSE_L10N}; do
 done
 unset l prev_l
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tk? ( scripts )"
 
 # osg
 # couple of third_party libs bundled
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
+	app-text/libqxp
 	app-text/poppler:=
 	dev-libs/hyphen
 	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -72,18 +72,18 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio
+	media-libs/libzmf
 	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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
+	hunspell? ( app-text/hunspell:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-01-25  0:00 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2019-01-25  0:00 UTC (permalink / raw
  To: gentoo-commits

commit:     4f94e36014e4ec45692f4419bf2705edb45fe667
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 23:46:03 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 23:59:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f94e360

app-office/scribus: 1.5.5_pre20190124 snapshot bump, re-add keywords

Dropped ~ppc for missing app-text/libqxp, media-libs/libzmf keyword.

Bug: https://bugs.gentoo.org/674804
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/Manifest                        |   1 +
 .../scribus/scribus-1.5.5_pre20190124.ebuild       | 240 +++++++++++++++++++++
 2 files changed, 241 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4e57dbe3b39..aa18cb539d7 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
 DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
+DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
new file mode 100644
index 00000000000..c926514f24c
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+COMMIT=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~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
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	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-1.62:= )
+	hunspell? ( app-text/hunspell:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+)
+
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+src_prepare() {
+	rm -r codegen/cheetah || die
+	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+	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
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local _lang lang langs
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${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 \
+				./resources/dicts/README_${_lang}.txt \
+				./resources/dicts/README_hyph_${_lang}.txt \
+				./resources/dicts/hyph_${_lang}.dic \
+				./resources/loremipsum/${_lang}.xml
+		fi
+		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+		safe_delete \
+			./resources/dicts/README_en_EN.txt \
+			./resources/dicts/README_hyph_en_EN.txt \
+			./resources/dicts/hyph_en_EN.dic \
+			./resources/loremipsum/en_EN.xml
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG="${langs#;};en"
+		-DWITH_PODOFO="$(usex pdf)"
+		-DWITH_BOOST="$(usex boost)"
+		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+		-DWANT_NOOSG="$(usex !osg)"
+		-DWANT_DEBUG="$(usex debug)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
+		-DWANT_HUNSPELL="$(usex hunspell)"
+		-DWANT_NOEXAMPLES="$(usex !examples)"
+		-DWANT_NOTEMPLATES="$(usex !templates)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang _lang
+	# en_EN can be deleted always
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if ! use l10n_${lang}; then
+			safe_delete "${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 || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+	local size
+	for size in 16 32 128 256; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+safe_delete () {
+	local x
+	for x in ${@}; do
+		if [[ -d "${x}" ]]; then
+			ebegin "Deleting ${x} recursively"
+			rm -r "${x}" || die
+			eend $?
+		elif [[ -f "${x}" ]]; then
+			ebegin "Deleting ${x}"
+			rm "${x}" || die
+			eend $?
+		fi
+	done
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-01-27 12:25 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2019-01-27 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     c9942b23a2b4a04624c04e4d74e9edb215853849
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 12:23:04 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 12:25:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9942b23

app-office/scribus: keyworded 1.5.5_pre20190124 for ppc, bug #663682

Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index c926514f24c..011a8953706 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-14 18:37 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3ca0fe096c5cc35b2e120279ac93ae8c1ea0e634
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 18:25:02 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca0fe09

app-office/scribus: Switch from gnome2-utils to xdg

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 14 +-------------
 app-office/scribus/scribus-9999.ebuild              | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index 011a8953706..04d23a89ff5 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 COMMIT=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965
-inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -212,18 +212,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
 safe_delete () {
 	local x
 	for x in ${@}; do

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 372e9412ba4..89fb20f8034 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -212,18 +212,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
 safe_delete () {
 	local x
 	for x in ${@}; do


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-17 17:08 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2019-02-17 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     d252034cd8d9783f502d19d160f02fae01530149
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 17:04:50 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 17:08:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d252034c

app-office/scribus: stable 1.5.5_pre20190124 for ppc, bug #676960

Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index 04d23a89ff5..f633555a359 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ~ppc64 ~sparc ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-17 17:14 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2019-02-17 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6b8e6eb10755db86eed15df8731021b66bbe8b56
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 17:14:15 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 17:14:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8e6eb1

app-office/scribus: stable 1.5.5_pre20190124 for ppc64, bug #676960

Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index f633555a359..f8cd0719543 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc ~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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-17 22:35 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2019-02-17 22:35 UTC (permalink / raw
  To: gentoo-commits

commit:     14add73de06a3571568e6a895716359307562837
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 22:34:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 22:34:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14add73d

app-office/scribus: x86 stable (bug #676960)

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index f8cd0719543..7814487f417 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-22 10:26 Mikle Kolyada
  0 siblings, 0 replies; 133+ messages in thread
From: Mikle Kolyada @ 2019-02-22 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a2c14a09982c282d7a14e7377c658ef38feb202e
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 10:25:44 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 10:25:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c14a09

app-office/scribus: amd64 stable wrt bug #676960

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-office/scribus/scribus-1.5.5_pre20190124.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
index 7814487f417..76be599564d 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-02-22 13:06 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2019-02-22 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fc44062de2e0ee939f484c00b0e2dd75b5e632c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 13:04:28 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 13:04:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc44062d

app-office/scribus: Drop 1.5.4-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-office/scribus/Manifest                |   2 -
 app-office/scribus/scribus-1.5.4-r1.ebuild | 246 -----------------------------
 2 files changed, 248 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a4eef7c9181..243e2e7272d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1 @@
-DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
-DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
 DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a

diff --git a/app-office/scribus/scribus-1.5.4-r1.ebuild b/app-office/scribus/scribus-1.5.4-r1.ebuild
deleted file mode 100644
index be1d49e219d..00000000000
--- a/app-office/scribus/scribus-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils desktop eutils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	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-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	# required for ${P}-poppler-0.64.0.patch
-	edos2unix \
-		scribus/plugins/import/pdf/slaoutput.{cpp,h} \
-		scribus/plugins/import/pdf/importpdf.{cpp,h}
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-05-08 17:20 Zac Medico
  0 siblings, 0 replies; 133+ messages in thread
From: Zac Medico @ 2019-05-08 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     dad0e16ab9fc0d5b6c9ca8b5c4647ececcf1608b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May  8 17:19:48 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May  8 17:19:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad0e16a

app-office/scribus: fix has_version syntax

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index a889616acc0..d279c081265 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -122,7 +122,7 @@ src_prepare() {
 		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
 		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
 
-	has_version ">=app-text/poppler-0.76.0" PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
+	has_version ">=app-text/poppler-0.76.0" && PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
 
 	cmake-utils_src_prepare
 }


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-05-19 13:14 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2019-05-19 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0071bcb762fd8af93c9f561e2325842dcb27cbd8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 13:08:54 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 19 13:08:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0071bcb7

app-office/scribus: x86 stable (bug #685492)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index d279c081265..5e9cd6b4e4a 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-05-20 11:32 Mikle Kolyada
  0 siblings, 0 replies; 133+ messages in thread
From: Mikle Kolyada @ 2019-05-20 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     80f0c0753652a996d88c45ad70c48b4102c11bda
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 11:32:25 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 20 11:32:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f0c075

app-office/scribus: amd64 stable wrt bug #685492

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index 5e9cd6b4e4a..6402cd3d0d5 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-06-12 10:03 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b8996055c1fbc92ff79b144f9f0f276baa0fc315
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 09:57:45 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:02:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8996055

app-office/scribus: Drop 1.5.5_pre20190124

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/Manifest                        |   1 -
 .../scribus/scribus-1.5.5_pre20190124.ebuild       | 228 ---------------------
 2 files changed, 229 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 7b2d1642c55..3734ddc121f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324

diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
deleted file mode 100644
index 76be599564d..00000000000
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc 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
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" 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_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN 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 so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	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-1.62:= )
-	hunspell? ( app-text/hunspell:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-)
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${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 \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${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 || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-09-13 23:51 Matt Turner
  0 siblings, 0 replies; 133+ messages in thread
From: Matt Turner @ 2019-09-13 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     649117fa760f34e0603864b5640eae1b9d735b43
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 23:17:59 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 23:51:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649117fa

app-office/scribus-1.5.5_pre20190429: drop sparc keywords

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index 56615d2265b..1926b62bb62 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 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


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-10-31 23:50 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2019-10-31 23:50 UTC (permalink / raw
  To: gentoo-commits

commit:     40ab47d15ab396004744a4817cda7b01afd671ff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 23:38:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 23:38:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ab47d1

app-office/scribus: x86 stable (bug #696206)

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 576abf23fb5..a2c649ca819 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-11-02  8:42 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2019-11-02  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     4e4f1c704ade77d4d86ce44dc0894500cddc2d92
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 08:40:46 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 08:40:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4f1c70

app-office/scribus: amd64 stable wrt bug #696206

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 011cbdfc82a..3cfe057c2ad 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-11-08 10:42 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2019-11-08 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ac12431b14cf9d13db74559d7a82136cf1e50464
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 10:41:53 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 10:42:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac12431b

app-office/scribus-9999: python-3, eapi7, qa fixes

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 06ff411dee8..27fa3c1b8ce 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
@@ -181,22 +181,22 @@ src_install() {
 	for _lang in ${IUSE_L10N}; do
 		lang=$(map_lang ${_lang})
 		if ! use l10n_${lang}; then
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
+			safe_delete "${ED}"/usr/share/man/${_lang}
 		fi
 	done
 
 	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
 	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+		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
+		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
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
 	cat >> "${T}"/COPYING <<- EOF || die
 	${PN} is licensed under the "${LICENSE}".
 	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-12-01 13:56 Sergei Trofimovich
  0 siblings, 0 replies; 133+ messages in thread
From: Sergei Trofimovich @ 2019-12-01 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     418d6d90cc39c927ef63fa3f412e96a5e1bc4f64
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 13:56:17 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 13:56:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418d6d90

app-office/scribus: stable 1.5.5 for ppc, bug #696206

Package-Manager: Portage-2.3.80, Repoman-2.3.19
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 65a2d33765b..3df0ede4938 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2019-12-03 11:58 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2019-12-03 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     7c55288d6a64d8fad1f4e98bea1febfdc008cff4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 11:57:34 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 11:57:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c55288d

app-office/scribus: ppc64 stable wrt bug #696206

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 3df0ede4938..c00d61006ab 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-01-03  7:24 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-01-03  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     91e7091096936ef82d8ea76edc8b595a4d4f7d92
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 07:23:37 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 07:24:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e70910

app-office/scribus: fixed 9999

1) added python3_8
2) switched from cmake-utils to cmake
3) removed unused config args

Bug: https://bugs.gentoo.org/691684
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index ac7b913c7f8..da3a47d2520 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg
+inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -77,7 +77,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	default
+	_CMAKE_SRC_PREPARE_HAS_RUN=1
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 
@@ -109,8 +110,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library_path)
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
 		-DWITH_BOOST=$(usex boost)
@@ -123,11 +122,11 @@ src_configure() {
 		-DWITH_PODOFO=$(usex pdf)
 		-DWANT_NOTEMPLATES=$(usex !templates)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use tk; then
 		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-01-03 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2020-01-03 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 20:06:58 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 20:07:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2afb61

app-office/scribus: Switch to cmake.eclass and fix 9999

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 8 ++++----
 app-office/scribus/scribus-9999.ebuild  | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 88bcd5cc441..fa0caa4e246 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -78,7 +78,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 
@@ -124,11 +124,11 @@ src_configure() {
 		-DWITH_PODOFO=$(usex pdf)
 		-DWANT_NOTEMPLATES=$(usex !templates)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use tk; then
 		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index da3a47d2520..2fc0d191008 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -77,8 +77,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
-	_CMAKE_SRC_PREPARE_HAS_RUN=1
+	cmake_src_prepare
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-02-09 16:11 Michał Górny
  0 siblings, 0 replies; 133+ messages in thread
From: Michał Górny @ 2020-02-09 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f459fb452fc7f96b02f60e4a5c90469c1ec0f749
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 11:30:06 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:11:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f459fb45

app-office/scribus: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 6 +++++-
 app-office/scribus/scribus-9999.ebuild  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index fa0caa4e246..ca708fa897b 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -60,7 +60,11 @@ DEPEND="${PYTHON_DEPS}
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 2fc0d191008..97d62f8d370 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -62,7 +62,11 @@ DEPEND="${PYTHON_DEPS}
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-03-20 21:53 Matt Turner
  0 siblings, 0 replies; 133+ messages in thread
From: Matt Turner @ 2020-03-20 21:53 UTC (permalink / raw
  To: gentoo-commits

commit:     8f6a0da14c2a98cedd6ae510d7a63e755a770074
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 21:47:00 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 21:52:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6a0da1

app-office/scribus: drop hppa keywords

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index ca708fa897b..b9350d63eef 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-03-27 10:08 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-03-27 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     624ba2504e489972a8d5c511628352bcc8748803
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Tue Mar 24 18:53:16 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 10:08:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624ba250

app-office/scribus: fix startup crash

The patch fixes the crash on startup, as well as a zlib package
finding related issue in src_configure. It also solves an issue
whith selecting the correct python implementation.

Bug: https://bugs.gentoo.rog/691684
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://bugs.gentoo.org/691684
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 97d62f8d370..9d0977e8bd7 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -80,18 +80,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
 )
 
+CMAKE_BUILD_TYPE="Release"
+
 src_prepare() {
 	cmake_src_prepare
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	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" \
@@ -115,6 +110,7 @@ src_configure() {
 		-DHAVE_PYTHON=ON
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
 		-DWITH_BOOST=$(usex boost)
 		-DWANT_DEBUG=$(usex debug)
 		-DWANT_NOEXAMPLES=$(usex !examples)


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-04-03 20:07 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     eaf3ca8747edaf0fb1623927fd095110adb79c13
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Mar 27 03:09:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 20:06:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf3ca87

app-office/scribus: dev-qt/qtgui[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/{scribus-1.5.5.ebuild => scribus-1.5.5-r1.ebuild} | 2 +-
 app-office/scribus/scribus-9999.ebuild                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
similarity index 99%
rename from app-office/scribus/scribus-1.5.5.ebuild
rename to app-office/scribus/scribus-1.5.5-r1.ebuild
index b9350d63eef..d17a4aee818 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 9d0977e8bd7..d532762422e 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtgui:5[-gles2-only]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-07-01 14:17 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2020-07-01 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d6eec871cd9da061cd912294d47ba1de231b514c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 13:43:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 14:16:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6eec871

app-office/scribus: 1.5.5_p20200626 snapshot bump w/ python3 support

Bug: https://bugs.gentoo.org/719938
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/Manifest                               |  1 +
 ...scribus-9999.ebuild => scribus-1.5.5_p20200626.ebuild} | 15 ++++++++-------
 app-office/scribus/scribus-9999.ebuild                    |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index e8d12ffa74f..823daf4f2db 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
+DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
similarity index 92%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.5_p20200626.ebuild
index d532762422e..a017d67eb01 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -3,19 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -58,8 +57,8 @@ DEPEND="${PYTHON_DEPS}
 	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.0[X,svg]
 	boost? ( >=dev-libs/boost-1.67:= )
-	hunspell? ( app-text/hunspell:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? (
@@ -82,6 +81,8 @@ PATCHES=(
 
 CMAKE_BUILD_TYPE="Release"
 
+S="${WORKDIR}"/${PN}-${COMMIT}
+
 src_prepare() {
 	cmake_src_prepare
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d532762422e..944a609bb5c 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 
@@ -58,8 +58,8 @@ DEPEND="${PYTHON_DEPS}
 	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.0[X,svg]
 	boost? ( >=dev-libs/boost-1.67:= )
-	hunspell? ( app-text/hunspell:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? (


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-07-13 11:28 Michał Górny
  0 siblings, 0 replies; 133+ messages in thread
From: Michał Górny @ 2020-07-13 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b95bf99c7928cf3b42d73bc9940cbe52134286be
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 11:19:47 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 11:28:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95bf99c

app-office/scribus: Stabilize 1.5.5_p20200626 amd64, #732396

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index a017d67eb01..24284862d6a 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-07-13 18:56 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2020-07-13 18:56 UTC (permalink / raw
  To: gentoo-commits

commit:     2d4abc3ca31c4c32e7cb6d8ff6cb87de951f9710
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 18:56:17 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 18:56:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4abc3c

app-office/scribus: ppc stable (bug #732396)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index 24284862d6a..76072b68d44 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-07-13 19:25 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2020-07-13 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     f3d3d1fd542d2d9daca7379d37c6caf8503de01c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 19:22:50 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 19:22:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d3d1fd

app-office/scribus: ppc64 stable (bug #732396)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index 76072b68d44..bf3f85e57b4 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-07-17 18:38 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2020-07-17 18:38 UTC (permalink / raw
  To: gentoo-commits

commit:     2f7fb219da54ab342b2dce83542c03ebd3457689
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 18:38:41 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 18:38:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7fb219

app-office/scribus: x86 stable wrt bug #732396

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index bf3f85e57b4..2b4f3fb49c3 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-08-06 13:28 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-08-06 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     493ea248942bc3d32f995d8d9424509e3db60f9b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 10:03:47 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 13:28:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493ea248

app-office/scribus: taking the package

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 22b568ff29b..4e2f58a9429 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>fordfrog@gentoo.org</email>
+    <name>Miroslav šulc</name>
+  </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-08-06 17:10 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-08-06 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2ef48ef5a61a589eba1c657dd5e97f56b6560ce2
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 17:10:33 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 17:10:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef48ef5

app-office/scribus: fixed typo in metadata.xml

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 4e2f58a9429..ab1b2fa6c13 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>fordfrog@gentoo.org</email>
-    <name>Miroslav šulc</name>
+    <name>Miroslav Šulc</name>
   </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-09-28 21:33 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2020-09-28 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b0eb1fc8412545fb98b62f9f427bac6602614de4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 20:47:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 21:28:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0eb1fc8

app-office/scribus: Fix various typos in metadata.xml

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index ab1b2fa6c13..de419b7e9f3 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -9,9 +9,9 @@
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></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="osg">3D rendering via <pkg>dev-games/openscenegraph</pkg></flag>
     <flag name="scripts">Install the scripts</flag>
-    <flag name="templates">Document tamplates</flag>
+    <flag name="templates">Document templates</flag>
     <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
   </use>
   <upstream>


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-11-16  9:08 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-11-16  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6e2781d43a16e3994bddfeeedc7400bc72218dd9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 09:08:17 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 09:08:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2781d4

app-office/scribus: bump to 1.5.6.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest                           |  1 +
 .../{scribus-9999.ebuild => scribus-1.5.6.1.ebuild}   | 19 ++++++++++---------
 app-office/scribus/scribus-9999.ebuild                |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 968c3cbf84b..d253eedb7a6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
+DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
similarity index 91%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.6.1.ebuild
index 944a609bb5c..a535eb5a50b 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -5,17 +5,16 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -32,7 +31,7 @@ DEPEND="${PYTHON_DEPS}
 	app-text/libqxp
 	app-text/poppler:=
 	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
+	dev-libs/icu:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -44,7 +43,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/harfbuzz:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libfreehand
@@ -56,8 +55,8 @@ DEPEND="${PYTHON_DEPS}
 	net-print/cups
 	sys-libs/zlib[minizip]
 	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.67:= )
+	x11-libs/cairo[X,svg]
+	boost? ( dev-libs/boost:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	hunspell? ( app-text/hunspell:= )
 	osg? ( dev-games/openscenegraph:= )
@@ -82,6 +81,8 @@ PATCHES=(
 
 CMAKE_BUILD_TYPE="Release"
 
+S="${WORKDIR}"/${PN}-${COMMIT}
+
 src_prepare() {
 	cmake_src_prepare
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 944a609bb5c..3fbcb491ffe 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
 	app-text/libqxp
 	app-text/poppler:=
 	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
+	dev-libs/icu:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -44,7 +44,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/harfbuzz:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libfreehand
@@ -56,8 +56,8 @@ DEPEND="${PYTHON_DEPS}
 	net-print/cups
 	sys-libs/zlib[minizip]
 	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.67:= )
+	x11-libs/cairo[X,svg]
+	boost? ( dev-libs/boost:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	hunspell? ( app-text/hunspell:= )
 	osg? ( dev-games/openscenegraph:= )


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-12-16 17:57 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2020-12-16 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     ae0d0dbfb581d26bcfabb18e9dc09c8af76f600b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 17:57:32 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 17:57:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0d0dbf

app-office/scribus: Stabilize 1.5.6.1 ppc, #760147

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index a535eb5a50b..82470486f2b 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-12-20 19:07 Thomas Deutschmann
  0 siblings, 0 replies; 133+ messages in thread
From: Thomas Deutschmann @ 2020-12-20 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6575b18a1b0e50e2f015053cc2b26cfed7f14025
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 18:55:55 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:06:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6575b18a

app-office/scribus: x86 stable (bug #760147)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index f001fe5574c..d68ada3ac04 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-12-22  5:20 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2020-12-22  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8b9685070ef73fe2fb0c63c0cef58c975597b244
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 05:20:49 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 05:20:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b968507

app-office/scribus: Stabilize 1.5.6.1 ppc64, #760147

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index d68ada3ac04..659599ae1ef 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2020-12-22 13:25 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2020-12-22 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     5eec1ae6ab42f0328ab69922ec287a6d3d0494e1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 13:25:18 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 13:25:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eec1ae6

app-office/scribus: removed obsolete 1.5.5_p20200626

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest                       |   1 -
 app-office/scribus/scribus-1.5.5_p20200626.ebuild | 159 ----------------------
 2 files changed, 160 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index d253eedb7a6..be709ff7499 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245

diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
deleted file mode 100644
index 2b4f3fb49c3..00000000000
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="tk?"
-COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	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-1.67:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-
-PATCHES=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	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
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-04-27  9:34 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2021-04-27  9:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1a1e8722269fd9c58017293c40cc685ecfbc8421
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 09:33:39 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 09:33:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1e8722

app-office/scribus: bump to 1.5.7

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/scribus-1.5.7.ebuild | 158 ++++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index be709ff7499..0d731f62af6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
+DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
new file mode 100644
index 00000000000..0793c811fb9
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	x11-libs/cairo[X,svg]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+
+PATCHES=(
+	# non(?)-upstreamable
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+	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
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts
+		python_optimize "${ED}"/usr/share/scribus/scripts
+	else
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-05-29 13:28 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2021-05-29 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c95b2eafeddc27f67f2e5a25c5f3dd1d8e6093fc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 10:20:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 10:21:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95b2eaf

app-office/scribus: Stabilize 1.5.7 ppc, #792786

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 89541682d7e..0168d180c48 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-05-29 13:28 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2021-05-29 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     85d49ddc2edeac9a3ebc30ba5affdbfb8c78ac69
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 10:18:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 10:21:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d49ddc

app-office/scribus: Stabilize 1.5.7 x86, #792786

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 0793c811fb9..89541682d7e 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-05-29 15:23 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2021-05-29 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     8f923f0a1b37f0b2329459ecf6038469353bccdd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 15:21:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 15:21:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f923f0a

app-office/scribus: Stabilize 1.5.7 amd64, #792786

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 0168d180c48..1c7309a2ea5 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-05-30  9:50 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2021-05-30  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     dfd416475704441d2a7acfec61db00de940b6dbc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 09:50:40 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May 30 09:50:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd41647

app-office/scribus: ppc64 stable wrt bug #792786

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 1c7309a2ea5..eebeed0651f 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2021-12-15  8:08 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2021-12-15  8:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c2b90af788833c9eb69b7e2ccd867cfc5bdfe354
Author:     t0b3 <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Tue Dec 14 20:23:23 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 08:08:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b90af7

app-office/scribus: add python 3.10

Closes: https://bugs.gentoo.org/829206
Signed-off-by: t0b3 <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23304
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.5.7.ebuild | 2 +-
 app-office/scribus/scribus-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 806085da0d11..6a826be1e707 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 xdg
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 9ee1a1dcf524..a926bffff40a 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-01-24 10:31 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2022-01-24 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     513b45f5b4bbe01dcf27331e5634161be1c90771
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 10:31:27 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 10:31:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513b45f5

app-office/scribus: bump to 1.5.8

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/scribus-1.5.8.ebuild | 159 ++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 1ef4d5a62e03..0844d8a46097 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
+DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
new file mode 100644
index 000000000000..472e6c130552
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	x11-libs/cairo[X,svg]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# non(?)-upstreamable
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+	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
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts
+		python_optimize "${ED}"/usr/share/scribus/scripts
+	else
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-03-16 15:17 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2022-03-16 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     001ab457c403760b8dd43ce513c7ce3cc444c0fa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 15:16:45 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 15:17:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001ab457

app-office/scribus: Fix SRC_URI by switching to SF mirror://

Closes: https://bugs.gentoo.org/835425
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index 228401b0e914..95598f864d10 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -9,7 +9,7 @@ inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-03-16 19:21 Jakov Smolić
  0 siblings, 0 replies; 133+ messages in thread
From: Jakov Smolić @ 2022-03-16 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     25d7811532830c37acd11e89843d4ec751f36028
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 19:20:22 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:20:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d78115

app-office/scribus: Stabilize 1.5.8 amd64, #835425

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index 95598f864d10..8e4217d415ca 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-03-18  8:15 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2022-03-18  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2dc9e5e7580bc0aec5151d48872d4fab5e492876
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 08:15:00 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 08:15:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc9e5e7

app-office/scribus: Stabilize 1.5.8 ppc, #835425

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index 8e4217d415ca..e8fdac49b665 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-03-19 19:21 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2022-03-19 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     093dd79c85faf25f252cd1b422d4cb9951943d51
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 19:21:14 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 19:21:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093dd79c

app-office/scribus: x86 stable wrt bug #835425

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index e8fdac49b665..c344d68a2691 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-03-27  2:34 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2022-03-27  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     09de8a1bf162ce6fcbf1ee771e98b85ef1885484
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 02:34:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 02:34:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09de8a1b

app-office/scribus: Stabilize 1.5.8 ppc64, #835425

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
index c344d68a2691..20e8e9c6d5a0 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-09  6:54 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2022-05-09  6:54 UTC (permalink / raw
  To: gentoo-commits

commit:     fbdbeee6ca80d6257e1866767230000c6ffcba6b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 06:54:12 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  9 06:54:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdbeee6

app-office/scribus: Drop broken 9999 ebuild

Bug: https://bugs.gentoo.org/832444
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 159 ---------------------------------
 1 file changed, 159 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
deleted file mode 100644
index dc6748192f39..000000000000
--- a/app-office/scribus/scribus-9999.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	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
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-16 12:21 Jakov Smolić
  0 siblings, 0 replies; 133+ messages in thread
From: Jakov Smolić @ 2022-05-16 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5ab2a2de47b464797b1aa3011eeae96e8bf62226
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 12:21:07 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon May 16 12:21:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab2a2de

app-office/scribus: Stabilize 1.5.8-r1 ppc64, #843356

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 9c9dfbd6604c..a9851f372d1b 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-16 12:21 Jakov Smolić
  0 siblings, 0 replies; 133+ messages in thread
From: Jakov Smolić @ 2022-05-16 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     6f3f15babb0ed6afd65b65dc9537f182c2866bc3
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 12:21:05 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon May 16 12:21:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3f15ba

app-office/scribus: Stabilize 1.5.8-r1 ppc, #843356

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index d54fc9affaaa..9c9dfbd6604c 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-16 12:22 Jakov Smolić
  0 siblings, 0 replies; 133+ messages in thread
From: Jakov Smolić @ 2022-05-16 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     af51b09e1c6b4ad9a583164d309bf8acb230d1fa
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 12:22:03 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon May 16 12:22:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af51b09e

app-office/scribus: Stabilize 1.5.8-r1 amd64, #843356

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index a9851f372d1b..38016ddcd6ab 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-17  9:24 Agostino Sarubbo
  0 siblings, 0 replies; 133+ messages in thread
From: Agostino Sarubbo @ 2022-05-17  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     804d8a804d4c3886871d70d62151c34ad11facb7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 09:23:26 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 17 09:23:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d8a80

app-office/scribus: x86 stable wrt bug #843356

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 38016ddcd6ab..5457bc6ee17f 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-05-17  9:39 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2022-05-17  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     59a7f9c82b983d5f6dfa41b313742616d07e7713
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 09:39:09 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 17 09:39:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a7f9c8

app-office/scribus: dropped obsolete 1.5.8

Bug: https://bugs.gentoo.org/843356
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8.ebuild | 162 --------------------------------
 1 file changed, 162 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
deleted file mode 100644
index 20e8e9c6d5a0..000000000000
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	x11-libs/cairo[X,svg]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-1.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	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
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-10-08 18:25 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2022-10-08 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b1a2ca73b34ffd2ee67fba3aeb6c338ed540e87b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 18:17:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 18:25:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a2ca73

app-office/scribus: fix MissingUseDepDefault on cairo

Closes: https://bugs.gentoo.org/875899
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/{scribus-1.5.8-r1.ebuild => scribus-1.5.8-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r2.ebuild
similarity index 99%
rename from app-office/scribus/scribus-1.5.8-r1.ebuild
rename to app-office/scribus/scribus-1.5.8-r2.ebuild
index 175ae6cd558b..edff91bca961 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r2.ebuild
@@ -50,7 +50,7 @@ DEPEND="${PYTHON_DEPS}
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg]
+	x11-libs/cairo[X,svg(+)]
 	boost? ( dev-libs/boost:= )
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	hunspell? ( app-text/hunspell:= )


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2022-12-29 21:34 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2022-12-29 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6bf7f944ee8fc778bb46244b20bd5fd4a787583c
Author:     Jeffery Gazso <jeff.gazso <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 00:05:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:34:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf7f944

app-office/scribus: antiword support optfeature

Signed-off-by: Jeffery Gazso <jeff.gazso <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27826
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r4.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r4.ebuild b/app-office/scribus/scribus-1.5.8-r4.ebuild
index b3a6630f39be..452fd4085ad9 100644
--- a/app-office/scribus/scribus-1.5.8-r4.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -162,3 +162,9 @@ src_install() {
 	doicon resources/iconsets/*/scribus.png
 	domenu scribus.desktop
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "MS Word .doc file import filter support" app-text/antiword
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-02-20 13:50 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2023-02-20 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     3740c45c2801717dbec434027d9daac2dfc87d01
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 13:49:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 13:49:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3740c45c

app-office/scribus: Stabilize 1.5.8-r5 ppc, #893488

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 6f8c9ec7de09..1175bafb55e2 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-02-20 14:30 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2023-02-20 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     27a8bf4b22a7ed54f915899b6f030e19939aea30
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 14:29:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 14:29:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a8bf4b

app-office/scribus: Stabilize 1.5.8-r5 amd64, #893488

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild
index e23d623e80a7..8331c66a59fd 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-02-20 14:30 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2023-02-20 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     099936712cf134f8304d5151fd1ef31a9bc09eeb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 14:29:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 14:29:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09993671

app-office/scribus: Stabilize 1.5.8-r5 x86, #893488

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 1175bafb55e2..e23d623e80a7 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-03-16 14:04 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2023-03-16 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     aa43e42830b43971cde887f8f29cb3d7237dcd31
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 14:04:13 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 14:04:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa43e428

app-office/scribus: Stabilize 1.5.8-r5 ppc64, #893488

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 8331c66a59fd..0261a742c7f3 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-10-24 16:51 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2023-10-24 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5a1fa483c85a06e49c8c1cc8fe611671e018ab56
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 16:51:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 16:51:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1fa483

app-office/scribus: Stabilize 1.5.8-r6 x86, #916227

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild
index d5391b38535f..a84e978a292d 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-10-24 17:19 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2023-10-24 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9f77a99164a00147cadf205462f82511090fcac1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 17:18:36 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 17:18:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f77a991

app-office/scribus: Stabilize 1.5.8-r6 amd64, #916227

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild
index a84e978a292d..56549f4efc56 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-10-24 19:11 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     dd68e2d67bc9bbb0558716ba68162720f2636263
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:11:23 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:11:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd68e2d6

app-office/scribus: Stabilize 1.5.8-r6 ppc, #916227

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild
index 56549f4efc56..5a09b3a672bc 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-10-27 12:17 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2023-10-27 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     8c8d8869c6c50857ae481b505c5d9dadd3df70ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 12:14:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 12:14:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8d8869

app-office/scribus: Stabilize 1.5.8-r6 ppc64, #916227

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild
index 5a09b3a672bc..9dd9b956b095 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2023-10-30  8:13 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2023-10-30  8:13 UTC (permalink / raw
  To: gentoo-commits

commit:     7d14d7fa89a5e1427e696ea53f517b72e345b95b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 08:13:06 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 08:13:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d14d7fa

app-office/scribus: dropped obsolete 1.5.8-r5

Bug: https://bugs.gentoo.org/916227
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.5.8-r5.ebuild | 168 -----------------------------
 1 file changed, 168 deletions(-)

diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild b/app-office/scribus/scribus-1.5.8-r5.ebuild
deleted file mode 100644
index 0261a742c7f3..000000000000
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET=${P}-patchset-1
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:=
-	net-print/cups
-	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg(+)]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-
-	# git master; # bug 834537, 843287, 893158
-	"${WORKDIR}"/${PATCHSET}
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	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
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://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}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "MS Word .doc file import filter support" app-text/antiword
-}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-01-10 10:06 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-01-10 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     cd811d45e6545d47e392e465155b6207f9c67c1e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 10:06:38 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 10:06:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd811d45

app-office/scribus: bump to 1.6.1, dropped 1.6.0

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest                                       | 2 +-
 app-office/scribus/{scribus-1.6.0.ebuild => scribus-1.6.1.ebuild} | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a5618a8e6015..8980478a95bb 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,4 @@
 DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20 SHA512 ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d
 DIST scribus-1.5.8-podofo-0.10.tar.xz 19116 BLAKE2B 3aa6ecc6726fece8c3b1645096493615eafc67daf45bb5e5ff56a01e75a08418aaad9cfd67e1de3114b4e1e8dd7478c2be3da63ea29560948ddd5295f586e00e SHA512 7d03cedbdae5147c6f2b662ae8c9bd009d5eb9efcb3087bd841e785b4a4a1942a2811f29d433590022d9dc68f716b8b20c30b818d5c91197cbe79fe3260d0db7
 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
-DIST scribus-1.6.0.tar.xz 73267436 BLAKE2B a855820c7c4b63339fb8a1e15764425b95655e20fe26857ebbc730d816d229441a639ca46f5be803e8599131495e698f1ff7d61b3b08dd42a303653dcdbdfc9d SHA512 bb64b628dda07acdd29b7bbcb765b4f22abbfa175df68f1f046041f840800549be04ada6cf3f24ea4bf0c61b38a1ad503c482d4d47b1f2a3a6885f7c963adef8
+DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e

diff --git a/app-office/scribus/scribus-1.6.0.ebuild b/app-office/scribus/scribus-1.6.1.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.6.0.ebuild
rename to app-office/scribus/scribus-1.6.1.ebuild
index 5b5fb9de4298..23dca9517e2f 100644
--- a/app-office/scribus/scribus-1.6.0.ebuild
+++ b/app-office/scribus/scribus-1.6.1.ebuild
@@ -75,10 +75,8 @@ PATCHES=(
 	# non(?)-upstreamable
 	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.6.0-fix-desktop.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-01-14 10:07 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-01-14 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c748eb3971c2a9e9f23fc5ae4e0842cc1b311819
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:06:42 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:06:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c748eb39

app-office/scribus: switched to svg icon in live

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 4e7611020d9c..3b5f179d8564 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -142,7 +142,7 @@ src_install() {
 		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
 	done
 	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
-	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+	newicon resources/iconsets/1_7_0/scribus-icon.svg scribus-${SLOT}.png
 	newmenu scribus.desktop scribus-${SLOT}.desktop
 }
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-01-14 10:29 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-01-14 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     aad534985ef2dc061a07ae2a0145da6d802fc06e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 10:29:15 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 10:29:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad53498

app-office/scribus: minor update in live

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 3b5f179d8564..0225ed3b28db 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qt5compat:6
-	dev-qt/qtbase:6[gui,network,opengl,xml,widgets]
+	dev-qt/qtbase:6[cups,gui,network,opengl,xml,widgets]
 	dev-qt/qtsvg:6
 	media-libs/fontconfig
 	media-libs/freetype:2


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-02-14 16:44 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2024-02-14 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     65bba2a3b1fe987b01688b2f8b61533957aa4e94
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 16:42:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 16:42:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bba2a3

app-office/scribus: Stabilize 1.6.1-r1 amd64, #924481

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 6a80b0653e02..7cad31d8601b 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-02-15 10:05 Jakov Smolić
  0 siblings, 0 replies; 133+ messages in thread
From: Jakov Smolić @ 2024-02-15 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d05ad58787c33a73805c624f89961a90412167fc
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 10:05:38 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 10:05:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05ad587

app-office/scribus: Stabilize 1.6.1-r1 x86, #924481

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 7cad31d8601b..dcaf6b17a10b 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-02-17 14:48 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2024-02-17 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f3bbc4a3cba0f69a9691aad63caee6e761e7daa6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 14:47:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:47:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3bbc4a3

app-office/scribus: Stabilize 1.6.1-r1 ppc64, #924481

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index dcaf6b17a10b..e91a3601b7ec 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-03-02 13:08 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2024-03-02 13:08 UTC (permalink / raw
  To: gentoo-commits

commit:     e1138dda822481a6625631b2c8b0b6b01893ef99
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 13:08:34 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 13:08:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1138dda

app-office/scribus: Stabilize 1.6.1-r1 ppc, #924481

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index e91a3601b7ec..3b9230eb12a6 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-05-14 18:41 Andreas Sturmlechner
  0 siblings, 0 replies; 133+ messages in thread
From: Andreas Sturmlechner @ 2024-05-14 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     af29dc60198156cb085f2cd68e1541805f469d28
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 18:40:33 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 14 18:41:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af29dc60

app-office/scribus: Replace missing patch w/ cmake.eclass facilities

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 7a3abef52fb0..6943d0b9a6bc 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -75,13 +75,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
 	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch
 	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
 	"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch
 )
 
 src_prepare() {
 	cmake_src_prepare
+	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
 
 	# for safety remove files that we patched out
 	rm -r scribus/third_party/hyphen || die


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-05-22  7:39 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-05-22  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     56ebb15c068d30a16f4a65d3b5376fbd146825af
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 07:38:57 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 22 07:38:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ebb15c

app-office/scribus: added python 3.13

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 app-office/scribus/scribus-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 1614345f8f40..34320daf3a04 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index d7e694a35803..9fb28e962ced 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="tk?"
 inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
 


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-05-22  7:43 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-05-22  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e798d39f6d06852477282296dca23fb9e205b1cb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 07:43:01 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 22 07:43:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e798d39f

app-office/scribus: fixed missing xcb dependency via qt

Closes: https://bugs.gentoo.org/930097
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
 app-office/scribus/scribus-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 34320daf3a04..bf38de284c12 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtgui:5[-gles2-only,X]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 9fb28e962ced..1d53740101ee 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qt5compat:6
-	dev-qt/qtbase:6[cups,gui,network,opengl,xml,widgets]
+	dev-qt/qtbase:6[cups,gui,network,opengl,X,xml,widgets]
 	dev-qt/qtsvg:6
 	media-libs/fontconfig
 	media-libs/freetype:2


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-06-04 10:26 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-06-04 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     eaa01a479ca0f87e7ab69d1ada61b18f387eceb1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 10:26:26 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 10:26:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa01a47

app-office/scribus: added 1.6.9999 for testing purposes

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/scribus-1.6.9999.ebuild | 157 +++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/app-office/scribus/scribus-1.6.9999.ebuild b/app-office/scribus/scribus-1.6.9999.ebuild
new file mode 100644
index 000000000000..13ccc1b48d25
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.9999.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/scribusproject/scribus"
+	EGIT_BRANCH="Version16x"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only,X]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:=
+	net-print/cups
+	sys-libs/zlib[minizip]
+	x11-libs/cairo[X,svg(+)]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
+
+	# for safety remove files that we patched out
+	rm -r scribus/third_party/hyphen || die
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DTAG_VERSION="-${SLOT}"
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
+		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
+	else
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
+	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+	newmenu scribus.desktop scribus-${SLOT}.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "MS Word .doc file import filter support" app-text/antiword
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-06-16 10:28 Miroslav Šulc
  0 siblings, 0 replies; 133+ messages in thread
From: Miroslav Šulc @ 2024-06-16 10:28 UTC (permalink / raw
  To: gentoo-commits

commit:     8a75774fce6082eb4565b283e23e7773c634e87c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 10:27:56 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 10:28:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a75774f

app-office/scribus: bump to 1.6.2

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 app-office/scribus/Manifest             |   1 +
 app-office/scribus/scribus-1.6.2.ebuild | 157 ++++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0ffc05a70363..48266e2a2a49 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
 DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
+DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B 2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547 SHA512 2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
new file mode 100644
index 000000000000..13ccc1b48d25
--- /dev/null
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/scribusproject/scribus"
+	EGIT_BRANCH="Version16x"
+	inherit git-r3
+else
+	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only,X]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:=
+	net-print/cups
+	sys-libs/zlib[minizip]
+	x11-libs/cairo[X,svg(+)]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_run_in scribus cmake_comment_add_subdirectory ui/qml
+
+	# for safety remove files that we patched out
+	rm -r scribus/third_party/hyphen || die
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DTAG_VERSION="-${SLOT}"
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus-${SLOT}/scripts
+		python_optimize "${ED}"/usr/share/scribus-${SLOT}/scripts
+	else
+		rm "${ED}"/usr/share/scribus-${SLOT}/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://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}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus-${SLOT}.png
+	newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+	newmenu scribus.desktop scribus-${SLOT}.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "MS Word .doc file import filter support" app-text/antiword
+}


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-07-17 11:26 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2024-07-17 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     fe982aca620dab14c141bc6e9725a64a893cfb48
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 11:26:32 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 11:26:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe982aca

app-office/scribus: Stabilize 1.6.2 ppc64, #936207

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 73d92f9871a0..638a2385c1c5 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="~amd64 ~ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-07-17 11:26 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2024-07-17 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     7b97c180516df6b3ee36a5915d3a846c6ecfe028
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 11:26:31 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 11:26:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b97c180

app-office/scribus: Stabilize 1.6.2 x86, #936207

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 13ccc1b48d25..73d92f9871a0 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-07-17 11:26 Arthur Zamarin
  0 siblings, 0 replies; 133+ messages in thread
From: Arthur Zamarin @ 2024-07-17 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     84e79a30b103e69433fd9642c49ecf70e1439eca
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 11:26:32 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 11:26:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e79a30

app-office/scribus: Stabilize 1.6.2 amd64, #936207

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index 638a2385c1c5..abd25fd69eef 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ppc64 x86"
+	KEYWORDS="amd64 ~ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
@ 2024-07-17 19:10 Sam James
  0 siblings, 0 replies; 133+ messages in thread
From: Sam James @ 2024-07-17 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     07ed0e9587f42ae3a5e37e3698752ec84bcd0f70
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 19:10:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 19:10:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ed0e95

app-office/scribus: Stabilize 1.6.2 ppc, #936207

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-office/scribus/scribus-1.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/scribus/scribus-1.6.2.ebuild b/app-office/scribus/scribus-1.6.2.ebuild
index abd25fd69eef..764455f39f70 100644
--- a/app-office/scribus/scribus-1.6.2.ebuild
+++ b/app-office/scribus/scribus-1.6.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="amd64 ~ppc ppc64 x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 133+ messages in thread

end of thread, other threads:[~2024-07-17 19:10 UTC | newest]

Thread overview: 133+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-17 11:26 [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2024-07-17 19:10 Sam James
2024-07-17 11:26 Arthur Zamarin
2024-07-17 11:26 Arthur Zamarin
2024-06-16 10:28 Miroslav Šulc
2024-06-04 10:26 Miroslav Šulc
2024-05-22  7:43 Miroslav Šulc
2024-05-22  7:39 Miroslav Šulc
2024-05-14 18:41 Andreas Sturmlechner
2024-03-02 13:08 Arthur Zamarin
2024-02-17 14:48 Sam James
2024-02-15 10:05 Jakov Smolić
2024-02-14 16:44 Sam James
2024-01-14 10:29 Miroslav Šulc
2024-01-14 10:07 Miroslav Šulc
2024-01-10 10:06 Miroslav Šulc
2023-10-30  8:13 Miroslav Šulc
2023-10-27 12:17 Sam James
2023-10-24 19:11 Arthur Zamarin
2023-10-24 17:19 Arthur Zamarin
2023-10-24 16:51 Arthur Zamarin
2023-03-16 14:04 Arthur Zamarin
2023-02-20 14:30 Sam James
2023-02-20 14:30 Sam James
2023-02-20 13:50 Sam James
2022-12-29 21:34 Sam James
2022-10-08 18:25 Sam James
2022-05-17  9:39 Miroslav Šulc
2022-05-17  9:24 Agostino Sarubbo
2022-05-16 12:22 Jakov Smolić
2022-05-16 12:21 Jakov Smolić
2022-05-16 12:21 Jakov Smolić
2022-05-09  6:54 Andreas Sturmlechner
2022-03-27  2:34 Sam James
2022-03-19 19:21 Agostino Sarubbo
2022-03-18  8:15 Arthur Zamarin
2022-03-16 19:21 Jakov Smolić
2022-03-16 15:17 Andreas Sturmlechner
2022-01-24 10:31 Miroslav Šulc
2021-12-15  8:08 Miroslav Šulc
2021-05-30  9:50 Agostino Sarubbo
2021-05-29 15:23 Sam James
2021-05-29 13:28 Sam James
2021-05-29 13:28 Sam James
2021-04-27  9:34 Miroslav Šulc
2020-12-22 13:25 Miroslav Šulc
2020-12-22  5:20 Sam James
2020-12-20 19:07 Thomas Deutschmann
2020-12-16 17:57 Sam James
2020-11-16  9:08 Miroslav Šulc
2020-09-28 21:33 Andreas Sturmlechner
2020-08-06 17:10 Miroslav Šulc
2020-08-06 13:28 Miroslav Šulc
2020-07-17 18:38 Agostino Sarubbo
2020-07-13 19:25 Sam James
2020-07-13 18:56 Sam James
2020-07-13 11:28 Michał Górny
2020-07-01 14:17 Andreas Sturmlechner
2020-04-03 20:07 Andreas Sturmlechner
2020-03-27 10:08 Miroslav Šulc
2020-03-20 21:53 Matt Turner
2020-02-09 16:11 Michał Górny
2020-01-03 20:07 Andreas Sturmlechner
2020-01-03  7:24 Miroslav Šulc
2019-12-03 11:58 Agostino Sarubbo
2019-12-01 13:56 Sergei Trofimovich
2019-11-08 10:42 Miroslav Šulc
2019-11-02  8:42 Agostino Sarubbo
2019-10-31 23:50 Thomas Deutschmann
2019-09-13 23:51 Matt Turner
2019-06-12 10:03 Andreas Sturmlechner
2019-05-20 11:32 Mikle Kolyada
2019-05-19 13:14 Thomas Deutschmann
2019-05-08 17:20 Zac Medico
2019-02-22 13:06 Andreas Sturmlechner
2019-02-22 10:26 Mikle Kolyada
2019-02-17 22:35 Thomas Deutschmann
2019-02-17 17:14 Sergei Trofimovich
2019-02-17 17:08 Sergei Trofimovich
2019-02-14 18:37 Andreas Sturmlechner
2019-01-27 12:25 Sergei Trofimovich
2019-01-25  0:00 Andreas Sturmlechner
2019-01-11  1:23 Andreas Sturmlechner
2018-12-06 11:04 Andreas Sturmlechner
2018-10-06 20:45 Andreas Sturmlechner
2018-10-06 19:12 Sergei Trofimovich
2018-08-30 18:25 Sergei Trofimovich
2018-08-16  0:39 Thomas Deutschmann
2018-08-14  0:52 Mikle Kolyada
2018-06-20 16:31 Andreas Sturmlechner
2018-04-12 10:04 Miroslav Šulc
2018-03-12  5:37 Matt Turner
2018-03-04 22:30 Sergei Trofimovich
2018-02-11 10:25 Michał Górny
2018-01-17  5:11 Thomas Deutschmann
2018-01-09 13:38 Ulrich Müller
2017-12-26  1:02 Andreas Sturmlechner
2017-12-26  1:02 Andreas Sturmlechner
2017-12-25 15:20 Andreas Sturmlechner
2017-12-25 15:20 Andreas Sturmlechner
2017-12-25 15:20 Andreas Sturmlechner
2017-12-25 15:20 Andreas Sturmlechner
2017-12-25 15:20 Andreas Sturmlechner
2017-12-20 21:34 Justin Lecher
2017-10-30 23:33 Andreas Sturmlechner
2017-10-22 11:24 Justin Lecher
2017-10-22 11:24 Justin Lecher
2017-10-22 11:24 Justin Lecher
2017-08-24  7:33 Miroslav Šulc
2017-07-31 23:05 Sergei Trofimovich
2017-07-26  8:20 Sergei Trofimovich
2017-04-20  8:26 Jeroen Roovers
2017-04-20  7:30 Jeroen Roovers
2017-04-05 20:25 Michael Weber
2017-02-25 19:43 Justin Lecher
2017-01-05 19:53 Justin Lecher
2016-11-06  8:41 Justin Lecher
2016-11-06  8:25 Justin Lecher
2016-09-27 19:15 Michael Weber
2016-09-27 18:34 Michael Weber
2016-09-24 12:27 Jeroen Roovers
2016-08-22 18:48 Michael Weber
2016-08-03  8:15 Michael Weber
2016-05-17  9:04 Austin English
2016-05-04  5:26 Jeroen Roovers
2016-02-14 17:54 Justin Lecher
2016-02-14 10:11 Agostino Sarubbo
2016-01-23  7:25 Jeroen Roovers
2016-01-17 17:02 Agostino Sarubbo
2016-01-15  9:03 Agostino Sarubbo
2016-01-14  9:53 Justin Lecher
2015-10-16 13:04 Justin Lecher
2015-10-01 14:21 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox