versionbump. minor cleaning of pkg_ (echo->einfo)

5 files changed, 120 insertions, 5 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 0af3e8a04753..3f7f127ff5b6 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/scrollkeeper
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.29 2003/11/15 02:57:50 agriffis Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.30 2004/02/05 23:01:04 spider Exp $
+
+*scrollkeeper-0.3.14
+
+  05 Feb 2004; <spider@gentoo.org> scrollkeeper-0.3.14.ebuild 
+  files/scrollkeeper-0.3.14-gentoo.diff :
+  Versionbump. Removed echo formatting fluff in pkg_, moved to einfo. removed
+  old comment/buildfix
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> scrollkeeper-0.3.12.ebuild:
   Stable on ia64
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
index 7224ded34fda..d3df191895fe 100644
--- a/app-text/scrollkeeper/Manifest
+++ b/app-text/scrollkeeper/Manifest
@@ -1,10 +1,13 @@
-MD5 7d4fea4fc8f721f4b8bc785c5f9105b1 ChangeLog 4907
+MD5 e2f473f93d4c5154bba670deceb23ca6 ChangeLog 5134
 MD5 0e888739b4e4109228edfd674db1b658 scrollkeeper-0.3.11-r1.ebuild 2524
 MD5 0f1123276d459163033e0014b1522440 scrollkeeper-0.3.12.ebuild 2521
+MD5 e9a8b758d3e98ae23c9926f08e6ea235 scrollkeeper-0.3.14.ebuild 2381
 MD5 6eb6de9d82c84fda0ce04033c692e2a6 files/digest-scrollkeeper-0.3.11-r1 71
+MD5 d960e6f55f5e37c7429a733b43ae4129 files/digest-scrollkeeper-0.3.12 71
 MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.10-gentoo.diff 264
 MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.10.diff 264
 MD5 32ed56fa752b41dacfcf315b96e37156 files/scrollkeeper-0.3.11-gentoo.diff 4741
-MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.9.diff 264
-MD5 d960e6f55f5e37c7429a733b43ae4129 files/digest-scrollkeeper-0.3.12 71
 MD5 af95590364f9f045f5e2ea882d0c24f4 files/scrollkeeper-0.3.12-gentoo.diff 281
+MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.9.diff 264
+MD5 af95590364f9f045f5e2ea882d0c24f4 files/scrollkeeper-0.3.14-gentoo.diff 281
+MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14 71
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14
new file mode 100644
index 000000000000..4cfbc6123884
--- /dev/null
+++ b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14
@@ -0,0 +1 @@
+MD5 161eb3f29e30e7b24f84eb93ac696155 scrollkeeper-0.3.14.tar.gz 679513
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.diff b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.diff
new file mode 100644
index 000000000000..fb483cbd1906
--- /dev/null
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gentoo.diff
@@ -0,0 +1,10 @@
+--- extract/dtds/Makefile.in.old	2003-01-24 06:52:13.000000000 +0100
++++ extract/dtds/Makefile.in	2003-01-24 06:52:39.000000000 +0100
+@@ -297,7 +297,6 @@
+ 
+ install-data-am: install-dtdsHEADERS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am:
+ 
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
new file mode 100644
index 000000000000..181876031ec4
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2004 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.14.ebuild,v 1.1 2004/02/05 23:01:04 spider Exp $
+
+IUSE="nls"
+
+inherit libtool
+
+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"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+
+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*
+	>=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}
+	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
+	}
+
+
+	econf \
+		--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() {
+	einfo "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
+	einfo "Rebuilding Scrollkeeper database..."
+	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
+	einfo "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
+}