cleanup; reslot

7 files changed, 122 insertions, 60 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index a286df475a4e..742c4342bc9e 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2002/06/14 00:56:47 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.8 2002/06/29 21:41:12 azarah Exp $
+
+scrollkeeper-0.3.9-r1 (29 Jun 2002)
+
+  29 Jun 2002; Martin Schlemmer <azarah@gentoo.org> *.ebuild:
+  Unfortunately we cannot have both installed, so changed them
+  all to have SLOT="0".  Also fixed some syntax errors in the
+  0.3.9 ebuild.
 
 scrollkeeper-0.2-r4 (13 Jun 2002)
   13 Jun 2002; Spider <spider@gentoo.org> scrollkeeper-0.2-r4.ebuild :
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r3 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r3
deleted file mode 100644
index 087d5909cb86..000000000000
--- a/app-text/scrollkeeper/files/digest-scrollkeeper-0.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a10cb1fae040525e50b1b05dc06dc9a7 scrollkeeper-0.2.tar.gz 308061
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.9-r1 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.9-r1
new file mode 100644
index 000000000000..fcec2fa00ea4
--- /dev/null
+++ b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.9-r1
@@ -0,0 +1 @@
+MD5 4ab0ddcbd0d8f00542ea4226272d79b2 scrollkeeper-0.3.9.tar.gz 418815
diff --git a/app-text/scrollkeeper/scrollkeeper-0.2-r3.ebuild b/app-text/scrollkeeper/scrollkeeper-0.2-r3.ebuild
deleted file mode 100644
index 6ccf6e761b3c..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-0.2-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.2-r3.ebuild,v 1.2 2002/04/28 03:59:29 seemant Exp $
-
-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://www.gnome.org/"
-
-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
-}
-
-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.2-r4.ebuild b/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild
index 62760d30d713..32aa4a7122b3 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild,v 1.1 2002/06/14 00:56:47 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.2-r4.ebuild,v 1.2 2002/06/29 21:41:12 azarah Exp $
 
 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://www.gnome.org/"
+SLOT="0"
 
 RDEPEND=">=dev-libs/libxml-1.8.11
 	>=sys-libs/zlib-1.1.3"
@@ -15,7 +16,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local  myconf
+	local myconf=""
 	use nls || myconf="${myconf} --disable-nls"
 
 	./configure \
@@ -57,3 +58,4 @@ 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.9-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..b03eb7b822f4
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.9-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.9-r1.ebuild,v 1.1 2002/06/29 21:41:12 azarah Exp $
+
+inherit libtool
+
+# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+# force debug information
+CFLAGS="${CFLAGS} -g"
+CXXFLAGS="${CXXFLAGS} -g"
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Scrollkeeper"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+http://telia.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz
+http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz
+http://belnet.dl.sourceforge.net/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}.diff || die
+}
+	
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+
+	if [ -z "`use nls`" ] ; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	# 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.9.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.9.ebuild
index d90baf833f69..1af1af9a7e39 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.9.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.9.ebuild,v 1.1 2002/06/02 00:08:03 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.9.ebuild,v 1.2 2002/06/29 21:41:12 azarah Exp $
 
 # Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
 DEBUG="yes"
@@ -17,7 +17,7 @@ http://telia.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz
 http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz
 http://belnet.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://scrollkeeper.sourceforge.net"
-SLOT="0.3"
+SLOT="0"
 LICENSE="FDL-1.1 LGPL-2.1"
 
 
@@ -31,10 +31,10 @@ DEPEND="${RDEPEND}
 	 >=dev-util/intltool-0.17
 	nls? ( sys-devel/gettext )"
 src_compile() {
-	local  myconf
+	local myconf=""
 
 	if [ -z "`use nls`" ] ; then
-		myconf ="--disable-nls"
+		myconf="--disable-nls"
 	fi
 	# hack around some to make sure we find the libxml2 includes. odd bug.
 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"