ppc64 stable wrt #316177

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 8 insertions, 127 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 2355af275965..b75f1ba7f99e 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.133 2010/06/21 11:33:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.134 2010/07/04 13:21:11 ssuominen Exp $
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> scribus-1.3.6.ebuild:
+  ppc64 stable wrt #316177
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> scribus-1.3.6.ebuild:
   Restrict media-libs/lcms depend to old version.
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index bf3f94d59cb4..be4c954fc66d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,10 +1,6 @@
-AUX scribus-1.3.5.1-check-hdict.patch 763 RMD160 c3c91f54004f69fce789d65c5bf298b3c7e2f034 SHA1 81e43534289516f41a33d5d2c1d7dc93b1291cbc SHA256 ee50555430cb6a14d63c5e7ec2bd64b3240a3adb2266eed90f850fdeeeaf10bc
-AUX scribus-1.3.5.1-lib2geom.patch 1052 RMD160 cda2ac0a8d053d049579276220adb574cdfaab10 SHA1 bb983d29223bedabeb8759d2c90a0baf446d8ec1 SHA256 1efb7fedad54a6a19a86b35121243800c7f38a550381329e09447fe1eec540b4
 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
-DIST scribus-1.3.5.1.tar.bz2 23680739 RMD160 8b8a73909b3c482de2a77cd344e91a8aedbf2611 SHA1 d138e47e2177974d18c2f7c87a1db9e462bf6287 SHA256 2e40fdf19aec6e4cfa7923bcf1214a8ab76e298c2a8401553fe808ee1b29006c
 DIST scribus-1.3.6.tar.bz2 22910849 RMD160 ab12c1191ee2c260280114bea0c112b933be5c7c SHA1 02bb65e9b7688e09c24eda60eefdd2aa990ca40c SHA256 262989072fca29dab29f1677e9498b4d551aa1c0f2fe0dec866a6c304ec8ecc3
-EBUILD scribus-1.3.5.1.ebuild 1691 RMD160 dcb2992bc3993570b328c3ba4b91ca68b8a93d6a SHA1 3eb2fde03ef860676861f7ad7a5b7620efd6b63f SHA256 aa753a155cc4212e109ec79889828cec0c7bb647f7bc4e97b0422a6e9a56142f
-EBUILD scribus-1.3.6.ebuild 1797 RMD160 d93e8f994be52eafa9437e10b48bab5c884dfce0 SHA1 e8c688f14bdb9561325211732295cf2d95f19767 SHA256 0c3e53aed0e44efc5ef618e913e51ee1cc0ed8f27ae999784f2a941c82c21688
-MISC ChangeLog 16258 RMD160 4ab84e2c6040ba13ef7f69a09c2c689cb65439aa SHA1 0a89fec107bb30c8ee895aea8e5ce5bd7dda85d7 SHA256 eb0f532c28689878efcc51e11addfe5665370f948fa4962f91e491758f91c8a3
+EBUILD scribus-1.3.6.ebuild 1796 RMD160 916a7a305fb817c971e304bc02bcf58541636e03 SHA1 3959f3283ef74a2255f41a2f8bd7b3b561770bd3 SHA256 aafe84c1e66fa9aa4b1fc3728831eb7766fd99873035ce7bb8be102ddc94a90d
+MISC ChangeLog 16362 RMD160 324fb54a7af1f57424651c1979eef1edd6391ad3 SHA1 6817f80a092716a5ceff1880397b52db6984b879 SHA256 a938d0be003a7d14047fc2afe9962500c9e568f5e929c140a2561345690790e2
 MISC metadata.xml 378 RMD160 2fa6ab13de3a197730f0888b1c468e532784c714 SHA1 551e7f0bc554518120b6c6b1bc097f5fb5d1eb49 SHA256 0a54cc08b3a8542bc6d63f6670ee998339a932cdb9690418cf67b5854b1412d6
diff --git a/app-office/scribus/files/scribus-1.3.5.1-check-hdict.patch b/app-office/scribus/files/scribus-1.3.5.1-check-hdict.patch
deleted file mode 100644
index 40c93226138e..000000000000
--- a/app-office/scribus/files/scribus-1.3.5.1-check-hdict.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dedea3f94802f0f9d9adef4c48f8061282baf776 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Mon, 23 Nov 2009 10:13:48 +0100
-Subject: [PATCH] check hdict value before freeing the hyphenator
-
----
- Scribus/scribus/hyphenator.cpp |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Scribus/scribus/hyphenator.cpp b/Scribus/scribus/hyphenator.cpp
-index 614db47..4da4467 100644
---- a/Scribus/scribus/hyphenator.cpp
-+++ b/Scribus/scribus/hyphenator.cpp
-@@ -90,7 +90,8 @@ Hyphenator::Hyphenator(QWidget* parent, ScribusDoc *dok) : QObject( parent ),
- 
- Hyphenator::~Hyphenator()
- {
--	hnj_hyphen_free(hdict);
-+	if (hdict)
-+		hnj_hyphen_free(hdict);
- }
- 
- void Hyphenator::NewDict(const QString& name)
--- 
-1.6.3.3
-
diff --git a/app-office/scribus/files/scribus-1.3.5.1-lib2geom.patch b/app-office/scribus/files/scribus-1.3.5.1-lib2geom.patch
deleted file mode 100644
index 6b7492770359..000000000000
--- a/app-office/scribus/files/scribus-1.3.5.1-lib2geom.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur scribus-1.3.5.1.orig/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt scribus-1.3.5.1/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
---- scribus-1.3.5.1.orig/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	2008-06-02 01:38:43.000000000 +0300
-+++ scribus-1.3.5.1/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	2010-01-06 20:31:13.000000000 +0200
-@@ -16,6 +16,10 @@
- #CB SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
- # We need to pass -fPIC only to lib2geom on amd64 - avoid it elsewhere see: http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3
- 
-+IF (ARCH_X86_64 EQUAL 1)
-+  SET(CMAKE_CXX_FLAGS "$(CMAKE_CXX_FLAGS) -fPIC")
-+ENDIF (ARCH_X86_64 EQUAL 1)
-+
- OPTION(2GEOM_BUILD_SHARED
-   "Build lib2geom and libtoy as shared libraries."
-   OFF)
-@@ -112,4 +116,4 @@
- #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
- #                ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
- #INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
--#
-\ No newline at end of file
-+#
diff --git a/app-office/scribus/scribus-1.3.5.1.ebuild b/app-office/scribus/scribus-1.3.5.1.ebuild
deleted file mode 100644
index 37be52c383ad..000000000000
--- a/app-office/scribus/scribus-1.3.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.5.1.ebuild,v 1.9 2010/05/31 18:19:25 arfrever Exp $
-
-EAPI=2
-NEED_PYTHON=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 +pdf spell"
-
-COMMON_DEPEND="dev-libs/hyphen
-	dev-libs/libxml2
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/jpeg:0
-	media-libs/lcms
-	media-libs/libpng
-	media-libs/tiff
-	net-print/cups
-	sys-libs/zlib
-	x11-libs/qt-gui:4
-	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}/${P}-check-hdict.patch"
-	"${FILESDIR}/${P}-system-hyphen.patch"
-	"${FILESDIR}/${P}-lib2geom.patch" )
-
-DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
-
-src_configure() {
-	mycmakeargs="${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_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	doicon scribus/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.3.6.ebuild b/app-office/scribus/scribus-1.3.6.ebuild
index 88e89f7f570a..c9569a7fa56e 100644
--- a/app-office/scribus/scribus-1.3.6.ebuild
+++ b/app-office/scribus/scribus-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.7 2010/06/21 11:33:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.6.ebuild,v 1.8 2010/07/04 13:21:11 ssuominen Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="cairo debug +minimal +pdf spell"
 
 COMMON_DEPEND="dev-libs/hyphen