use dobin instead of exeinto /usr/bin/ && doexe; drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 19 insertions, 87 deletions

diff --git a/app-misc/hachoir-metadata/ChangeLog b/app-misc/hachoir-metadata/ChangeLog
index de0cb310d7a8..ced2069a1316 100644
--- a/app-misc/hachoir-metadata/ChangeLog
+++ b/app-misc/hachoir-metadata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/hachoir-metadata
-# 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 $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-metadata/ChangeLog,v 1.10 2015/03/21 08:27:00 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -hachoir-metadata-1.3.3.ebuild,
+  hachoir-metadata-1.3.3-r1.ebuild, metadata.xml:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
 *hachoir-metadata-1.3.3-r1 (11 Jun 2014)
 
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
index 85078916b2fd..a117a2c40fd6 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild,v 1.2 2015/03/21 08:27:00 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gnome gtk kde qt4"
 
-RDEPEND=">=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]
+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 )
@@ -53,14 +54,13 @@ python_install_all() {
 	fi
 
 	if use kde; then
-		exeinto /usr/bin
-		doexe kde/hachoir-metadata-kde
+		dobin 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"*
+		rm "${ED}usr/bin/hachoir-metadata-gtk"* || die
 	fi
 }
 
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3.ebuild
deleted file mode 100644
index 8e2e3068e791..000000000000
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/10/16 20:29:18 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-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
-	>=dev-python/hachoir-parser-1.3
-	gtk? ( >=dev-python/pygtk-2.0 )
-	gnome? ( gnome-base/nautilus gnome-extra/zenity )
-	kde? ( kde-base/konqueror )
-	qt4? ( dev-python/PyQt4 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-DISTUTILS_GLOBAL_OPTIONS=("--setuptools")
-PYTHON_MODNAME="${PN/-/_}"
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test_doc.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	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
-
-	if ! use qt4; then
-		rm "${ED}usr/bin/hachoir-metadata-qt"*
-	fi
-}
-
-pkg_postinst() {
-	distutils_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
-}
diff --git a/app-misc/hachoir-metadata/metadata.xml b/app-misc/hachoir-metadata/metadata.xml
index 34b0b7e5bdcd..eaadcd7b0aa3 100644
--- a/app-misc/hachoir-metadata/metadata.xml
+++ b/app-misc/hachoir-metadata/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">tool to extract metadata from multimedia files (sound, video, archives,
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">tool to extract metadata from multimedia files (sound, video, archives,
 		etc.)</longdescription>
-	<upstream>
-		<remote-id type="pypi">hachoir-metadata</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="pypi">hachoir-metadata</remote-id>
+  </upstream>
 </pkgmetadata>