5 files changed, 74 insertions, 10 deletions
diff --git a/dev-python/kid/ChangeLog b/dev-python/kid/ChangeLog
index 71193c15969d..0e1069785e27 100644
--- a/dev-python/kid/ChangeLog
+++ b/dev-python/kid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/kid
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/ChangeLog,v 1.8 2006/07/21 12:35:44 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/ChangeLog,v 1.9 2006/12/23 11:06:17 lucass Exp $
+
+*kid-0.9.4 (23 Dec 2006)
+
+  23 Dec 2006; Lukasz Strzygowski <lucass@gentoo.org>
+  +files/kid-0.9.4-ezsetup-gentoo.patch, files/kid-0.9-ezsetup-gentoo.patch,
+  +kid-0.9.4.ebuild:
+  Version bump (bug #158870), updated patch.
 
 *kid-0.9.3 (21 Jul 2006)
 
diff --git a/dev-python/kid/files/digest-kid-0.9.4 b/dev-python/kid/files/digest-kid-0.9.4
new file mode 100644
index 000000000000..c67ad287ffbf
--- /dev/null
+++ b/dev-python/kid/files/digest-kid-0.9.4
@@ -0,0 +1,3 @@
+MD5 2122ee32062079418db34cfd5fc15c37 kid-0.9.4.tar.gz 122800
+RMD160 2a32af5e0053f5b9fce992f87da1a028f0d869ac kid-0.9.4.tar.gz 122800
+SHA256 5099b81f6023d3666f17781758c9417ef27b000befeef5b358f839ccdd6938ee kid-0.9.4.tar.gz 122800
diff --git a/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch b/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch
index 5dca21884882..837077f1a7ca 100644
--- a/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch
+++ b/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch
@@ -16,12 +16,3 @@
  setup(
      name="kid",
      version=version,
-@@ -29,7 +27,6 @@
-     },
-     py_modules=[],
-     packages=["kid", 'kid.test'],
--    install_requires=['elementtree'],
-     classifiers = [
-             'Development Status :: 4 - Beta',
-             'Environment :: Console',
-
diff --git a/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch b/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch
new file mode 100644
index 000000000000..313c12fe21e7
--- /dev/null
+++ b/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch
@@ -0,0 +1,16 @@
+--- setup.orig	2006-12-23 11:53:52.000000000 +0100
++++ setup.py	2006-12-23 11:54:43.000000000 +0100
+@@ -1,12 +1,8 @@
+-# bootstrap setuptools if necessary
+-from ez_setup import use_setuptools
+-use_setuptools()
+-
+ import os
+ 
+ execfile(os.path.join("kid", "release.py"))
+ 
+-from setuptools import setup, find_packages
++from distutils.core import setup
+ 
+ install_requires = []
+ try:
diff --git a/dev-python/kid/kid-0.9.4.ebuild b/dev-python/kid/kid-0.9.4.ebuild
new file mode 100644
index 000000000000..6a703996f0d9
--- /dev/null
+++ b/dev-python/kid/kid-0.9.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/kid-0.9.4.ebuild,v 1.1 2006/12/23 11:06:17 lucass Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="A simple and Pythonic XML template language"
+SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.kid-templating.org/"
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.3
+	>=dev-python/elementtree-1.2.6"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# use distutils instead of egg
+	epatch ${FILESDIR}/kid-0.9.4-ezsetup-gentoo.patch
+}
+
+src_test() {
+	${python} run_tests.py -x || die "run_tests.py failed"
+}
+
+src_install() {
+	distutils_src_install
+
+	dobin bin/*
+
+	dodoc doc/*.txt COPYING HISTORY RELEASING
+	dohtml -r doc/html/*
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}
+
+pkg_postinst() {
+	einfo "Installing dev-python/celementtree may enhance performance."
+}
+