scribus bump

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

3 files changed, 91 insertions, 2 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 4ca26eda162a..2a86bb7a85ac 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.113 2008/11/21 13:30:04 hanno Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.114 2009/07/30 19:09:14 hanno Exp $
+
+*scribus-1.3.3.13 (30 Jul 2009)
+
+  30 Jul 2009; Hanno Boeck <hanno@gentoo.org> +scribus-1.3.3.13.ebuild,
+  +files/scribus-1.3.3.13-cheaders.diff:
+  Version bump, patch for QA warnings, moved to EAPI 2.
 
   21 Nov 2008; Hanno Boeck <hanno@gentoo.org> scribus-1.3.3.12-r1.ebuild:
   Remove dodoc, redundant as the scribus build system already installs the
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
new file mode 100644
index 000000000000..8690f67e1638
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.3.3.13-cheaders.diff
@@ -0,0 +1,35 @@
+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.13.ebuild b/app-office/scribus/scribus-1.3.3.13.ebuild
new file mode 100644
index 000000000000..b4e47553ed7d
--- /dev/null
+++ b/app-office/scribus/scribus-1.3.3.13.ebuild
@@ -0,0 +1,48 @@
+# 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.1 2009/07/30 19:09:14 hanno 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}
+	virtual/ghostscript"
+
+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"
+}