From f024db6ec8881790847ff13a3051b055feaa05e8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 5 Sep 2013 12:58:23 -0700 Subject: [PATCH] bump(app-portage/gentoolkit): sync with upstream --- .../app-portage/gentoolkit/ChangeLog | 22 ++++- .../app-portage/gentoolkit/Manifest | 36 +++++---- .../gentoolkit/gentoolkit-0.3.0.8.ebuild | 81 +++++++++++++++++++ .../gentoolkit/gentoolkit-9999.ebuild | 10 +-- 4 files changed, 126 insertions(+), 23 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/ChangeLog b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/ChangeLog index 1ae6c38d3e..8e411d435b 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,26 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.293 2013/03/12 16:14:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.298 2013/09/05 18:25:00 mgorny Exp $ + + 05 Sep 2013; Michał Górny gentoolkit-9999.ebuild: + Clean up PYTHON_COMPAT from old implementations. + +*gentoolkit-0.3.0.8 (05 Sep 2013) + + 05 Sep 2013; Paul Varner +gentoolkit-0.3.0.8.ebuild: + Version bump for bug fixes and conversion to distutils-r1 eclass. See + http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=shortlog;h=refs/heads/gentoolkit + for full list of bug fixes. + + 04 Sep 2013; Paul Varner gentoolkit-9999.ebuild: + Remove dosym calls for eclean-dist and eclean-pkg, since they are now actual + files. + + 30 Aug 2013; Mike Gilbert gentoolkit-9999.ebuild: + Call distutils-r1_python_prepare_all. + + 26 Jul 2013; Mike Gilbert gentoolkit-9999.ebuild: + Add pypy2.0 and fix PYTHON_REQ_USE after recent remove of xml use flag. *gentoolkit-0.3.0.7-r2 (12 Mar 2013) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest index 076d1268d9..45d7eb361f 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest @@ -11,27 +11,31 @@ AUX 0.3.0.7-configroot.patch 820 SHA256 d27661499dd92c23d3f0b74fd15b405dcae1ead7 AUX 0.3.0.7-root.patch 4857 SHA256 8727fab6a19cdb024fddb79f09d93b6dcebaff0715043d19bae23c165259a63b SHA512 202bbda5e880a4481f063beb1c47f71ad9784c31490c8c3c59fbead56923324793dc94c4bd78b636d679de198ec3e450ef2859fb232a41f09f6943bca9d22ec4 WHIRLPOOL ab95567f22588ddc4e9928e766820f6f22d4fa218db40871db906dd736e4eb6fddb3a0d3869ee133b9e8a5488f1bb855ad35c2e4969c0241c76857e5affd9b30 DIST gentoolkit-0.3.0.6.tar.gz 191896 SHA256 5b1b7e9e0363764b3c8349540e3a16fcdd850ec2441bb56b24fdb729130e604a SHA512 6bc46fd364cba3326e9e4f1083485f1220a8dc6675b75ad058fbee59d3c103f2ca103be6035f5f726e92f496a854dca72ec08b0d2cfe012aa7efbdc3a95891a0 WHIRLPOOL e928b8d3c493ac00b622b859985e144cd7828d4c4e1be7c2a4b8abae9864f10aa22c4626b991d9ba81c6408dc7769be2346f2f9abf3c2ec864ce9eed2ae3d9e5 DIST gentoolkit-0.3.0.7.tar.gz 3191108 SHA256 45ca2b48cfba7939a76428213f2fc4c3a1fc58716290f7a352ccd9299beb49d7 SHA512 798a058a58cf881a24b92ae32fabe7c6d49305e2611bab568004dd711392e5af97b7d66029e344f4e7c52d0b6cf47690b76cf7e3d77b5482c30b6883f872c1d1 WHIRLPOOL c21ce47365500cd93c6c617d79ee9c979f1f6a06966ed41a69eb73014354b6e066fef904c2d221b64f6116a76792f2060a8863ee633f781764c270ce954de1a7 +DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0 EBUILD gentoolkit-0.3.0.6-r3.ebuild 3584 SHA256 338531d464db51d2353f0ceb7cf8930bc48995e198c85ffed7833599bad7fa4d SHA512 e94ce46d660f8f336a70e9d9440be2ab098a9be412e05707d679eb199340fd0f0a31af6fa4bdab58d2c52a7b6469ac79461dac2e4b38fd28d40ec9d1a2c488ea WHIRLPOOL 28181a9c7aee2196d4f68b2d750b655f1dff88a337afc47efc01ede3625c17082bd54a07709f7a7ec473cc1ee280d7183ce8d7da99b75853f0fbd5370dfa7934 EBUILD gentoolkit-0.3.0.7-r1.ebuild 3299 SHA256 63a75a6c1bbc4521c1403daa569161627dfa1383f532523dd25796256fc5f966 SHA512 0d8158dfdef74c41a7c7fe844890b7c8357e02a2c69c792429553d3aae4842824f84bb8036fa965219561f1addf8d8a065c8f61faa0202c4b4437ad3ee0aa602 WHIRLPOOL d467b42a72c88155c1322dcff7e4c1b3733bece2b594eadb32d634f332494d5b32276849cd6bdf5add753f77041d6cb9bc8ef22d0254ee2f59477e2243c84ee7 EBUILD gentoolkit-0.3.0.7-r2.ebuild 3344 SHA256 7059e57f363b13e74278eacf22ac7af1aaffbb5cc4ee2f3d8df96df533a1ef83 SHA512 188b609391df1da9ecf2ce012c66ed2f1e4d8459cd068a93e6bb5534512fa4313e7ab3130f6442bca5e14da43f6afe2ab76a8617ce13755809737496357d020c WHIRLPOOL f4af731d9f691abf1f983d846a177a05ca7feab4460060bcbf36f242527a68980ef8d368c648f252671fd87c6851226dcff2faff62006d2ce85b8f82da49880b EBUILD gentoolkit-0.3.0.7.ebuild 3221 SHA256 e193c7749cd595c544f2f2390161aa56e89ae01a6f2abec7286fe4f08a57c14f SHA512 b4dba20d1c7a05dffa651c1014c018f80b97548e5c2b65d979c943c5995ca562f6e20a9263d93aa391171ec08d2528e0d169212c90e01a2faf68a547751c59a8 WHIRLPOOL b868a4c297d872d3318febe8072224d38d4e60b629309b2f4445a8a08ee37ccdc4b03436b75afc0559f55fb2389d3a37fa678308cfe4a6b83251b5e7c74b1361 -EBUILD gentoolkit-9999.ebuild 2360 SHA256 83b058983d5296a427834d72b338a0ac4a31dcdc69cc3e0ba95393c7a17193be SHA512 2f8e848fe0d48a9aacefdb74495861b1046ff8f76ba21538ef7b1233faa1ac618808ed390b7cc7227254351d3369f28b4811e3cd177856527dee3d5412045962 WHIRLPOOL 2fa1368816f13b07f72eadc3745a7a78884d4cd3813e5a70167fde11688170555de17a8b88fcc704be711d9f80bb0a4011927ef2c82094adb0abadb13844a3f5 -MISC ChangeLog 74584 SHA256 6664bab3c738f458a6dbfe0c3ba4dd3016d59bc5ecf288199df983123898e506 SHA512 5bc2d13799d6383265f42e75b250bd8877e9df3a16c49469c044f6037c73d600d90f2b44de5c0edfedc4b335749d074735f737d0dc2118765a8dd238622e45ee WHIRLPOOL f6348eaad3844fb21b0319da1b5781bdfe00cb91e75d4b08cf0e25fc2df1a0e38983774dd4f447339302a5f8f5cc46f5bb1ba0aa94d1db18ede09242e661a0e6 +EBUILD gentoolkit-0.3.0.8.ebuild 2829 SHA256 f110109855a6337057f0befad6ea9588bebd5bec4d7fc2288a612cbff4048b2a SHA512 852cac25b2cfdba08dc52b83e3f11d65670594544380160963b71fa294b00e47e025c5e67518f7b8e3b28357865067dc0ab971d119deddc35133a9c61626718b WHIRLPOOL e3d407d03dc2098a794dea213b347cfb9411105ac21d263f9f99b9572ef4ad3bd269747f3b838dc34579a2f4df3da571e93cf6c2d226786a4e392cce680dcd3a +EBUILD gentoolkit-9999.ebuild 2290 SHA256 c7bd4eb8bd4b80ee1632d05c2e4449eb86c1f11100b2c09f62dccd0eac29c391 SHA512 b6b529217a63a57c07c6e6b2f0833122217e669a1e48731b031fa774261f134c22ec84e65c8dd00e3804d04c83a8e0c7ad588e1113d00c78c7fb89af964edf64 WHIRLPOOL f8606e286059f5c0a9affd4443ea11b68df958d3c87bae75fa2e610f3e5906b385ecf0202af9571c109b6b07a1dfd7228278d80b7cb155a87fe07a69bce63c4d +MISC ChangeLog 75447 SHA256 ff541b146d63149ef112b8728dc8f949dfd0766bffe61f1c76717f0e98b37338 SHA512 8a382aa1d6d3dc9857cb869302a806fac40720ccbf2dfa6a8c16ad83fff468a18b33942ebf9777dac60023f36f16535ee6250155e6a3a296a6ddced70e29c707 WHIRLPOOL 628a8df865d6668a939aa81f10b2b9c5f8aa9384aa3f3d22624c19916fb4e349c7940febe92b624a347f553dcd5fd504b076887842bc24ae948aec4e364f123f MISC metadata.xml 451 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb SHA512 dae13a7b17e9f425f620d1cd71da9c3142353eed53489540f05878b9c6b9799b4ca4b97c72cf81576c095cc99b3b4d57faeb3a052a72110d638c4961ed7a645d WHIRLPOOL 6e333d72a075ae313c914c204dadc66c36686f05b01f6eb9071813555d5d0a12da38e9a8548f7526f315c838c3ada6570d393d7f8dbee6570748090a8c7e8050 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.21 (GNU/Linux) -iQIcBAEBCAAGBQJRP1UoAAoJELEHsLL7fEFW+DwQAIG2qEB8jiYr9cUHvSteqhxv -m2X25QTePgOCQAyDHLKgXFTY1iKF9vvopzlFfRAmc+meIq1Ie/a0mcWcZOqmTiPD -d9BqqZPpeR+55C7TfVyIpf533iTlQ7JDOfaGSww4ENNUOUeBvYFqUqdT1bL2sWd3 -9JauAj3up4oRLFAir8vKOGhxeCpVagWRj5y9l+CJkpoyCgE4egYv+BSs0ISAlrTs -kEXGYRbLWqigdjoswaWEwfDwkdZdflZWUnn+WB85X3hES5qeOnAExNC7J3GvmSjP -e8+3hL1GPUP96gaKxaYmY1WU4ehV121AV4adBOZjYAppziUz7wlmivpzqOIw72TN -pLeG0J3Fhp+C4+1JFbfgbrC9UQyVfaNRnrzSE7qVnrHzT9DcOXZMIAPvLvPeRtB5 -PO4JKh343bmwhGpMu7mDCSMoAEeG3sD+IP1MgeHrES91HSQtETv1qk6EQcNDwm/g -X6evOeFQovLlEeLissqmZ6qJuLNjJnHBkZ4slrrYPT7/MrfzKWAzFrGubhwwQa3Y -piRsJJaO2NhoYExhbAnCGtuTkTuxtu6cZWBgkIWmjZMXJOPIJEnRYDbV0cRpSVnn -FWzzObakymAGBKfgTri+QHCkLw+xCzoullpqrzDQZ/i/xlFlP+o7Tq5VTq2Y08lu -3lWnbfjlWqEQBeIFlFWr -=myfs +iQJ8BAEBCABmBQJSKMyfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWjMP/iaeSVALBbGDmkDg2zUsfYL4 +8TbZztmSR/msO/Kp3eDabrydtzV0DkgtXiD16gUDc+YNY7r8h5kQYwhrwOsO3yQb ++so9PIdQ1XNh3+uckTEFt81YWf7ZH5rnSS9BKc1HRv6T5abZjJBY+UDRGwJfwGlb +Vjs9GNJK8xfuKj0cPHRYtwkJh8YAj7Jx8ac1Fho+Z0J5gkiOUHbStg0kGjvRLALk +Zfv2zIZWKS0zr80kbvwNi1jHn6eMz4x9+cPmNXT0UYpKwRGU6cp7M4u2OIDV+pcH +1MsKv4UDlJTkKqhaZKtp2vdxRQClZrcmUE+GPRWz72DQDQxdLq2uhe/JCwYCU2CE +n/ZvgPoQGC1VBw7HilPMFfwRQJHvmdzmdp8k77iGVUkUomDzsR2vt90e10WL/DuS +KrS54vCs8nAp01B+sc2HSe7w3Q4u2kW0WVrwQUuNB/6FzVbtbHijRI4OAx1D04ZK +BPWk9VMQDPQm9Ge89Wip5Q/iSckdyeNXR+1VTG6nn9YcvoBx7CAlGkJFD7qqWEXP +2RUw2ZNQw30vxRyZSk3gh/jTLhkHTE5k4LkA0u9acprdX2nJzQmtAYBGKyTn0FlF +QEQxYoBHbMOwJJWmVUMimOsYu5OOie9EP6HKVxPgODLSwoLP+gpYX6R+NbP2ZkGt +Kb42eOwCSDXk5XnS4wsL +=CTvp -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild new file mode 100644 index 0000000000..29accf663f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2013 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.8.ebuild,v 1.1 2013/09/05 16:56:38 fuzzyray Exp $ + +EAPI="5" + +PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} 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 ~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" +RDEPEND="${DEPEND} + !<=app-portage/gentoolkit-dev-0.2.7 + || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) + sys-apps/gawk + sys-apps/grep + virtual/python-argparse[${PYTHON_USEDEP}]" + +python_prepare_all() { + python_export_best + echo VERSION="${PVR}" "${PYTHON}" setup.py set_version + VERSION="${PVR}" "${PYTHON}" setup.py set_version + 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. + mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py + dosym revdep-rebuild.sh /usr/bin/revdep-rebuild + + # Create cache directory for revdep-rebuild + keepdir /var/cache/revdep-rebuild + use prefix || fowners root:root /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/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index 0d9fc4ed41..daa52a89fd 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 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.26 2013/01/02 22:56:29 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.30 2013/09/05 18:25:00 mgorny Exp $ EAPI="5" -PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3} pypy1_9 ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0) +PYTHON_REQ_USE="xml(+)" EGIT_MASTER="gentoolkit" EGIT_BRANCH="gentoolkit" @@ -36,6 +36,7 @@ python_prepare_all() { python_export_best echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version + distutils-r1_python_prepare_all } python_install_all() { @@ -55,9 +56,6 @@ python_install_all() { rm -rf "${ED}"/etc/revdep-rebuild rm -rf "${ED}"/var fi - # Can distutils handle this? - dosym eclean /usr/bin/eclean-dist - dosym eclean /usr/bin/eclean-pkg } pkg_postinst() {