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

["Michael Weber" <xmw@gentoo.org>]

commit:     1617ba74c828ee4e4b1dd531037c3b5982c25a81
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 18:50:25 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 18:50:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1617ba74

app-office/scribus: drop old versions.

Package-Manager: portage-2.2.28

 app-office/scribus/Manifest                        |   2 -
 app-office/scribus/files/scribus-1.4.2-docs.patch  |  29 ---
 .../scribus/files/scribus-1.4.4-ppc64-fpic.patch   |  19 --
 app-office/scribus/scribus-1.4.5.ebuild            | 151 ----------------
 app-office/scribus/scribus-1.5.1.ebuild            | 200 ---------------------
 5 files changed, 401 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 7460f6b..1f887c4 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,3 @@
-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
 DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7

diff --git a/app-office/scribus/files/scribus-1.4.2-docs.patch b/app-office/scribus/files/scribus-1.4.2-docs.patch
deleted file mode 100644
index 977bfe0..00000000
--- a/app-office/scribus/files/scribus-1.4.2-docs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- CMakeLists.txt |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f34048..4880594 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2)
-     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-         IF(NOT WANT_VERSIONING)
--            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
-+            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
-         ELSE(NOT WANT_VERSIONING)
-             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
-         ENDIF(NOT WANT_VERSIONING)
-@@ -801,12 +801,11 @@ INSTALL(FILES
-   BUILDING
-   ChangeLog
-   ChangeLogSVN
--  COPYING
-   LINKS
-   NEWS
-   PACKAGING
-   README
-   TODO
-   TRANSLATION
-   DESTINATION ${DOCDIR}
- )

diff --git a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch
deleted file mode 100644
index 295cec3..00000000
--- a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
-index 18898a7..ba872b9 100755
---- a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
-+++ b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
-@@ -18,9 +18,9 @@ SET(2GEOM_VERSION 0.1.0)
- # http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
- 
--IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1)
-+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
--ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1)
-+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
- 
- OPTION(2GEOM_BUILD_SHARED
-   "Build lib2geom and libtoy as shared libraries."

diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
deleted file mode 100644
index 85396dc..00000000
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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 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? ( 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}"/${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
-	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
-
-	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
-}

diff --git a/app-office/scribus/scribus-1.5.1.ebuild b/app-office/scribus/scribus-1.5.1.ebuild
deleted file mode 100644
index b9563b0..00000000
--- a/app-office/scribus/scribus-1.5.1.ebuild
+++ /dev/null
@@ -1,200 +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 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
-}