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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/app-misc/hachoir-metadata/ChangeLog b/app-misc/hachoir-metadata/ChangeLog
index de0cb310d7a8018c7fb6740eb96bbc71a0bf95c3..ced2069a13163acbf2fe709c088c61e9577684fa 100644 (file)
--- 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/Manifest b/app-misc/hachoir-metadata/Manifest
index b44d618a14e88c6d88b0fa4bd4f02a0509eddaed..6ba5151a142c017a8346003a713f1bd4ab31aa47 100644 (file)
--- a/app-misc/hachoir-metadata/Manifest
+++ b/app-misc/hachoir-metadata/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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 1654 SHA256 73652c0e0a03824195669aa60f3bf3f4ec82c0f5c0f6e65ed193a6f8d27e843b SHA512 8212bea1870ea715921a27f3c92dff407c71bd7d123113c761bcba70989b30abfd23e180f952eda61ec9fa6e894e28841b8996f349284156b9279d96f7a27546 WHIRLPOOL 1fe96ad4a9cdb1c42f918ec48206c04bfac6436be47612a447171083d44624094c249ebeb848f9198d4d228ebdbc34c7214452627cc3aa413641e2999c78d526
-MISC metadata.xml 419 SHA256 1257187d67c0b0c825749da5de1f58341c3d568c9f1ae473e3f78df418df9cd4 SHA512 1c1135132c52b1920e371489a51a7d92d8b4050f43bae7e4457832beba29dd359bec0dbc7c4fe8707d708b494656ff49a83696118573338a89c9486fe906f896 WHIRLPOOL 7ba84546c31803f792248918a8cee5429915f18fbe7044cf0602dfaee27b3a909f94d622b08575329134cab535e4b0e12c95f9eb9cf0874b3de4a394a11971ee
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1876 SHA256 08092e701724bfa98b059b73c4393b4c51f8dae18800fb0e373be860d7897d45 SHA512 3cf78bb1421a7d293da160a6ad057b48c9bfe243d266b304571c77830d2dd8cc89a39fdc4e7e7ac459b43cd68fc052e6bc100a673b46569ff7564f7e8c94b492 WHIRLPOOL db5bc6586be051b10f4726dc65e6e3a80f797284425d9c0c5473c30cc790d3a100d924e6f509404d7a211e42473434f2e95e8cfbccca21093ce4c43a4fca1c12
+MISC ChangeLog 1843 SHA256 a14c66063b66d7b84722eb8d734e3aa83211432d67da0de1461aa5ec96bcdc54 SHA512 0853d902162b38c92920be0d8556fb0ecc2edc6eccd18dfd4580e79c443fe86eef41a9de085bfc174053e3f148f4323612bad5c37b70c195a450cab5ca8241d5 WHIRLPOOL 702712b8c3182f90072c0bd7a707b3661ccf92c3c0ce7b453a49a7584f7c1cff90bd5dcd54dd559bf2574c73617d8eb041d7fce8d072348184840aa8bd8ebf05
+MISC metadata.xml 428 SHA256 01562aa3d18c0024fffe9df0b4d201145b889bad9773cb378fa83b0f82a258ca SHA512 9e704ec9c0b4ce0d704d2a454008a0f4b7eb4b6557ea01853fe9d53c9228abeca6a0c9c21b6a9fdaba5deaa28a539e6c572cec995841ae5a4e7e7b1d5f9be5e6 WHIRLPOOL d29fb47d9343a72a5bc525d100ea8de58886cbdfc8e1f3edc862431725ec992d3a3f5ad13ff8330f6109226fa07e1a23f739792dd1007b641fc2d105d1189632
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-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
+iQJ8BAEBCgBmBQJVDStVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir81sP/icg9Lmf4CrVEWHeCFduBpco
+TqUI9D6Rvbuxf26Q3Bz9JZ7WLyaLGvZ67rU2v8ZXZiLRpX8E7MQjIM8cH9sULlGs
+6+dYf1haCvhbm70TENdHGkeq8iVGTotzkQ6Txq5D5PVIZl66c4WXV2hLSV+mrJKL
+LwulJ1JpipYHWauaSZBhkYzl9vvYzGihkzMzvpALd37DRPgXyplJF3Mr/PjkQs8S
+dBdwRvGuTSfY1EHgs49aBlYgbeFcUXQ5VsCvnaFQONUtx+BFxio0ZFWMp38ws0fc
+t3XyxxRd/cXuJy4PEwnI46stfIjfThCAZWdZLeVNBHxTTFrULiwJOOX0yvH8wIeN
+3QJUwI9nsOWw8rp/BZGxQqlhDPi/YfALqlHQ3gaiF9q20HsB0WNoVzB43r9cSJ85
+jGMB9OB5HHFPnWGNISudUVxh9DDuSWHstnwrUoTsj/d3TeXEzZHvJkjrgIQHqO9L
+npTT1XNSh9UVDxgIyj+OTF78ZAS9kdZO8xO0Cv+THCkkqkbrF54GnIwA25gC3fbC
+mvsU4425305KM636hQ5WT+US2jejz3aawSWXdXWzQk3xu0vRtaS+L5DWL+6JR8qG
+Fun/wiHgaYuGZIVRhqMApeb3M334bWJahso6nJNYLzIo06DdVgi4lUdLiGfJMtoy
+BMpDu1/1o4lhPa/Q1/0j
+=PErD
 -----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
index 85078916b2fd4d4faf86585a068b3a7b2179478f..a117a2c40fd6889719be4ea3fd2e27ff59255f01 100644 (file)
--- 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 (file)
index 8e2e306..0000000
--- 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 34b0b7e5bdcdb81061bfa1d3044d6046bc882207..eaadcd7b0aa37e6e53888c4e69571fb62b6ad353 100644 (file)
--- 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>