From 2e05fe42a086de0afb6b1660d1f46a39bf582b87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 18 Nov 2014 08:53:40 +0000 Subject: [PATCH] Forward-port python-r1 change into -9999. Wrap ekeyword as well. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- app-portage/gentoolkit-dev/ChangeLog | 6 +++- app-portage/gentoolkit-dev/Manifest | 34 +++++++++---------- .../gentoolkit-dev-0.2.8.3-r1.ebuild | 4 +-- .../gentoolkit-dev/gentoolkit-dev-9999.ebuild | 28 ++++++++++----- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog index 6ed838e53661..ed20c98efd25 100644 --- a/app-portage/gentoolkit-dev/ChangeLog +++ b/app-portage/gentoolkit-dev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/gentoolkit-dev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.136 2014/11/18 08:43:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.137 2014/11/18 08:53:38 mgorny Exp $ + + 18 Nov 2014; Michał Górny + gentoolkit-dev-0.2.8.3-r1.ebuild, gentoolkit-dev-9999.ebuild: + Forward-port python-r1 change into -9999. Wrap ekeyword as well. 18 Nov 2014; Michał Górny gentoolkit-dev-9999.ebuild: Switch to git-r3. diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest index 78808008d3d6..207ef6f3dc88 100644 --- a/app-portage/gentoolkit-dev/Manifest +++ b/app-portage/gentoolkit-dev/Manifest @@ -9,28 +9,28 @@ DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 SHA256 b9f96deb53adacf7885c937e1c92688a DIST gentoolkit-dev-0.2.8.tar.gz 50440 SHA256 a33fc1bd35dd397863f84b488786e1d4370b72a8d65b10d4cb96f89c51a65868 SHA512 fe454554513c68b4ff1aee16404dc96f1e1ccd019694c7861d2180c1e8a1b13f8d66b5c33c3083f9c1b94d7da74c42ae1220b1b3395f1e8d2ef9439973bd4e2c WHIRLPOOL 1ba77e71b776e01c6a07b538081bbf8575bc217dece8eafc932201adb32a7e659df050b73a57a0aeab3db61dab33130594a956077cfd2e7cf4d8339eb9d38ad8 EBUILD gentoolkit-dev-0.2.6.14.ebuild 1194 SHA256 0e2f0783772c3c6f1b3d51e62a23f3f10ad4c8193dba5073b64fb1f9959f9c2e SHA512 1983bcb65a66ab024b7b47fcac7e18fa35229e1a3f9234bf81cb7c5c7c2ecd9dfec9cc7522d889d5724baecfa4463bb11dad8ec3acf9e0279bcced6366f2aa97 WHIRLPOOL d5dbcc28b7cc0dc47bd0b77170fc14cceca5ba9fee6a206d035888076fde321ab6098aa4083aa971d4292986a9201c41d45aa9af0e058eb8f0673fb468e0ea81 EBUILD gentoolkit-dev-0.2.7.ebuild 1184 SHA256 6dcc6d1f8fe6296c17835b5b6728f06a1e084739b09a17bd813fc7d67ed759d9 SHA512 ffc4e88bc5aae077867848fc00a6a22e42019a84954ec77af7b07a01049a9a2d1b913428d38a0b0e481aad087e7c74b884c8c9b07357a4a9fe0075b4ea7f2b35 WHIRLPOOL 55615518c4b43b09ba1c09d7b0ef82ae1614614dfb8d47c391e91282fd673c6b5bd8b13151c468e0078cb23e0cd47ac98991dd51ba3c322c70f2ae46c82673c2 -EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1511 SHA256 697308af1b0a62cc401643767675236bc89e7663c7c06732e503b64584d165a1 SHA512 aaf5f1e65f7b5e3b39df871d7cce6d05b0388a0d2a1f7dffbdd9ec85dd38aafea23bd8940bb466390e1f3236680ff3a422716fd56fd750753db19159d9d84bc8 WHIRLPOOL bce0972896ae27a7a2bcff179c3687ea4dd026647d7174f2ba94c1b5b92addc77869038d38ac1888be123bb0c1bde7012c94376add314b58f2c4844a72797d5d +EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1521 SHA256 7beef95fec4e85a6e736c4da40eb28396c5432f5a5b965c9d370db28173fa14a SHA512 186fa365d077da0d5f7bb4b75c860c7dd522839faa57bf26acd1eae21c54e1d0bdbc7807ea74ee38ea8360a6c8c495d11e1cf9f375ebe1cecd2b39062b52039f WHIRLPOOL 75e977a242c89b89a66923bb339e8fb0c5d3fa7ddb0ac53db3d41bbdaeef3f138f63be22d004e8bba2b84eac27060a26a60056eeed33dfa2e881dbf3a4a40474 EBUILD gentoolkit-dev-0.2.8.3.ebuild 1273 SHA256 f166a3cef3a570f8d788917fdfe105c0030bec858140c6c8416e658c12dc2f72 SHA512 bf51a80e78d59ea514defcdc887a02a263c9fc5b47ff4e7376a73477eb7962bbe255151d712c8e260acc782a26629bc3a9a11267ba4bef86573cd12e3e94745a WHIRLPOOL cc61211c78e8eedc6e8c4ac1771ad649f1dbc9f72acf56ce9849dffde19c726945acaf410249fec10d94806327c3744b1e72b8146c0b66c595c6238ecc3dca5d EBUILD gentoolkit-dev-0.2.8.ebuild 1248 SHA256 d96195658437431ec741da28eb22f12e59bb807a7866af44d463a1bb7bc8ce45 SHA512 e62d6a7bdb53228cd511ecfed5e5731c62b5f9a589f6bf95d002ffaeecc932b3711af3c523ba8a78469a9bac5ac3d8ae1c6c1fde0f54fbe8c8ce0702611d4c6a WHIRLPOOL 099be6a1042a1b08bad35a44395b6286641326627aece0d62c9c6101ac6a7fea253e2938b6758c6fa71846c57556893670efea148fed4c957f57aa60c0b3354b -EBUILD gentoolkit-dev-9999.ebuild 1038 SHA256 3e91232a1850ef147bbbb346522ade47db09a152681c23e821db999845f7bcd9 SHA512 c8524bef8a6903b1c3cba8b0b54e30b8f3c3895d0ae6287c19bc3414c45b0f42849f4ab496e4d3266c85b55b3dfa853110f09651517a91513265bf3cf8e1ec6b WHIRLPOOL 2f955bd9816ef16a4e58d364309e6e36a7d07467c6200c2e99e0769300dfb636d75acbb6cb825c033f28303136bfb384de09cd43afc002a7b6a9a361baa52c99 -MISC ChangeLog 21032 SHA256 57562b49cefd21189d27061796aea3d693c52c8fe1950b75797fe7d303b9482a SHA512 3a73a317c700dc78040eb2907cbf65894b75bcf311ea212b31ba2f24ef46dfb32ae8fc9c1bcda48e62086a8cf073d61aaa88a562094baf629bef3333547dcc74 WHIRLPOOL 0446d23f2b800d3c5eaeae8701b790b466ad73d9f81da7fd4688923869c81ef7e8a3f5a502f4190622dc20dcb2bccae222037981923336e0ee4e227bba3b748e +EBUILD gentoolkit-dev-9999.ebuild 1275 SHA256 af76bee5d08b92fe01765c2882123cc63fbb29abc4a7a0c2e00bdc0523f9d76b SHA512 f02938a85bfe5e6bc9c357821c074ac2169143113347b49e424788998fea1648c5f125ae64098f47c14f3f3519c033abcde8f60d307471cacdaee4a3cbb59d8e WHIRLPOOL 83ac5b10e5d32d40da9c2a5cee1054004743e85c0dd84c2afd3579db1b4d3fc0648311861e014f6230b65bf602a320e909da33624ac2b8ded4f5ce6ec4ca0a2d +MISC ChangeLog 21214 SHA256 77c2b6c29bb4ed913465f42c58b426f0e99cd6c49257b5423ae601d9114be23e SHA512 2b1ce9e42888945564585e850197ad041b34e5ca446f10435b1be8ee8a4d44eec067c49b3b457d4fb7d807e33f08b1689ced9a80842a02b20680a3dd58807d1c WHIRLPOOL 7a359409e0ef7fd9b7616de72bd2f8a60e5a77c53beca91a96124405600e13f496d42b3d7a186fb6f310d3ff036d1ab8bca6d24680443c73bbb84057f11b55d7 MISC metadata.xml 289 SHA256 f87d734bc9e4ddaf3323fb85a5d36e80395d2eda5ac3f8e0c1f1ee0b74ac4604 SHA512 b1f377b70097383c03f567902fcf9f96571770861ef489381c6db0fa139528e519631e87ee9832c95a35bb3dfa3752c7ae4c9fe5f597b783bd58fe6a69d8449d WHIRLPOOL ff92b728d58a85f4ff1c02576545709c931c95ffa0a7d3820a5a5012e3508759c1494879bf0093be830de2f905ce51772a2b7b38f9b5a310712ed8b55989e625 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUawavXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUawkUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOM5EP/R1wSpSA9QCW8Wfdx49H4Wmf -M5uRpDhVl6Tah8oBlH3g2H1AzDS/oytRrIJO3tr6aUzPhHIOIKxHPyud+ATqfStI -wcLBP0h8y04yocXzvWQeyPuLQSOqsXSbs9VYhalATkC0aK1T10j1CjyibWcZuEIY -rdGqQV2KvXDkTWSmv33TTJ/sLlVFe2YUqTGJhN7EILoe/XR0A+7jNNOXgBAGq2jS -4M/JDlXtSHtMuPuqq0eCN9xsX9QayJUrt9RqUTKebbEKI+GC/BKsVWuyP96guhX9 -OiLGVExS6LvzpF5S7xvitLAWaMxC6ZwSZJN8P2xxKIUefitzTrk0aMsuUzB0prf4 -E+Z2LsrRyTWy2BgRhMoxCKLCBUNqvW16xLv6U9MFNAzkT6tyEg9kQpYrWeqQ1HIB -mh40CAgp0IcL9mrq0Z3iRJknhTtt7eok6X23mIlfmtfUxwGvThPRGCK1idDH5hzu -oOpqswtrMqUzQG3xbE+FMoxDqTw2w7NbwFPpOs9mIhzfaIUzPDlstScEaejEspYO -Injaggcu6JzsXDUpWkw5mBcSjvRxNVG8Jqr7ZlLB93ty2Ph/DqI/Nv6fkSWaLr71 -fU39vL5XGCl2j+vZlrmQtqe4Iwh7HT9u9KHxISuv07quSUXHgGSWKN9Q/WDe/mVe -wP5IJs01PvCuzw4f508G -=xahW +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEowQAMzq658cazobs1C+c5MRhr04 +oT3MJexb6zCW1nul6JUQyhNy1DoPIhoVyfExu/+ZMp9IceZ+uW7du9XVlUKcxMHJ +7iR847BUxU2vnpuqWgnSVzqN6EzdjqXhccnc5fGxDhIBk1dJcp1gqFQASrYZAQvy +xh7ahTng6ZU6yPTcyK3SKe/adBi1LagVtcTTF995xWiKeGY+bFF0u7E6jkmGK5AM +Ae9gTTmCfkId7Nwxl682bw9b96yQJFNk9qcYIHKM19+zslFNOtHcmJjtgUw+iVts +Ov19txiOevmJgJLPE3vYDNIfV4wGAle+QXjtmmHNARjI/sTtmZBgnXyltA/Ty0og +9+i5u2wYEffEPmXSphErFW8jbl1iagfQzVsaXiRtSKTWSYw4u/M01gLUQukp+abw +Vvpo09L6KRPELgk8qYrgYBzEatAqMOsRdHPIOsY2TVra57Ywl+Kvr+WpWtt9NJ6J +GYog8QQvRYzHD5EbLU5egV2xTg/BCbqqxIjJlvVP+LovMU69MpzK62kYEeIOyHOs +FaS77Ba+S50kpe/KMGJE8rNSKZWTQgoOUrVzc2floziO6F0T6mNWG/IHeEkqiqiC +eImJcoGgUsRLDkl41ZRQvcZAVzBQ00JFyv4rzXxg/CIGIGKIm3oE2hVTiu3LgzpQ +Zc9XBFzA1OQMAWZO5zSB +=gamW -----END PGP SIGNATURE----- diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild index 0549788332e2..2fde9c1298ce 100644 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild +++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.15 2014/05/03 20:58:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.16 2014/11/18 08:53:38 mgorny Exp $ EAPI="5" @@ -47,5 +47,5 @@ src_test() { src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - python_replicate_script "${ED}"/usr/bin/imlate + python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate} } diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild index a88529f9a400..75dabbf2f94c 100644 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild +++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.12 2014/11/18 08:43:26 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.13 2014/11/18 08:53:38 mgorny Exp $ EAPI="5" -PYTHON_DEPEND="*:2.6" -PYTHON_USE_WITH="xml" -inherit git-r3 python +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) + +PYTHON_REQ_USE="xml" + +inherit git-r3 python-r1 DESCRIPTION="Collection of developer scripts for Gentoo" HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" @@ -18,24 +20,32 @@ EGIT_BRANCH="gentoolkit-dev" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="test" -DEPEND="" -RDEPEND="sys-apps/portage +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +CDEPEND=" + sys-apps/portage[${PYTHON_USEDEP}] dev-lang/perl sys-apps/diffutils" +DEPEND="${PYTHON_DEPS} + test? ( ${CDEPEND} )" +RDEPEND="${PYTHON_DEPS} + ${CDEPEND}" + src_test() { # echangelog test is not able to run as root # the EUID check may not work for everybody if [[ ${EUID} -ne 0 ]]; then - emake test || die + python_foreach_impl emake test else ewarn "test skipped, please re-run as non-root if you wish to test ${PN}" fi } src_install() { - emake DESTDIR="${ED}" VERSION="${PV}" install || die + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + python_replicate_script "${ED}"/usr/bin/{ekeyword,imlate} } -- 2.26.2