Added fixes for zlib-1.2.5.1-r1, #383833

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

4 files changed, 115 insertions, 11 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/Manifest b/app-office/scribus/Manifest
index ec7e73ff451c..ed9c1ed68c27 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX scribus-1.3.5.1-system-hyphen.patch 3754 RMD160 15e0768f9f2aaf1c297b2226bd040d9ff8b0a648 SHA1 c5f9513799f41fb6569cc6bf9a2f7825d3a494bd SHA256 f17ef356e0c096b71e83048a4c97b53e455a73af7f25bc9048136c8000744e67
 AUX scribus-1.3.6-podofo-0.8.0.patch 1749 RMD160 f5a54609d7f382cc99e90857c430585f704b9918 SHA1 901631c1b1b2a01ed4acb594ad8bc1a54803810c SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7
@@ -11,16 +11,15 @@ DIST scribus-1.4.0.rc5.tar.bz2 36661351 RMD160 73d040ef136df76fbbc440f0e8589b913
 EBUILD scribus-1.3.6.ebuild 1830 RMD160 a7c2e1fe3b5df278e63c537c33f72ca92ade4db7 SHA1 15194e963496dd6624f45e68edb9f1d94811d111 SHA256 b73763a9ea03468cd87e0f28039443ba708aee3eabdaace16ba6500e59d20900
 EBUILD scribus-1.3.8.ebuild 1760 RMD160 5a7c4d967c776adba4ee4586fde4742c9db33caf SHA1 b88d52f919b39f43dad7888bf9a253252779b0b3 SHA256 2c710421fe0b3de392dfafc992768e63bea60ea668673654c7dabaf51b538dea
 EBUILD scribus-1.3.9-r1.ebuild 2010 RMD160 212550f0938bb3b4e9eab60b2c1495a43cc3ada4 SHA1 e9ca5f227deeca7ac65be0909ca6abc0e0ce5429 SHA256 9d3d6c157fe5fb011749ec1f4ea6b4182c143cc52e5b3332f453d568fa2f4209
+EBUILD scribus-1.3.9-r2.ebuild 2112 RMD160 e38894a519960002e69b921d8c2ed247211244a2 SHA1 96492a80ffce2f8eb237cbe382bfe9a2d9cdd188 SHA256 2b2c8781a6e60685d4705cd2f931d77efa68b5ec7cedd02d00ae47272170d41a
 EBUILD scribus-1.3.9.ebuild 1762 RMD160 c16228fd11f5dca702453ded1a6e74822217847c SHA1 278bee25497a0bcedb9b4720a218e6ffc17f95ed SHA256 ccd77304b767a83ba46e409e9b66ed508d72b0b6bacb3c799e1b89eba3eb61e9
-EBUILD scribus-1.4.0_rc5.ebuild 2087 RMD160 5cd7681b06f0de1f164e728e6a8382fdc114dfdc SHA1 ae0577ba04e03086f8366abfc40ed5e3d151e126 SHA256 6a9ac96390e39dc323af964c9cd0fb41a14d25a9c185b6a2246d0196fafdd0c3
-MISC ChangeLog 18125 RMD160 2d8698fc4e6d3d602332dd60a9a6795768682120 SHA1 62d45c422498c77f8540944cd549670b65bad96f SHA256 b3d032b92b981cdbc72d2bd01e5b4a895127c2102daca8b1a1622e9e9e13cfd7
+EBUILD scribus-1.4.0_rc5.ebuild 2186 RMD160 dea5eae7449ddca4a13f21fcc33f12b93496f5ce SHA1 620259b943d189c85c7be5e4a7a34d5884e15b89 SHA256 f117b80ec80b1fbef0d073d29dd21dbced1eb3e514ff44ede63d457f665b679f
+MISC ChangeLog 18297 RMD160 9236f9d8f7bc1c472191fff66c9c5fee1d252298 SHA1 ccdde2316d4f89716649ceec1db844534a8c3b8e SHA256 a25870273a0f93888e03a26aa5a17d3f879c227cf596c9a78aa0ed420b549862
 MISC metadata.xml 509 RMD160 973444b4aa0105ba32817d53de061a7d3708a60f SHA1 0f44e6bec99702756c1128c416367cda4c1b0c0e SHA256 d20aac5deda5242c9f51e632f54f672a7c7df060ae18ff04f1779d57b202550a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4gV8IACgkQIiMqcbOVdxTfAgP+OK7Kg8Jx2QUhYrGOIhS9PiSb
-ubtl2N6G+1qZU41b/+Xmmq6DswOLNXvCCOsZD74+6W3ROWGcumKwYTqobN+1vEsf
-MrglVHtlhb0DEWr5PypgCszli6oq3Iv60mlG2Pywqb1efKBMmg4xKCj6kKhUbAJH
-mknsfXS4Ks7BoLpFOCg=
-=8SbX
+iEYEAREKAAYFAk6CQAAACgkQgAnW8HDreRYfLwCgxdEBGMU4khOP/SfqUYpK712g
+vLIAoLGOZcf9WE+TJuJHq/b42oX1M2/u
+=KZy7
 -----END PGP SIGNATURE-----
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
 }