add zlib-dependency, resolves bug 11270

4 files changed, 11 insertions, 52 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index fb677b205bbd..24ea3073db75 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.6 2002/11/17 10:56:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.7 2002/11/28 22:17:14 hanno Exp $
+
+  28 Nov 2002; Hanno Boeck <hanno@gentoo.org> scribus-0.9.2.ebuild
+  scribus-0.8.ebuild :
+  Added zlib as a dependency, should resolve bug #11270.
 
 *scribus-0.9.2 (17 Nov 2002)
 
diff --git a/app-office/scribus/scribus-0.7.4-r1.ebuild b/app-office/scribus/scribus-0.7.4-r1.ebuild
deleted file mode 100644
index 3906a9581b4e..000000000000
--- a/app-office/scribus/scribus-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.7.4-r1.ebuild,v 1.6 2002/11/17 18:24:11 hanno Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Scribus is a Layout program"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid"
-SRC_URI="http://web2.altmuehlnet.de/fschmid/${P}.tar.gz"
-IUSE="kde"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="=x11-libs/qt-3*
-	media-libs/freetype
-	media-libs/lcms"
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die "make failed"
-	mv debian/scribus-debian.xpm debian/scribus.xpm
-}
-
-src_install () {
-
-	einstall destdir=${D} || die "couldn't be installed"
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Fixing desktop.scribus
-	use kde &&
-	(
-		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
-	)
-	# 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-0.8.ebuild b/app-office/scribus/scribus-0.8.ebuild
index e0adf87b6604..fc2c1bbf6f3d 100644
--- a/app-office/scribus/scribus-0.8.ebuild
+++ b/app-office/scribus/scribus-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.3 2002/11/17 18:24:11 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.8.ebuild,v 1.4 2002/11/28 22:17:14 hanno Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Scribus is a Layout program"
@@ -14,7 +14,8 @@ KEYWORDS="x86 ~ppc"
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/freetype
-	media-libs/lcms"
+	media-libs/lcms
+	sys-libs/zlib"
 
 CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms"
 
diff --git a/app-office/scribus/scribus-0.9.2.ebuild b/app-office/scribus/scribus-0.9.2.ebuild
index 389db1e17e11..a1645bf1f5d4 100644
--- a/app-office/scribus/scribus-0.9.2.ebuild
+++ b/app-office/scribus/scribus-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.2.ebuild,v 1.1 2002/11/17 10:56:14 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.2.ebuild,v 1.2 2002/11/28 22:17:14 hanno Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Scribus is a Layout program"
@@ -14,7 +14,8 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND="=x11-libs/qt-3*
 	media-libs/freetype
-	media-libs/lcms"
+	media-libs/lcms
+	sys-libs/zlib"
 
 CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms"