Avoid unnecessary doc-regen in the old version, remove the obsolete doc-regen code in the new version. Add missing PYTHON_USEDEP. Fix running tests.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

6 files changed, 51 insertions, 83 deletions

diff --git a/dev-python/pyplusplus/ChangeLog b/dev-python/pyplusplus/ChangeLog
index b79e52fec387..85fd39c4987e 100644
--- a/dev-python/pyplusplus/ChangeLog
+++ b/dev-python/pyplusplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyplusplus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/ChangeLog,v 1.7 2014/05/03 02:02:06 heroxbd Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/ChangeLog,v 1.8 2015/01/01 23:43:25 mgorny Exp $
+
+  01 Jan 2015; Michał Górny <mgorny@gentoo.org> -pyplusplus-1.0.0.ebuild,
+  pyplusplus-1.0.0-r1.ebuild, pyplusplus-1.0.0_p20131206.ebuild,
+  pyplusplus-9999.ebuild:
+  Avoid unnecessary doc-regen in the old version, remove the obsolete doc-regen
+  code in the new version. Add missing PYTHON_USEDEP. Fix running tests.
 
   03 May 2014; Benda Xu <heroxbd@gentoo.org>
   files/pyplusplus-1.0.0_p20131206-numpy.patch:
diff --git a/dev-python/pyplusplus/Manifest b/dev-python/pyplusplus/Manifest
index 6f2100802492..e3a036a5667e 100644
--- a/dev-python/pyplusplus/Manifest
+++ b/dev-python/pyplusplus/Manifest
@@ -1,9 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pyplusplus-1.0.0_p20131206-numpy.patch 9236 SHA256 bd2588aac38063e2de5c4409d5e0547f336c1ee4bf53bee1d63dc76b26c0e0b7 SHA512 173655e30525ad60b40a1fb42ca4179aa975622c02545c563658303c0cc56f48c6d0358104d91248cdf27d9dafeef340d4d491556af33fee56848ada21db4e97 WHIRLPOOL 64add1e8a27f860ef2a6990148b3e3ebfd57cc76c0506a955e37566819c015f8b3e3bd4fb27a7b3aebee0d85ba8bf7a00f1eeb67e48af354b788ce62563e2be6
 DIST pyplusplus-1.0.0.zip 7886416 SHA256 dc749514642846d85de148735b44c5f5e03dc0b62feceb0727698f4069d3c963 SHA512 04a9d6f06d8d22da9ac3b4ec1efdf001f0e4a2453ff5d70d6a15b808d7247ace630c4064ab2476a28ed3dede9cdb867c0650810a0c72a0a6474912fc7ef65812 WHIRLPOOL ab12d4c2432155226e66081f72007406c71da11aae5f7e2e4bf80e3e28680cef5ec0370a8fc442f86ed14793bc340f85d203903f348982d355f48f4a52c4f89a
 DIST pyplusplus-1.0.0_p20131206.tar.xz 2984232 SHA256 bcec544fc4520a3f37dc672dfb5c3611ed973ac34912eff5f5c67267680154ba SHA512 5cdf158477d6b93d1b579383657241c48d59ac17fd890016ac68d3b9ca8453726dabb8a7913f6139e24e93c691ead85adb99a6b20aa031603c6471df04fcfea6 WHIRLPOOL ef8d5d193ab334a82a3b364bf525efd3fd588e07993de525cad705aa175041291ffabfd115f8863952a00d9424a802f4c4cb5d09c3837ef67c860d821c212730
-EBUILD pyplusplus-1.0.0-r1.ebuild 1131 SHA256 413f4e62c4c661b13e120be1db508a4843ac322da1013d687cc7a973b03d9c88 SHA512 964ea866d3f4c147e33cb6443279a03a3925fc705e5bda78f96b83e1cd16d8aa7ef84e8a84b670669f4c41d2d77f953ed8faf19def6b23236d3d130d83b93c8a WHIRLPOOL 8ed9c4a9a1f97ec1c438502a675811728c02a4caec8bb527ab1bd3022f428f4755fdec21cd6d6ba90b1fd7dda8cea81d39f288196074547d84c568a205fdc81c
-EBUILD pyplusplus-1.0.0.ebuild 998 SHA256 dc39c513a466d093f087dd3eac198e7a713f06cf5eb1fe6fa6ebb19b0db8f828 SHA512 e1eff924e64d770a80aa2bbb0d4020b0c9caeb45d2ee952812beb4253d868932a5af2812e5f8505252b4c3a9974a698972663e0c891428270dd94ee7e5798b44 WHIRLPOOL 24678aff12840ee89c686afe4fd10e2cbbf1a79f4262ea795a16fd2661a028fdfc66dc67fc09eeea3718964ba210e9cf93a09239f694d1a982720fa767cfb0fd
-EBUILD pyplusplus-1.0.0_p20131206.ebuild 1262 SHA256 0cf2dd45346a60997a9242d23be108a963b959f77b7ae2a734e30471d28a3b64 SHA512 8d99ac573421db40f813aefcfed8e79bf7a313dba357318ed80c2a4f401cde664dd6ea99891a7bccd148b72a7224a33bb2389934ebc1792bc026fa0b2deed5d9 WHIRLPOOL ad09ac0062a35f21cf65e4c28844fb89eac803531a5dd53de3118407b347ec72d3ed1d642e4948434902fd6decdf95a4af7a8ab24f678e2ae1c4850cc83d9720
-EBUILD pyplusplus-9999.ebuild 1154 SHA256 0261ce86fdf9c72df6ba51c7e876938bd957437d145309f50901d1cbf14223ce SHA512 6ae7548d9bed5448ec050f62067540be892733ba2d3946e9385631552df02fea92b4c81bdae139a112fb9c71254e8279aac0eee7355a1c12eeb3c2107ede6550 WHIRLPOOL a1edf47f0790dceeccad3d2543233a888e665a007c44e8119571953e1fdf40c11f23a09c24a73773f9de7287d72e9c343970302c353c06b2b95b11cd5f5777df
-MISC ChangeLog 1583 SHA256 45b53957d7943a579398898946058970f01a4b4d7febaca2f8717e9e7167816b SHA512 84403d3a5a07a4b14e07e49037d507ec21cd02a6ecc162d84cb2c1561f3c26573a32ee31433d8b89f929601a821d38c9a19fab05c6611ebd64a9e74ad26c5541 WHIRLPOOL f8c9bb5328f468e3b4d44c9874cb1135f51d799ab882a9063ccc572974015a591c549492239d98e4552a39ac65dcc2a0ec622a269280c324c5661134a7f79ea5
+EBUILD pyplusplus-1.0.0-r1.ebuild 1053 SHA256 af94a4f80906f077537e968809155045121188a7277bcc9ddaf0fb99a89a5920 SHA512 406bb28cfcc6e89e47104d784483b1ca632a7ec581a4673c58286ab7aa509c9a428ac8be6a35f907042b6270dbeca4139d36bc891d335ee70c8f0b416bbd5c79 WHIRLPOOL a430ee0d78b779388cc81d23e3df0453cf61dbb3a6bef238e34026c82e165df02c6f7c01d9d7e11f0906c0682c74e5b9544cbc79f93f3a2ef67a8fd6e0bc8016
+EBUILD pyplusplus-1.0.0_p20131206.ebuild 1162 SHA256 0d33f424142828b47e09b5a450d59a8e8378638f05ce432d8213b4aea240ecfe SHA512 b3f4617c2d26171ec0f59c7c270fe38a6431975f041b223d24684c617532cb450987ab2eb27ea754da6fbb2ad773f5b09bfdfeb2193b7697689ca0d6cc0d054b WHIRLPOOL 02a62c176889aec3dc11b38231b1bad08b85efbedb6b5f5eab52e07836f7a412d945b20d2c771a5a2bf41d07dc1cfe439585a97bd1e39b81ff86d434cf98eb71
+EBUILD pyplusplus-9999.ebuild 1028 SHA256 9cae1d3bedf8824bd7e14723e6d65efe950ec741fb78fa1d0cbfacb73e1e0be5 SHA512 4dc9617b96add995fc97ce22779141666beec4132a09130f620f3e61a74fed0df9d4bfd2548ea001884b95369f3127b8a7bdac6400d6765b581ec61d361fc366 WHIRLPOOL e1e28959fb620607ccd79f74c1232b9d684067f2b290a4ce2ad17842436b777a4b8ca5b7ca0bf3325c47b95fef6964830d085e91f9c6855fcee477d4afe8a215
+MISC ChangeLog 1903 SHA256 6d8d59262c0b1c3304df22b3df1dd5ab4b012d0eba4584ee8942ef4bf3625c08 SHA512 669ee2094a16a46a87bd2f02256ed1e9e901e0928bbfbe444a29beb62b2f851518d738fa1fe5798c809ce291eae10c2a90bc542e6734eaeefe0549be432c82de WHIRLPOOL 805e3f505f4f10a5c257dfcad6c69c88b6f9f7c1ac339128d1005228bc375b9f7d889288ddf2da6a3e45da9623b372edef036316539c763c184a68c785a61b4d
 MISC metadata.xml 567 SHA256 565e143fb5c63c4e328187784ed85ca345f762a5c263f9cbf0f62bb8c6d1d765 SHA512 345d4770e02bccfa4f36ae27b314d0be698f2100a4b8577bfab99f76afc279771d29a5caf5dca03f85cc9a575727b6f59c3156d33b77c9467f36eaff05aaf0fe WHIRLPOOL 4ee4b7e2cccec12427a76f65b83e5f8d05d0039adc0d10a0d32b8fce1a97e59293f6d2515758304459f2beb9c603e3063bba01be2b7f7ad57c2603eb9d3c7328
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUpdufXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXkEQAMJ1w8VXBB+Tx5zIT2+joOCW
+gTN5oO/mQqKD0JXNtUfjhu2A5SaGuDj0a7yKVbWFHdx3tlBiDPfiBFS4330/WO7D
+3jd89fN0qu/vKuPVIHF62TMA9BLtgDJiHMcZG4AXlfRRHUXvsUHZHDCTJtXA36n5
+zeyW/zIZ1zIuw8sSnepyN1aogehENJNW9HmDQBrMjuRNtjZbFsQQduq5M702IFXm
+ZEs9sll4iGKAZAjzco6FFxRGfDRKLBs+mlbAYdpzJMjb//szpGcNBOm/9zFGB6va
+gHz7MkE7tjGHDcE+FUui+sldLvfE58E1gnO1FV9PXqFUVvhyCZf8+7sMdZRZW8+O
+JCgkh0boPq5r7tUl7zsiUEYvboHygOVVE4US7wA2hW3EnduXWZG/6b9gMakzmmxp
+Wm3hbwQt+dcUhWQfZyKkehAs46wr7FgCRL5GfMzn0jR7pAzBd11OcZbS7wFESpBQ
+4l5QRMyavwk8vsvLB0rXSEDYNAyHF/3H/PHXnFfTpk91hXPgk1vVoq0M0eXuBwPJ
+uAHZyy4vWg5+yi34EmCTRpcN2uP+VIfHSj6Tmwcid0uKRf/NYjzRZWfv7vQJ9C+j
+f5fpq+tOdtdpB0zpzXhTGthbe/q23Vsxalfs3t414bRd8n6hBdaRj+DxOk2QaOTq
+Pm12YBkxbnuUaNRRqBtJ
+=G3JY
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild b/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild
index 307a2412842b..5694e64c0ee3 100644
--- a/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild
+++ b/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild,v 1.2 2013/10/27 08:24:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild,v 1.3 2015/01/01 23:43:25 mgorny Exp $
 
 EAPI=5
 
@@ -17,20 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples +indexing"
 
-DEPEND="doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )
-	app-arch/unzip"
+DEPEND="app-arch/unzip"
 RDEPEND="=dev-python/pygccxml-1.0.0[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/Py++-${PV}
 
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-	fi
-}
-
 python_test() {
-	"${PYTHON}" unittests/test_all.py
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pyplusplus/pyplusplus-1.0.0.ebuild b/dev-python/pyplusplus/pyplusplus-1.0.0.ebuild
deleted file mode 100644
index 925a2a64c1c9..000000000000
--- a/dev-python/pyplusplus/pyplusplus-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-1.0.0.ebuild,v 1.2 2013/10/27 08:24:43 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Object-oriented framework for creating a code generator for Boost.Python library"
-HOMEPAGE="http://www.language-binding.net/"
-SRC_URI="mirror://sourceforge/pygccxml/${P}.zip"
-
-LICENSE="freedist Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )
-	app-arch/unzip"
-RDEPEND="=dev-python/pygccxml-1.0.0[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/Py++-${PV}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-	fi
-}
-
-python_test() {
-	"${PYTHON}" unittests/test_all.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/documentation/apidocs/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild b/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild
index 347aed32b8ed..04d4eac60a19 100644
--- a/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild
+++ b/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.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/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild,v 1.2 2014/02/25 01:56:52 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild,v 1.3 2015/01/01 23:43:25 mgorny Exp $
 
 EAPI=5
 
@@ -22,27 +22,22 @@ fi
 
 LICENSE="freedist Boost-1.0"
 SLOT="0"
-IUSE="doc examples numpy"
+IUSE="examples numpy"
 
-DEPEND="doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )
-	app-arch/unzip
-	numpy? ( dev-python/numpy )"
+DEPEND="app-arch/unzip
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/pygccxml[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	use numpy && epatch --binary "${FILESDIR}"/${PN}-1.0.0_p20131206-numpy.patch
-}
-
-python_compile_all() {
-	use doc && "$(PYTHON)" setup.py doc
+	distutils-r1_src_prepare
 }
 
 python_test() {
-	"$(PYTHON)" unittests/test_all.py
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=(  docs/documentation/apidocs/. )
 	use examples && local EXAMPLES=( examples/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/pyplusplus/pyplusplus-9999.ebuild b/dev-python/pyplusplus/pyplusplus-9999.ebuild
index d28a64fb092f..ae16f6a6458e 100644
--- a/dev-python/pyplusplus/pyplusplus-9999.ebuild
+++ b/dev-python/pyplusplus/pyplusplus-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-9999.ebuild,v 1.1 2013/12/06 13:35:53 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyplusplus/pyplusplus-9999.ebuild,v 1.2 2015/01/01 23:43:25 mgorny Exp $
 
 EAPI=5
 
@@ -22,23 +22,17 @@ fi
 
 LICENSE="freedist Boost-1.0"
 SLOT="0"
-IUSE="doc examples numpy"
+IUSE="examples numpy"
 
-DEPEND="doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )
-	app-arch/unzip
-	numpy? ( dev-python/numpy )"
+DEPEND="app-arch/unzip
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
 RDEPEND="dev-python/pygccxml[${PYTHON_USEDEP}]"
 
-python_compile_all() {
-	use doc && "$(PYTHON)" setup.py doc
-}
-
 python_test() {
-	"$(PYTHON)" unittests/test_all.py
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=(  docs/documentation/apidocs/. )
 	use examples && local EXAMPLES=( examples/. )
 
 	distutils-r1_python_install_all