dep fix

7 files changed, 9 insertions, 171 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 3ddf3ca50ee3..77117a3e31a4 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for app-text/scrollkeeper
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.21 2003/01/24 06:41:45 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.22 2003/02/10 14:14:35 foser Exp $
 
 *scrollkeeper-0.3.12 (24 Jan 2003)
+
+  10 Feb 2003; foser <foser@gentoo.org> scrollkeeper-0.3.1[1-r1,2].ebuild :
+  Fixed docbook-xml-dtd to be more picky
   
   24 Jan 2003; Spider <spider@gentoo.org> : scrollkeeper-0.3.12.ebuild: 
   First official release in ages, now fixes the tempfile vulnerability and 
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r4 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r4
deleted file mode 100644
index 087d5909cb86..000000000000
--- a/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a10cb1fae040525e50b1b05dc06dc9a7 scrollkeeper-0.2.tar.gz 308061
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11
deleted file mode 100644
index fd45668c41d2..000000000000
--- a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33ea7a193adcb2ff9534da68a0f8bd7f scrollkeeper-0.3.11.tar.gz 437816
diff --git a/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild b/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild
deleted file mode 100644
index e5425be81dd8..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild
+++ /dev/null
@@ -1,64 +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-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild,v 1.12 2002/12/09 04:17:45 manson Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A cataloging system for documentation on open systems"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://scrollkeeper.sourceforge.net"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-LICENSE="FDL-1.1 LGPL-2.1"
-
-RDEPEND=">=dev-libs/libxml-1.8.11
-	>=sys-libs/zlib-1.1.3"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	cd omf-install
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	rm Makefile.old
-	cd ${S}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-	einfo ">>> Fixing symlinks... "
-	cd ${D}/usr/share/scrollkeeper/Templates
-		for a in $( ls -l | grep "lrwxrwxrwx" | tr " " "*" ); do
-		ORIG=`echo $a | tr "*" " " | awk '{print $9}'`
-		DEST=`echo $a | tr "*" " " | awk -F "/" '{print $12}'`
-		rm $ORIG
-		ln -s $DEST $ORIG
-	done
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Scrollkeeper ${PV} unmerged, if you removed the package"
-	echo "    you might want to clean up /var/lib/scrollkeeper."
-}
-
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
index 1d50983e5c86..1187011ed244 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild,v 1.7 2002/12/15 10:44:11 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild,v 1.8 2003/02/10 14:14:35 foser Exp $
 
 IUSE="nls"
 
-inherit libtool
+inherit libtool debug
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Scrollkeeper"
@@ -18,7 +18,7 @@ KEYWORDS="x86 ppc sparc alpha"
 RDEPEND=">=dev-libs/libxml2-2.4.19
 	>=dev-libs/libxslt-1.0.14
 	>=sys-libs/zlib-1.1.3
-	>=app-text/docbook-xml-dtd-4.1.2-r2
+	=app-text/docbook-xml-dtd-4.1.2-r2
 	>=app-text/docbook-sgml-utils-0.6.6"
 
 DEPEND="${RDEPEND}
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.11.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.11.ebuild
deleted file mode 100644
index 354a1d28c6eb..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.3.11.ebuild
+++ /dev/null
@@ -1,99 +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-text/scrollkeeper/scrollkeeper-0.3.11.ebuild,v 1.8 2002/12/09 04:17:45 manson Exp $
-
-IUSE="nls"
-
-inherit libtool
-KEYWORDS="x86 ppc sparc "
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Scrollkeeper"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://scrollkeeper.sourceforge.net"
-SLOT="0"
-LICENSE="FDL-1.1 LGPL-2.1"
-
-RDEPEND=">=dev-libs/libxml2-2.4.19
-	>=dev-libs/libxslt-1.0.14
-	>=sys-libs/zlib-1.1.3
-	>=app-text/docbook-xml-dtd-4.1.2-r2
-	>=app-text/docbook-sgml-utils-0.6.6"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/intltool-0.17
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}/extract/dtds
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
-}
-	
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-
-	use nls || {
-		myconf="${myconf} --disable-nls"
-		# Not existing can cause ./configure to fail in some cases.
-		touch ${S}/intl/libintl.h
-	}
-
-	# hack around some to make sure we find the libxml2 includes. odd bug.
-	#CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
-				
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL TODO COPYING* ChangeLog README NEWS
-}
-
-pkg_preinst() {
-	if [ -d ${ROOT}/usr/share/scrollkeeper/Templates ]
-	then
-		rm -rf ${ROOT}/usr/share/scrollkeeper/Templates
-	fi
-}
-
-pkg_postinst() {
-	echo ">>> Installing catalog..."
-	${ROOT}/usr/bin/xmlcatalog --noout --add "public" \
-		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
-		"`echo "${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" |sed -e "s://:/:g"`" \
-		${ROOT}/etc/xml/catalog
-	echo ">>> Rebuilding Scrollkeeper database..."	
-	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update -v &>${T}/foo
-}
-
-pkg_postrm() {
-	if [ ! -x ${ROOT}/usr/bin/scrollkeeper-config ]
-	then
-		# SK is being removed, not upgraded.
-		# Remove all generated files
-		einfo ">>> Cleaning up ${ROOT}/var/lib/scrollkeeper..."
-		rm -rf ${ROOT}/var/lib/scrollkeeper
-		rm -rf ${ROOT}/var/log/scrollkeeper.log
-		rm -rf ${ROOT}/var/log/scrollkeeper.log.1
-		${ROOT}/usr/bin/xmlcatalog --noout --del \
-			"${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
-			${ROOT}/etc/xml/catalog
-
-		einfo ">>> Scrollkeeper ${PV} unmerged, if you removed the package"
-		einfo ">>> you might want to clean up /var/lib/scrollkeeper."
-	fi
-}
-
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
index 00c2caffd584..50751b398994 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.12.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-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.1 2003/01/24 06:41:45 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.2 2003/02/10 14:14:35 foser Exp $
 
 IUSE="nls"
 
@@ -18,7 +18,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 RDEPEND=">=dev-libs/libxml2-2.4.19
 	>=dev-libs/libxslt-1.0.14
 	>=sys-libs/zlib-1.1.3
-	>=app-text/docbook-xml-dtd-4.1.2-r2
+	=app-text/docbook-xml-dtd-4.1.2-r2
 	>=app-text/docbook-sgml-utils-0.6.6"
 
 DEPEND="${RDEPEND}