app-office/scribus: Clean fix for minizip usage, #383833

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 190 insertions, 1 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 3894a0603471..e4a12d37b03a 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.153 2012/03/26 12:09:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.154 2012/04/30 07:28:44 jlec Exp $
+
+*scribus-1.4.0-r2 (30 Apr 2012)
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> +scribus-1.4.0-r2.ebuild,
+  +files/scribus-1.4.0-minizip.patch:
+  Clean fix for minizip usage, #383833
 
   26 Mar 2012; Justin Lecher <jlec@gentoo.org> scribus-1.3.9-r2.ebuild,
   +files/scribus-1.3.9-cups-1.5.patch:
diff --git a/app-office/scribus/files/scribus-1.4.0-minizip.patch b/app-office/scribus/files/scribus-1.4.0-minizip.patch
new file mode 100644
index 000000000000..c0a4b7cb38eb
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.4.0-minizip.patch
@@ -0,0 +1,60 @@
+ Scribus.pro            |    4 ----
+ scribus/CMakeLists.txt |    2 --
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/Scribus.pro b/Scribus.pro
+index 17b5417..0cc23c9 100644
+--- a/Scribus.pro
++++ b/Scribus.pro
+@@ -276,7 +276,6 @@ HEADERS += scribus/about.h \
+            scribus/insertaframe.h \
+            scribus/insertTable.h \
+            scribus/inspage.h \
+-           scribus/ioapi.h \
+            scribus/javadocs.h \
+            scribus/KarbonCurveFit.h \
+            scribus/langmgr.h \
+@@ -496,7 +495,6 @@ HEADERS += scribus/about.h \
+            scribus/undostate.h \
+            scribus/unicodesearch.h \
+            scribus/units.h \
+-           scribus/unzip.h \
+            scribus/updatemanager.h \
+            scribus/upgradechecker.h \
+            scribus/urllauncher.h \
+@@ -933,7 +931,6 @@ SOURCES += scribus/about.cpp \
+            scribus/insertaframe.cpp \
+            scribus/insertTable.cpp \
+            scribus/inspage.cpp \
+-           scribus/ioapi.c \
+            scribus/javadocs.cpp \
+            scribus/KarbonCurveFit.cpp \
+            scribus/langmgr.cpp \
+@@ -1143,7 +1140,6 @@ SOURCES += scribus/about.cpp \
+            scribus/undostate.cpp \
+            scribus/unicodesearch.cpp \
+            scribus/units.cpp \
+-           scribus/unzip.c \
+            scribus/updatemanager.cpp \
+            scribus/upgradechecker.cpp \
+            scribus/urllauncher.cpp \
+diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
+index dcd7e10..3aca69b 100644
+--- a/scribus/CMakeLists.txt
++++ b/scribus/CMakeLists.txt
+@@ -405,7 +405,6 @@ SET(SCRIBUS_SOURCES
+   insertTable.cpp
+   insertaframe.cpp
+   inspage.cpp
+-  ioapi.c
+   javadocs.cpp
+   KarbonCurveFit.cpp
+   langmgr.cpp
+@@ -613,7 +612,6 @@ SET(SCRIBUS_SOURCES
+   undostate.cpp
+   unicodesearch.cpp
+   units.cpp
+-  unzip.c
+   updatemanager.cpp
+   upgradechecker.cpp
+   urllauncher.cpp
diff --git a/app-office/scribus/scribus-1.4.0-r2.ebuild b/app-office/scribus/scribus-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..15f4d07bf081
--- /dev/null
+++ b/app-office/scribus/scribus-1.4.0-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0-r2.ebuild,v 1.1 2012/04/30 07:28:44 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit cmake-utils fdo-mime multilib python
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cairo debug examples +minimal +pdf spell templates"
+
+# 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 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_}"
+
+COMMON_DEPEND="
+	dev-libs/hyphen
+	dev-libs/libxml2
+	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]
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	virtual/jpeg
+	spell? ( app-text/aspell )
+	pdf? ( app-text/podofo )
+	cairo? ( x11-libs/cairo[X,svg] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	"${FILESDIR}"/${P}-export.patch
+	"${FILESDIR}"/${P}-minizip.patch
+	)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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
+
+	if use templates; then
+		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
+	fi
+	if use examples; then
+		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
+	fi
+
+	base_src_prepare
+}
+
+src_configure() {
+	local lang langs
+	for lang in ${IUSE_LINGUAS}; do
+		use linguas_${lang} && langs+=",${lang}"
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
+		-DPYTHON_LIBRARY=$(python_get_library)
+		-DWANT_NORPATH=ON
+		-DWANT_QTARTHUR=ON
+		-DWANT_QT3SUPPORT=OFF
+		-DGENTOOVERSION=${PVR}
+		-DWANT_GUI_LANG=${langs#,}
+		$(cmake-utils_use_has spell ASPELL)
+		$(cmake-utils_use_has pdf PODOFO)
+		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(cmake-utils_use_want debug DEBUG)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+	docompress -x /usr/share/doc/${PF}/en
+	doicon resources/icons/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_preinst() {
+	# 399595
+	rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}