[gentoo-commits] proj/betagarden:master commit in: dev-python/pyexiv2/, dev-python/pyexiv2/files/

[gentoo-commits] proj/betagarden:master commit in: dev-python/pyexiv2/, dev-python/pyexiv2/files/

[Sebastian Pipping]

commit:     a53cc23a917c7bdbd9f758166d01c05f23a8f74d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon May 23 19:05:49 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon May 23 19:05:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=a53cc23a

dev-python/pyexiv2: Updates from bug #289004

---
 dev-python/pyexiv2/files/pyexiv2-0.3.0-docs.patch |   11 ++++
 dev-python/pyexiv2/pyexiv2-0.3.0-r1.ebuild        |   60 +++++++++++++++++++++
 dev-python/pyexiv2/pyexiv2-0.3.0.ebuild           |   30 ----------
 3 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/dev-python/pyexiv2/files/pyexiv2-0.3.0-docs.patch b/dev-python/pyexiv2/files/pyexiv2-0.3.0-docs.patch
new file mode 100644
index 0000000..dffb3a6
--- /dev/null
+++ b/dev-python/pyexiv2/files/pyexiv2-0.3.0-docs.patch
@@ -0,0 +1,11 @@
+--- doc/SConscript.orig
++++ doc/SConscript
+@@ -20,7 +20,7 @@
+           for doc in sphinx.builder.get_outdated_docs()]
+ 
+ def build_doc(target, source, env):
+-    sphinx.build(all_files=False, filenames=[])
++    sphinx.build(False, filenames=[])
+     return sphinx.statuscode
+ 
+ env = Environment()

diff --git a/dev-python/pyexiv2/pyexiv2-0.3.0-r1.ebuild b/dev-python/pyexiv2/pyexiv2-0.3.0-r1.ebuild
new file mode 100644
index 0000000..e2a8bf8
--- /dev/null
+++ b/dev-python/pyexiv2/pyexiv2-0.3.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils versionator scons-utils python
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Python binding to exiv2"
+HOMEPAGE="http://tilloy.net/dev/pyexiv2/"
+SRC_URI="http://launchpad.net/${PN}/${MY_PV}.x/${MY_PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND=">=media-gfx/exiv2-0.20
+	dev-python/sphinx
+	dev-libs/boost[python]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-docs.patch
+}
+
+src_compile() {
+	escons lib || die
+	if use doc; then
+		escons doc || die
+
+		# To enable doins -r in src_install
+		rm -R doc/_build/.doctrees || die
+	fi
+}
+
+src_install() {
+	escons DESTDIR="${D}" install || die
+	dodoc NEWS README todo || die
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins src/*example*.py
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/
+		doins -r doc/html || die  # no dohtml due to mixed content
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}

diff --git a/dev-python/pyexiv2/pyexiv2-0.3.0.ebuild b/dev-python/pyexiv2/pyexiv2-0.3.0.ebuild
deleted file mode 100644
index fced014..0000000
--- a/dev-python/pyexiv2/pyexiv2-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit versionator scons-utils python
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Python binding to exiv2"
-HOMEPAGE="http://tilloy.net/dev/pyexiv2/"
-SRC_URI="http://launchpad.net/${PN}/${MY_PV}.x/${MY_PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/exiv2
-	dev-libs/boost[python]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	escons lib || die
-}
-
-src_install() {
-	escons DESTDIR="${D}" install || die
-}