Use get_python_sitedir, added tests, doc USE flag, PYTHON_MODNAME. Fixes bug# 232596. Thanks Rene 'Necoro' Neumann <gentoo@necoro.eu>. Removed older version.

(Portage version: 2.2_rc4/cvs/Linux 2.6.25-gentoo-r4 i686)

3 files changed, 30 insertions, 53 deletions

diff --git a/dev-python/empy/ChangeLog b/dev-python/empy/ChangeLog
index ad0318c37dd8..f6826f7adb48 100644
--- a/dev-python/empy/ChangeLog
+++ b/dev-python/empy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/empy
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.12 2007/06/25 07:40:06 hawking Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.13 2008/07/30 21:59:51 pythonhead Exp $
+
+  30 Jul 2008; Rob Cakebread <pythonhead@gentoo.org> -empy-3.2.ebuild,
+  empy-3.3.ebuild:
+  Use get_python_sitedir, added tests, doc USE flag, PYTHON_MODNAME. Fixes
+  bug# 232596. Thanks Rene 'Necoro' Neumann <gentoo@necoro.eu>. Removed
+  older version.
 
   25 Jun 2007; Ali Polatel <hawking@gentoo.org> empy-3.2.ebuild,
   empy-3.3.ebuild:
diff --git a/dev-python/empy/empy-3.2.ebuild b/dev-python/empy/empy-3.2.ebuild
deleted file mode 100644
index 9b398aa72351..000000000000
--- a/dev-python/empy/empy-3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.2.ebuild,v 1.4 2007/06/25 07:40:06 hawking Exp $
-
-inherit distutils
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/empy/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="dev-lang/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" em.py \
-		|| die "Failed to patch em.py"
-}
-
-src_install() {
-	distutils_src_install
-	distutils_python_version
-	dodir /usr/bin
-	fperms 755 /usr/lib/python${PYVER}/site-packages/em.py
-	dosym /usr/lib/python${PYVER}/site-packages/em.py /usr/bin/em.py
-	dodir /usr/share/doc/${PF}/examples
-	insinto /usr/share/doc/${PF}/examples
-	doins sample.em sample.bench
-	#3.2 has the html in this funny place. Fix in later version:
-	dohtml doc/home/max/projects/empy/doc/em/*
-	dohtml doc/home/max/projects/empy/doc/em.html
-	dohtml doc/index.html
-}
diff --git a/dev-python/empy/empy-3.3.ebuild b/dev-python/empy/empy-3.3.ebuild
index d9bfab6476d7..ec0f0dc1bd5b 100644
--- a/dev-python/empy/empy-3.3.ebuild
+++ b/dev-python/empy/empy-3.3.ebuild
@@ -1,36 +1,43 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3.ebuild,v 1.9 2007/06/25 07:40:06 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3.ebuild,v 1.10 2008/07/30 21:59:51 pythonhead Exp $
 
 inherit distutils
 
 DESCRIPTION="A powerful and robust templating system for Python"
 HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/empy/${P}.tar.gz"
+SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ia64 ~ppc x86"
-IUSE=""
+IUSE="doc"
 DEPEND="dev-lang/python"
+PYTHON_MODNAME="em.py"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i -e "s:/usr/local/bin/python:/usr/bin/python:g" em.py \
 		|| die "Failed to patch em.py"
 }
 
 src_install() {
 	distutils_src_install
-	distutils_python_version
 	dodir /usr/bin
-	fperms 755 /usr/lib/python${PYVER}/site-packages/em.py
-	dosym /usr/lib/python${PYVER}/site-packages/em.py /usr/bin/em.py
-	dodir /usr/share/doc/${PF}/examples
-	insinto /usr/share/doc/${PF}/examples
-	doins sample.em sample.bench
-	#3.3 has the html in this funny place. Fix in later version:
-	dohtml doc/home/max/projects/empy/doc/em/*
-	dohtml doc/home/max/projects/empy/doc/em.html
-	dohtml doc/index.html
+	fperms 755 "$(get_python_sitedir)/em.py"
+	dosym $(get_python_sitedir)/em.py /usr/bin/em.py || \
+		die "dosym failed"
+	if use doc ; then
+		dodir /usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
+		doins sample.em sample.bench
+		#3.3 has the html in this funny place. Fix in later version:
+		dohtml doc/home/max/projects/empy/doc/em/*
+		dohtml doc/home/max/projects/empy/doc/em.html
+		dohtml doc/index.html
+	fi
+}
+
+src_test() {
+	./test.sh ${python} || die "tests failed"
 }