Remove old wrt bug #302249, Comment #8.

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

4 files changed, 6 insertions, 132 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index c07e48bf0ec9..2db686b96c2d 100644
--- 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/files/scribus-1.3.3.13-cheaders.diff b/app-office/scribus/files/scribus-1.3.3.13-cheaders.diff
deleted file mode 100644
index 8690f67e1638..000000000000
--- 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
index e833349dbdb1..000000000000
--- 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
index 0efd2ba45371..000000000000
--- 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"
-}