From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- sys-apps/Manifest.gz | Bin 48492 -> 48497 bytes sys-apps/baselayout-prefix/Manifest | 2 +- .../baselayout-prefix-2.2-r5.ebuild | 2 +- sys-apps/baselayout/Manifest | 4 +- sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 +- sys-apps/baselayout/baselayout-9999.ebuild | 2 +- sys-apps/dbus-broker/Manifest | 10 +- sys-apps/dbus-broker/dbus-broker-8.ebuild | 66 ------ sys-apps/dbus-broker/dbus-broker-9.ebuild | 64 +++++ sys-apps/dbus-broker/dbus-broker-9999.ebuild | 8 +- sys-apps/fwupdate/Manifest | 2 +- sys-apps/fwupdate/fwupdate-9.ebuild | 3 +- sys-apps/i2c-tools/Manifest | 2 + sys-apps/i2c-tools/i2c-tools-4.0.ebuild | 62 +++++ sys-apps/iproute2/Manifest | 4 +- .../files/iproute2-4.14.1-fix-tc-actions.patch | 222 ++++++++++++++++++ sys-apps/iproute2/iproute2-4.14.1-r1.ebuild | 2 +- sys-apps/iproute2/iproute2-4.14.1-r2.ebuild | 146 ++++++++++++ sys-apps/miscfiles/Manifest | 2 +- sys-apps/miscfiles/miscfiles-1.5-r3.ebuild | 2 +- sys-apps/portage/Manifest | 4 +- sys-apps/portage/portage-2.3.17.ebuild | 258 --------------------- sys-apps/portage/portage-2.3.18.ebuild | 258 +++++++++++++++++++++ sys-apps/udevil/Manifest | 2 +- sys-apps/udevil/metadata.xml | 4 - 25 files changed, 780 insertions(+), 353 deletions(-) delete mode 100644 sys-apps/dbus-broker/dbus-broker-8.ebuild create mode 100644 sys-apps/dbus-broker/dbus-broker-9.ebuild create mode 100644 sys-apps/i2c-tools/i2c-tools-4.0.ebuild create mode 100644 sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch create mode 100644 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild delete mode 100644 sys-apps/portage/portage-2.3.17.ebuild create mode 100644 sys-apps/portage/portage-2.3.18.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index e8ff13dc49cc..b3aa39a8f191 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest index f5dc405d835a..c9f191392357 100644 --- a/sys-apps/baselayout-prefix/Manifest +++ b/sys-apps/baselayout-prefix/Manifest @@ -1,4 +1,4 @@ AUX baselayout-2.2-prefix-chaining.patch 2060 BLAKE2B f53fd01cf6b24a2821aca5be8fddfe2132114d806189a7e81b7c9e6db1627a579efaa7d8843c3da95e684aea09b35aada52d76bdd9a43ce1a53c27e3d7ed30a7 SHA512 6ad809a735250efebf2052736a095e6573cdc1650f54c2d636053e05add9e71045d2e14ad1788eadaef5eff76a4bdea9ac58db67ffcb67ba5bf16f1883186aca DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 -EBUILD baselayout-prefix-2.2-r5.ebuild 3557 BLAKE2B 80172a309c49d48820acb02ddbe4f18ac9a3e4b3973b65fabe895362be692053e07c6c4c9c30d32152312cd0828f0c2e2e2d2be4992112fd1dcb7b16f957f243 SHA512 9ed29ada5260ad9dd26b83ab55ce73558e31bfe883824a54f8e6526bfb12a8dd3f894b66559cf10762c0ba1bf64b39351c06f72e540eab42fbec10f820d23165 +EBUILD baselayout-prefix-2.2-r5.ebuild 3564 BLAKE2B df426f4364017b63a49f6d58af4b24b63268fb2a68b16665a888bd5e391e6c389c78e33fa8b4351427d3221fe692e385a096f34a749e9f1fbf05ac4f093baabd SHA512 c8d667d36d11dc2f98b373bff7901b5bdbf2837e7873e0dcdb8d9f766633aa531b63f61ca2df8bfb439ed20d4b1f53aa848a6150a0c7ecd1afbb4f080f8665b2 MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild index 9f59ae36b38f..5706fd59a8ac 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~arm ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="sys-apps/gentoo-functions" DEPEND="${RDEPEND}" diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 1fd797b6deb1..3a4c194d4364 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,6 @@ DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 EBUILD baselayout-2.3.ebuild 8346 BLAKE2B e69042d75377e5993f7f834cff27fbb30ecc5c1b1f6bceae70b96c6c077918e214d1d25b2b335f9c711ec32bb0edbeed3daceb4a98860342e7ac0e9e66b15304 SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1 -EBUILD baselayout-2.4.1-r2.ebuild 8567 BLAKE2B e8ef33d350088380e3b4c13735157b955213938ef8f01a3b28b46f3872d316e2f0d11fd4c7d9007a31eb8ccfa9b7efb1c04a55cc6ae66fd6e3632c91d2c75184 SHA512 54b918555d24639073a1526324fbd12273e5e8f799e7a2a591c5c1eb4e70bbbc161e4056b62a2de2ade1d912b5d1b2736e84a5c4cb552b7ffca7dc1427ee781b -EBUILD baselayout-9999.ebuild 9168 BLAKE2B 93aed1290d7ab2779c05f2e45a293d02ed7f28e18cf69639242388a3408b648b1eca27b1111d029ceb6ac0bf43964ac89e83bb8ca7214eef9518deccdb50b333 SHA512 7901912868396280249acaf517c6dc915a5eb443e11eadd42e64368ebd34997635fe033db3fcf27c14fe9685699c96b64a2bfc130faa96bc6851aea84113884a +EBUILD baselayout-2.4.1-r2.ebuild 8590 BLAKE2B d69044e26bbe76022f9b6e3dffe9efa1ca165e1a9c5c39c462966a5a4369c0dca69a80021d6475c1f2ca400bb4f8b3104c74f1fbfe7dee8722c376e0fa32ac69 SHA512 7165d72ad79dda758181d7f623ec10b75463961cc6a19355ecea2b3ac3ce873670afdb82ab266d3be44add9ddc13176e1fdb48d8bc551b87c06f2b162138241f +EBUILD baselayout-9999.ebuild 9191 BLAKE2B defd00dbef7c524e118b8d863c7eae6f87870d25169ea7919c43c68b5e20892b214d7cc72637dfaebb29b50eab546e38a8cbb745d0eb236a5155c4cdf20f8799 SHA512 0cc07338bdc4eaba42770dca5fb7be1e0c025325f9879d3a0d4081edd3e9f6dd11a7c1ea24d2ab2eb19b28ac2648f14877cf305ef65b6d9bd7aff11fc3d60e0f MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1 diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild index d137c15e5274..bc82d2ddcdb2 100644 --- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild +++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild @@ -93,7 +93,7 @@ multilib_layout() { case ${CHOST} in *-gentoo-freebsd*) ;; # We want it the other way on fbsd. i?86*|x86_64*|powerpc*|sparc*|s390*) - if [ -d "${prefix}lib32" ] ; then + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then rm -f "${prefix}lib32"/.keep if ! rmdir "${prefix}lib32" 2>/dev/null ; then ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 7e43ea7af598..a7d95e53ed43 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -111,7 +111,7 @@ multilib_layout() { case ${CHOST} in *-gentoo-freebsd*) ;; # We want it the other way on fbsd. i?86*|x86_64*|powerpc*|sparc*|s390*) - if [ -d "${prefix}lib32" ] ; then + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then rm -f "${prefix}lib32"/.keep if ! rmdir "${prefix}lib32" 2>/dev/null ; then ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest index 8afb20490802..44a3c182ebcf 100644 --- a/sys-apps/dbus-broker/Manifest +++ b/sys-apps/dbus-broker/Manifest @@ -1,8 +1,8 @@ DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d -DIST c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz 20459 BLAKE2B d2d884a1eb865fc929bf1a17c8f898ff04295ed627617cef4e1ce943525805eadda5e5940fbc6158a0576800f1fbffb27193eb2dbff5ca78c112fa10199662b6 SHA512 d45630c8a54ca9145862b673afc3a15a19d330f46c9a1eb451c2282c2701d596cead45e6bb57a9e32aab344a3732f70ff8fe27d13065ebd8b402dd37a252ad05 -DIST c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz 24927 BLAKE2B 89b0cbf67d83bc40aa8300366a93d2b410678a5b6152ba781151a08676c9f404de6209c26d7486d5e3503682e7dc215db1dcb6c5c1fc6b51d90e2798924d6c8c SHA512 4ff8d8def07882850b1983f8eb9b4c82e444429beafbf249385717805a5a89427bb91bde6dcfb60565866f90ee3daa8d35e681ab65cb0a1f20dcb96dcd9e0756 +DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359 +DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e -DIST dbus-broker-8.tar.gz 153824 BLAKE2B c8bee2d3fbbb09842a70d69a1e5944318f36bdefcd0d8c79bd2291f7a170e7e864c434e94232339d039492c1142b54e7f1f9397f138c0655594794672bac7760 SHA512 423d78569ce23c04bdc6639f3a3e554ffaec32f9c81076edefc84cb691b10a096a177edc677aed8b136709ffafe611a53b5e34f7cd5ee2147b0500fba81b5221 -EBUILD dbus-broker-8.ebuild 1887 BLAKE2B 3538e1ff2d9e00176401135bf95ea78629bef9be1edde0caf159ed5f6c53aa496360358c9c9ed9c48f86d4e433e99759f6a29943c7dc64fa218b504d9d728bbd SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 -EBUILD dbus-broker-9999.ebuild 1887 BLAKE2B 3538e1ff2d9e00176401135bf95ea78629bef9be1edde0caf159ed5f6c53aa496360358c9c9ed9c48f86d4e433e99759f6a29943c7dc64fa218b504d9d728bbd SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 +DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40 +EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425 +EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1 diff --git a/sys-apps/dbus-broker/dbus-broker-8.ebuild b/sys-apps/dbus-broker/dbus-broker-8.ebuild deleted file mode 100644 index ba718173881c..000000000000 --- a/sys-apps/dbus-broker/dbus-broker-8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" -else - dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad - list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574 - rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a - sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769 - SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz - https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz - https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz - https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz - " - KEYWORDS="~amd64" -fi - -DESCRIPTION="Linux D-Bus Message Broker" -HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="audit +launcher selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - audit? ( sys-process/audit ) - launcher? ( - >=dev-libs/expat-2.2 - >=dev-libs/glib-2.50:2 - >=sys-apps/systemd-230 - ) - selinux? ( sys-libs/libselinux ) -" -DEPEND="${RDEPEND} - dev-python/docutils - virtual/pkgconfig - test? ( >=sys-apps/dbus-1.10 ) -" - -src_prepare() { - if [[ ${PV} != 9999 ]]; then - rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die - mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die - mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die - mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die - mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die - fi - default -} - -src_configure() { - local emesonargs=( - -D audit=$(usex audit true false) - -D launcher=$(usex launcher true false) - -D selinux=$(usex selinux true false) - ) - meson_src_configure -} diff --git a/sys-apps/dbus-broker/dbus-broker-9.ebuild b/sys-apps/dbus-broker/dbus-broker-9.ebuild new file mode 100644 index 000000000000..62c8053832d1 --- /dev/null +++ b/sys-apps/dbus-broker/dbus-broker-9.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" +else + dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad + list=72c59181d677a3f50b201d51f190b1bff02d4279 + rbtree=825f626a16257c5f0b0c523c11ce1bca16851180 + sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769 + SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz + https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz + https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz + https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz + " + KEYWORDS="~amd64" +fi + +DESCRIPTION="Linux D-Bus Message Broker" +HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="audit +launcher selinux" + +RDEPEND=" + audit? ( sys-process/audit ) + launcher? ( + >=dev-libs/expat-2.2 + >=dev-libs/glib-2.50:2 + >=sys-apps/systemd-230 + ) + selinux? ( sys-libs/libselinux ) +" +DEPEND="${RDEPEND} + dev-python/docutils + virtual/pkgconfig +" + +src_prepare() { + if [[ ${PV} != 9999 ]]; then + rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die + mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die + mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die + mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die + mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die + fi + default +} + +src_configure() { + local emesonargs=( + -D audit=$(usex audit true false) + -D launcher=$(usex launcher true false) + -D selinux=$(usex selinux true false) + ) + meson_src_configure +} diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild index ba718173881c..62c8053832d1 100644 --- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild @@ -10,8 +10,8 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" else dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad - list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574 - rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a + list=72c59181d677a3f50b201d51f190b1bff02d4279 + rbtree=825f626a16257c5f0b0c523c11ce1bca16851180 sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769 SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz @@ -27,8 +27,7 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki" LICENSE="Apache-2.0" SLOT="0" -IUSE="audit +launcher selinux test" -RESTRICT="!test? ( test )" +IUSE="audit +launcher selinux" RDEPEND=" audit? ( sys-process/audit ) @@ -42,7 +41,6 @@ RDEPEND=" DEPEND="${RDEPEND} dev-python/docutils virtual/pkgconfig - test? ( >=sys-apps/dbus-1.10 ) " src_prepare() { diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest index cd3c9a9750b5..2645d5523886 100644 --- a/sys-apps/fwupdate/Manifest +++ b/sys-apps/fwupdate/Manifest @@ -2,5 +2,5 @@ AUX fwupdate-9-objcopy_detection.patch 1616 BLAKE2B 88daad5739b7bc1e7a5fb2d9c96a DIST fwupdate-8.tar.gz 41062 BLAKE2B 904cd34cf490fc48d0bd89667b37ec23ab41432e1b6a5155cd3887697e910b5758404c47c85acb8c8acd5d41acc7ef68a08b49f0c8e39c6007b20690a763bbb4 SHA512 3b9b2693d7d792f0a6c7107325612cba35c891259d870152ca9ebcbd397edc307601e414f6f0fefbcb1aff422badac651ce00867c4dba38dac347ff75e1267b7 DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8 EBUILD fwupdate-8.ebuild 694 BLAKE2B b9dbe6e4a747ac4a0832b0d9d3c5090c41eb17b7e53190fb6317e735a9ca10b4a0ec6e664fad12d8929977ae708f2aca52c9ddbf2f000de728acce00d6af1d90 SHA512 59cdd6682ce60e98b2dd605e3edf32c7e458641a7ca5b5db14754ae8e3b87cd2e646566061a3fb1a8e68b53487fa8feecff882c6e7ee59970372b0b9c7e679d5 -EBUILD fwupdate-9.ebuild 864 BLAKE2B c52cee3987219861aa58333020cffe9d571af1ca77671aaea5ed4e12ad14f7ceffb070cc0370470db545023f4bdbc1123fb8b43d577db29e9061bbed1553819b SHA512 47e219a9b2f1fd313e19d513bdecd9e30433c61d46422d4bde7d51ff16634bd32fd9ac05f58fe7e929ee843086f0134487f7d2ada948c516b4c2a0010e4f1f64 +EBUILD fwupdate-9.ebuild 901 BLAKE2B 3c6e68d44c4de562e43cfbc808624f0c06ad94a98d67ca4b7a4e78694680eae5be4681add956c0dce9c5a17850edc0809a612f64ff676856c63350fbb1e3006a SHA512 fe51dd20e9b7e8f23d5d76b48c027bb6b13df001b705d780c4a24fbc5b435d040d5c6a8bbac2293092e032d7625bfe9976ec5c1371ae5e80a469eba6560824df MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf diff --git a/sys-apps/fwupdate/fwupdate-9.ebuild b/sys-apps/fwupdate/fwupdate-9.ebuild index 0a68fa746ce7..74e9ccfa61bc 100644 --- a/sys-apps/fwupdate/fwupdate-9.ebuild +++ b/sys-apps/fwupdate/fwupdate-9.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit mount-boot +inherit mount-boot toolchain-funcs DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates" HOMEPAGE="https://github.com/rhinstaller/fwupdate" @@ -30,6 +30,7 @@ PATCHES=( do_make() { emake \ + CC="$(tc-getCC)" \ EFIDIR="gentoo" \ GNUEFIDIR="/usr/$(get_libdir)" \ "${@}" diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest index 3a169c81cda1..7a77dfbb9cc9 100644 --- a/sys-apps/i2c-tools/Manifest +++ b/sys-apps/i2c-tools/Manifest @@ -1,4 +1,6 @@ AUX i2c-tools-3.1.1-python-3.patch 3348 BLAKE2B 4fbe75455e4370da6c61c786cd0eaef94039b24d9de33ecc1ac6333f5776d61d8638493f7b7218bd15e36301cfeed840217050ed37edf3825017cdbf9b7b3d25 SHA512 0f264e49237af0318c868deac39bdd7c2b718c39317c2e47b15ad7d421530dc165f38b5995ca45bcfd65074ab51022d88ced6f2d589e30ebbab1702cf964f8da DIST i2c-tools-3.1.1.tar.bz2 71789 BLAKE2B 0a7a3db6a3b396cfb8d5e58d8c83cae4e52239786502c6552d971350f7fc05a1ce9d7d89e9cdb154a21ac15bdf34aa0dec9501ea45317ec9c5d9fc211780bbf1 SHA512 b91f89b803e5558d49ce63f42f6542438f4f47927e4ce420cd9df989cab14a5c55d971befed73e8f793b0cf4aa41936c0ef519e5a407dceb2c08964461e803c5 +DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e EBUILD i2c-tools-3.1.1-r1.ebuild 1431 BLAKE2B 9e345a8bcc8122c6e5dc1dc08ce5e3278c682d35725d03ed92d1ca5650f92e6d24e9fc7b8419271f155ca440b538838969a3ed7b038cbd9d6616f1ab736b1343 SHA512 03b8a80f90970877019cc27d519e535fb7478d636603b937a63f375b3c7ed8264bf975bc3640541afbe02ca7f0de7e226940f6a0f6ab4a7f9d54f2fc02efc564 +EBUILD i2c-tools-4.0.ebuild 1400 BLAKE2B 3e8316aec0396172e0b3626f888fb4789eb36916592f085fb23148d893efdea13b2d82bd28ba0682390718c7a17e3ca2d1a16cbcb89e0118602a5b4e2e61581c SHA512 9cc0e3bf449c75a7502e384337912390cb66af15bb1ee51b64a76deffd7fa5b596c040eca9d6c88275e961a2862760d8531ecc268c6174ba082ad3646042da9d MISC metadata.xml 214 BLAKE2B d6d548e131d54a9e13f05d269df0bf13b142967950b365aa52a37bec3a03ed97774f1ec27bf59d54457cd1903475f4f84c144256f5a96643a0bbd1c20714930a SHA512 ae2a716aa849a3e9bd264007acc830ed4ee3c3acd1fc76ed1a60c683e248bded6aeefa174f04d70f0a7705c57bbd1e1ca44fd975f140c12de415381702d8df43 diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild new file mode 100644 index 000000000000..d5f248f7c280 --- /dev/null +++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +DISTUTILS_OPTIONAL="1" + +inherit flag-o-matic multilib toolchain-funcs distutils-r1 + +DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more" +HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools" +SRC_URI="${HOMEPAGE}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="! +Date: Fri, 8 Dec 2017 11:18:07 +0100 +Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control() + +Not all callers want parse_action_control*() to advance the +arguments. For instance act_parse_police() does the argument +advancing itself. + +Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions") +Signed-off-by: Michal Privoznik +--- + tc/m_bpf.c | 1 + + tc/m_connmark.c | 1 + + tc/m_csum.c | 1 + + tc/m_gact.c | 10 +++++----- + tc/m_ife.c | 1 + + tc/m_mirred.c | 4 +++- + tc/m_nat.c | 1 + + tc/m_pedit.c | 1 + + tc/m_sample.c | 1 + + tc/m_skbedit.c | 1 + + tc/m_skbmod.c | 1 + + tc/m_tunnel_key.c | 1 + + tc/m_vlan.c | 1 + + tc/tc_util.c | 1 - + 14 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/tc/m_bpf.c b/tc/m_bpf.c +index 1c1f71c..576f69c 100644 +--- a/tc/m_bpf.c ++++ b/tc/m_bpf.c +@@ -129,6 +129,7 @@ opt_bpf: + + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_connmark.c b/tc/m_connmark.c +index 37d7185..47c7a8c 100644 +--- a/tc/m_connmark.c ++++ b/tc/m_connmark.c +@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_csum.c b/tc/m_csum.c +index 7b15673..e1352c0 100644 +--- a/tc/m_csum.c ++++ b/tc/m_csum.c +@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p, + } + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); ++ NEXT_ARG_FWD(); + + if (argc) { + if (matches(*argv, "index") == 0) { +diff --git a/tc/m_gact.c b/tc/m_gact.c +index e7d91da..b30b042 100644 +--- a/tc/m_gact.c ++++ b/tc/m_gact.c +@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (argc < 0) + return -1; + +- +- if (matches(*argv, "gact") == 0) { +- argc--; +- argv++; +- } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) { ++ if (matches(*argv, "gact") != 0 && ++ parse_action_control(&argc, &argv, &p.action, false) == -1) { + usage(); /* does not return */ + } + ++ NEXT_ARG_FWD(); ++ + #ifdef CONFIG_GACT_PROB + if (argc > 0) { + if (matches(*argv, "random") == 0) { +@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p, + if (parse_action_control(&argc, &argv, + &pp.paction, false) == -1) + usage(); ++ NEXT_ARG_FWD(); + if (get_u16(&pp.pval, *argv, 10)) { + fprintf(stderr, + "Illegal probability val 0x%x\n", +diff --git a/tc/m_ife.c b/tc/m_ife.c +index 205efc9..4647f6a 100644 +--- a/tc/m_ife.c ++++ b/tc/m_ife.c +@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_mirred.c b/tc/m_mirred.c +index 3870d3a..aa7ce6d 100644 +--- a/tc/m_mirred.c ++++ b/tc/m_mirred.c +@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p, + } + + +- if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) ++ if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) { + parse_action_control(&argc, &argv, &p.action, false); ++ NEXT_ARG_FWD(); ++ } + + if (argc) { + if (iok && matches(*argv, "index") == 0) { +diff --git a/tc/m_nat.c b/tc/m_nat.c +index 1e4ff51..f5de4d4 100644 +--- a/tc/m_nat.c ++++ b/tc/m_nat.c +@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct + + parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_pedit.c b/tc/m_pedit.c +index 26549ee..dc57f14 100644 +--- a/tc/m_pedit.c ++++ b/tc/m_pedit.c +@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + + parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_sample.c b/tc/m_sample.c +index ff5ee6b..31774c0 100644 +--- a/tc/m_sample.c ++++ b/tc/m_sample.c +@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c +index aa374fc..c41a7bb 100644 +--- a/tc/m_skbedit.c ++++ b/tc/m_skbedit.c +@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, + parse_action_control_dflt(&argc, &argv, &sel.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c +index 561b73f..bc268df 100644 +--- a/tc/m_skbmod.c ++++ b/tc/m_skbmod.c +@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p, + + parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c +index 1cdd035..2dc9187 100644 +--- a/tc/m_tunnel_key.c ++++ b/tc/m_tunnel_key.c +@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/m_vlan.c b/tc/m_vlan.c +index 161759f..edae0d1 100644 +--- a/tc/m_vlan.c ++++ b/tc/m_vlan.c +@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, + parse_action_control_dflt(&argc, &argv, &parm.action, + false, TC_ACT_PIPE); + ++ NEXT_ARG_FWD(); + if (argc) { + if (matches(*argv, "index") == 0) { + NEXT_ARG(); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index 1887905..ee9a70a 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p, + } + result |= jump_cnt; + } +- NEXT_ARG_FWD(); + *argc_p = argc; + *argv_p = argv; + *result_p = result; +-- +cgit v1.1 + diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild index e0476f1e13ac..e84d53c46cd9 100644 --- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild +++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild new file mode 100644 index 000000000000..ab9012f964c5 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl virtual/libelf ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + berkdb? ( sys-libs/db:= ) + atm? ( net-dialup/linux-atm ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + >=sys-devel/bison-2.4 + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${P}-fix-tc-actions.patch +) + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + ) + fi + + default + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^WFLAGS/s:-Werror::" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Use /run instead of /var/run. + sed -i \ + -e 's:/var/run:/run:g' \ + include/namespace.h \ + man/man8/ip-netns.8 || die + + # build against system headers + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + printf '#include \nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + # run "configure" script first which will create "config.mk"... + default + + # ...now switch on/off requested features via USE flags + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex minimal n y) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX%/}"/$(get_libdir) \ + SBINDIR="${EPREFIX%/}"/sbin \ + CONFDIR="${EPREFIX%/}"/etc/iproute2 \ + DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX%/}"/usr/share/man \ + ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED%/}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + + if use berkdb ; then + dodir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + fi +} diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest index f43f1817b3fb..f7fb0201bc67 100644 --- a/sys-apps/miscfiles/Manifest +++ b/sys-apps/miscfiles/Manifest @@ -3,5 +3,5 @@ DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f982679 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95 EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b -EBUILD miscfiles-1.5-r3.ebuild 1864 BLAKE2B 480a7fa1fd17449bdcf163f0f5561048312b81b9ba65253655d903d5bfad8d5ffbedc7dae5da247f8f4392dbd5b329ed67a776d7ec5a0db31eee9c3696062195 SHA512 7e2e7192a6a186c7d5d94bd085f2446f19bcfdac41404c4a780e932e0600bb2035454326bc3b23cafe075f5cbe6c42ad2ce58d389e1ea547bd56f1f619adfab5 +EBUILD miscfiles-1.5-r3.ebuild 1863 BLAKE2B 02baa39aad2faecbcac8a5678a33352ecb9321edf94fceecae9334cc25f5620579b3be0b7fd0c3d64423eb82384181a64139fd6d0d40159f67db1fd378a2f2b5 SHA512 add1b4858344f1453496c2546a9f59bfce6c245cc595ca8fd4523afde1d7419ef76bcc83031b568a6ed6925596ba37305935d8ae960437bda198018dc95a8cc3 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild index 2891fbf74c5d..009120ebde14 100644 --- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild +++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz LICENSE="GPL-2 unicode" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="minimal" # Collides with older versions/revisions diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index aac7ca475649..1d2ff9293668 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -2,14 +2,14 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf -DIST portage-2.3.17.tar.bz2 953854 BLAKE2B 8b4367d647d29550fb50c807013a896eceac5ca137ea8d85157c32b7a99b6af7f39b60173ad40df7606d4c213025d8fbd617e9b6f3bf6f580c09cd07d4ce6d37 SHA512 9864ceae200b2137c695cd5af856a277971ab3bb0bedafcb1ed59aa4f647f3a412bf22bf0f4067f87716a4296f76d4a602bb4e7714ba1c89213720e34d11e152 +DIST portage-2.3.18.tar.bz2 954588 BLAKE2B 9ab3b0d3fab188c5fd301fb1023d5be47cf585ac9816836e9f5edb76aceaf2b45e9e67f3bb50dbdfe24cd58a9dcaad3009096563d91ee35fec631a4691371b52 SHA512 b27f05239014f6172a85e162186d73ae60195f2ae5d71a5d5b14f26c7c14f547081e732fcd0978ca0a0026a0c40a4926737680f32540d4c6e20b9b0d16b16118 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 EBUILD portage-2.3.13-r1.ebuild 8518 BLAKE2B ab9fbf21b666eb2c8fb4e2e0e9defc9f4ec19c339d7587fed01ed94421609e7b75648fc59e037ecca933468023ae33c16d05f2c3d100b28bc47ea55e7d88c00d SHA512 44faaa868a4c4832ed596d9601e958f0af21a60a8be1e5a59e1d4b15fbeb6c3d39e1943f0c01f9c99960c00c9ad34a3ac5b91ff8b6824ad9eca821168ba97bb5 EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe EBUILD portage-2.3.16.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65 -EBUILD portage-2.3.17.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65 +EBUILD portage-2.3.18.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65 EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a EBUILD portage-9999.ebuild 7898 BLAKE2B 3eb2b5417170a7309bb0a56085ab1caf807a7245d02cd3f1f2f1e8dc2a75dee0204538daac9b364d1604da89abef5e55093af6759ef62136f2829a928fec180e SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef diff --git a/sys-apps/portage/portage-2.3.17.ebuild b/sys-apps/portage/portage-2.3.17.ebuild deleted file mode 100644 index b4f03d91d2de..000000000000 --- a/sys-apps/portage/portage-2.3.17.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_4 python3_5 python3_6 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i pym/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi - - if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ - has_version "<${CATEGORY}/${PN}-2.3.3"; then - SYNC_DEPTH_UPGRADE=true - else - SYNC_DEPTH_UPGRADE=false - fi -} - -pkg_postinst() { - if ${SYNC_DEPTH_UPGRADE}; then - ewarn "Please note that this release no longer respects sync-depth for" - ewarn "git repositories. There have been too many problems and" - ewarn "performance issues. See bugs 552814, 559008" - fi - einfo "" - einfo "This release of portage NO LONGER contains the repoman code base." - einfo "Repoman has its own ebuild and release package." - einfo "For repoman functionality please emerge app-portage/repoman" - einfo "Please report any bugs you may encounter." - einfo "" -} diff --git a/sys-apps/portage/portage-2.3.18.ebuild b/sys-apps/portage/portage-2.3.18.ebuild new file mode 100644 index 000000000000..b4f03d91d2de --- /dev/null +++ b/sys-apps/portage/portage-2.3.18.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -i cnf/repos.conf || die "sed failed" + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use epydoc && targets+=( + install_epydoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi + + if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ + has_version "<${CATEGORY}/${PN}-2.3.3"; then + SYNC_DEPTH_UPGRADE=true + else + SYNC_DEPTH_UPGRADE=false + fi +} + +pkg_postinst() { + if ${SYNC_DEPTH_UPGRADE}; then + ewarn "Please note that this release no longer respects sync-depth for" + ewarn "git repositories. There have been too many problems and" + ewarn "performance issues. See bugs 552814, 559008" + fi + einfo "" + einfo "This release of portage NO LONGER contains the repoman code base." + einfo "Repoman has its own ebuild and release package." + einfo "For repoman functionality please emerge app-portage/repoman" + einfo "Please report any bugs you may encounter." + einfo "" +} diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest index 6535a3dbe03c..d6a4e06745f2 100644 --- a/sys-apps/udevil/Manifest +++ b/sys-apps/udevil/Manifest @@ -6,4 +6,4 @@ DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c49506617 EBUILD udevil-0.4.4-r1.ebuild 1922 BLAKE2B fdecab7535d5e4abce85d8ff584f825ba19879dd5470261f8954b311df119cfeb247760e4c5b3d7cf5195a4241ca6310b926af780e585ca3240df14093190bb0 SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9 EBUILD udevil-0.4.4-r2.ebuild 1988 BLAKE2B 6e2cfb15a2a7d80fb125aae5577b166295f54aa770f7149b4153f34bd55b7b3f4577c91368de493265caea0df8fa4f935a7790210e013cd74d8ef72093552643 SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a EBUILD udevil-0.4.4-r3.ebuild 1989 BLAKE2B 4f021d1b6e6c63d3f3b2b66273116f1dee686116cc36018228976ae8e007dea465ebea76403eff70c584680b74539e57abcf6c76cf7b4a302bdaf76db68144e4 SHA512 dc1d1d46004a1633ecab5096383caa64e12df393ca79cc0688dbbbfbdb6bb55712435e3703d0970e387c494157bfe6085dc50b73f5ae7f440629f553d348c797 -MISC metadata.xml 453 BLAKE2B f240e76ab129c5cdddedd3ae5ff6685e3e87be49fe6e6289db1041dfb9472bde75b6d0b1916dbb7f5c726029784c7c62f5a7abc72a1995002163d45d168403ee SHA512 92443a23495fc46cfba373d4e712d2e530080b68e4ebceff8cec159d71bf581eb3ea66c1c85134f4edcce3740a22d7eb00d9c5339efa6445318bf2f98028d78a +MISC metadata.xml 347 BLAKE2B 0b64f860e96ddf20c1d28627228191ed4a3798c973577a48c0cc71e4db14afac769bfbf25a7176e9cf39b30b5503453f651c1c2656be4c74296d251e0fc807d9 SHA512 c4533e63e73b7f4156a234b4ddf6d9ec5849af219586bbb8a0a63cd5bfb89bd072b5eeb4184bedc4adb400ee81ec552720407cc4599e0197e4b1fb7a5fd73cdc diff --git a/sys-apps/udevil/metadata.xml b/sys-apps/udevil/metadata.xml index 77901d0e5ea1..124764d8351c 100644 --- a/sys-apps/udevil/metadata.xml +++ b/sys-apps/udevil/metadata.xml @@ -1,10 +1,6 @@ - - zlg@gentoo.org - Daniel Campbell - ThyArmageddon+Gentoo@Gmail.com Elijah El Lazkani -- cgit v1.2.3