ppc64 stable wrt #316177

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 6 insertions, 121 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/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