scribus version bump and cleaned out old ebuilds

(Portage version: 2.1_pre7-r2)

14 files changed, 22 insertions, 280 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 398483de6d47..f60d252b84a3 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/scribus
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.76 2006/03/15 03:15:29 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.77 2006/03/27 15:21:30 hanno Exp $
+
+*scribus-1.3.3 (27 Mar 2006)
+
+  27 Mar 2006; Hanno Boeck <hanno@gentoo.org> +scribus-1.3.3.ebuild:
+  Version bump.
 
   15 Mar 2006; Patrick McLean <chutzpah@gentoo.org> scribus-1.2.4.1.ebuild:
   Stable on amd64 (bug #126244)
diff --git a/app-office/scribus/files/digest-scribus-1.2.2.1 b/app-office/scribus/files/digest-scribus-1.2.2.1
deleted file mode 100644
index f3d7da3fa23d..000000000000
--- a/app-office/scribus/files/digest-scribus-1.2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c2eac0a358b04c39252586d9d85ab24 scribus-1.2.2.1.tar.bz2 7718632
diff --git a/app-office/scribus/files/digest-scribus-1.2.3 b/app-office/scribus/files/digest-scribus-1.2.3
deleted file mode 100644
index 904bf4ba1d42..000000000000
--- a/app-office/scribus/files/digest-scribus-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ced1e74d4be30482b48bd04d52e47d46 scribus-1.2.3.tar.bz2 8048282
diff --git a/app-office/scribus/files/digest-scribus-1.3.1 b/app-office/scribus/files/digest-scribus-1.3.1
deleted file mode 100644
index 131bc6ae9f7c..000000000000
--- a/app-office/scribus/files/digest-scribus-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad36f7de1bba1229d143b93d2b6cd8e9 scribus-1.3.1.tar.bz2 8838483
diff --git a/app-office/scribus/files/digest-scribus-1.3.1-r1 b/app-office/scribus/files/digest-scribus-1.3.1-r1
deleted file mode 100644
index 131bc6ae9f7c..000000000000
--- a/app-office/scribus/files/digest-scribus-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad36f7de1bba1229d143b93d2b6cd8e9 scribus-1.3.1.tar.bz2 8838483
diff --git a/app-office/scribus/files/digest-scribus-1.3.2 b/app-office/scribus/files/digest-scribus-1.3.2
deleted file mode 100644
index de162c18de27..000000000000
--- a/app-office/scribus/files/digest-scribus-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 9910738
diff --git a/app-office/scribus/files/digest-scribus-1.3.3 b/app-office/scribus/files/digest-scribus-1.3.3
new file mode 100644
index 000000000000..c23e286f9017
--- /dev/null
+++ b/app-office/scribus/files/digest-scribus-1.3.3
@@ -0,0 +1,6 @@
+MD5 e5dea801a492aa607e8afbe8958d89c9 scribus-1.3-fhs.diff.bz2 5834
+RMD160 69080f7b5b8a1b4376ab5a56a50ad9444a4ecd00 scribus-1.3-fhs.diff.bz2 5834
+SHA256 7faaa2c08af3f1b2161dc72c69ce5086d3df9fa9754c21bfd5667ba3d374f156 scribus-1.3-fhs.diff.bz2 5834
+MD5 3d1dc7f13573243569b18239149b4e6c scribus-1.3.3.tar.bz2 10897464
+RMD160 609f52014602b0fc461ca57febeccaa0cbf3b11c scribus-1.3.3.tar.bz2 10897464
+SHA256 4307942753c3fc689a8b75e8bbbff9504dc32ee1e179fd4d9a01a1b94820bef6 scribus-1.3.3.tar.bz2 10897464
diff --git a/app-office/scribus/files/scribus-1.3.1-gcc41.patch b/app-office/scribus/files/scribus-1.3.1-gcc41.patch
deleted file mode 100644
index c71219449ffe..000000000000
--- a/app-office/scribus/files/scribus-1.3.1-gcc41.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur scribus-1.3.1/scribus/inspage.h scribus-1.3.1-gcc41/scribus/inspage.h
---- scribus-1.3.1/scribus/inspage.h	2005-08-17 01:17:16.000000000 +0200
-+++ scribus-1.3.1-gcc41/scribus/inspage.h	2005-12-20 23:53:55.383767250 +0100
-@@ -45,7 +45,7 @@
- 	QString prefsPageSizeName;
- 	QPtrList<QComboBox> masterPageCombos;
- 
--	const QStringList InsPage::getMasterPages();
-+	const QStringList getMasterPages();
- 	const QString getMasterPageN(uint n);
- 	const int getWhere();
- 	const int getWherePage();
-diff -Naur scribus-1.3.1/scribus/pdfoptionsio.h scribus-1.3.1-gcc41/scribus/pdfoptionsio.h
---- scribus-1.3.1/scribus/pdfoptionsio.h	2005-08-10 09:14:56.000000000 +0200
-+++ scribus-1.3.1-gcc41/scribus/pdfoptionsio.h	2005-12-20 23:56:51.582779000 +0100
-@@ -80,7 +80,7 @@
- 	// Build and return an XML representation of the settings.
- 	// QString::null is returned on failure, in which case
- 	// the error string is set.
--	QString PDFOptionsIO::buildXMLString();
-+	QString buildXMLString();
- 
- 	// Populate the current DOM tree with the settings from the
- 	// current PDFOptions instance.
-diff -Naur scribus-1.3.1/scribus/picstatus.h scribus-1.3.1-gcc41/scribus/picstatus.h
---- scribus-1.3.1/scribus/picstatus.h	2005-09-22 13:17:30.000000000 +0200
-+++ scribus-1.3.1-gcc41/scribus/picstatus.h	2005-12-20 23:57:32.409330500 +0100
-@@ -55,10 +55,10 @@
- 
- 	// Toggle a searc button in the table between "Search" and "Cancel Search",
- 	// fixing signal connections as well.
--	void PicStatus::setSearchButton(int row, bool toCancel, const FileSearch* searcher);
-+	void setSearchButton(int row, bool toCancel, const FileSearch* searcher);
- 
- 	// Load the image specified into the PageItem shown on row `row'
--	bool PicStatus::loadPictByRow(const QString & newFilePath, unsigned int row);
-+	bool loadPictByRow(const QString & newFilePath, unsigned int row);
- 
- 	// Column indexes
- 	static const unsigned short COL_FILENAME;
diff --git a/app-office/scribus/files/scribus-1.3.1-memleak.patch b/app-office/scribus/files/scribus-1.3.1-memleak.patch
deleted file mode 100644
index 5e2528f6037a..000000000000
--- a/app-office/scribus/files/scribus-1.3.1-memleak.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- scribus-1.3.1-orig/scribus/util.cpp	2005-09-17 05:55:05.000000000 +0200
-+++ scribus-1.3.1/scribus/util.cpp	2005-11-03 00:22:32.000000000 +0100
-@@ -1201,20 +1201,20 @@
- {
- 	static QMap<QRgb, QPixmap*> pxCache;
- 
--	QPixmap * pm = pxCache[rgb.rgb()];
--	if (!pm)
--	{
--		pm = new QPixmap(15, 15);
--		pm->fill(rgb);
--		QPainter p;
--		p.begin(pm);
--		p.setBrush(Qt::NoBrush);
--		QPen b(Qt::black, 1);
--		p.setPen(b);
--		p.drawRect(0, 0, 15, 15);
--		p.end();
--		pxCache[rgb.rgb()] = pm;
--	}
-+	QRgb index=rgb.rgb();
-+	if (pxCache.contains(index))
-+		return pxCache[index];
-+
-+	QPixmap *pm = new QPixmap(15, 15);
-+	pm->fill(rgb);
-+	QPainter p;
-+	p.begin(pm);
-+	p.setBrush(Qt::NoBrush);
-+	QPen b(Qt::black, 1);
-+	p.setPen(b);
-+	p.drawRect(0, 0, 15, 15);
-+	p.end();
-+	pxCache.insert(index, pm);
- 	return pm;
- }
- 
-@@ -1222,12 +1222,13 @@
- {
- 	static QMap<QRgb, QPixmap*> pxCache;
- 
--	QPixmap * pm = pxCache[rgb.rgb()];
--	if (!pm) {
--		pm = new QPixmap(30, 15);
--		pm->fill(rgb);
--		pxCache[rgb.rgb()] = pm;
--	}
-+	QRgb index=rgb.rgb();
-+	if (pxCache.contains(index))
-+		return pxCache[index];
-+
-+	QPixmap *pm = new QPixmap(30, 15);
-+	pm->fill(rgb);
-+	pxCache.insert(index, pm);
- 	return pm;
- }
- 
diff --git a/app-office/scribus/scribus-1.2.2.1.ebuild b/app-office/scribus/scribus-1.2.2.1.ebuild
deleted file mode 100644
index d0fa84e41af9..000000000000
--- a/app-office/scribus/scribus-1.2.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.2.1.ebuild,v 1.8 2005/09/24 08:15:24 corsair Exp $
-
-inherit qt3 eutils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3.4)
-	>=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"
-
-RDEPEND="${DEPEND}
-	virtual/ghostscript"
-
-src_compile() {
-	econf || die
-	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	domenu scribus.desktop
-	doicon scribus/icons/scribusicon.png
-
-	mkdir -p ${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
-}
diff --git a/app-office/scribus/scribus-1.2.3.ebuild b/app-office/scribus/scribus-1.2.3.ebuild
deleted file mode 100644
index 318873142ef8..000000000000
--- a/app-office/scribus/scribus-1.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.3.ebuild,v 1.1 2005/09/13 22:36:13 hanno Exp $
-
-inherit qt3 eutils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3.4)
-	>=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"
-
-RDEPEND="${DEPEND}
-	virtual/ghostscript"
-
-src_compile() {
-	econf || die
-	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	domenu scribus.desktop
-	doicon scribus/icons/scribusicon.png
-
-	mkdir -p ${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
-}
diff --git a/app-office/scribus/scribus-1.3.1-r1.ebuild b/app-office/scribus/scribus-1.3.1-r1.ebuild
deleted file mode 100644
index aae4cc10c00c..000000000000
--- a/app-office/scribus/scribus-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.1-r1.ebuild,v 1.1 2005/12/20 23:40:04 hanno Exp $
-
-inherit qt3 eutils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-IUSE="cairo"
-
-DEPEND="$(qt_min_version 3.3.4)
-	>=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}
-	virtual/ghostscript"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/scribus-1.3.1-memleak.patch
-	epatch ${FILESDIR}/scribus-1.3.1-gcc41.patch
-}
-
-src_compile() {
-	econf `use_enable cairo` || die
-	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	domenu scribus.desktop
-	doicon scribus/icons/scribusicon.png
-
-	mkdir -p ${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
-}
diff --git a/app-office/scribus/scribus-1.3.2.ebuild b/app-office/scribus/scribus-1.3.2.ebuild
deleted file mode 100644
index 61a2fc0f5a19..000000000000
--- a/app-office/scribus/scribus-1.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.2.ebuild,v 1.1 2006/01/23 15:10:22 hanno Exp $
-
-inherit qt3 eutils
-
-DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
-HOMEPAGE="http://www.scribus.net"
-SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3.4)
-	>=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"
-
-RDEPEND="${DEPEND}
-	virtual/ghostscript"
-
-src_compile() {
-	econf --disable-cairo || die
-	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	domenu scribus.desktop
-	doicon scribus/icons/scribusicon.png
-
-	mkdir -p ${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
-}
diff --git a/app-office/scribus/scribus-1.3.1.ebuild b/app-office/scribus/scribus-1.3.3.ebuild
index 80927bf82121..4afc7a273761 100644
--- a/app-office/scribus/scribus-1.3.1.ebuild
+++ b/app-office/scribus/scribus-1.3.3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.1.ebuild,v 1.1 2005/10/09 20:36:52 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.3.ebuild,v 1.1 2006/03/27 15:21:30 hanno Exp $
 
 inherit qt3 eutils
 
 DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
 HOMEPAGE="http://www.scribus.net"
-SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://www.schokokeks.org/~hanno/scribus-1.3-fhs.diff.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
@@ -24,6 +25,12 @@ DEPEND="$(qt_min_version 3.3.4)
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/scribus-1.3-fhs.diff.bz2
+}
+
 src_compile() {
 	econf `use_enable cairo` || die
 	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
@@ -36,7 +43,4 @@ src_install() {
 
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png
-
-	mkdir -p ${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
 }