summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-05-31 18:19:25 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-05-31 18:19:25 +0000
commit2e5c7a9f17e5ace99666fab565e0e97c5fd4133c (patch)
tree3d752e792ec8cd550929819813a6dfb547844261 /app-office
parentAdded ghc 6.10.4 and 6.12.1 binaries for ppc, marked ~ppc. (diff)
downloadhistorical-2e5c7a9f17e5ace99666fab565e0e97c5fd4133c.tar.gz
historical-2e5c7a9f17e5ace99666fab565e0e97c5fd4133c.tar.bz2
historical-2e5c7a9f17e5ace99666fab565e0e97c5fd4133c.zip
Backport fix for deprecation warning from scribus-1.3.6.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/scribus/ChangeLog6
-rw-r--r--app-office/scribus/Manifest4
-rw-r--r--app-office/scribus/scribus-1.3.5.1.ebuild8
3 files changed, 10 insertions, 8 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 6f2b57c88051..7f2746f76bf2 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
# 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.131 2010/05/24 15:45:54 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.132 2010/05/31 18:19:25 arfrever Exp $
+
+ 31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ scribus-1.3.5.1.ebuild:
+ Backport fix for deprecation warning from scribus-1.3.6.
23 May 2010; <nixnut@gentoo.org> scribus-1.3.6.ebuild:
ppc stable #316177
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4a483fd4db0d..3874ccfe5585 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,7 +4,7 @@ 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
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 1726 RMD160 0d03679f5ef9fecd474becfa09187a6939b06e01 SHA1 a82ef3b3a8c65ae6c0c1ca65b7484443b06cf4f7 SHA256 98b528bc076447bce4528930f6b624659f7d19b4906a825a2d747cff5dc8803f
+EBUILD scribus-1.3.5.1.ebuild 1691 RMD160 dcb2992bc3993570b328c3ba4b91ca68b8a93d6a SHA1 3eb2fde03ef860676861f7ad7a5b7620efd6b63f SHA256 aa753a155cc4212e109ec79889828cec0c7bb647f7bc4e97b0422a6e9a56142f
EBUILD scribus-1.3.6.ebuild 1790 RMD160 c2c3a6ec3740e7d7428856332890ae84a8940102 SHA1 ddf347dc7349a48787a581dd92fa59eb586d9b88 SHA256 ddf53faa44fa16087e270526350b709dafd0df85e8c12c2fa5a0ed2a04540801
-MISC ChangeLog 15969 RMD160 c6bb0c9f32d0453450102336ee7e1ab74741b68d SHA1 16c201e1e92e9ce1a720628bcebef1eba2edbc42 SHA256 609e3ae6da2c4972b177908b82fa036ae5592397665b8f874f789cf59e182a9c
+MISC ChangeLog 16130 RMD160 c9742087f3af5cba4fa81e2f3cf4da8a82e4a8a3 SHA1 4b8b608256c4ad24a036f084259c26cae8c20943 SHA256 81a6f8f2004d74710afed9436d447a5ddd3b772bada9a37297f6443dfd2a6579
MISC metadata.xml 378 RMD160 2fa6ab13de3a197730f0888b1c468e532784c714 SHA1 551e7f0bc554518120b6c6b1bc097f5fb5d1eb49 SHA256 0a54cc08b3a8542bc6d63f6670ee998339a932cdb9690418cf67b5854b1412d6
diff --git a/app-office/scribus/scribus-1.3.5.1.ebuild b/app-office/scribus/scribus-1.3.5.1.ebuild
index 3e0336741463..37be52c383ad 100644
--- a/app-office/scribus/scribus-1.3.5.1.ebuild
+++ b/app-office/scribus/scribus-1.3.5.1.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.5.1.ebuild,v 1.8 2010/02/16 22:34:43 fauli Exp $
+# $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
@@ -41,12 +41,10 @@ PATCHES=( "${FILESDIR}/${P}-check-hdict.patch"
DOCS="AUTHORS ChangeLog* LINKS NEWS README TODO TRANSLATION"
src_configure() {
- python_version
-
mycmakeargs="${mycmakeargs}
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER}
- -DPYTHON_LIBRARY=/usr/$(get_libdir)/libpython${PYVER}.so
+ -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
+ -DPYTHON_LIBRARY=$(python_get_library)
-DWANT_NORPATH=ON
-DWANT_QTARTHUR=ON
-DWANT_QT3SUPPORT=OFF