Convert to distutils-r1. Handle USE=qt4 properly.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 99 insertions, 7 deletions

diff --git a/app-misc/hachoir-metadata/ChangeLog b/app-misc/hachoir-metadata/ChangeLog
index b3c83abd3bde..de0cb310d7a8 100644
--- a/app-misc/hachoir-metadata/ChangeLog
+++ b/app-misc/hachoir-metadata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/hachoir-metadata
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-metadata/ChangeLog,v 1.8 2013/06/01 12:06:53 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-metadata/ChangeLog,v 1.9 2014/06/11 14:40:47 mgorny Exp $
+
+*hachoir-metadata-1.3.3-r1 (11 Jun 2014)
+
+  11 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +hachoir-metadata-1.3.3-r1.ebuild:
+  Convert to distutils-r1. Handle USE=qt4 properly.
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #151880
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
index 01204d59c50b..b44d618a14e8 100644
--- a/app-misc/hachoir-metadata/Manifest
+++ b/app-misc/hachoir-metadata/Manifest
@@ -2,13 +2,26 @@
 Hash: SHA256
 
 DIST hachoir-metadata-1.3.3.tar.gz 52304 SHA256 ec403f13a44e2cf3d26001f8f440cdc4329a316a4c971035944bfadacc90eb3c SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a WHIRLPOOL 8ce755703c74005e7d355ca7a60e22a69f8d19b9bb66e540191b7b4d547fb6b54ce9db723fefc3f79941870b6621b9e9c7b5ace29f3995c68381da42ace1feff
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1888 SHA256 31564a17299d6684d30721215f43b213688ebb17eb81e70b6fa1fb3550b4518f SHA512 5bbf05f62abff1238c7915a762ba3f592e1a76de82b6ce6a7de937faa384689db1f40a85faf5d2ac6f68b89dcb759a5c9267a9512ac781af9d20529d4616df36 WHIRLPOOL aaff11309ddb1644cc3b94b35a1185c07df65eb13312d655065362cac6ff9bd92a2e58d0ebf4cb377f181ad79c7db905154ab59519930c59493b66e19d9420b1
 EBUILD hachoir-metadata-1.3.3.ebuild 1767 SHA256 eac44d743c57a42231421fcc74ab2b126deaea38e38c44d3df41d9e3019a54d8 SHA512 8df27d900446800fa4bcc01c459a730de03aaf36122bbf341cb54d966938cea86dce5dfe0f807c38400e4b35c65009d154c027a29e51b0942695a0b3bbf3f432 WHIRLPOOL d106f07f0d54a3db7014f81c97faadd279fcd75a6916549752f3559da02774a665419b3f5cc4cf11c33fc483d7c3f1c1caf50fe494223a4cd8f96199bfdc4bb7
-MISC ChangeLog 1471 SHA256 a5516b02fa31da39ac86dc101de8e416c3fdb07095cdfe29f69ed3f411d36a21 SHA512 35b2e776e1b570d5c8ec136e25b4a0b37441ba26df8605d154f7882af360594f64c68447a926d41231874718cd846d35ed056b10a4c2726ace901d2042f2730e WHIRLPOOL fabe0913572a204a4a81983b75b7c0a18278203c6a19cb1b2414ce5ac80d58eb8b96ec46937352b42f47c1ab0ffc5d817d400a4e963b580db4c23342fdb2ef1a
+MISC ChangeLog 1654 SHA256 73652c0e0a03824195669aa60f3bf3f4ec82c0f5c0f6e65ed193a6f8d27e843b SHA512 8212bea1870ea715921a27f3c92dff407c71bd7d123113c761bcba70989b30abfd23e180f952eda61ec9fa6e894e28841b8996f349284156b9279d96f7a27546 WHIRLPOOL 1fe96ad4a9cdb1c42f918ec48206c04bfac6436be47612a447171083d44624094c249ebeb848f9198d4d228ebdbc34c7214452627cc3aa413641e2999c78d526
 MISC metadata.xml 419 SHA256 1257187d67c0b0c825749da5de1f58341c3d568c9f1ae473e3f78df418df9cd4 SHA512 1c1135132c52b1920e371489a51a7d92d8b4050f43bae7e4457832beba29dd359bec0dbc7c4fe8707d708b494656ff49a83696118573338a89c9486fe906f896 WHIRLPOOL 7ba84546c31803f792248918a8cee5429915f18fbe7044cf0602dfaee27b3a909f94d622b08575329134cab535e4b0e12c95f9eb9cf0874b3de4a394a11971ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlGp494ACgkQCaWpQKGI+9RYlQCeIpSlRB1ByYoEyQzvwpN5e8cW
-dR4AoIiZga6IsAPS+mbNAIs5dERSirA5
-=+4I0
+iQJ8BAEBCABmBQJTmGpwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjycP/1DWvJB/4gSNXjX97n8BagDr
+pWNmQ9n9diTMc5jv9QK82mGyTACEGbdYPjwcWDxyzycGS9NnMy2rezNsBFX9xgjX
+N+5s2tUtxUkgLFWd+7ySMzYnt2ceJ70fyjDBydL7/zvrEnqB4NAqf6cbRASmUHsv
+vEXgUbGrQbdvRwf4lxZM1zlLYL/aeBsQIym8j5GOimi7+iPhVWyHt1KbBOVdSYqC
+n3rXs8ELVPq5lYvq3Sx157enwfqcP8BlqIw2rNfYrBev1mHRPM9hZrF7EL6fdsWx
+jgJxJPM1GD6meHR5fXvjyXkN5UF+K0NQX4jHl24fPfAx/41EGkHCDp5LzzRyFk/6
+gTBv0bt/fACS3+O32s+yHtKB/Kx/EOGB26DxhhXhpj9jfPP2dFfPYaqdC369UOkC
+NtGoRHis7mZcbIn3j0DtK3hwTMTGUXBV/ZImulvODYVs68OvZB1fxO1KPdImv+L1
+apzwNolbgFXySVynNw4cL/KXK85CD2T9/gXedU01DQsx/XVqpCAJOyiyp962OnI/
+0XdlP85hIij1jleo3j5XJWZGHDa8kUJRj9FcKLB9+puqD2R/8LwDyujA8u/+8gyr
+wKsOd12H3Y7P00G9/znoit/7OvNOQk/reGyUtDtDcIwt/KDiEDfbQUNjy9AtSkoW
+L6NQwzi9rB9xunm3aCB1
+=UwXE
 -----END PGP SIGNATURE-----
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..85078916b2fd
--- /dev/null
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild,v 1.1 2014/06/11 14:40:47 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to extract metadata using Hachoir library"
+HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata http://pypi.python.org/pypi/hachoir-metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome gtk kde qt4"
+
+RDEPEND=">=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]
+	>=dev-python/hachoir-parser-1.3[${PYTHON_USEDEP}]
+	gtk? ( >=dev-python/pygtk-2.0[${PYTHON_USEDEP}] )
+	gnome? ( gnome-base/nautilus gnome-extra/zenity )
+	kde? ( kde-base/konqueror )
+	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	if ! use gtk; then
+		sed -i -e '/SCRIPTS/s:, "hachoir-metadata-gtk"::' setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --setuptools )
+
+	use qt4 || mydistutilsargs+=( --disable-qt )
+}
+
+python_test() {
+	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use gnome; then
+		exeinto /usr/share/nautilus-scripts
+		doexe gnome/hachoir
+	fi
+
+	if use kde; then
+		exeinto /usr/bin
+		doexe kde/hachoir-metadata-kde
+		insinto /usr/share/apps/konqueror/servicemenus
+		doins kde/hachoir.desktop
+	fi
+
+	if ! use gtk; then
+		rm "${ED}usr/bin/hachoir-metadata-gtk"*
+	fi
+}
+
+pkg_postinst() {
+	if use gnome; then
+		elog "To enable the nautilus script, symlink it with:"
+		elog " $ mkdir -p ~/.gnome2/nautilus-scripts"
+		elog " $ ln -s /usr/share/nautilus-scripts/hachoir ~/.gnome2/nautilus-script"
+	fi
+}