From 710b8d635a5c568a863b9fc413befff5cf73864a Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Wed, 12 Nov 2014 17:45:36 +0000 Subject: [PATCH] Revision bump to add patches Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x6E1CBA7B --- app-portage/gentoolkit/ChangeLog | 14 ++- app-portage/gentoolkit/Manifest | 30 +++---- .../files/0.3.0.9-equery-508114.patch | 37 ++++++++ .../files/0.3.0.9-equery-strip-XXXFLAGS.patch | 27 ++++++ .../files/0.3.0.9-revdep-rebuild-526400.patch | 26 ++++++ .../gentoolkit/gentoolkit-0.3.0.9-r2.ebuild | 90 +++++++++++++++++++ app-portage/gentoolkit/gentoolkit-9999.ebuild | 4 +- 7 files changed, 208 insertions(+), 20 deletions(-) create mode 100644 app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch create mode 100644 app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch create mode 100644 app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch create mode 100644 app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 2439cd9965b2..dee1b2735a76 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.314 2014/07/06 12:35:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.315 2014/11/12 17:45:13 fuzzyray Exp $ + +*gentoolkit-0.3.0.9-r2 (12 Nov 2014) + + 12 Nov 2014; Paul Varner +gentoolkit-0.3.0.9-r2.ebuild, + gentoolkit-9999.ebuild, +files/0.3.0.9-equery-508114.patch, + +files/0.3.0.9-revdep-rebuild-526400.patch, + +files/0.3.0.9-equery-strip-XXXFLAGS.patch: + Revision bump to add patches for the following: + revdep-rebuild: Fix gawk warning. Bug 526400 + equery: strip leading '-' from CFLAGS, CXXFLAGS, LDFLAGS + equery: Don't always print license field. Bug 508114 + Added Python 3.4 to PYTHON_COMPAT 06 Jul 2014; Michał Górny gentoolkit-0.3.0.8-r2.ebuild, gentoolkit-0.3.0.9-r1.ebuild, gentoolkit-0.3.0.9.ebuild, diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index 89d7ae198769..2b6887c44e46 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -3,32 +3,28 @@ Hash: SHA256 AUX 0.3.0.8-revdep-rebuild-476740.patch 990 SHA256 0e41b1ca96b59112af756e6b199349b1165d9ee23d81d0c17a862d52ba30f426 SHA512 9aaff1a7c277a1aefa57213ada599b520f5cea0f76f9d08b94c29324e380223c1e682804ae8e7d683077c436ec007cf2df31ff8285f38d349f5f6478e8df733f WHIRLPOOL 65db69af095d40799e11525439068f68de0eced22b5b7391b3a9e10bbb1f23fef244f7e10395cdaa9e1d0ce2e3bd8f6314e7bab25bfae201ec54f7ff87fb6151 AUX 0.3.0.8-revdep-rebuild-484340.patch 1696 SHA256 b82e965072f10d11af4ae89c1633b773c1ffce0454862b26eaa6f153cdfd07fc SHA512 330caf60a34508847323e4f129d8195286b2093c3d2bb023a1a4e7dbee09d8d18f657bd584af8977a4ba46df8d5043fc72fd4fd54caa1076cae544ded15afc3c WHIRLPOOL f8198bcca4fb7764220cad90f8edb9efa32a57cd6c189f5e9733a36dca2ad0490a5e772aa12b4bf23418c43c470ba2b8b1b3ed99f397d3bac71f3d290acbe7d3 +AUX 0.3.0.9-equery-508114.patch 1280 SHA256 5faa9cb38047b162acfe7ba19370a5fa71fa6d76008de1de90b813e3e212effa SHA512 23ceb413cbb20876b7cdf8fe540e70a05b2bf0059374f3262cd44e0002c442b2076236bf9bccecee0d54b7f0335da6206f98e1b8a86b46815858212c5ad6a95a WHIRLPOOL 16adaf598cdb40161c1eba4fc53d5417de37c5df2ec3e59e0c6e6c242967ae89cbc24f14f8e0ff590279b1805f9cbb72c05a0fb69230d1f3c56267efd5d0607d +AUX 0.3.0.9-equery-strip-XXXFLAGS.patch 881 SHA256 82dd9db66c2ef196bee726810be6f1f7a026a50701941598c3560530252e4813 SHA512 9344862f79d3db56ae336c3eea23a35214b055d2e6fb71ec449a16e04bb326fbc4dfe93639e188499db0285be285c74232d4fe3d1e831bb0349c50aceae4bdc2 WHIRLPOOL 639ad24b9fb28ed350eb67ab87a3da0afa18af12fc11a1eed90d474dd4f35cfae3c920b63508cc0a4d6b8312584319547e82b669ca3e1464746f2c251f7f393c +AUX 0.3.0.9-revdep-rebuild-526400.patch 864 SHA256 2add7cc95a2309e70cb17912992259a180dbad99e4dc5b2c36f4056f1093741f SHA512 b737102035b59c47ba0dbb0cd10a0d2e918eb4bdc1ea81b90fba7f4ad38d9ed0050c1365e84d10a50b2337593197163bf9612ffd7bab8dfd34f8d7d591e1c6df WHIRLPOOL ad4fb1bb32a242ee8ae9b16cab76090064dd05c9c29d1da15413bc435fddd795441333c9c25eb5fe1cbe81e0275dd28fcb0d4182b87bedbfa29b0a0d1fbc1daf AUX 0.3.0.9-revdep-rebuild-py-504654-1.patch 828 SHA256 82223ee777fa9467d83263188d91930c23e4dfda5c01eeb9ff9f9b10d84ce03b SHA512 60b6452de8e8323d2b938c31363a007091f9e992c9fc5481e23804e59fbf512d3ca10e05b1aa0d4cb93eb4efe8488afa18ef8a8238ff59eab32f3c781bd3081c WHIRLPOOL bd37f5aff852c02f0452baf6abc95a3e334a6145898e53da6c177224b3a7f71a9a67fdef5cc1471b2106d5d6e7dbe62a11b72d4d3af9d8917501cb6b1d68ab08 AUX 0.3.0.9-revdep-rebuild-py-504654-2.patch 1031 SHA256 0a8d05030a4202f2bc671bd19cbfda68837cbb56509ce91fbb971cbde679ef10 SHA512 95ab05306737c898f608b8d9c80e37f5f57ec7d6931f54c3b8225aa99e27a2c8f3ba1ba2dcb7186c523af030cc6f2f9078644c2c440aa70bca4e477c167306ad WHIRLPOOL 18593cc376a0f2e4d900e38b99ba81a58fa12fc90a94df4f39ae8694eaa875fae257eb1a018fef1f177dd2c70d0bb5e76d569cb49c4ffeaadd22abef1fcca1c6 DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0 DIST gentoolkit-0.3.0.9.tar.gz 3194703 SHA256 c660d150dfccbaea6f291fb7fc2659c8e0e38eaebe6e68f92dee728c8c7e320d SHA512 75b2d15b2b9ed08055840b56b239ed5d63838a10e8d31ec3ed8822cf1d3ef32841609763433736e17f93a5fdd293ccbda4a3dfa0f007241321aec3333bcde847 WHIRLPOOL 5e9dc038c161361eb2dd8f0cd17e8efaa41183a281d6fcf620c1631c6da661673d085c60572424cd48504222c29613473591f8dd276792ab96ba3cfda88f1fe1 EBUILD gentoolkit-0.3.0.8-r2.ebuild 2859 SHA256 f8b745a384f38872d66d98b0f1a2e786baf94deca4f4e1a5f4bd4bc33974a127 SHA512 4b5d5c5071f68d5e23641c94a14fe58ca8f9c0f3240a1e48f24d7c01228f57b8cf3f9c475cd74191350a45bb5533d2fcc917dba68e419c726e020f9e4f5b8ece WHIRLPOOL 49342e06fd98df054dee0e1dc744463519acbe880748c0bb1ef76306c6ef5f373871509ca407c4dccfca92ded2f2aa3360636db069efc7f1df847dc55defef4b EBUILD gentoolkit-0.3.0.9-r1.ebuild 2990 SHA256 32749ce460d74b23ef87071b6f6ea081e18a51b302758da5592235a87d5bfec6 SHA512 02467fc2c7c5a2445346ba7f4cbf8c9f913b51bb12d35c533644b8fc58f2d2282118b469e6f376449fb2920a6c32848259d53fac8d648fae4a5f22979f5cdb52 WHIRLPOOL c929a95be5eec192b823a5c565439f599f2b851304bb3d7352e22d76d91a2a59a26120876cb458ab0a921a9c13dd9a567f52c5646bbd5ba4afa6ce1fbdb6930e +EBUILD gentoolkit-0.3.0.9-r2.ebuild 3135 SHA256 09838a3c15fe441bd47ac1de18a21c65fc0cc5c68a228241c2406a8768a80191 SHA512 797d3857fec0a231690883ab280169f4d7500dddae7b3b007f654619065ef2ccbd32d6641fc5a7953d28a66b3c6b8e53402cf2a7ef9d90a7ba489eba571bafa1 WHIRLPOOL 1647a223c8ea2c5510bead876d6436aac259b9a23e24347d777ac23611ae196dccc356ff7c8c0fb6379d29a71dbf42b303e3101ac821658bacefdfc0eba0c2e3 EBUILD gentoolkit-0.3.0.9.ebuild 2815 SHA256 2465e6c0f234ac6ca8736e3280e9714b5324c07d454216af18f4d3c92714f98e SHA512 a073b85b463c68d3f4490a79b6ad66377487e648cb336dea1cb3f568b53dd9777e40891d55fd837f6127085b90dbbd350dcd06e32baeef18ea5136f8d3237f77 WHIRLPOOL 6fb2f0ef72eeb65f61cbc1d3ef1b271575f19c7713e57b828fea500f1e7c74322e38814d16832e03850cdc9db76bd7fee791b82125d8eecf39f04411a1ac34a1 -EBUILD gentoolkit-9999.ebuild 2307 SHA256 b2318dc816287003d509506c646363de4eacb9d3aefc8e63400e9d3d225d4866 SHA512 d3de1e46a9c0fc2c275c8e0f54a2b51999fc6873c9c358a5065e1a313a8016955c7053229cdbce0e2061b5bd92ba614a257103f715b7317727f19ff61be3c127 WHIRLPOOL b814283f65a5feaad013a808fd492b9dc950ceccc21967176ee183bfb726ddd63b6b21664033ae8e2d8f8fd6b1c79569873fc914e1b615e296d48dfd87e9e96d -MISC ChangeLog 78763 SHA256 5b896f76fd41f3bf3d3a84ef61a1f17cb7282a3ec224187604013ce7b522f6f7 SHA512 69127cfeb28e5596c7f84c4af644ded65ac377a16ce540859fca5b3dbd3b68288dc516fef39bb2a8a74bb50a8737c1c1c0a52db03864af697bbd7bc5a656bc49 WHIRLPOOL acd763732a754bf50e1638acbbb5dbea58736f992cfdae5d19cf7522a170b5deeffd34caaca89d9b112addb9a884102a5ed755fe67623076ee0f698af3015e43 +EBUILD gentoolkit-9999.ebuild 2313 SHA256 cb71c809ea38caaf7a6007958d2969d6b207476aa04977db999eb49dd5d174a7 SHA512 c37e36c5f8431c8cd1bd07a3797d8cda4b3205559a1815848de8431cb5cd4c64d2aa919fcd18437f2140a071b99dda9f80018ef493da422ce4af6bd2c778189c WHIRLPOOL 075c5cc7bb7f2bace147e00431d9bb34e0ff9ebfefc33dfc3ab13fc25dac74cec94a25cf6fd40f6a6af18b276bd100bb293f90415b415712e635cdd8c8cc328a +MISC ChangeLog 79285 SHA256 6c6cd215af742cc31ac29db5eba9d292a3de62a76cebf6ef6e59d2de2b55b5a4 SHA512 4550a1b2424238748d7d7def2e8589c22f2b1ce2d1ea21dc85b510a88ecaafb63b34f9fdec0ca2dd5eb834ce36f58f3d698ade893dab0848479a1d0afd7692f6 WHIRLPOOL 23c1373d94df71c294cf4c7e57cad2007532afa58baec9967fe0bb6037652218a579e12ff3d0e5d8b01aa6f91e4dc18c884576ad02dddecf7fc3c8a8fcd7dd3a MISC metadata.xml 454 SHA256 ccc4e0222e09f2b7f198c30cb22756602aba47770c6966abc7570626b6626ea5 SHA512 0edd2bd297d4d40659f67249e0ca49f769a4164cdf8c6e5de38fa732e4978d9f8565ee6142105ecad4bd0c71ce8e64b71c587aa3447a6933c8a7f70493a1c6e8 WHIRLPOOL 62d87243e7e11afff4df2a9f5bedb2c693f0fbcea7b4657c49f1da87bd16dded21e259d8a7788a45270b09211ad7b7cd7f848ce36acac1f8f441350e9656ae10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJTuUKNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOc7oP/1tvIru+ViRMebQ4749KeuLl -dkOz2XqKKIiVerAVIVwJfq1IpJfWixJDIqOktfXHC/g3UoZW4/5RAO9EUBQOAS9W -h2Jineaxc8WXQTXId8SRrJl2ApdRnxZahN7sOH7Hljt4mrmcJI7FlVd673hbR0Wh -O5s6377hbDQYQcC78+R67K18wat6Z43fXgmNfoS9yBifktuO4WIWqAILci3ZDk4e -V2vRfKEMgztO75Hb6H9DI5SlUzqrLWbbfQth9iJlOVBuPzCenfsTn3+h27vZlU1L -d6jpjQpT7K/JkxUO4jQb0NGpplEXM3LhJ8y9YSeJ+pDBA2OH+25iE/BJdG1b7TJ4 -yrNtXJDLXM4sfk1DAgI95RJ+FlwtjDMpapSKZKyECLnu+913y5lqiMj2soz05xzU -zv8VCCJ9qvwOaSZCY2sfykUMvlk5mcd4YaFm98bqZSeWRmrGRETYljuaQx/U4xFv -sc7R3PWhVylPD8BluQEZFvOJSn29y6s8kNQ6CzqnRPlYUTq7EhMf98tI3bvxUCp/ -a5jVyPobwr+sj8wQetHhvLccafMCb45o3YSk2rbt8PKfwNVjhG58LVZNd0jq9HXO -w6kvev36wou1HbKHdhRuxh4qpKZ3ACyuAGoHKjsIdSwxi8wLcWRjwObDAQl0Xlwq -On5rpL5rbjdLo4xGqhsk -=e+EO +iQEcBAEBCAAGBQJUY5y/AAoJECXneoluHLp73NgIALjwT5/G42+fl2ELiGI3jN+i +p6MpvO14kwo9nCROQFkq4q6ulj3lQ/3pIYMoDWmu4vNtUvTrYAqDGSLsvtjfRV8J +5zIDGWzgMEKRuwp+keFJIGOKljdcp6vygbf6kkqn1LtgkuRK/ve+9MuMlSTws+2j +SK094mEZj7r7PN+n7WvWROZtTd0OCxWy/KlIpRL4WcIsbBuC+dFLXnOUbjlbtD/d +q2xYtgwy57Ki6wo+UeqQWgS/Zt0TJ2Y3VCWDqIW1yJCTCDpZ+LSTR9zny0NZT/gj +Nz+VIN9wfvDE8M3wrRbFA7EzWiVjbcH7PpNd40aD1pTCortqabqtZjKXAxk7Sqg= +=TfdA -----END PGP SIGNATURE----- diff --git a/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch b/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch new file mode 100644 index 000000000000..3fc67d366545 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.9-equery-508114.patch @@ -0,0 +1,37 @@ +From 9a33ceffe2e0045bf75b1209a90e9a53530d4e0d Mon Sep 17 00:00:00 2001 +From: Tobias Heinlein +Date: Sat, 19 Apr 2014 18:39:03 +0200 +Subject: [PATCH 01/14] equery: Don't always print the license field (bug + #508114). + +--- + pym/gentoolkit/equery/meta.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py +index e2d2124..d3342cd 100644 +--- a/pym/gentoolkit/equery/meta.py ++++ b/pym/gentoolkit/equery/meta.py +@@ -373,12 +373,13 @@ def call_format_functions(best_match, matches): + useflags = format_useflags(best_match.metadata.use()) + print_sequence(format_list(useflags)) + +- _license = best_match.environment(["LICENSE"]) +- if QUERY_OPTS["license"]: +- _license = format_list(_license) +- else: +- _license = format_list(_license, "License: ", " " * 13) +- print_sequence(_license) ++ if QUERY_OPTS["license"] or not got_opts: ++ _license = best_match.environment(["LICENSE"]) ++ if QUERY_OPTS["license"]: ++ _license = format_list(_license) ++ else: ++ _license = format_list(_license, "License: ", " " * 13) ++ print_sequence(_license) + + if QUERY_OPTS["stablereq"]: + # Get {: [u'ia64', u'm68k', ...], ...} +-- +2.1.3 + diff --git a/app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch b/app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch new file mode 100644 index 000000000000..42c5e35e057b --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.9-equery-strip-XXXFLAGS.patch @@ -0,0 +1,27 @@ +From 1351a6b8f09ab2f4a7469d6e2be874b56a31d3c4 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Thu, 28 Aug 2014 20:56:22 -0700 +Subject: [PATCH 03/14] equery has: Add CFLAGS, CXXFLAGS, LDFLAGS to strip the + leading '-' + +Strip the leading '-' from values found in these files. +--- + pym/gentoolkit/equery/has.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pym/gentoolkit/equery/has.py b/pym/gentoolkit/equery/has.py +index 15c60b9..180f7f0 100644 +--- a/pym/gentoolkit/equery/has.py ++++ b/pym/gentoolkit/equery/has.py +@@ -74,7 +74,7 @@ def query_in_env(query, env_var, pkg): + """Check if the query is in the pkg's environment.""" + + try: +- if env_var in ("USE", "IUSE"): ++ if env_var in ("USE", "IUSE", "CFLAGS", "CXXFLAGS", "LDFLAGS"): + results = set( + [x.lstrip("+-") for x in pkg.environment(env_var).split()] + ) +-- +2.1.3 + diff --git a/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch b/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch new file mode 100644 index 000000000000..a9f45b6dd406 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0.9-revdep-rebuild-526400.patch @@ -0,0 +1,26 @@ +From 91023ef967c680db9307b5c58762e8872346167e Mon Sep 17 00:00:00 2001 +From: Paul Varner +Date: Fri, 24 Oct 2014 12:59:59 -0500 +Subject: [PATCH 06/14] Fix gawk warning escape sequence \. treated as plain. + Bug 526400 + +--- + bin/revdep-rebuild.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh +index 3179a83..01a0454 100755 +--- a/bin/revdep-rebuild.sh ++++ b/bin/revdep-rebuild.sh +@@ -842,7 +842,7 @@ main_checks() { + done < <( + # Regexify LD_LIBRARY_MASK. Exclude it from the search. + LD_LIBRARY_MASK="${LD_LIBRARY_MASK//$'\n'/|}" +- gawk -v ldmask="(${LD_LIBRARY_MASK//./\\\.})" ' ++ gawk -v ldmask="(${LD_LIBRARY_MASK//./\\\\.})" ' + /no version information available/ && $0 !~ ldmask { + gsub(/[()]/, "", $NF) + if (seen[$NF]++) next +-- +2.1.3 + diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild new file mode 100644 index 000000000000..f6ca0d18a081 --- /dev/null +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild,v 1.1 2014/11/12 17:45:13 fuzzyray Exp $ + +EAPI="5" + +PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 + +DESCRIPTION="Collection of administration scripts for Gentoo" +HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND="sys-apps/portage[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + !<=app-portage/gentoolkit-dev-0.2.7 + || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) + sys-apps/gawk + !prefix? ( sys-apps/gentoo-functions ) + sys-apps/grep" + +PATCHES=( + "${FILESDIR}"/${PV}-revdep-rebuild-py-504654-1.patch + "${FILESDIR}"/${PV}-revdep-rebuild-py-504654-2.patch + "${FILESDIR}"/${PV}-equery-508114.patch + "${FILESDIR}"/${PV}-equery-strip-XXXFLAGS.patch + "${FILESDIR}"/${PV}-revdep-rebuild-526400.patch +) + +python_prepare_all() { + python_export_best + echo VERSION="${PVR}" "${PYTHON}" setup.py set_version + VERSION="${PVR}" "${PYTHON}" setup.py set_version + mv ./bin/revdep-rebuild{,.py} || die + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + + # Rename the python versions of revdep-rebuild, since we are not ready + # to switch to the python version yet. Link /usr/bin/revdep-rebuild to + # revdep-rebuild.sh. Leaving the python version available for potential + # testing by a wider audience. + dosym revdep-rebuild.sh /usr/bin/revdep-rebuild + + # TODO: Fix this as it is now a QA violation + # Create cache directory for revdep-rebuild + keepdir /var/cache/revdep-rebuild + use prefix || fowners root:0 /var/cache/revdep-rebuild + fperms 0700 /var/cache/revdep-rebuild + + # remove on Gentoo Prefix platforms where it's broken anyway + if use prefix; then + elog "The revdep-rebuild command is removed, the preserve-libs" + elog "feature of portage will handle issues." + rm "${ED}"/usr/bin/revdep-rebuild* + rm "${ED}"/usr/share/man/man1/revdep-rebuild.1 + rm -rf "${ED}"/etc/revdep-rebuild + rm -rf "${ED}"/var + fi +} + +pkg_postinst() { + # Only show the elog information on a new install + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog + elog "For further information on gentoolkit, please read the gentoolkit" + elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml" + elog + elog "Another alternative to equery is app-portage/portage-utils" + elog + elog "Additional tools that may be of interest:" + elog + elog " app-admin/eclean-kernel" + elog " app-portage/diffmask" + elog " app-portage/flaggie" + elog " app-portage/install-mask" + elog " app-portage/portpeek" + elog " app-portage/smart-live-rebuild" + fi +} diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index a2a15a66ea97..e4898ade4bc2 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.35 2014/07/06 12:35:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.36 2014/11/12 17:45:13 fuzzyray Exp $ EAPI="5" -PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy pypy2_0) +PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0) PYTHON_REQ_USE="xml(+)" EGIT_MASTER="gentoolkit" -- 2.26.2