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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 197 insertions, 6 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/Manifest b/app-office/scribus/Manifest
index f61e7bd7ad00..b5b99448657c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,20 +5,22 @@ AUX scribus-1.3.5.1-system-hyphen.patch 3754 RMD160 15e0768f9f2aaf1c297b2226bd04
 AUX scribus-1.3.6-podofo-0.8.0.patch 1749 RMD160 f5a54609d7f382cc99e90857c430585f704b9918 SHA1 901631c1b1b2a01ed4acb594ad8bc1a54803810c SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7
 AUX scribus-1.3.9-cups-1.5.patch 840 RMD160 2831edaa6de55768bad09792e13f2d24be1aaf8f SHA1 3c8516813b59633a838ab90d2fc70e35699e521f SHA256 1bd000e5d7813b484727a468c9b49f85662a7c6a94140025b6d8eba6fc49f245
 AUX scribus-1.4.0-export.patch 786 RMD160 42b78bc3f6d3abe9d950dede35ac71092bddb374 SHA1 9488389074e67641092b9226cd40bc6f17eaa76b SHA256 f7e1a9db36f65b77282d728a0aaf064fe8ea939fb0cdb8184e3de93b350c6379
+AUX scribus-1.4.0-minizip.patch 1891 RMD160 c4ebe120c0aa534b02f746ac221f250fb63b30f7 SHA1 90453366f009384a8799ea431da06340b31e41e6 SHA256 dcbe79335a59b7238d6866f7c92757ffb5ac1ef26ff9f146b4fb702814c83dd7
 AUX scribus-1.4.0_rc5-docs.patch 828 RMD160 599634de0a6f7bc2594c28f2a1d089f3818f1fd5 SHA1 e9df8b185e0bf72c19c2e1586a6a8d1ceb9bb72a SHA256 50c56976bcc2e2a7d04ee62b8c2398d91137360f69e95910c6f2a01b49c8595f
 DIST scribus-1.3.9.tar.bz2 35729860 RMD160 63e1d3f7f723843e9d1c787e1405b57a15f08fcc SHA1 86bc4db2d8fbb91fe94f8535327991e9128c5862 SHA256 fb172f6b9a812f3b0a9de911b245012a067a9aad50473fa1da1d1c5861641eac
 DIST scribus-1.4.0.tar.bz2 42134397 RMD160 f4a0813c1961f1929bccaaa4c0a21f84dfd75c62 SHA1 d19e455f261c4075076f1d6f4a55fbd934a66c60 SHA256 9ae4e50523f0891c9dce45893ca9f58d32096442e43e75acec466fd9405362a9
 EBUILD scribus-1.3.9-r2.ebuild 2151 RMD160 8567a07bceaf0e2bfeef124511df946743bac0c2 SHA1 850ed27464646f3919d53d11fc8b5e3a2ccb75ec SHA256 8896e578d4f95160cae05d74f7414fed6511cd895b7b1d750fbee7aa4c1941de
 EBUILD scribus-1.3.9.ebuild 1760 RMD160 98f5cdabc0a96a5e2851f310491062d69fad782a SHA1 ddf0cad864308587b1e0e6c4c1711e8dcb2428be SHA256 fca86c8dec51f2cf185702bb0db6aa3ceaa483895d1ac2c200005c33f2492849
 EBUILD scribus-1.4.0-r1.ebuild 2905 RMD160 5388c1bb0a684a2460bedadc76ea66c5f60c762f SHA1 96e3aedeb4bab002d298dc386dee0132d287dbd1 SHA256 03b1b59f0620209c232412a3a5bf1cc618ca433910fbd5130a194b65c4aa46c3
+EBUILD scribus-1.4.0-r2.ebuild 3137 RMD160 a93500146479b736e99f083cd78234b8374bfd35 SHA1 ed6e29a3872dd8184be682f5d62a161c9817ceda SHA256 3d5d6763a1378ca914c3080985af4878742216a13e24efa020c692cf87d89740
 EBUILD scribus-1.4.9999.ebuild 2969 RMD160 7b1ccc8cdd70ab48d33e4822ee351af96fcd57c1 SHA1 773a0b5cd031afb28543430bfe67b4c11012011c SHA256 38eebca7f224af26e2dfa503f66890c5c81ab1cc22e29d0fbeb546c5162f6faa
 EBUILD scribus-9999.ebuild 2951 RMD160 77bd6e3b2e46b0dce5033678e6e228f968f1b08a SHA1 c4ff832ca4cd0fa4a70e0e62fa0a9c9a53cf3487 SHA256 86971283dc370b8b35fff58c79fbddd8b60a4418fff40faea03014ac40300855
-MISC ChangeLog 19862 RMD160 3af4914934671fd2b08b04f5ae0657e0cf3546f1 SHA1 195afddfc3721aa5a9fd36957debc16739592854 SHA256 00c18bb653bb8dab264fd2707b5883b58afacca7344204a7c28ffb2df181887b
+MISC ChangeLog 20046 RMD160 e0c22f4d8a14e6a6bebba86d0209274533a20b8c SHA1 1aa1edaddec59a3bccdfef8ecf65c2f8d046dcaa SHA256 d59e452ccb610a36bf83265b6cdc2da4537c2f6c2618576676d6528fc1ad6ed6
 MISC metadata.xml 1137 RMD160 00e3b693f409e0d90ee575f294c3caa1cbcc2b22 SHA1 8b7b7aef6154e329325efd40da2c22b7c099c513 SHA256 794d317abd9329bff636e333c582e7fd79a8f4cccfe8d606d960eb2aebb22ccc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk9wXJoACgkQgAnW8HDreRbaLACfe7uIXHSSNCZTRSVUJk2Jwrqn
-4/oAn3phPG1f7/aEqa4RnOvzIOaieZD7
-=88ih
+iEYEAREKAAYFAk+ePzIACgkQgAnW8HDreRbZ6gCdH9wGzNBHIZDIjsizpw+UBgPz
+Zt8An2NY9ArmGrXS7ZA/Q8vQdDNEeRhP
+=a5Ey
 -----END PGP SIGNATURE-----
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
+}