gentoo resync : 29.12.2022

3 files changed, 2 insertions, 165 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 57be2761d717..8b1ee92bfe4d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -7,6 +7,5 @@ AUX scribus-1.5.8-poppler-22.04.0.patch 11352 BLAKE2B 392bf170c922c3e47167da287d
 AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af
 AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611
 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
-EBUILD scribus-1.5.8-r1.ebuild 4223 BLAKE2B 08e9472f250891190a1f6a5279ae3ab59b0e78338a3b125c8762516c4462708be3345f9799f1c5d34531a5ffc1375d1cdde171e206c60a3558a4232a114f70ce SHA512 c947803dbacfcaebb326ea33f35e87976656afeb7b471228cace38aba94ae1cfa93c56870a767d6cb57d246adb2e40bfe8e3aaf651a42f4bfd97bb1dc5f816c9
-EBUILD scribus-1.5.8.ebuild 4146 BLAKE2B e32ad027e529fd267c4b37de0dbd91c1d4c53855ceb6b8f691f06f112125a765b7395b7f4114a23a699ffcd34fbc522a050b921c44575f683e6b2c21c6f0d0f0 SHA512 21a0d6772d46005f6191e812b2b8e58d94bad4cf7a23d6fd926325f1bd82960a28013a70c4b5951082c3ce67f7d78be14bef5218b4519b3edc468f54e86dc398
+EBUILD scribus-1.5.8-r1.ebuild 4219 BLAKE2B ab236866da16800819ebf054a6f6895f0060a1ad8cf48aca4826358d455260e19daa50d2ab656363752ccd2363958520a138d05f303df14e0e348a32d423aaf4 SHA512 aad68dd23e6a6df229aacfbb9881613c31e45a8a9d8053acba7165479dd6a9a0bdaf3f7e2910954f24a0f3625b503e586126229f866216f61cacb3236e531532
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index d54fc9affaaa..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}
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
-}