Add _p version suffix to adapt better to upstream scheme; fix LICENSE; update HOMEPAGE; simplify ebuild.

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

4 files changed, 57 insertions, 51 deletions

diff --git a/dev-qt/qt-docs/ChangeLog b/dev-qt/qt-docs/ChangeLog
index 8eb7cbf285b4..b96580fed72c 100644
--- a/dev-qt/qt-docs/ChangeLog
+++ b/dev-qt/qt-docs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qt-docs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/ChangeLog,v 1.2 2015/03/15 04:34:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/ChangeLog,v 1.3 2015/04/01 20:44:49 pesa Exp $
+
+*qt-docs-5.4.1_p0 (01 Apr 2015)
+
+  01 Apr 2015; Davide Pesavento <pesa@gentoo.org> +qt-docs-5.4.1_p0.ebuild,
+  -qt-docs-5.4.1.ebuild:
+  Add _p version suffix to adapt better to upstream scheme; fix LICENSE; update
+  HOMEPAGE; simplify ebuild.
 
   15 Mar 2015; Ben de Groot <yngwin@gentoo.org> qt-docs-5.4.1.ebuild:
   Adjust description
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 8d5b48b02e7e..4a604e05d734 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST 5.4.1-0qt5_docs.7z 78331600 SHA256 3e98d788e03e9aacfdbcb8c458928a537208b4525c253dce04cc9b8d8116b7bd SHA512 23c2fed256d5f4eace52411f2582ed689bef063ca6dff0d928917dd62c9dcece3bd2409e005dd0cffc51c5f81d837f3875498caf928b0c6f91143f645687eb30 WHIRLPOOL 415a53f87eeeeb3dc9a9705363d98aa3f9ba454d9a339048df302b6aacddab2ac5ca2f2247a474b91652e92049c175e3d6ab2e8e7c0901d958619306f1cd11fc
-EBUILD qt-docs-5.4.1.ebuild 992 SHA256 540d96d8dc7da4079ed3efebabac049db7afa1e5e7b8547816c7bf4fd440cb92 SHA512 f52e7692722f9a45e8ec07aeb8de5ab4904b6fbd8fde1a91da1eba1ef6fe093698263d75560d74f930aa5b0fb93e3d169e5475027c5b1b2eb6c3551ba8aa1f99 WHIRLPOOL ae647d85e70e33749788e95b4b42041eba1b5dbd34477f90cf1db2d54d36fe20fd04424cf2d3504a13296eb62d63a9882f13b8f82a68cf1c870e5f5fe2c86103
-MISC ChangeLog 458 SHA256 bc782a87418d8894a11dc9a97f9ce6fa785afdc4eea445f83c385aa4168f24d7 SHA512 a4a73aa18432d886dd04d28f2538bcfce76be1c4d22c03a1558dce35c7106072c51b44416349f7c1aa55360e67fe008b5a4f22d8a0ead07a4d84d606b8fd7ae6 WHIRLPOOL e68ed04dba56d232545e29382c5a36fad10acc9a2724cb1aeff023a09871449712d67d5f11ab8b22cc4068d057036fd1857a42cf4eb50f1578ef080516b01a3b
+EBUILD qt-docs-5.4.1_p0.ebuild 928 SHA256 6e93bdb40e8bafa83711df57320c230252f0a9516da60c691a6ddbca695685b9 SHA512 6e1acd5af07b38aa47aa8d713c5784930856da0e24f4d76b30d767bc0e4182b7221d417b72a24ec355d0d37a5e394d37906d50359af0471fe23fda958f297c81 WHIRLPOOL 9572c14fda4c2c46a81f334ce529549faaa229a02dbc672f258aba7881e8f387270bba4357c3451b5836cae10f4ba39cfbcfdae30d1b973120e10f2f0ec10a8b
+MISC ChangeLog 700 SHA256 d39664d5cb9da99ed2694614057f5454133e52acf512031dacb7ac7ee0431587 SHA512 33c085cff74f2de7e5c95ee8ad67814ce843089f47712930aaecf9e33f9709efe5dd9eb1a90c0f251d45c8a3987c4cc40ae542ebbb2bee22adecfb0c1753968c WHIRLPOOL 036bc5ee3c130414a8787f04e36177a61d14573f0f1059922a1773f43872174edf7f66e5a5212da149e2f51097306170cb808d7b301d1ce9e7dd8e9e84a2a781
 MISC metadata.xml 275 SHA256 27953caf318944ca21fac56f700bfc73fa85c88662528326ef008734734b4f5f SHA512 edcffb8d5f026245ae5aa8f59da26aa117de5d909bd4861b7e3fc5806a42f17b33491416f6d17663b347a161e737195f3a22e1ab7eca45a6403a95cd7ce7cb7a WHIRLPOOL 51ec5d0f5b4e4ac856a9e8b2076df202ede24095020e7f2d6c34f4e7c99fe85e6e4876508f51d3fde17b7109d048fb5432bae80155303efac864b9edf2c6403d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVBQvbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOWCQP/i1O24m1z5l2rQCsBvzqJGdj
-MgL+iDOkk8PCwOz3HO/tNDggU23ypF///ujlbjEr98azjwchP/S95AWiLjs5H91m
-EblTDmwOlN1RlavTc1VeHGnLbX13/OGGnSosIvGlPbd9Sl6cvrF7qK16A09ppgXm
-TwT+RQElSw9ja5xrt+DBVcHy9Gkl0fiPtVZo4sDlmKfCkjnggTwlFeQ9lX7wqIih
-2zdxFDOkazpEbIR8jQTShUNgLVL9+v/bJSE+HeF49AJn1oDslBe4ABGedpe8UBqO
-bcTT7NpIy/GKl3c46VRI8r69x13w3NVz5fEl9AyTjMNbFnLOfsIJe6d51trev431
-H4l936IKvevV2HYV109iSNSNwp9ixoNLQX2LOEawli5/P1W+TfwrXEJRmG1o1+br
-eu1M+nckCDtgiDbEX9biiNi6XNSA2kDbRleWAOEG/DyppzNBbCg5f0BGwRKKFnPr
-VkeqkB3f+BHQAEXR/XFbcd75f49vUG85720iIaezJ9PYmBNdGr3dyXia9/6JjgwH
-iF7LOi5RnytTiMmmY1gRhAwDxvk6AECQIMobnpqKs5aJBfdAj/u/VxVNjVUhRZl+
-OZHQFT9xIY1OcUKBJeLc6Xhz+akh2BK95E+LuvJQdAeDjH9krjmxMy6gJJYbtEAX
-zwF3+RH/rdLHK5FKZuDv
-=jPCM
+iQJ8BAEBCABmBQJVHFjIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9wf8P/3JuNehsC0k2mgjxqYFgxbhT
+KloVg7G1TJpYk/BqVUg3AvtLoEXytNxrTb376hP8O6O+WgRVOA5J50ezgvq8udZK
+u2P4miCkiuhR8LUshs/vC2sfXRDvRD+ysI3+Q4nIy7nrFmE6O0xXpJXeHxMCmKN3
+LeGYJqVEK8t+Zo0Qla0XLK/eg5EzzQI8ydB8O8YcRhd5SumTHRnJPAjJA9KeHyb6
+hpVi2B0obB+QpxYgLWSzrDt4vnmD+i29XHxD/EMyUo3IZv0o7k0u0tpkzgr8ksi3
+DIFsjMvN3U5xJch7vxQ/HDA8Jqsm56ObREsESMO8u6qaFpjieddQv9fWZGZ2+AmF
+Euc4QwK6yArR3gIb1+w8rL8TliqMvC+tBUb5orUVxkWuD7MnPpayEyevPRZl1+px
+s8XTP9i+hlMU98g5sDosg3LixM5H6K/GNM91pL8KIbG12n0Fnzs1m0FX9eefzKmf
+8up0uxb0HBMvlcWF0aVpPpdTzKs38xQPa3agjy21Cdn6jTFHq+cYIRgj8WvmrQKs
+oKnxtpY321s9mpMEpIf9l16JQSXVsiw/Fr7Yd5kiAONuuga/TYPAUskOqQSLJ6cJ
+i99DFJ9T4OAxKkY9pC6uykS4OdSVqd1tZ5QzCZcY49D0ZUb42NomOSg3hcVUCo4Z
+ybJDsTlneHi54o5RFMwr
+=mr7o
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-docs/qt-docs-5.4.1.ebuild b/dev-qt/qt-docs/qt-docs-5.4.1.ebuild
deleted file mode 100644
index fb26123cb7bf..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/qt-docs-5.4.1.ebuild,v 1.2 2015/03/15 04:34:26 yngwin Exp $
-
-EAPI=5
-
-inherit versionator
-
-MY_PN="qt5"
-MY_PV="$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_PV_MICRO="0"
-
-DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
-HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
-SRC_URI="http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/${MY_PN}_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${PV}-${MY_PV_MICRO}${MY_PN}_docs.7z"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/p7zip"
-
-S="${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)"
-
-src_install() {
-	rm -rf global # We remove the docs that conflict with qtcore
-
-	local target="/usr/share/doc/qt-${PV}"
-	dodir "${target}"
-	docompress -x "${target}"
-	insinto "${target}"
-	doins -r *
-}
diff --git a/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild
new file mode 100644
index 000000000000..8ee5e1b5a7a3
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild,v 1.1 2015/04/01 20:44:49 pesa Exp $
+
+EAPI=5
+
+inherit versionator
+
+MY_PV=$(get_version_component_range 1)$(get_version_component_range 2)
+
+DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${PV/_p/-}qt5_docs.7z"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
+
+src_install() {
+	# remove global docs that conflict with qtcore
+	rm -rf global
+
+	# using ${PV} instead of ${PF} is intentional
+	local dest=/usr/share/doc/qt-${PV%%_p*}
+	insinto "${dest}"
+	doins -r *
+	docompress -x "${dest}"
+}