Use PYTHON_USEDEP in RDEPEND, made RDEPEND additive to eclass dependencies; thanks to jlec and ercpe.

Package-Manager: portage-2.1.12.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 39 insertions, 34 deletions

diff --git a/app-editors/retext/ChangeLog b/app-editors/retext/ChangeLog
index 59ef03c75738..e57594e86ff5 100644
--- a/app-editors/retext/ChangeLog
+++ b/app-editors/retext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/retext
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.2 2013/06/29 13:02:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.3 2013/06/29 15:43:38 tomwij Exp $
+
+  29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> retext-4.0.1-r1.ebuild,
+  retext-4.0.1.ebuild, retext-9999.ebuild:
+  Use PYTHON_USEDEP in RDEPEND, made RDEPEND additive to eclass dependencies;
+  thanks to jlec and ercpe.
 
 *retext-9999 (29 Jun 2013)
 *retext-4.0.1-r1 (29 Jun 2013)
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 03c16fb3d089..8542029b782f 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 DIST ReText-4.0.1.tar.gz 92892 SHA256 547f4d4cd6ca826963799a55e124ee22bbd2c1dc33fd11dc0d891cb66af8b77e SHA512 7055df357573ea87227bb169d9016e6d94fa7a299461019b12e56f8f1f15738f239dd6a1fbd2b37a84ea66abac4f85af6ae5d0b41e85323fbe10bbe8a6db4a81 WHIRLPOOL bf47d53870c3d3d913d09c3094a6451aa3b11f51126dd26c21e4f0d814fa876dbaba38adeb36c5660ad849742beb024bc567d49825c8f244941b761ff7eef471
-EBUILD retext-4.0.1-r1.ebuild 1311 SHA256 6ba0fd255adb7fd595f776553f69ae273439b52dfa5eebb73ca544124342c938 SHA512 bc8e82e6bdd1d53f10339421a5b2fa18d5a2803336fbcd2076d5156c149f2a4ea2ade4e15853d2dfd26daca9b0cb18143c645292227ec9531149e0e018cd2e4e WHIRLPOOL b3246acbee535a07b2d2ba3875ef476006c812fc7f433ebba593409be09bc16e72f50031abedb4ca9592788b9da2bca470268e1e34596d39749ac34ed79c78c3
-EBUILD retext-4.0.1.ebuild 942 SHA256 0808167be50069fdf4c38de8cd04fd877a65f8001766ee522f6f58222ed923fa SHA512 5ab7d10e803cdc822ffecd2c437b3d30ec8bfabaa1819d8ad0c31503eedd9e9fd29e97789b1c51ede797fb13e727ca9364b7da03c7d169251741e44374d6be92 WHIRLPOOL 7d8e2351d72cd91ce457abda953600699a5d775d3fb4a718b87c434076af89ce049c0cc1bc8253a1ed4e30bed01bc8c407062530e66f147662c98a97b301198e
-EBUILD retext-9999.ebuild 1314 SHA256 ee915d0ed4610b38e4f84d118d7b7d1b07b3c02cf14356babca7af687c35a941 SHA512 56d34165273cbfb1acc5afa6f26df50157e267c3fbbd27c7afbb774eadbabde91df20d2c0c7262c4e32e37dc2c52a0d8520e339133f3323ad836361a1666c89d WHIRLPOOL b37685cc145e25bef55eb0192842f8d678b960a9b96831f4470a5db3b9f3b420aa5612e8ee93eb3d576e96e5086e3de8a996f34b86b1a8534e507084ebb5119b
-MISC ChangeLog 910 SHA256 9d8fa84654545b1fbc419d31fe6ea3f88003748297c19adb75996a542205a4d0 SHA512 c03a05abbf94aae16e02ba92451f6d2ce929e51f3a2fb07ff67800385f70b9f09e88402fee6fc2db9617e87180c2d6580f2f6b04edda9074de89e67705427810 WHIRLPOOL 57b29adaf0e361a621401bd44508f692d99b33d72f1ad9d2a11b5a6b22d76a4b317d64ede20bc7f5576a1bed637067a04851b7cdf9e1c589ca2b24e4dad7a4c7
+EBUILD retext-4.0.1-r1.ebuild 1401 SHA256 1d1631168d802bd116d003d1b62866f933ae22733cf7e43b693ede6f5c556bd0 SHA512 923466a26dd9a212b7c3c1d709dee2160b54fc8b90f5db0758993b6d8c142d9adefe5ba5c7d1ba45f62b4d0f85beec90d1a818954d2c8ffd1f4964c379f310b9 WHIRLPOOL 86c7d0132048c4f3511b3b3a1d8e213f410b651dd15702efbbf8cf0b7d8a38b576ca827d7fd1e792710f0213be5d032a4fb596cad510befff19a29bf95da4f4b
+EBUILD retext-4.0.1.ebuild 1032 SHA256 96caaa8ec7849661fb65c69c15528741ce4b82cfc45905542bca10e488c278b5 SHA512 d03bf454e3027aa41355c0aff4d8c0465b8f28b22196eee856579d0128be15388450eec96141361e343ecab58c67e3e0aa83a48969a0651cbeef623b82a185ed WHIRLPOOL a7a3acb21df8be961b5bf6f5ef6a95fac2907b92f92fef8bb1fc10ac783f955f8be32b189f6d3e93f7e4b0e67cad63f0e7ced6688e31aa9ba89ae64d3fee2641
+EBUILD retext-9999.ebuild 1397 SHA256 639f30abcb6d856cdc4620bf5813922f1c8f7793882a80b8a4e6b68f31f0699d SHA512 9e90223ff258abd3e9e115992c43a92dfd6a5d0e5c18dc0dfad3edac82e54651e3c710562fe8b8f8428cd7ee23f86210d4feaf8bc86e830721b776eae1fff238 WHIRLPOOL 09bd0e0fc493029f377997e55ac5587efd4266cf69620b1d5f18b38fb3cbfac6b99342ec1e5fcf50f97213cc5ee26dc462ff9ddeb92e26f57c36ed2f24528ef0
+MISC ChangeLog 1131 SHA256 1aa1ed6df66d396d1da21ccaf78badd9473ceb9e60558366675947522c4613a0 SHA512 d08d104a8a75209ab25720ab91d0f3fff0ae244803b50f33b0731baace613ec5ef35af4845a559475e9d73ba062229b7be405e59e1ea5d0c1bdb19ad401298ff WHIRLPOOL 4dd10b6e12f1e56f57f07ea3ee0ab4843c3511a3605380339a8c8aaa444cb2e79642527d17b67359d0762866a502026ad549f43fd32bed650fb0f33361a55e25
 MISC metadata.xml 236 SHA256 104ec78f2e678b6b40f2995ebf7ec1e4a712a9dd1c4a59717c1a553660ec9758 SHA512 d7aed0a729c9750aa73f379b2dd5bbb84defc1a65ec083de2ae493c7d05de7706e3ace83c3372a6403dba1f5c8b0cf7c7ff5dd6600bc81aa49e73f1c3d49e721 WHIRLPOOL 6465959cdf3ed3b903efd861ce136a3f332c5ed55ca995892928408c66e236a255b103e2c924fa503461d8518ab2ed05ae435bb7f79aca9c2d1b653dd74a97f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRztpEAAoJEJWyH81tNOV9mTgIAIg6+u3NAMnPM7/CCfv+G4kZ
-F11oRhbSqpyks7oabd2W0emQakuTvi24/s2wfhGwItu4q0GL2pMbGBOyraF2eoQx
-mL/TCPOuoKY6zi2ZiqhmM54KTojZXYzxzSMuPoMfmN7vIj++MtVcNiN7gAyboa/0
-sMQmhpxDhpI8RqS2bQi4lH/wOWYFbxpLievELwJ61O/4EQ6vIEKN3DwPJ8pieop8
-07C0Ie59BIr4f6upl37eSr9DqIm6Fr+IZdy+JOSdcu4MnrW3L8vMGay/lNTt/3Py
-AmCZkfnd0TiaZku7x1n0BrwH6u19am9i9As5LXhmet+tF92oCYuY9Q4itClV/Bo=
-=SUlm
+iQEcBAEBCAAGBQJRzwACAAoJEJWyH81tNOV9kswH/R6TZhfpi/2ML7cM2DXCM1n/
+N5B4NGChb9IWUdH2OFnCemz2IOwDezWXN0Cv84+eNLnwomkiqkzzRKshBBHmFdKj
+W6y0OcilGrna8GvCoQ62cB8pwAdL8BvwzTHv7uietfpVOvVcMPhd3WfUvtD9W4pg
+pNLk3sATnP6UsXjqO0IcFEzM6ufzopM4Dh0cMY+r/xteOsLyTkggstEXyArrrc1v
+9zr2tmqnlClq6THl3Lthxlj/LV68Gu2VCxsu64hnbql2apTXqG+/h4Bh/lt+IFWj
+pwxDG/CEUaZXkNnvaGXOZT7d5MOQXlFXBS2lGlvQ3ztPIz8DSrpeLXhFBf9vuxk=
+=4bxw
 -----END PGP SIGNATURE-----
diff --git a/app-editors/retext/retext-4.0.1-r1.ebuild b/app-editors/retext/retext-4.0.1-r1.ebuild
index 1c0c503120a5..f1cf4d020419 100644
--- a/app-editors/retext/retext-4.0.1-r1.ebuild
+++ b/app-editors/retext/retext-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r1.ebuild,v 1.1 2013/06/29 13:02:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r1.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
 
 EAPI="5"
 
@@ -29,12 +29,12 @@ SLOT="0"
 
 IUSE="+spell"
 
-RDEPEND="
-	dev-python/docutils
-	dev-python/markdown
-	dev-python/markups
-	dev-python/PyQt4[webkit]
-	spell? ( dev-python/pyenchant )
+RDEPEND+="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}"/${MY_P}
diff --git a/app-editors/retext/retext-4.0.1.ebuild b/app-editors/retext/retext-4.0.1.ebuild
index cad12475d53b..25bfbad80127 100644
--- a/app-editors/retext/retext-4.0.1.ebuild
+++ b/app-editors/retext/retext-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1.ebuild,v 1.1 2013/06/29 12:33:55 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
 
 EAPI="5"
 
@@ -21,12 +21,12 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="+spell"
 
-RDEPEND="
-	dev-python/docutils
-	dev-python/markdown
-	dev-python/markups
-	dev-python/PyQt4[webkit]
-	spell? ( dev-python/pyenchant )
+RDEPEND+="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}"/${MY_P}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index bdd8f88391ff..97074fa45ac0 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.1 2013/06/29 13:02:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 python3_2 )
 PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
 
-inherit eutils distutils-r1 l10n
+inherit distutils-r1 l10n
 
 MY_PN="ReText"
 MY_P="${MY_PN}-${PV/_/~}"
@@ -29,12 +29,12 @@ SLOT="0"
 
 IUSE="+spell"
 
-RDEPEND="
-	dev-python/docutils
-	dev-python/markdown
-	dev-python/markups
-	dev-python/PyQt4[webkit]
-	spell? ( dev-python/pyenchant )
+RDEPEND+="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}"/${MY_P}