revbump; add IUSE doc, examples, dep for doc build and install, fixes Bug #497446 by C. Mayo

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 65 insertions, 59 deletions

diff --git a/dev-python/pyserial/ChangeLog b/dev-python/pyserial/ChangeLog
index 4cdeabe176f7..256c6b7ef762 100644
--- a/dev-python/pyserial/ChangeLog
+++ b/dev-python/pyserial/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyserial
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.96 2014/03/25 08:23:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.97 2014/03/28 05:20:38 idella4 Exp $
+
+*pyserial-2.7-r1 (28 Mar 2014)
+
+  28 Mar 2014; Ian Delaney <idella4@gentoo.org> +files/mapping.patch,
+  +pyserial-2.7-r1.ebuild, -pyserial-2.5-r1.ebuild, -pyserial-2.6.ebuild:
+  revbump; add IUSE doc, examples, dep for doc build and install, fixes Bug
+  #497446 by C. Mayo
 
   25 Mar 2014; Ian Delaney <idella4@gentoo.org>
   +files/pyserial-2.6-list_ports.patch, pyserial-2.6-r1.ebuild:
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 31cddb89f1a2..f95569d76ead 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mapping.patch 491 SHA256 fd86ae541fd3a326f168c4529ca93b2b612d0eb9a21a11d1be5e170a10ffadaf SHA512 3e028b7a846d0122bd2c1d165ba870edb711f59e6b795c1ef599febe32ef511ddec805bc248d2a5c145255b515d99d60456da71bfa55f3740c8c1467b4cf6088 WHIRLPOOL 50c194618ae987259dbd44672cbf19eb8d1b36f27be4f1137734bf7e33fa3db336032c4d8a04a5a0264879364178f7d830a5decd484c8365d8ad198a680f7d20
 AUX pyserial-2.5-python-3.patch 1216 SHA256 106195813396b9dcd86ebcddac8c68e6cc07c93783c685b87c06d8249f15bd63 SHA512 95caad2f8c84ec994d071a1eda952a48706c68b121bc2ffb985410c4f388a66957a6f40ebb9f12ec562cf46d2f6a632c50a0ade56d9185c3e2e67cd35e63faf0 WHIRLPOOL ee6dd04334cd900478ace2d1531a644561a171d9aff1d0e5b0fd0a1b15f8851ff4a04c8eecdb6074923b4fcaa24b9617b16501e7ebb81d762827e488e751301c
 AUX pyserial-2.6-list_ports.patch 683 SHA256 cbb7cd33736a5b7e985bc295791701ea3c2882bdbc00f0a4cbbf4e8640a65145 SHA512 aa1abcac7e49b4f11e9fa77de37e2c064c685187feefcd04d51261b04c578d0383cf985deb48a565f66bb412d4bf3b375da6bf36c851d729eb86d004144b2a44 WHIRLPOOL ccafd4ecdcd717e493e9684c0f1ca902b5b8085594bf332e81b8c774c9c41d7f29a5b8da7df37ffcd910ce8699e8a04a24185a17156bfa2e1ddd64cb1b3dc036
-DIST pyserial-2.5.tar.gz 106278 SHA256 eddd22280e0dac0888c6cddd8906ebd902fa42467fee151c43ecde4196bbf511 SHA512 22c610c9b2115b23928e86198e0c0bd840b95cadf6983d8847fd164e6f94ffbf7fddf6f4fc710a8ccb21ae954bcf13f73561e6fcf47d69d745f996d0cf152d6e WHIRLPOOL e56eab24c294b448a8dd05e35ef62bc01270d787bc4a7767f9756a193106d6df472ee37142daf6eef867b2ef3af71a34014e9e4d06d45fd5b3d0535fe5815422
 DIST pyserial-2.6.tar.gz 116289 SHA256 049dbcda0cd475d3be903e721d60889ee2cc4ec3b62892a81ecef144196413ed SHA512 41682f8fafb6c5fa9642d3a0a3d6d0648101c38d157005f9c4e019e55d534953486072caf05647d8828b0e19c8259cc61cac856a570bf09904922ffd175fad2d WHIRLPOOL d632521d4687751f3056eda3ef254d603a7450d09457deed4d12136ee690d8af8d9aea1b8f8aebe9ec877a00bec5fa54933d2bff0cec281de0b676dde3d86e55
 DIST pyserial-2.7.tar.gz 122081 SHA256 3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477 SHA512 3fc8d9425a47ebcd37db1fcc58182854b48c9abd6642f35fba2d21458d864ae448105d704dc0d880832ba7516fa16f108f24363bd5fa9f083ea79a4ac614339b WHIRLPOOL ae6b4df86220617f7fbc1f1e4085a7e85dca645a6d84339163b40fc7a15f14b879ef7a729d3d23d0300f9ee04b21d6c24d13a791d520aef3f3ad141c6acd9b68
-EBUILD pyserial-2.5-r1.ebuild 782 SHA256 f2c2c5ae351fec80dfc5bc58a05797c61761e93ff379202e0f1664d7a58c4049 SHA512 d514c9554cfbf4b0bbf318a45a57f5f7aeee3c7480bf74e8ddc87013f1d9d31e62d0f70841f9d067fc07ca4fe49a4ab17e23290e269ed83f6a95908c3994e8f0 WHIRLPOOL 624f40c57999ca642c14003f838e21f7c043138e777edcf12d763ca6ff5ce073d1b13d1385bca1bfa7d72cca5deb5913ab4429c0b1b656561c3772b89d4e3efd
 EBUILD pyserial-2.6-r1.ebuild 761 SHA256 70b168bb64828bce54257e9ac5a9bb8d93ee1ce3b0544fce936f16b4484cfe12 SHA512 6764b8cae4f10a880ad4adbd0d60640b6ca8ffb73db14ddc3c92f1e582f260216dabdfa68dc14cc73c356838fd594c51dfe1921cb4e9fde49aefb20a110bb023 WHIRLPOOL e392965fd72c17f173ebb795725bb50240bb293f0e2769a818b0ce60d39d8fd42d218e38d02aa4a7a35634d528178ba34e3d4b0cf0d0a6d63a36157c46b5ff99
-EBUILD pyserial-2.6.ebuild 710 SHA256 fbfe3e712f91c42f3f90d2a7a3015f1b64afef0fadfffe23d1726acfd46bede7 SHA512 ac44b6245060c7c52f2aa1e467f383a3d30196395baa49b13b0e05bf364becefd094c6ad031603c03dd41bee2dae1860e2c15911dae734a44092f9aeb116a1e5 WHIRLPOOL caf26430a049f756ee4d2c3ae248283ad043f42aff644c8b848592709ce997d137f98d95eeb8825a02f544e25be5fbd35daeb09c9874155389f9b3f3c3483895
+EBUILD pyserial-2.7-r1.ebuild 1157 SHA256 19cd6dd4192b3e44a9f7636e944067aa1486dc89d2877c993842dc224c869880 SHA512 d7f2d9508d501a7e061d3eec6218c545d60fae687b923d2cda50005ef837d3e5c236e911957c3e7e1103129acb6e188232e71474ccd147909bbe221ad24f032f WHIRLPOOL 10543ec4d81587a6b7c3becb75f1e9b0a9acb36681ddf829e8747e1d163223dad7499c98eb03247d4a65b4ce0937c4f09873e1caadb07eb3bf869c685ff04a7b
 EBUILD pyserial-2.7.ebuild 702 SHA256 53c4f494c8727bffaec92ea1436f7a23136b02a6dfd19a0da2840e175d69729d SHA512 b831450771bb8fa4f02424b5b992bedfdb7701060ea52f488988bc242ce4f3e5a4d3a557ae05fde07d655bd1a3158c4d6c2fd9e91465d99e995994732dff11dc WHIRLPOOL c63519ba2d7ba84614d815ca99e41b77ac52917bb8a807d202e94fe2eb14259e5829228b0773dadf7948d72300c411e420749d53bf25728cdc021119bcefecc9
-MISC ChangeLog 10795 SHA256 1dd4829470176f4e75b99798de1bf05be42dcd459e2d0ed50ed178a582edf76b SHA512 95722fe7f047f91814f9ba5568c67b3eaaa9d765a0cbcb1388d14b6c4f4ac1e95b70f2c98787738d062d6cf80792d11f531a78fab75c8d3802ac6460d088edcd WHIRLPOOL 662f4636d75a504232dfaf9915e4489b51ca839eb706a670daa26c1ef225de7424d63372793da0c6b52dfa0096a0d570fac66994cb99991533aef0d6f2d53895
+MISC ChangeLog 11069 SHA256 d6eb0f82adc385b1dd7ce7b8358c2a6f61548cac1b370e942b70348e8dcf0e82 SHA512 3a57efadd82affcd130ae9302fddf506530625e710d60f0b152961ba347b5845c2d9fdbd3d2c72a4dda2d5f508f6dc4a260924aa744f26fb68e086d3204b5010 WHIRLPOOL 9d9fe080161dcbf3243c9f5b638754192832bfc819301b92e979dd120e809ee3ec27de3f42515871452b37d4a53cf61e6b007baf073f77511b91e89b5d7a3129
 MISC metadata.xml 231 SHA256 b1891be3cf95c62cb54cd6cb78d0dfeef69e0e9d976d197c592d3e432bf6face SHA512 3b65cff6d68b977fe8551719cd088166ef52a9b6f629467ad07f21db0a59bd3123b1eb68c829606bdc58173ff660b071b22bde8d4f46b43536c02106d37d91a4 WHIRLPOOL 609b054197c88eb6faee0495d024f9a36cfdb01a7341ffffe753e1ab4a786a538a65238b06709bac26cf1f3f58ebbbb600865c07bdd26bb4429483f39b8cc7f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlMxO20ACgkQso7CE7gHKw1aZwCYx8gYyexSGx/ellmmM3pkWAl1
-mACfZ2AA44o1GJkezSpcNVz465TDka8=
-=QDfs
+iEYEAREIAAYFAlM1BPgACgkQso7CE7gHKw3LDACgp5LE7hlq1sdVf1SIXjwNWBvs
+VZoAoMCaOXxHp3Qj67UZLLixux5L9qX7
+=QtuH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyserial/files/mapping.patch b/dev-python/pyserial/files/mapping.patch
new file mode 100644
index 000000000000..bd315d98f040
--- /dev/null
+++ b/dev-python/pyserial/files/mapping.patch
@@ -0,0 +1,13 @@
+diff -ur pyserial-2.7.orig/documentation/conf.py pyserial-2.7/documentation/conf.py
+--- documentation/conf.py     2013-10-18 00:29:53.000000000 +0800
++++ documentation/conf.py  2014-03-28 12:41:08.848807687 +0800
+@@ -192,9 +192,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# for external links to standard library
+-intersphinx_mapping = {
+-        #~ 'python': ('http://docs.python.org', None),
+-        'py': ('http://docs.python.org', None),
+-        }
diff --git a/dev-python/pyserial/pyserial-2.5-r1.ebuild b/dev-python/pyserial/pyserial-2.5-r1.ebuild
deleted file mode 100644
index a25f52e51e12..000000000000
--- a/dev-python/pyserial/pyserial-2.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.5-r1.ebuild,v 1.9 2011/08/27 21:19:46 neurogeek Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Python Serial Port Extension"
-HOMEPAGE="http://pyserial.sourceforge.net/ http://sourceforge.net/projects/pyserial/ http://pypi.python.org/pypi/pyserial"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES.txt README.txt"
-PYTHON_MODNAME="serial"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-python-3.patch"
-}
diff --git a/dev-python/pyserial/pyserial-2.6.ebuild b/dev-python/pyserial/pyserial-2.6.ebuild
deleted file mode 100644
index bd3d504805c9..000000000000
--- a/dev-python/pyserial/pyserial-2.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.6.ebuild,v 1.3 2012/05/08 23:59:28 aballier Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python Serial Port Extension"
-HOMEPAGE="http://pyserial.sourceforge.net/ http://sourceforge.net/projects/pyserial/ http://pypi.python.org/pypi/pyserial"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES.txt README.txt"
-PYTHON_MODNAME="serial"
diff --git a/dev-python/pyserial/pyserial-2.7-r1.ebuild b/dev-python/pyserial/pyserial-2.7-r1.ebuild
new file mode 100644
index 000000000000..af612578f97e
--- /dev/null
+++ b/dev-python/pyserial/pyserial-2.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.7-r1.ebuild,v 1.1 2014/03/28 05:20:38 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Serial Port Extension"
+HOMEPAGE="http://pyserial.sourceforge.net/ http://sourceforge.net/projects/pyserial/ http://pypi.python.org/pypi/pyserial"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc examples"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=""
+PATCHES=( "${FILESDIR}"/mapping.patch )
+DOCS=( CHANGES.txt README.txt )
+
+python_prepare_all() {
+	# Usual avoid d'loading un-needed objects.inv file
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}