commit: 2eb97b2d9c3670d0e800d686e504f42498a0af20 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Tue Aug 14 05:50:23 2018 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Tue Aug 14 06:17:13 2018 +0000 URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=2eb97b2d
sys-libs/bionic: Use python-any-r1 to describe python2. Credit: mgorny Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-libs/bionic/Manifest | 20 -------------------- sys-libs/bionic/bionic-8.1.0_p41.ebuild | 7 +++---- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/sys-libs/bionic/Manifest b/sys-libs/bionic/Manifest deleted file mode 100644 index b5de935..0000000 --- a/sys-libs/bionic/Manifest +++ /dev/null @@ -1,20 +0,0 @@ -AUX amd64-soong.variables 1720 BLAKE2B ecbbc9404f714b47a64a6c31f29a4ba8fe4e803182ad59bbf786af42dd0e4818812707137f6144373cc88673c1fb861266e1a7633ff3a11c712ba87e786c6985 SHA512 bca04367b2535184cff7bcffe3c43cb2dd1090f373aa8352c19566f7f408970e3bf80c67a692d62189c9c6411fa455bf8d4d60fb6fd41be31cffebaddb86f341 -AUX bionic-binutils-port.patch 1152 BLAKE2B a50612ed7aecadc117bbe1e0b5f4675431d61b368ace7a77fade9c296403efa2aa60be2ee25d3c26a7ba7b8e0f3ce091af73d8432147c0fe5219fb1b193c0d06 SHA512 d2a89e8fc4cb7f4cdb6abbdf2536368c8f4a4340d1197977b9626df89445ba77d233e1760c569916e5da18b76b17e84ce2d8cbac1cb03e67d05ca8b1eeed46d8 -AUX bionic-glibc-port.patch 4112 BLAKE2B 26471da03d2471f0b3674fd26d2e7f7893631421366d7e2bb0c15f1228fa944e0195c3159d3f62e4cbc3fc0133063164eb4f72552d08728375b6c56b1d703512 SHA512 183eb20f64f203d7c814551d63acb351c34d91c4c1be8caa9ce88a6f5b8fad2f3ee2fcabc62e33a966cb5a082265ccb2b7cc32f44174bd644e5714c6116da2e5 -AUX bionic-no-visibility-hack.patch 456 BLAKE2B 659b5d940d198bb2d7bb0b8464abe6dcb1339f76ea46b8f62cd376d2e55a97cdde303a3d5e1c02b7a8a0aa56f47b5172e89c4b035a256b2e52a4c126148208e4 SHA512 604ac7152d74725980dc19f18427a6afbceb845be9e016e4ecec0778e636fb85c7c34075550edf9cf227939fb46f82b2a1903c27b2bdb6aacc3909798948ce51 -AUX bionic-unwind-gcc_s.patch 1463 BLAKE2B aa2caad4b0400a48e25eb53c726d01806751d06fe06d819e16109cbe180cb7c987f545ad808cf3ee2784c743b9eafcb1234657c1c55884d7546278a79061b812 SHA512 23f2ad6c934cee8636a284b2010791dc4a04122b09faf3013b3e87cb0015a87083df67081ca2e6b18fd7ffb54df5929313ab4b482739f1028c6a31d7d93c8889 -DIST bionic-8.1.0_p41.tar.gz 3517518 BLAKE2B 4c5121cda0e3562b3b65d8e7fa621c6e231973077d582b7d4abf861d03533fd4881901bd48ec971d5baaf155dc8f1a92eb62068a910199fa751fb3001d20d0ba SHA512 b110b46e9f67174f8f30f3b8da0e0fa02c42f2dbb5ced6a9ba9ad948d6cd0a82c1850e8a8d4cd5f3b81ad286e9eb400236fb5320ab02b72f44a0510829cd3e6d -DIST build-8.1.0_p41.tar.gz 2587534 BLAKE2B 5a0eb0dab1d41c60b8eb2e14c5f6e82584ed57e63541fcfc1087f841d8206bb45302b341cff5754ca641e392ed3cccca7ab4609932620fe100aba37ff61679b1 SHA512 a4b0f24800055cc9e433b578c9e1ae7f511959512459cb916b63fd3ec9312fe272858117f15beea28a60464a04fd8fd17a7bfb6772b346edecfb387aad89a97d -DIST compiler-rt-8.1.0_p41.tar.gz 2377259 BLAKE2B 09104aba4ef1dc9ce18609cae395f3849d3df6dbb9b9759c3a1532759afd52d7af37475df21ae2db3bbea0891f9974785833405c3731d0082e749c304a86bc89 SHA512 9472ca3fed7a0215f6bd7506f5ba722891c65f9a88a4296c57a69bd038854ad416b7ce433d11451408c632ec23b3f19c4a3fc6373a7955c27563d7786301b6de -DIST core-8.1.0_p41.tar.gz 5230053 BLAKE2B 7d061d424554fadf9b91412ee9e20d698ec97f196b899aecd7ba7a9a8353ac7f9f6d29831278fb9b81e910031d15b26038ead0d8a2bb7349a767302243d096be SHA512 44458749dd108cf7c89e7b5ad6fdfdb70c2e2a1fb7116543a8203be1fedf45b27b47734f0602e6d7e3ab340d415115884d52a38bf247eebd27a5f87e9ee2c8cd -DIST jemalloc-8.1.0_p41.tar.gz 474553 BLAKE2B 7402befbc29f4ec795c6c5715c015fcd8684207467ac87bf99e65b2c46efc05697f42c0c060ac971367534f57a9e075810fca837089db8fa3c256a2e6c44b5a9 SHA512 1cea81038a5bac8902a2f71c571b172c792857d4eb62d13e4ec25dddd14dc724328b8604f412da6708d6f9af78e8c1582f6d38388b707d1d405f425901534f9c -DIST libcxx-8.1.0_p41.tar.gz 2346631 BLAKE2B ba37b446d722108dba6d970e07f3ce63ed4e23678d97f8b6eb215d2795848dbb6e5b0fe50f57686eed4fe6ada762e5e7d7824dbdc4a54496c1ed811684faa2c6 SHA512 a9632729ed454711a7c09e11845fe4ef0c111d4e369951d28c8ed179e5d9b4dc7a7108c963d62e20f3c87e1f5362896ade08591b6454a145fa99b87c8931f0ba -DIST libcxxabi-8.1.0_p41.tar.gz 709877 BLAKE2B 31ccf771a7397e9207bac222b9ac24bdba07103508426782f743dd0b7766702eac6db22edcfe214135b41f4bec7b12d148fae62fce27348c38fecadc3b127659 SHA512 7c26527f569464e93893e4fe31032b18bf9553ef1bd695a0177bdf4e6a8462040a6694f2b87eee0265f777da9ca5f4ebf2be302c6aaec86bbbfbf2f41785bd96 -DIST libunwind-8.1.0_p41.tar.gz 444441 BLAKE2B e02b2a5f9be17ffa61d607f4e7a0f878d77d3f26f195f9f2a5f6cdb043508aabefff2f18b1e6844700d50b984bc2331bd4f897c1bda73a9edc05f23e656b89f2 SHA512 e47282f05baf3accb87b8d7164790929789e84ec4c2542c1da6553ead10558529f4a15d478f43970f4c5ca0ddbd4ce86d96e2aa0c4b859fff24f398e6779ca5d -DIST libunwind_llvm-8.1.0_p41.tar.gz 90999 BLAKE2B 3ebd73a228513548ee9f6f84ab22190b9eed4b29b28acde5ed9e7dc8211691629a04980b04712d50fe3f1690e2e4e4df823c818ddd8e23448d4840029bb7acd2 SHA512 2a433a5c929b65e4738b9507a807c005aab22ba303676145806d000db9a21b04f6589282a15f36a4be725099501eccfce07349f5734871d59f09e1f732a6dae3 -DIST llvm-8.1.0_p41.tar.gz 26253027 BLAKE2B 50687a47c6a271d0881f6a115d25a698c3fc86d9477cafe361147beaaf4b3c2dd8599391287141f20efa2db8e0be183eed2d44744269b50471c1364a2f6f7687 SHA512 dbc7848cbc7d48c5b4d02fcc855aea57bf1922e8c116cd4f8424826d6aa49569474298f371561360cc2af6050c175b90296eec359443a9a81f65a8cf309fd27b -DIST lzma-8.1.0_p41.tar.gz 733693 BLAKE2B 733b0995778adce01af50b9f22276ec4a54d3c73ff7b9709a6b3c0327dd89c0a785cb991dbd3343e4e7b9c5eb9009afaea3d78db993a48e1dcbaa9807fdaf7ff SHA512 4cebceabb9096c19ccf3ab25ef27d4ce6f1655e431c6381f888345613f310509864135bc0ee7fd78dc5f1170521effea2113f149e71cca56a07254566755c0c5 -DIST safe-iop-8.1.0_p41.tar.gz 10800 BLAKE2B 02959e9a0f02259362bfbe840eae50bdfa429b09de8f56f8beec2f99697eabb4a0a71a175a79a52f943facded257a68bff383a53acbe61249b76fe2ff95911e1 SHA512 8b717408601194b76a6a44fec5bd62ff2121b89f5f8fea7b3eee7ca46c122e346f8d73d92f5b34575318b1015e74186affda1e1aca7b53ac9c3c303d4e8e7710 -DIST zlib-8.1.0_p41.tar.gz 607311 BLAKE2B b175cf9d4548df24cfd587abea62ee4c3dcee56f6a68b4044c4b1419be148ab4542c42cb19ce0d773b247ceaf3193afca385170674c9d6d2f92a4df8f6d346ba SHA512 0d587729c1210ee6efa6bb7cdac723da71a9c56252be67f6973e80c3597dbb7f2c96ea093078e580d97709de5e8d8fabf92aae0594f382b95e2d9559e43953d2 -EBUILD bionic-8.1.0_p41.ebuild 3576 BLAKE2B c75b4bfee069f65f2abceace308668dbd8893bb8d3659c080c13b1cb3e33efb10cc322d6206237d51b12be7a5fe8d5306794e2f4d32eb040792a454da3e79715 SHA512 6ad9046d70f7289b2a3e00d056239ba9a494b1957265ef33ed3abf13f560fc770eae6f5db5bc003e3a6a37a8a9ef5da96f808be27ec9b901377452bdf56ed324 -MISC metadata.xml 242 BLAKE2B 08b4880748ab6d685ce28f65a9f6cc5ad62deff8f85d4e0a55a3dc12aa8bd63cf1de56b28ff89929e054a6831e223d6ef0207e8b19c6887f09ee22621bd76928 SHA512 ae57aaeecc094cffa640d88329a0baa6c2b0703330d84f6406f3f68d8bb9b724d2e19a8478be8708de284db9ac452f95f225a9f79cd1c5d0236aa2f9935b9b21 diff --git a/sys-libs/bionic/bionic-8.1.0_p41.ebuild b/sys-libs/bionic/bionic-8.1.0_p41.ebuild index 60493c7..6ea8daa 100644 --- a/sys-libs/bionic/bionic-8.1.0_p41.ebuild +++ b/sys-libs/bionic/bionic-8.1.0_p41.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit ninja-utils +PYTHON_COMPAT=( python2_7 ) +inherit ninja-utils python-any-r1 DESCRIPTION="Lightweight libc of Android." HOMEPAGE="https://android.googlesource.com/platform/bionic"; @@ -20,8 +21,7 @@ SLOT=0 LICENSE="Apache-2.0" BDEPEND="dev-util/soong - dev-libs/libpcre2 - dev-lang/python:2.7" + dev-libs/libpcre2" DEPEND="net-libs/libtirpc" PATCHES=( "${FILESDIR}"/bionic-glibc-port.patch @@ -41,7 +41,6 @@ src_unpack() { src_prepare() { default - sed -e '1s/python/python2/' -i build/tools/fs_config/fs_config_generator.py || die # We are building a minimal bionic for toolchains. Ignore the # advanced optional features like tests and debug tools.
