Added fixes for zlib-1.2.5.1-r1, #383833

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

3 files changed, 107 insertions, 2 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index c418c2c79c29..97ec211e90b6 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.145 2011/07/15 15:07:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.146 2011/09/27 21:28:14 jlec Exp $
+
+*scribus-1.3.9-r2 (27 Sep 2011)
+
+  27 Sep 2011; Justin Lecher <jlec@gentoo.org> +scribus-1.3.9-r2.ebuild,
+  scribus-1.4.0_rc5.ebuild:
+  Added fixes for zlib-1.2.5.1-r1, #383833
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> scribus-1.3.9.ebuild:
   ppc/ppc64 stable wrt #362053
diff --git a/app-office/scribus/scribus-1.3.9-r2.ebuild b/app-office/scribus/scribus-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..b43d48554938
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.9-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.9-r2.ebuild,v 1.1 2011/09/27 21:28:14 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+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"
+
+COMMON_DEPEND="
+	dev-libs/hyphen
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:0
+	media-libs/libpng
+	media-libs/tiff
+	net-print/cups
+	sys-libs/zlib
+	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.3.5.1-system-hyphen.patch"
+	)
+
+DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	use templates || \
+		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
+	use examples || \
+		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+
+	base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		"-DHAVE_PYTHON=ON"
+		"-DPYTHON_INCLUDE_PATH=$(python_get_includedir)"
+		"-DPYTHON_LIBRARY=$(python_get_library)"
+		"-DWANT_NORPATH=ON"
+		"-DWANT_QTARTHUR=ON"
+		"-DWANT_QT3SUPPORT=OFF"
+		$(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_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	doicon resources/icons/scribus.png
+	domenu scribus.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
diff --git a/app-office/scribus/scribus-1.4.0_rc5.ebuild b/app-office/scribus/scribus-1.4.0_rc5.ebuild
index b11e074bdb50..49093d90d4e1 100644
--- a/app-office/scribus/scribus-1.4.0_rc5.ebuild
+++ b/app-office/scribus/scribus-1.4.0_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_rc5.ebuild,v 1.3 2011/07/12 09:59:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0_rc5.ebuild,v 1.4 2011/09/27 21:28:14 jlec Exp $
 
 EAPI=3
 
@@ -55,6 +55,11 @@ src_prepare() {
 		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt
 	use examples || \
 		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt
+
+sed \
+	-e '1i#define OF(x) x' \
+	-i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+
 	base_src_prepare
 }