cleanup scribus

8 files changed, 4 insertions, 202 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0fea3f6f7dd2..bcd15d2d9ca7 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,11 +1,5 @@
-MD5 b90f5cf030e2cfc25484ca6895969f15 scribus-1.0_rc1.ebuild 1202
-MD5 1034f2a05f99b89d7412441bd8b35491 scribus-0.8.ebuild 1360
-MD5 477f32fa908953deeeb30fad3de09b28 scribus-1.0.1.ebuild 1141
-MD5 5fd42666eff7ffd683db75fd382b3f94 scribus-1.0.ebuild 1138
 MD5 eb64b6c6bbbf03b766ee74a909679653 ChangeLog 2218
-MD5 418671b40c4b08e6ce65a757c0999753 files/Fonts.diff 843
-MD5 123bb39628fb75fc8db1967bab163f1d files/digest-scribus-0.8 64
+MD5 5fd42666eff7ffd683db75fd382b3f94 scribus-1.0.ebuild 1138
+MD5 5aec1778cc4b006894f76fd209769668 scribus-1.0.1.ebuild 1140
 MD5 12f985e1638cfcf7bb181e1d1fa8c4a9 files/digest-scribus-1.0 64
 MD5 9166f39eab6ccbb4059900d5b22b2061 files/digest-scribus-1.0.1 66
-MD5 34060ad84b63c66cd7a8e223e2c3efd6 files/Palette.diff 2322
-MD5 a1b3e8fea8dce00c91dd7a0b2625b0ff files/digest-scribus-1.0_rc1 67
diff --git a/app-office/scribus/files/Fonts.diff b/app-office/scribus/files/Fonts.diff
deleted file mode 100644
index 273378a53aba..000000000000
--- a/app-office/scribus/files/Fonts.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur scribus-0.8/scribus/fmitem.cpp scribus-0.8n/scribus/fmitem.cpp
---- scribus-0.8/scribus/fmitem.cpp	Fri Nov 30 21:50:57 2001
-+++ scribus-0.8n/scribus/fmitem.cpp	Fri Oct 11 11:16:59 2002
-@@ -17,11 +17,13 @@
- 
- #include "fmitem.h"
- #include <qfontmetrics.h>
-+#include <qapplication.h>
- 
- FmItem::FmItem(const QString& s, const QFont& f)
- {
- 	string = s;
- 	font = f;
-+	font.setPointSize(qApp->font().pointSize());
- }
- FmItem::~FmItem()
- {
-diff -ur scribus-0.8/scribus/scfonts.cpp scribus-0.8n/scribus/scfonts.cpp
---- scribus-0.8/scribus/scfonts.cpp	Sun Sep 22 10:54:38 2002
-+++ scribus-0.8n/scribus/scfonts.cpp	Sat Oct 12 19:41:57 2002
-@@ -443,6 +443,7 @@
- 					{
- 						t->Font.setPointSize(12);
- 						t->Font.setRawName(tmp);
-+						t->Font.setPointSize(12);
- 						t->FontEnc = FoEnc;
- 						insert(SCName,t);
- 						if(t->HasMetrics)
diff --git a/app-office/scribus/files/Palette.diff b/app-office/scribus/files/Palette.diff
deleted file mode 100644
index d74e1fac393a..000000000000
--- a/app-office/scribus/files/Palette.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur scribus-0.8/scribus/mpalette.cpp scribus-0.8.02/scribus/mpalette.cpp
---- scribus-0.8/scribus/mpalette.cpp	Sat Sep 14 12:26:16 2002
-+++ scribus-0.8.02/scribus/mpalette.cpp	Sun Oct 27 08:15:56 2002
-@@ -430,8 +430,8 @@
-     connect(FrameScale, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
-     connect(Aspect, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
-   	connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(Docken(QDockWindow::Place)));
--  	setCloseMode(Always);
--		undock();
-+		pa->moveDockWindow(this, DockTornOff);
-+		setCloseMode(Always);
- 		resize(sizeHint());
- 		setResizeEnabled(true);
-     Fram->raiseWidget(4);
-diff -ur scribus-0.8/scribus/scribus.cpp scribus-0.8.02/scribus/scribus.cpp
---- scribus-0.8/scribus/scribus.cpp	Tue Sep 24 22:09:45 2002
-+++ scribus-0.8.02/scribus/scribus.cpp	Sat Oct 26 16:37:53 2002
-@@ -4686,7 +4686,7 @@
- 			pda.Zeiger = 0;
- 			pda.Datei = "";
- 			pda.Typ = 0;
--			if (DLLName(d[dc], &nam, &ty, pda.Zeiger))
-+			if (DLLName(d[dc], &nam, &ty, &pda.Zeiger))
- 				{
- 				if (ty == 1)
- 					extraMenu->insertItem(tr(nam));
-@@ -4698,7 +4698,7 @@
- 					helpMenu->insertItem(tr(nam));
- 				pda.Datei = d[dc];
- 				pda.Typ = ty;
--				PluginMap[tr(nam)] = pda;
-+				PluginMap.insert(tr(nam), pda);
- 				}
- 			}
- 	 	connect(extraMenu, SIGNAL(activated(int)), this, SLOT(RunPlug(int)));
-@@ -4742,7 +4742,7 @@
- 		dlclose(mo);
- }
- 
--bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void *Zeig)
-+bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
- {
- 	void *mo;
- 	char *error;
-@@ -4773,7 +4773,7 @@
- 		return false;
- 		}
- 	*typ = (*demo1)();
--	Zeig = mo;
-+	*Zeig = mo;
- 	if (*typ != 4)
- 		dlclose(mo);
- 	else
-diff -ur scribus-0.8/scribus/scribus.h scribus-0.8.02/scribus/scribus.h
---- scribus-0.8/scribus/scribus.h	Tue Sep 24 22:09:58 2002
-+++ scribus-0.8.02/scribus/scribus.h	Sat Oct 26 16:34:00 2002
-@@ -98,7 +98,7 @@
-     void UpdateRecent(QString fn);
-     void InitPlugs();
- 		void FinalizePlugs();
--    bool DLLName(QString name, QString *PName, int *typ, void *Zeig);
-+    bool DLLName(QString name, QString *PName, int *typ, void **Zeig);
-     void CallDLL(QString name);
-     PSLib* getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
-     void closePSDriver();
diff --git a/app-office/scribus/files/digest-scribus-0.8 b/app-office/scribus/files/digest-scribus-0.8
deleted file mode 100644
index 5447dbb4c89e..000000000000
--- a/app-office/scribus/files/digest-scribus-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a5ee8056b27d54ddba64f4c7deecce1 scribus-0.8.tar.gz 3014043
diff --git a/app-office/scribus/files/digest-scribus-1.0_rc1 b/app-office/scribus/files/digest-scribus-1.0_rc1
deleted file mode 100644
index 06b25acdb99a..000000000000
--- a/app-office/scribus/files/digest-scribus-1.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ccac9ad8820b368887786fa1b1326f0 scribus-1.0RC1.tar.gz 1689020
diff --git a/app-office/scribus/scribus-0.8.ebuild b/app-office/scribus/scribus-0.8.ebuild
deleted file mode 100644
index 6bc9c5f33ee5..000000000000
--- a/app-office/scribus/scribus-0.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.8.ebuild,v 1.8 2003/08/23 23:31:25 lanius Exp $
-
-DESCRIPTION="Layout program similar to Adobe(R) PageMaker, QuarkXPress, or Adobe(R) InDesign"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
-SRC_URI="http://web2.altmuehlnet.de/fschmid/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE="kde"
-
-DEPEND="=x11-libs/qt-3*
-	media-libs/freetype
-	media-libs/lcms
-	sys-libs/zlib"
-
-CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms"
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 < ${FILESDIR}/Fonts.diff
-	patch -p0 < ${FILESDIR}/Palette.diff
-}
-
-src_compile() {
-	econf || die
-	emake || die "make failed"
-	mv debian/scribus-debian.xpm debian/scribus.xpm
-}
-
-src_install() {
-	einstall destdir=${D}
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Fixing desktop.scribus
-	if [ `use kde` ] ; then
-		inherit kde-functions
-		set-kdedir 3
-		sed -e 's/local\///' desktop.scribus > desktop.scribus.2
-		echo "Name=Scribus" >> desktop.scribus.2
-		cp -f desktop.scribus.2 scribus.desktop
-		insinto ${PREFIX}/share/applnk/Graphics
-		doins scribus.desktop
-	fi
-	# Copy the pixmaps to the generic place
-	insinto /usr/share/pixmaps/
-	doins debian/scribus.xpm
-
-	dosym /usr/share/scribus/doc /usr/share/doc/${PF}/html
-}
diff --git a/app-office/scribus/scribus-1.0.1.ebuild b/app-office/scribus/scribus-1.0.1.ebuild
index 942477835b0b..82a8ac66cafe 100644
--- a/app-office/scribus/scribus-1.0.1.ebuild
+++ b/app-office/scribus/scribus-1.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.0.1.ebuild,v 1.1 2003/08/20 18:15:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.0.1.ebuild,v 1.2 2003/08/26 17:18:47 hanno Exp $
 
 DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
 HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
 SRC_URI="http://scribus.planetmirror.com/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="kde"
 S=${WORKDIR}/${P}
 
diff --git a/app-office/scribus/scribus-1.0_rc1.ebuild b/app-office/scribus/scribus-1.0_rc1.ebuild
deleted file mode 100644
index 0d09ca1ad76d..000000000000
--- a/app-office/scribus/scribus-1.0_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.0_rc1.ebuild,v 1.2 2003/08/23 23:31:25 lanius Exp $
-
-MY_PV="1.0RC1"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Layout program similar to Adobe(R) PageMaker, QuarkXPress, or Adobe(R) InDesign"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
-SRC_URI="http://web2.altmuehlnet.de/fschmid/${MY_P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="kde"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="=x11-libs/qt-3*
-	media-libs/freetype
-	media-libs/lcms
-	sys-libs/zlib
-        !media-plugins/scribus-svg"
-
-src_compile() {
-	econf || die
-	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
-}
-
-src_install() {
-	einstall destdir=${D} || die
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Fixing desktop.scribus
-	if [ `use kde` ] ; then
-		inherit kde-functions
-		set-kdedir 3
-		sed -e 's/local\///' scribus.desktop > desktop.scribus.2
-		echo "Name=Scribus" >> desktop.scribus.2
-		cp -f desktop.scribus.2 scribus.desktop
-		insinto ${PREFIX}/share/applnk/Graphics
-		doins scribus.desktop
-	fi
-
-	dosym /usr/share/scribus/doc /usr/share/doc/${PF}/html
-}