diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
| commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
| tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /sys-apps/baselayout | |
| parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) | |
gentoo resync : 15.12.2017
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 2 |
3 files changed, 4 insertions, 4 deletions
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" |