Drop broken manpage generation, fix for prefix

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

diff --git a/dev-python/translate-toolkit/ChangeLog b/dev-python/translate-toolkit/ChangeLog
index 97cc85dcbc33efa600c743ddb18c62096440a305..0495ad02eaaef99a493db88e7a18ee4581b3dd6f 100644 (file)
--- a/dev-python/translate-toolkit/ChangeLog
+++ b/dev-python/translate-toolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/translate-toolkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/translate-toolkit/ChangeLog,v 1.11 2015/01/10 06:57:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/translate-toolkit/ChangeLog,v 1.12 2015/04/16 09:27:57 jlec Exp $
+
+  16 Apr 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
+  translate-toolkit-1.12.0.ebuild:
+  Drop broken manpage generation, fix for prefix
 
 *translate-toolkit-1.12.0 (10 Jan 2015)
 

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 5423565cca1bdb3211ce35d37b4c16b5286f7795..c4d47cddf47a3396bebb19ada3d391601ac007cf 100644 (file)
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST translate-toolkit-1.10.0.tar.bz2 4201705 SHA256 2db825cd039648b4f29c1530334f22dc25fe85ea2cefa4b393488aefd76554b1 SHA512 bdc85ab5c1f86ccd274842efbaccc6ca69828630aef9afaed54b809327111ede7ccaa7e0916332659de85b9fb1e819c8f99b0f6d3f96117b0aa99a03757225a3 WHIRLPOOL cca3d3eec0ebeac8885c4ec3463d76a26147054590dae80d7139294feadb9c4e3a949269d4471adae8c80a8ccdbeca1a9c86704a9b0a9ee7c83c51c3fcd3f830
 DIST translate-toolkit-1.12.0.tar.bz2 5329772 SHA256 11e332f2a29d8644364b4ca79b4ac079df328626ec8c27ac0e8cc454696719ca SHA512 c84424790ad66492dec97a5ec5601f5ffa68d23b219836def998847449b902970ac32fcb7d06455365e00c7b06f49d7dedda5257275bf7e845b16100153922dd WHIRLPOOL 866eb62056a30c8042d96a1ec06a23e56c2a5121dd66234a8b0889193548fff962d4c56700bb50a01c793e2443d49e33a02d92d5b53513f6c7b0805af827decf
 EBUILD translate-toolkit-1.10.0.ebuild 1790 SHA256 472d2f63aa2dd79972378647a2e9f92c914acb941d066b3057d5eed6f8353d55 SHA512 b360bc6afc92e30139b8ebbd7522a79c75077acde980198156afaa1e4499584dcdfea13e40365e30d938c38a1a9a6066870da2250bdbdf6b1c076af464c5a0f8 WHIRLPOOL 8cafd9256f1042421f858d2140545509983fa09f54223f62420fc7b801d8711e737f4556ce1d9ce497fe8fe33bf8cd3e09803c9c8b42284a8a3924d2ffe8690e
-EBUILD translate-toolkit-1.12.0.ebuild 2187 SHA256 a69c94e99820bdb42a23b02f769502cf8d360a10732e9a7dbd8565175a1b1fdd SHA512 0e71d9f2f16b71bd617b4ccf597c9c40a861e6e3c27c925a33bcc386908daaaad1e4372dbc7f64ee16caf8a766474b0771653fb2a8e2200621a6a20a319b4948 WHIRLPOOL b26cc8438ed9a83023e0eef2b86dd84929357e54f9ffc12b7a8435e363bf2f4b76b16f3e9c81ad0beb3648ac812e8202fc30fb509de25bf20ad45ae4a7867be3
-MISC ChangeLog 2049 SHA256 356e25c906ce88bcdfc14e79bdb0e1b1ee22d1b58341101ca36d3452729258fd SHA512 6f0170dca38fad3735495227e36ebf69e96174b04e4560dc7d1f3337906341c87dd91b7e2e52e8552a6a5355d208d3aad6cd441691a02faed9e8c5f2d03889ca WHIRLPOOL 1aeba6198533f9f5a2d15a284864df5da4a1dd57fb32b5dc8d560b0f27f57580c0fac09faa970c5c905922121f01dd1b5b2ef9c64c8da18c27ecbdd81939016e
-MISC metadata.xml 459 SHA256 0370b089719bd46b7656cf2f12804e1e65cbf175175e79314fb3251b5353ac02 SHA512 ab5255179e8c2d15c77644691bf29d58937bd15b58b9ec00c8d5be88edf220a3f12e7fe9c981215497cab25d136e7e2a1fc5748a49a5526c1d3d4f61fa674a53 WHIRLPOOL e674b1e3833964a1f88cb0748508786e13ee20d0087efc53707de09c2b56d783a7e67e9b5356c4626597c122482e85b411122649fbcb077ae4af107aeaa41be6
+EBUILD translate-toolkit-1.12.0.ebuild 1929 SHA256 89052c054bd43b3fb12a11d3cb4e08588676353cbc045cf9e35bfe1c4df54802 SHA512 ac0851c6876b0848f29732b373b4ca73b3dacba18dc52356ce4cd9e824668b4d13aebeb833f3831c2c2e87d7a22af8329c6e1180911b67746d4075e0d58fa44f WHIRLPOOL c1faf1b2b9e56b55a6155ddc46924f48b3624c559d7cf815740058a7f12e4fcbe2ab4f14f24b558465506aa5ee833656a06bba7ec840ef358e511f18e3a07490
+MISC ChangeLog 2192 SHA256 9ae31505d771687d49b53e0f0ee9018ed5f2ea67cb417cc9610e21a486d775f8 SHA512 1d0831a18adbe139c70d4b2622c45a8901549d598a15ae84ae551a49547fb574f5a38345df8b0d1e71979f02ff0ca6fc158b0f174d953fa44f30c8a45a089276 WHIRLPOOL 3e1d18d9a74b1ef0ddcebe1bcacb636c653b4f196850dfc3457b914872ea909015cc6f1963899756c8699454a21dca5e5fe08a6dd978ece3b69ff0166280bf1f
+MISC metadata.xml 476 SHA256 e0092570e63836b186e9dd191a80fc10277d423c1e4ecc7c836b7564acfffb52 SHA512 4b5e27977fe4da1abd9b034870eb2b5145ccc996e5102d43d1c183c667a049d56d8786dd1cb23567ecbc630b0a56a1751eb2bbf2e14f91f30296c61580343430 WHIRLPOOL 8db00d136be1ce117732fd8345a2cc7c602dd14357ef336a37a85230fe808ddd82a2badfc0bd06238c715353adcf04e8cbb6b99a4f1f9cc41cd7939903643140
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlSwzYQACgkQso7CE7gHKw1HDgCgl1rf5GFsDh8dLRkHf/Vn4/CG
-WbAAn0/uOcxjpN2XPcd1XD1SffjA4Vgp
-=mYH3
+iQJ8BAEBCgBmBQJVL4CeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirfAYQAJuv6vo58Yis6XSQ6e90FzPe
+72j0iKN2VvMPm4o7jk8Sej5EX2R/YuBwu4lIcyXBwESMQCgJOaNQszRAtalmBZbJ
+rgpfYVKNPIXmK0cQaTc1o83KjFk7Kk3HEJTX5oRcArz+2kEK50rr+EiczD8hU+eB
+Ye1i/AFuL4tsWC8d+oFrIOnZkpFn7tm+ee4YypSexh+4whfTjyfhgh+Qjc4MKHCL
+S+DutJ21sFmD7qXCHthvElvFNEHU/Q5PTIBklbhPJ25iLBia2vZcykQhYB6QVWKy
+yMyEfKFByYpKQLePd7WNDGvtv7MQWPSlkb6sKgVgFY4rnRgq18f7J2TF3VObqecN
+LZdcjtU5maoxb/7oH+OMnshMZ/7YjfcliaVwzGcGOkc+dclJbXzIoaL3g2sFc90d
+Ia5+1bzKGK0qN2TWefpeJPm6JSlpjfDmZANmtCnUi2ZO+DC9BdZyJEf3ADvMH63E
+b4YuUHrT6yy448xZX4dMFSC+YiB2+54d/pDraWH2UxTF92UFMsEI8GJ58E5S8GPR
+ZQnsp1L4AbdM9pgUZDhmpgyS3p/e4pXrbTLB4iQvLYSDgVnguRcqU/gnXtMRtExc
+4cE4NQmCmqY/wq8sJOurF13HU/ViMNpe7dKACYrlNOU2e3K5vpOrmURHgI3G1bKb
+HngNbje7DeqkS0Id+ISk
+=/uz4
 -----END PGP SIGNATURE-----

diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index 349bdf857e55a499c55dc648068c9a0899a78914..5fdb12e0ebd123ecde10bb761ef1e6fb39be720c 100644 (file)
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>python</herd>
-<use>
-       <flag name="html">Support conversion between po and html files</flag>
-       <flag name="ical">Support conversion between po and ical files</flag>
-       <flag name="ini">Support conversion between po and ini files</flag>
-       <flag name="subtitles">Support conversion between po and sub files</flag>
-</use>
+  <herd>python</herd>
+  <use>
+    <flag name="html">Support conversion between po and html files</flag>
+    <flag name="ical">Support conversion between po and ical files</flag>
+    <flag name="ini">Support conversion between po and ini files</flag>
+    <flag name="subtitles">Support conversion between po and sub files</flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild
index f9df6e91f24b5baed0d1f48068e593484b33c9d9..0afc5cefe4457d04f39dc84efb1170fdbfa04c44 100644 (file)
--- a/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild,v 1.1 2015/01/10 06:57:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/translate-toolkit/translate-toolkit-1.12.0.ebuild,v 1.2 2015/04/16 09:27:57 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -34,10 +34,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 python_prepare_all() {
        # Prevent unwanted d'loading in doc build
-       sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py
+       sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
 
        distutils-r1_python_prepare_all
-       mkdir man
 }
 
 python_compile_all() {
@@ -48,35 +47,25 @@ python_install_all() {
        use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
        distutils-r1_python_install_all
        rm -Rf docs || die
-
-       local filename binary
-       einfo "Generating man pages..."
-       for binary in "${D}"/usr/bin/*; do
-               filename=$(basename "${binary}")
-               ${file} --man > "${S}"/man/${filename}.1 2> /dev/null
-       done
-       # doman doesn't want to work
-       insinto /usr/share/man
-       doins man/*.1
 }
 
 python_install() {
        distutils-r1_python_install
 
        if ! use html; then
-               rm "${D}"/usr/bin/html2po || die
-               rm "${D}"/usr/bin/po2html || die
+               rm "${ED}"/usr/bin/html2po || die
+               rm "${ED}"/usr/bin/po2html || die
        fi
        if ! use ical; then
-               rm "${D}"/usr/bin/ical2po || die
-               rm "${D}"/usr/bin/po2ical || die
+               rm "${ED}"/usr/bin/ical2po || die
+               rm "${ED}"/usr/bin/po2ical || die
        fi
        if ! use ini; then
-               rm "${D}"/usr/bin/ini2po || die
-               rm "${D}"/usr/bin/po2ini || die
+               rm "${ED}"/usr/bin/ini2po || die
+               rm "${ED}"/usr/bin/po2ini || die
        fi
        if ! use subtitles; then
-               rm "${D}"/usr/bin/sub2po || die
-               rm "${D}"/usr/bin/po2sub || die
+               rm "${ED}"/usr/bin/sub2po || die
+               rm "${ED}"/usr/bin/po2sub || die
        fi
 }