update amara (#112117)

svn path=/; revision=9

5 files changed, 57 insertions, 33 deletions

diff --git a/dev-python/amara/Manifest b/dev-python/amara/Manifest
index 2e7244c..bbadc5d 100644
--- a/dev-python/amara/Manifest
+++ b/dev-python/amara/Manifest
@@ -1,2 +1,8 @@
-MD5 31f5e549b81047b31196fe00a1f45566 amara-1.0_beta2.ebuild 657
-MD5 4cc5af71508d4506e229ca8680f9fb2c files/digest-amara-1.0_beta2 63
+DIST Amara-1.1.7.tar.bz2 83457 RMD160 505b2f2855eedf887270baa33ae3c2274a64559c SHA1 8add986f71082d401929c6654d17c534d22f73f6 SHA256 0f14d0a8b61fb430ac69773b2d7260bcd25d59e4ae43905850a2dffd80f55db5
+EBUILD amara-1.1.7.ebuild 929 RMD160 5923e2971cc81961405c8f52eb41340fba6b8403 SHA1 e5d4a54dfe61ae4f14d65a1bcd66cfcb05058226 SHA256 c1e533e2deedd7ea1bca152df54506d18cc656304f2e41f32cdbe17c626e15b0
+MD5 118235f8822ff254d07e97083f5ae8d7 amara-1.1.7.ebuild 929
+RMD160 5923e2971cc81961405c8f52eb41340fba6b8403 amara-1.1.7.ebuild 929
+SHA256 c1e533e2deedd7ea1bca152df54506d18cc656304f2e41f32cdbe17c626e15b0 amara-1.1.7.ebuild 929
+MD5 7a7d43284aeb2e0bddc0f91b1ece1ac5 files/digest-amara-1.1.7 235
+RMD160 74b7d857c25cb8511d1e88dcec4644971cc2782d files/digest-amara-1.1.7 235
+SHA256 9203ba6b8597b6f22d2a2c62927e2782f661d457e65bc3787b408116ad6296fa files/digest-amara-1.1.7 235
diff --git a/dev-python/amara/amara-1.0_beta2.ebuild b/dev-python/amara/amara-1.0_beta2.ebuild
deleted file mode 100644
index a158f05..0000000
--- a/dev-python/amara/amara-1.0_beta2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Bug: http://bugs.gentoo.org/show_bug.cgi?id=112117
-
-inherit distutils
-
-MY_P=${P/amara/Amara}
-MY_P=${MY_P/_beta/b}
-DESCRIPTION="A collection of Pythonic tools for XML data binding built on 4Suite"
-SRC_URI="http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/${MY_P}.tar.bz2"
-HOMEPAGE="http://uche.ogbuji.net/uche.ogbuji.net/tech/4Suite/amara/"
-
-DEPEND=">=dev-lang/python-2.3
->=dev-python/4suite-1.0_alpha4"
-
-IUSE=""
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-
-PYTHON_MODNAME=Amara
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/doc/${PF}
-	doins -r demo test
-}
diff --git a/dev-python/amara/amara-1.1.7.ebuild b/dev-python/amara/amara-1.1.7.ebuild
new file mode 100644
index 0000000..e2ca82a
--- /dev/null
+++ b/dev-python/amara/amara-1.1.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils
+
+MY_P=${P/amara/Amara}
+
+DESCRIPTION="Python tools for XML processing."
+HOMEPAGE="http://uche.ogbuji.net/uche.ogbuji.net/tech/4suite/amara/"
+SRC_URI="http://uche.ogbuji.net/tech/4suite/etc/${MY_P}.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc examples"
+
+DEPEND=">=dev-python/4suite-1.0_beta2
+	doc? ( dev-python/epydoc )"
+RDEPEND=">=dev-python/4suite-1.0_beta2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We would get 'unknown module amara' if amara is not yet installed
+	ln -s lib amara
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc ACKNOWLEDGEMENTS CHANGES README TODO quickref.txt
+	dohtml manual.html
+
+	if use doc; then
+		epydoc build/lib/amara && dohtml -r html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r demo
+	fi
+}
diff --git a/dev-python/amara/files/digest-amara-1.0_beta2 b/dev-python/amara/files/digest-amara-1.0_beta2
deleted file mode 100644
index 44e4c66..0000000
--- a/dev-python/amara/files/digest-amara-1.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f2794a8b37d6c41d35815876f59cb22 Amara-1.0b2.tar.bz2 70171
diff --git a/dev-python/amara/files/digest-amara-1.1.7 b/dev-python/amara/files/digest-amara-1.1.7
new file mode 100644
index 0000000..d147ec5
--- /dev/null
+++ b/dev-python/amara/files/digest-amara-1.1.7
@@ -0,0 +1,3 @@
+MD5 12ae537e9c517a258194878e65c85672 Amara-1.1.7.tar.bz2 83457
+RMD160 505b2f2855eedf887270baa33ae3c2274a64559c Amara-1.1.7.tar.bz2 83457
+SHA256 0f14d0a8b61fb430ac69773b2d7260bcd25d59e4ae43905850a2dffd80f55db5 Amara-1.1.7.tar.bz2 83457