5 files changed, 53 insertions, 44 deletions
diff --git a/dev-python/gnosis-utils/ChangeLog b/dev-python/gnosis-utils/ChangeLog
index 7ed056e13a3c..4fc00732ec19 100644
--- a/dev-python/gnosis-utils/ChangeLog
+++ b/dev-python/gnosis-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/gnosis-utils
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/ChangeLog,v 1.7 2006/07/12 15:36:23 agriffis Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/ChangeLog,v 1.8 2007/02/15 21:02:50 dev-zero Exp $
+
+*gnosis-utils-1.2.1 (15 Feb 2007)
+
+  15 Feb 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -gnosis-utils-1.0.6.ebuild, +gnosis-utils-1.2.1.ebuild:
+  Version bump. Dropped old version.
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> gnosis-utils-1.1.1.ebuild:
   Mark 1.1.1 stable on ia64
diff --git a/dev-python/gnosis-utils/files/digest-gnosis-utils-1.0.6 b/dev-python/gnosis-utils/files/digest-gnosis-utils-1.0.6
deleted file mode 100644
index c19eef882228..000000000000
--- a/dev-python/gnosis-utils/files/digest-gnosis-utils-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6171cc12f66f5d1565ca854e4c06cdc Gnosis_Utils-1.0.6.tar.gz 179934
diff --git a/dev-python/gnosis-utils/files/digest-gnosis-utils-1.2.1 b/dev-python/gnosis-utils/files/digest-gnosis-utils-1.2.1
new file mode 100644
index 000000000000..28ff10319c93
--- /dev/null
+++ b/dev-python/gnosis-utils/files/digest-gnosis-utils-1.2.1
@@ -0,0 +1,3 @@
+MD5 63c8b90f9f053eb590ace5ada4b1e518 Gnosis_Utils-1.2.1.tar.gz 285238
+RMD160 24fbf3c718228e6fc634428ed60074b1940d422d Gnosis_Utils-1.2.1.tar.gz 285238
+SHA256 8a67343a1d192c4586b40f224ce7997e285ccef80390d40ebcfaef95498b1ab7 Gnosis_Utils-1.2.1.tar.gz 285238
diff --git a/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild b/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild
deleted file mode 100644
index ae6bee10b1b9..000000000000
--- a/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild,v 1.7 2004/06/25 01:30:40 agriffis Exp $
-
-inherit distutils
-
-IUSE=""
-MY_P=${P/gnosis-utils/Gnosis_Utils}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="XML pickling and objectification with Python."
-SRC_URI="http://www.gnosis.cx/download/Gnosis_Utils.OLD/${MY_P}.tar.gz"
-HOMEPAGE="http://www.gnosis.cx/download/"
-
-DEPEND="virtual/python"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="PYTHON"
-
-src_compile() {
-	python setup_gnosis.py build || die
-}
-
-src_install() {
-	distutils_python_version
-
-	python setup_gnosis.py install --root=${D} || die
-
-	dodir /usr/share/doc/${PF}
-	dodoc README MANIFEST PKG-INFO
-
-	if [ -e "${D}/usr/lib/python${PYVER}/site-packages/gnosis/doc" ] ; then
-		einfo "Moving documentation to correct location"
-		mv ${D}/usr/lib/python${PYVER}/site-packages/gnosis/doc ${D}/usr/share/doc/${PF}/doc
-	fi
-
-	rm -f ${D}/usr/lib/python${PYVER}/site-packages/gnosis/{README,MANIFEST}
-	rm -f ${D}/usr/lib/python${PYVER}/site-packages/{README,MANIFEST}
-}
diff --git a/dev-python/gnosis-utils/gnosis-utils-1.2.1.ebuild b/dev-python/gnosis-utils/gnosis-utils-1.2.1.ebuild
new file mode 100644
index 000000000000..d6514eadc074
--- /dev/null
+++ b/dev-python/gnosis-utils/gnosis-utils-1.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/gnosis-utils-1.2.1.ebuild,v 1.1 2007/02/15 21:02:50 dev-zero Exp $
+
+NEED_PYTHON=2.1
+
+inherit distutils
+
+MY_P=Gnosis_Utils-${PV}
+
+DESCRIPTION="XML pickling and objectification with Python."
+SRC_URI="http://www.gnosis.cx/download/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gnosis.cx/download/"
+SLOT="0"
+KEYWORDS="~ia64 ~x86"
+LICENSE="PYTHON"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="gnosis"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	dodoc README gnosis/doc/{*.txt,readme,GETTING_HELP,*ANNOUNCE}
+	newdoc gnosis/anon/README README.anon
+	newdoc gnosis/xml/relax/README README.relax.xml
+
+	# This setup.py installs files according to the MANIFEST.
+	# README and MANIFEST have to get out, otherwise they may
+	# generate collissions because they're directly installed in
+	# site-packages.
+	sed -i \
+		-e '/README/d' \
+		-e '/MANIFEST/d' \
+		-e '/gnosis\/doc/d' \
+		MANIFEST || die "sed failed"
+
+	distutils_src_install
+}