Remove old wrt bug #302249, Comment #8.

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

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index c07e48bf0ec959940a004ce77715faee71d18c0e..2db686b96c2db50aab309dc0d0bd657d1bca64c3 100644 (file)
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.125 2010/03/17 09:56:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.126 2010/03/17 10:02:52 ssuominen Exp $
+
+  17 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -scribus-1.3.3.11.ebuild, -scribus-1.3.3.13.ebuild,
+  -files/scribus-1.3.3.13-cheaders.diff:
+  Remove old wrt bug #302249, Comment #8.
 
 *scribus-1.3.6 (17 Mar 2010)
 

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 84059f85f5f5c2597914ef4a592c294ba40ae9b4..357ba2be1aaa0727fb1588cccfd520b5cd5d6416 100644 (file)
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,14 +1,9 @@
-AUX scribus-1.3.3.13-cheaders.diff 1049 RMD160 362a14ab7aca1167e4ec61ee93501fde5a578316 SHA1 8292b969bfabbeec30d35ee8a70205ae9028d26c SHA256 fea1e15bd15635fec7fc4e3cfd777de8242fd435280575bff6aa2d92e8d614a3
 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
-DIST scribus-1.3.3.11.tar.bz2 13302366 RMD160 88fcc880c93756b0ea5d373228e8c2cee5602e31 SHA1 f9242b5b77cf0644ff5d8277425852c7e9df4a55 SHA256 8685baf28a21d7c680b0f9ff62188818b837bb67c64dc15fce3acbdc9180a8ca
-DIST scribus-1.3.3.13.tar.bz2 14923426 RMD160 c12860f38e103c1f7249449b0316a69bf8bdafbf SHA1 72625d2c172c991c88e521f6597b914365eba320 SHA256 5a255e81d662f27729b2a3b658d6a8e2a6bc5caad328935b3d5a1fae5db3841a
 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.3.11.ebuild 1108 RMD160 46e30897eaafdd9c479554f54131d9edd1da7a18 SHA1 a17fdf036cdc28aea0f8d865443747957864c861 SHA256 3dc934e5d925afa76e857b02082490797fe62534f055cb2763faa159838a90b9
-EBUILD scribus-1.3.3.13.ebuild 1211 RMD160 3b3313f228736adfdffe92d36cd79a9b190028b3 SHA1 3f97ba3b3510a39625baf68862ffa2a578a07f7b SHA256 b9de2101b6d4e9d85ceaac513fae7ce1afaf0f00a5359a5b9787b4cf922bb96d
 EBUILD scribus-1.3.5.1.ebuild 1726 RMD160 0d03679f5ef9fecd474becfa09187a6939b06e01 SHA1 a82ef3b3a8c65ae6c0c1ca65b7484443b06cf4f7 SHA256 98b528bc076447bce4528930f6b624659f7d19b4906a825a2d747cff5dc8803f
 EBUILD scribus-1.3.6.ebuild 1687 RMD160 4025a60d86a5b939f0408be148a3a2cd6c21fe62 SHA1 9be84c52311a36a12c37fb08d6448e562a399cfc SHA256 44d95b86eddcfa46fbe75a09e8865f4f8b97df5b367a478fc245de0705c52c4a
-MISC ChangeLog 15033 RMD160 040db7b3dbf00da37f1f36dab7716261be16545d SHA1 b95b8e547d5d1a3e961c0501afc9bc40d9f3f905 SHA256 187257e9d167751f2b023ceae71bf5ab7f5d0cccbcb24f5eae4150b022c80f78
+MISC ChangeLog 15225 RMD160 30ee22bc809ca558d5e22e456116bb1855234ab4 SHA1 469d39c9517566fa481f75a97569c27224e1bda6 SHA256 86696f4e35fd9b1d60b039f8251c87a0fb754fbca23fbe7d5d537450b236294f
 MISC metadata.xml 362 RMD160 9199b9f1cdf7ead6f377a2a112c075a1e99a8650 SHA1 03e3f1197ae7b149c9a365136d134d55f3fb9995 SHA256 c0a47d4ce874707eda75a4ae913db075febcfa5e8aff6428daf1beaf9d93cf0a

diff --git a/app-office/scribus/files/scribus-1.3.3.13-cheaders.diff b/app-office/scribus/files/scribus-1.3.3.13-cheaders.diff
deleted file mode 100644 (file)
index 8690f67..0000000
--- a/app-office/scribus/files/scribus-1.3.3.13-cheaders.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur scribus-1.3.3.13/scribus/md5.c scribus-1.3.3.13-1/scribus/md5.c
---- scribus-1.3.3.13/scribus/md5.c     2005-07-05 09:36:06.000000000 +0300
-+++ scribus-1.3.3.13-1/scribus/md5.c   2009-07-27 23:04:27.000000000 +0300
-@@ -24,6 +24,7 @@
- #include "scconfig.h"
- #endif
- 
-+#include <strings.h>
- #include <sys/types.h>
- 
- #if STDC_HEADERS || defined _LIBC
-diff -Naur scribus-1.3.3.13/scribus/pixbuf/gdk-pixbuf-xlibrgb.c scribus-1.3.3.13-1/scribus/pixbuf/gdk-pixbuf-xlibrgb.c
---- scribus-1.3.3.13/scribus/pixbuf/gdk-pixbuf-xlibrgb.c       2005-07-05 09:36:06.000000000 +0300
-+++ scribus-1.3.3.13-1/scribus/pixbuf/gdk-pixbuf-xlibrgb.c     2009-07-27 23:00:46.000000000 +0300
-@@ -51,16 +51,12 @@
- 
- #if HAVE_CONFIG_H
- #  include "scconfig.h"
--#  if STDC_HEADERS
--#    include <stdio.h>
--#    include <stdlib.h>
--#    include <string.h>
--#  endif
--#else
--#  include <stdio.h>
--#  include <stdlib.h>
- #endif
- 
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
- #define ENABLE_GRAYSCALE
- 
- /* include this before so that we can get endian definitions if

diff --git a/app-office/scribus/scribus-1.3.3.11.ebuild b/app-office/scribus/scribus-1.3.3.11.ebuild
deleted file mode 100644 (file)
index e833349..0000000
--- a/app-office/scribus/scribus-1.3.3.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.11.ebuild,v 1.8 2009/12/26 19:27:03 pva Exp $
-
-EAPI=1
-
-inherit qt3 eutils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="cairo"
-
-DEPEND="x11-libs/qt:3
-       >=media-libs/freetype-2.1
-       >=media-libs/lcms-1.09
-       media-libs/tiff
-       >=media-libs/libart_lgpl-2.3.8
-       >=sys-devel/gcc-3.0.0
-       >=dev-libs/libxml2-2.6.0
-       cairo? ( >=x11-libs/cairo-1.0 )"
-
-RDEPEND="${DEPEND}
-       app-text/ghostscript-gpl"
-
-pkg_setup() {
-       if use cairo && ! built_with_use 'x11-libs/cairo' 'X' ; then
-               eerror "You must build cairo with X support"
-               die "x11-libs/cairo built without X"
-       fi
-}
-
-src_compile() {
-       econf `use_enable cairo` || die
-       emake || die
-}
-
-src_install() {
-       einstall || die
-
-       dodoc AUTHORS ChangeLog README TODO
-
-       domenu scribus.desktop
-       doicon scribus/icons/scribusicon.png
-}

diff --git a/app-office/scribus/scribus-1.3.3.13.ebuild b/app-office/scribus/scribus-1.3.3.13.ebuild
deleted file mode 100644 (file)
index 0efd2ba..0000000
--- a/app-office/scribus/scribus-1.3.3.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.13.ebuild,v 1.2 2009/12/26 19:27:03 pva Exp $
-
-EAPI=2
-
-inherit qt3 eutils cmake-utils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo cups"
-
-DEPEND="x11-libs/qt:3
-       >=media-libs/freetype-2.3
-       >=media-libs/lcms-1.17
-       >=media-libs/tiff-3.6
-       >=media-libs/libart_lgpl-2.3.17
-       >=dev-libs/libxml2-2.6.0
-       media-libs/jpeg
-       media-libs/libpng
-       dev-python/imaging
-       media-libs/fontconfig
-       cups? ( net-print/cups )
-       cairo? ( >=x11-libs/cairo-1.4.10[X,svg] )"
-
-RDEPEND="${DEPEND}
-       app-text/ghostscript-gpl"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-cheaders.diff" || die
-}
-
-src_compile() {
-       local mycmakeargs="$(cmake-utils_use_want cairo CAIRO) \
-               $(cmake-utils_use_enable cups)"
-       cmake-utils_src_compile || die "compile failed"
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       domenu scribus.desktop
-       doicon scribus/icons/scribus.png || die "doicon failed"
-}