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

[Michael Weber]

commit:     bd9de60abecd63ffe02ae034a4331fa382244659
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Fri Sep  2 11:20:19 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 11:20:19 2016 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=bd9de60a

scribus integrated into ::gentoo

 app-office/scribus/Manifest                        |  21 ---
 .../scribus/files/scribus-1.5.0-QObject.patch      |  15 --
 .../scribus/files/scribus-1.5.0-docdir.patch       |  42 -----
 app-office/scribus/metadata.xml                    |  18 --
 app-office/scribus/scribus-1.5.2.ebuild            | 199 ---------------------
 5 files changed, 295 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
deleted file mode 100644
index c5f47e6..0000000
--- a/app-office/scribus/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJXovWjAAoJEHHVc6gvQ0BlyuwQAInufyJxqzjezNIv3uLhO3mT
-QeguqHjQmg4wdT6vTk5ikcCowhCoNIB5Ppie+KJaSVpAHT2bGJwQsDee9M8uxWdz
-g6R/WbuZee0JzxJ3eQyyVyrDnDeRBC15maLCtHTx5TEfV80NYPMo9MiUPlASg+SW
-NacZzcmbBVMEK2YYYJtCqbHh7LWZ0Fliqb3Y+8ohFvtyz+bJulvsDs5rHjHqmpt1
-hCH/kFrkqlevj10juMAwvuElOLLDjulX9yZC4EKcAH+o9rq81APNy35NCQw8FNRj
-872oP1I8NqNQM8gB7KzaZZV64gOhTLsOKNibhMCbH1J9WtnkCpR4snkjTlKPTu5F
-Ow8grbfho84s3R3QBa4aAdapCtFuhPlc9Ob50i2TNF7niEcUjTCAR8/bootcSnWn
-o3ZaJVXN4xFYOwrVqpIuV7Rwt/4o1kQfriTk16sNPOEIW4WtXYjpJ9AIEcei/HxO
-g58rVTy2OWNCC6qST72jRxkes2UKhF0p+wcxXE5k16X5iByvBtWfVZZPGwK1hRNM
-opGFVjEFGfPCeMnhBevwQxo/vedxnOf0ZTztf+Nn2A21PKAiiXDGEcKCTWEjPBQA
-3JBx5Dmft6O711qm8/+Nxu+8GfXW1UotK2PHTmNtMVVBqy+aSo/sBI82d3bA1Dtu
-qdjofJG+6GKGDZdEDISo
-=6jj9
------END PGP SIGNATURE-----

diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch
deleted file mode 100644
index 1ad2d1a..0000000
--- a/app-office/scribus/files/scribus-1.5.0-QObject.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- scribus/sclayer.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp
-index 502112b..4da7bd5 100644
---- a/scribus/sclayer.cpp
-+++ b/scribus/sclayer.cpp
-@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
- 
- #include <QHash>   //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
- #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
-+#include <QObject>
- #include <QtAlgorithms>
- 
- ScLayer::ScLayer(void)

diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch
deleted file mode 100644
index 2ff316a..0000000
--- a/app-office/scribus/files/scribus-1.5.0-docdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- CMakeLists.txt | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29d66f3..1c08cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,19 +244,21 @@ ELSE()
- ENDIF()
- 
- #SHARE - use the default on Apple as TAG_VERSION is empty
--IF(WIN32 OR OS2)
--	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--ELSE (WIN32 OR OS2)
--	IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
--		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--	ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
--		IF(NOT WANT_VERSIONING)
--			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--		ELSE(NOT WANT_VERSIONING)
--			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
--		ENDIF(NOT WANT_VERSIONING)
--	ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
--ENDIF (WIN32 OR OS2)
-+IF(NOT DOCDIR)
-+	IF(WIN32 OR OS2)
-+		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+	ELSE (WIN32 OR OS2)
-+		IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+		ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+			IF(NOT WANT_VERSIONING)
-+				SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-+			ELSE(NOT WANT_VERSIONING)
-+				SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+			ENDIF(NOT WANT_VERSIONING)
-+		ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
-+	ENDIF (WIN32 OR OS2)
-+ENDIF(NOT DOCDIR)
- IF(NOT IS_ABSOLUTE ${DOCDIR})
- 	ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
- ELSE()

diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
deleted file mode 100644
index 745ba20..0000000
--- a/app-office/scribus/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>
-    <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="scripts">Install the scripts</flag>
-    <flag name="templates">Document tamplates</flag>
-    <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scribus</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild
deleted file mode 100644
index 7a0f15c..0000000
--- a/app-office/scribus/scribus-1.5.2.ebuild
+++ /dev/null
@@ -1,199 +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 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
-}