168386 2007-02-25 22:13 0000 Strange newline in app-emulation/emul-linux-x86-baselibs-10.1 2007-02-26 10:02:47 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified AMD64 Linux RESOLVED FIXED P2 trivial --- 1 michael@smith-li.com amd64@gentoo.org michael@smith-li.com 2007-02-25 22:13:01 0000 There's a bit of odd code in app-emulation/emul-linux-x86-10.1.ebuild. Here's an alternative solution that IMO is a bit cleaner. Reproducible: Always Steps to Reproduce: michael@smith-li.com 2007-02-25 22:14:41 0000 Created an attachment (id=111238) emul-linux-x86-baselibs-10.1.ebuild --- app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild.orig 2007-02-19 17:05:33.000000000 -0500 +++ app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild 2007-02-23 13:45:23.000000000 -0500 @@ -64,13 +64,16 @@ unpack ${A} cd ${S} + # rm these first so find has less to do + rm -r "${S}/etc/env.d/binutils/" \ + "${S}/usr/lib32/binutils/" \ + "${S}/usr/lib32/engines/" \ + "${S}/usr/lib32/openldap/" \ + "${S}/usr/lib32/python2.4/" + + # Not POSIX compliant, but it should work on amd64 WHITELIST="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)" - # the following line is broken up because we have files with spaces in the filename - find ${S} ! -type d ! -name '*.so*' | egrep -v "${WHITELIST}" | xargs -d ' -' rm -f - rm -rf ${S}/etc/env.d/binutils/ ${S}/usr/lib32/binutils/ - rm -rf ${S}/usr/lib32/engines/ ${S}/usr/lib32/openldap/ - rm -rf ${S}/usr/lib32/python2.4/ + find ${S} ! -type d ! -name '*.so*' -print0 | egrep --null -v "${WHITELIST}" | xargs -0 rm ln -s ../share/terminfo ${S}/usr/lib32/terminfo } blubb@gentoo.org 2007-02-26 10:02:47 0000 Actually 10.1-r1 was already put in the tree which uses the eclass so looks much cleaner, but i merged the rm calls together. Thanks. 111238 2007-02-25 22:14 0000 emul-linux-x86-baselibs-10.1.ebuild emul-linux-x86-baselibs-10.1-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA3IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L2FwcC1lbXVsYXRpb24vZW11bC1saW51eC14ODYt YmFzZWxpYnMvZW11bC1saW51eC14ODYtYmFzZWxpYnMtMTAuMS5lYnVpbGQsdiAxLjMgMjAwNy8w Mi8xOSAyMTo1NzoyOCBibHViYiBFeHAgJAoKREVTQ1JJUFRJT049IlByb3ZpZGVzIHByZWNvbXBp bGVkIDMyYml0IGxpYnJhcmllcyIKSE9NRVBBR0U9Imh0dHA6Ly9hbWQ2NC5nZW50b28ub3JnL2Vt dWwvY29udGVudC54bWwiClNSQ19VUkk9Im1pcnJvcjovL2dlbnRvby9iaW51dGlscy0yLjE2LjEt cjMudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9iemlwMi0xLjAuMy1yNi50YnoyCgkJbWlycm9yOi8v Z2VudG9vL2NvbV9lcnItMS4zOS50YnoyCgkJbWlycm9yOi8vZ2VudG9vL2NyYWNrbGliLTIuOC45 LXIxLnRiejIKCQltaXJyb3I6Ly9nZW50b28vY3Vwcy0xLjIuNi1ub3NzbC50YnoyCgkJbWlycm9y Oi8vZ2VudG9vL2RiLTQuMi41Ml9wNC1yMi50YnoyCgkJbWlycm9yOi8vZ2VudG9vL2RidXMtMS4w LjIudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9kYnVzLWdsaWItMC43Mi50YnoyCgkJbWlycm9yOi8v Z2VudG9vL2RidXMtcXQzLW9sZC0wLjcwLnRiejIKCQltaXJyb3I6Ly9nZW50b28vZTJmc3Byb2dz LTEuMzkudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9leHBhdC0xLjk1LjgudGJ6MgoJCW1pcnJvcjov L2dlbnRvby9maWxlLTQuMTgudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9nYW1pbi0wLjEuOC50Ynoy CgkJbWlycm9yOi8vZ2VudG9vL2dkYm0tMS44LjMtcjMudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9n bGliLTEuMi4xMC1yNS50YnoyCgkJbWlycm9yOi8vZ2VudG9vL2dsaWItMi4xMi43LnRiejIKCQlt aXJyb3I6Ly9nZW50b28vZ3BtLTEuMjAuMS1yNS50YnoyCgkJbWlycm9yOi8vZ2VudG9vL2pwZWct NmItcjcudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9sY21zLTEuMTQtcjEudGJ6MgoJCW1pcnJvcjov L2dlbnRvby9saWJhcnRfbGdwbC0yLjMuMTcudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9saWJpZG4t MC41LjE1LnRiejIKCQltaXJyb3I6Ly9nZW50b28vbGlibW5nLTEuMC45LXIxLnRiejIKCQltaXJy b3I6Ly9nZW50b28vbGlicGVybC01LjguOC1yMS50YnoyCgkJbWlycm9yOi8vZ2VudG9vL2xpYnBu Zy0xLjIuMTUudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9saWJ0b29sLTEuNS4yMi50YnoyCgkJbWly cm9yOi8vZ2VudG9vL2xpYnhtbDItMi42LjI3LnRiejIKCQltaXJyb3I6Ly9nZW50b28vbmN1cnNl cy01LjUtcjMudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9uc3NfbGRhcC0yNTMudGJ6MgoJCW1pcnJv cjovL2dlbnRvby9vcGVubGRhcC0yLjMuMzAtcjIudGJ6MgoJCW1pcnJvcjovL2dlbnRvby9vcGVu c3NsLTAuOS44ZC50YnoyCgkJbWlycm9yOi8vZ2VudG9vL3BhbS0wLjc4LXI1LnRiejIKCQltaXJy b3I6Ly9nZW50b28vcHdkYi0wLjYyLnRiejIKCQltaXJyb3I6Ly9nZW50b28vcmVhZGxpbmUtNS4x X3A0LnRiejIKCQltaXJyb3I6Ly9nZW50b28vc2xhbmctMS40LjktcjIudGJ6MgoJCW1pcnJvcjov L2dlbnRvby9zcy0xLjM5LnRiejIKCQltaXJyb3I6Ly9nZW50b28vdGlmZi0zLjguMi1yMi50Ynoy CgkJbWlycm9yOi8vZ2VudG9vL3psaWItMS4yLjMtcjEudGJ6MiIKCkxJQ0VOU0U9Inx8ICggQXJ0 aXN0aWMgR1BMLTIgKSB8fCAoIEJTRCBHUEwtMiApIEJaSVAyIENSQUNLTElCIERCCgkJR1BMLTIg fHwgKCBHUEwtMiBBRkwtMi4xICkgTEdQTC0yIExHUEwtMi4xIE1JVCBPUEVOTERBUCBvcGVuc3Ns CgkJUEFNIFpMSUIgYXMtaXMiClNMT1Q9IjAiCktFWVdPUkRTPSItKiBhbWQ2NCIKSVVTRT0iIgoK UkVTVFJJQ1Q9InN0cmlwIgpTPSR7V09SS0RJUn0KCkRFUEVORD0iIgpSREVQRU5EPSIiCgpwa2df c2V0dXAoKSB7CgllaW5mbyAiTm90ZTogWW91IGNhbiBzYWZlbHkgaWdub3JlIHRoZSAndHJhaWxp bmcgZ2FyYmFnZSBhZnRlciBFT0YnIgoJZWluZm8gIiAgICAgIHdhcm5pbmdzIGJlbG93Igp9Cgpz cmNfdW5wYWNrKCkgewoJdW5wYWNrICR7QX0KCWNkICR7U30KCgkjIHJtIHRoZXNlIGZpcnN0IHNv IGZpbmQgaGFzIGxlc3MgdG8gZG8KCXJtIC1yICIke1N9L2V0Yy9lbnYuZC9iaW51dGlscy8iIFwK CSAgICAgICIke1N9L3Vzci9saWIzMi9iaW51dGlscy8iIFwKCSAgICAgICIke1N9L3Vzci9saWIz Mi9lbmdpbmVzLyIgIFwKCSAgICAgICIke1N9L3Vzci9saWIzMi9vcGVubGRhcC8iIFwKCSAgICAg ICIke1N9L3Vzci9saWIzMi9weXRob24yLjQvIgoKCSMgTm90IFBPU0lYIGNvbXBsaWFudCwgYnV0 IGl0IHNob3VsZCB3b3JrIG9uIGFtZDY0CglXSElURUxJU1Q9Iigke1N9L2xpYjMyL3NlY3VyaXR5 L3BhbV9maWx0ZXIvdXBwZXJMT1dFUnwke1N9L2V0Yy9lbnYuZCkiCglmaW5kICR7U30gISAtdHlw ZSBkICEgLW5hbWUgJyouc28qJyAtcHJpbnQwIHwgZWdyZXAgLS1udWxsIC12ICIke1dISVRFTElT VH0iIHwgeGFyZ3MgLTAgcm0KCglsbiAtcyAuLi9zaGFyZS90ZXJtaW5mbyAke1N9L3Vzci9saWIz Mi90ZXJtaW5mbwp9CgpzcmNfaW5zdGFsbCgpIHsKCWZvciBkaXIgaW4gZXRjL2Vudi5kIGV0Yy9y ZXZkZXAtcmVidWlsZCA7IGRvCgkJaWYgW1sgLWQgJHtTfS8ke2Rpcn0gXV0gOyB0aGVuCgkJCWZv ciBmIGluICR7U30vJHtkaXJ9LyogOyBkbwoJCQkJbXYgLWYgJGZ7LC1lbXVsfQoJCQlkb25lCgkJ ZmkKCWRvbmUKCgkjIHJlbW92ZSB2b2lkIGRpcmVjdG9yaWVzIG9yIHBvcnRhZ2Ugd2lsbCBzaG93 IHdlaXJkIG91dHB1dAoJZmluZCAke1N9IC1kZXB0aCAtdHlwZSBkIHwgeGFyZ3Mgcm1kaXIgMiY+ L2Rldi9udWxsCgoJY3AgLWEgIiR7V09SS0RJUn0iLyogIiR7RH0iLyB8fCBkaWUgImNvcHlpbmcg ZmlsZXMgZmFpbGVkISIKfQo=