diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2013-02-15 17:39:13 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2013-02-15 17:39:13 +0000 |
| commit | 2e0f7af8748ca8b51db049d6b03675a11f08ca68 (patch) | |
| tree | 851884e0699e1f66196775d6542abe1ae1445aff /sys-apps | |
| parent | Fix unmerged changes from previous commit; Add original ebuilds (diff) | |
| download | srcshelton-2e0f7af8748ca8b51db049d6b03675a11f08ca68.tar.gz srcshelton-2e0f7af8748ca8b51db049d6b03675a11f08ca68.tar.bz2 srcshelton-2e0f7af8748ca8b51db049d6b03675a11f08ca68.zip | |
Modified ebuilds
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.1-r1.ebuild | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 01ce2507..3b3e28bd 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,2 +1,2 @@ DIST baselayout-2.1.tar.bz2 40398 SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956 SHA512 3a7ab13eb0cb75bd96ceab652f6a2848edb93285eaec1993257531bc19a8c9705b82e9928929048df4ad6023bc13eb2f40b15cae63e6a94e316a772fdbae6313 WHIRLPOOL edddd31366baf3b90c7f9d15e4a0ec7b25dcd2820058bc83132ac45c2a48630003f9c7e983283752e6b3f7be4a6d545047461d4f04deb807d2b2a91fd278de35 -EBUILD baselayout-2.1-r1.ebuild 8163 SHA256 545773c126bde35ae593c3704b1d4f1ccc5020ffd032d505e4e1d33e6163bfd5 SHA512 5c73a5b2cbf34c3e15bedd454eeb236861d1683c01c017eecc37615bc5fbbceac12974fbe3d8cc41ce5a6a3dceb0d3e7fbcca606e34f02ad22b1c443ab1d6ecd WHIRLPOOL 7e1525a1743b5eea804aeb456be07bbc2b2719a119f77bbfa4a89b8ca9794d99ba9d5ec73a394c3bf15b22b1c55f98468880533cea312ff3195fc33f9698eac0 +EBUILD baselayout-2.1-r1.ebuild 8225 SHA256 524f9c149dc36d8298f9e613c75e4136ea362207b834b2dd4fc3701e57b466ab SHA512 d23af9702408cd9c3e34fda6b8a1561da6b927a749ec6743033476dfeddf511bee0604cf619c71f9eaff78ab99fdcefc16394b6f51c92e5b3f0599269453f0d5 WHIRLPOOL e26df7cfe595dd9a1dceb9820f1f004bbac65245a126e8fc4d1fc305816e438369fe4308181e0bf0e48abeb8ae497e9fa3f3e9add16cedf5dcd28332fd10fbc5 diff --git a/sys-apps/baselayout/baselayout-2.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.1-r1.ebuild index 317b0026..d2d83b44 100644 --- a/sys-apps/baselayout/baselayout-2.1-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.1-r1.ebuild @@ -106,10 +106,12 @@ multilib_layout() { case ${CHOST} in i?86*|x86_64*|powerpc*|sparc*|s390*) if [ -d "${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" - die "non-empty dir found where there should be none: ${prefix}lib32" + if ! [ "${LIBDIR_x32}" = "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" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi fi fi ;; |