diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-01-22 06:44:57 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-01-22 06:44:57 +0000 |
| commit | a26a762232685e6023d98f6adb46f32c8ed0d6b1 (patch) | |
| tree | 0cae85f11e7df4939ecd1bd37d1c6a1a4a86f540 /app-admin | |
| parent | Stable on amd64 and x86, wrt bug #537268 (diff) | |
| download | historical-a26a762232685e6023d98f6adb46f32c8ed0d6b1.tar.gz historical-a26a762232685e6023d98f6adb46f32c8ed0d6b1.tar.bz2 historical-a26a762232685e6023d98f6adb46f32c8ed0d6b1.zip | |
Avoid error messages when /usr/lib*/opengl does not exist, bug #537224.
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/eselect-opengl/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/eselect-opengl/Manifest | 32 | ||||
| -rw-r--r-- | app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild | 14 |
3 files changed, 28 insertions, 23 deletions
diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog index bc4d006e46ca..24347b31d37e 100644 --- a/app-admin/eselect-opengl/ChangeLog +++ b/app-admin/eselect-opengl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/eselect-opengl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.137 2015/01/21 08:32:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.138 2015/01/22 06:44:52 mgorny Exp $ + + 22 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1-r2.ebuild: + Avoid error messages when /usr/lib*/opengl does not exist, bug #537224. *eselect-opengl-1.3.1-r2 (21 Jan 2015) diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest index 61b26b5b03d3..49cffbdfb550 100644 --- a/app-admin/eselect-opengl/Manifest +++ b/app-admin/eselect-opengl/Manifest @@ -6,25 +6,25 @@ DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533 EBUILD eselect-opengl-1.2.7.ebuild 1741 SHA256 abf94132d991a53adac42284456b8225dc69a5da639bfb80aa2b846cb7a17eff SHA512 1c52b5c51559d75bf666cb50f01678c4adceeed7f75b63a4849928164b85956393bda4b0a86066fbd801ca3c99f1d5c0247eaf5ef9752922fa6a9f5e71e2969c WHIRLPOOL 3549df8d269f81a2fa926a75038e6139297f45a7426f08f7632c10c6e5517a1422c135625244273a00aea7d213b9dc248c22a6be692392a7d6fbade1298caffa -EBUILD eselect-opengl-1.3.1-r2.ebuild 2556 SHA256 c00635cf3523b6147a22ec066a1cfe6b2273aa5d7d32944110927d95cab2a588 SHA512 8085547d4a6ce4871e2a7082be820a8d2aeaaf54f5ef4dba830a2e7393e340b0c2560565d56553903644636591bfc23f404eac20a10423023749e59c0ad4fdf6 WHIRLPOOL 35785f7369bea2628bc3e12d19917c67ce5b7db4a1cc032878e04e2fda86e2401bfa1218d4b0782800ecc236fa51467977e5e5bbb08591d5892bda87fd808eca -MISC ChangeLog 20374 SHA256 225876b117da292b407c0563d033bebb4d2f2f486bc3d2dbf15233b68e9c7099 SHA512 8c948563345f4e61c0f41ed8634e984e4148ca51851f9c0851d2a518cd370c7dc37438e6ecad8b2d274c2c7edd22f43a6f9f339dee86f0ca23422a573e0f0afe WHIRLPOOL 772a39cd5c616c64ddf13f2445aa4e417e5987d037b2bbddf0dab05c8aa7a6110fb45376c1a5831ffc34faf6edeaa5b281bf3b1519a308ecf3b68968ea23562c +EBUILD eselect-opengl-1.3.1-r2.ebuild 2620 SHA256 7a8557c8f09abf4f31cb6db6ad81b6fa96001e4391a9a7c31ae99aa3c00deef5 SHA512 5cf9fec2c229d33444c86cb0623c7230964709b629a8d2a8797e87400870a66e2d56b490c3a1dec2ebee4e39329b301cb663de59e6ebbc265584b206812e3957 WHIRLPOOL ee9d69ff8dc527ac80dccd45954dff5c9661e4faf0adc057e94c9fb6aed31ab2fb9052a72565304cd0a52ad092f4a674409fc3eaaa5fd22120ac62c0a2f3312b +MISC ChangeLog 20531 SHA256 f741b8121ddac3f75e2ddc4cd0bc336835dc37034cf1b96e4c5ca7b392ca80e8 SHA512 2e8d007fa68ec14149b91cc8db4d09644c5fa01586aa8bdee59e7a69f5d95db9c78cc8c55d39d2ab2bedcbfaa493c60c6c7dc118b8f6426b315507afbf028627 WHIRLPOOL 398ac2d9adad64c768171801a1cee9dae183ca88c5e7dece7be87c123bad9f342477aac9f662b7aeafd79e95dd662ebf327603409711435e4dcca026dc991e5c MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUv2Q3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUwJxpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOakAQANY5Hpk0U5no1I8X9VZoiArj -mkkuGZObd7beS0hleCHNlvJNb1gePfr7vVT91d4boFEizBximeM440WyZOjLQV8P -GLHgNQG7XEVItVfHng7Z0Y+JoCUAsp8+etbgJTSHrUGlo6C1rZ/nRpu49b2WqtvY -Zx4FZfNGdn19lFSNSBNWLNtomn04A5QpNdfx3k+k65IXqj7wkMaRKU+P4fOXDSHk -o9mxyYAiTxqcBFCens2xmO+VKsjJQUL8LN8CLod0Lf8EUgggwb4VH70V3IA7g8Qj -uwOhHo0vZpw8WilPdhHrRjTRXK/4AWlpr5lughRtKuahxuHSRDSqez2mZDvgL8lt -pCGWAP3KDH+od2oR74vwg0K/3E/Mokcb0nUApViEuvSMj+AbtCPGc7A3LTcCK9uQ -UUanbqTHVl0uSRZHLbI43Cyx6RbXrcc7/kws1phzny6aa4UxGJ37n95W5DD7ICBG -vUH4evl71hi3gm+lniJxIG7ny3/zfyNG/QVBcO7XnKCb/7s21i1AipoRrMDyomya -vAbonTMRAW3WzolgfwuDEFFwkICX4jxlY6T3R5veJKNgZH3TMEmw/NGPDD3vGcU5 -F16/wS6YV18v5k8G0xMQUPzX/LcLkmLxVg6fA4j5v5DV24FNOCKGTJSw8pJd035n -IvI8KqbWhC9XSquUIYRr -=XoGw +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsioQAMxb5LndKTg01h7sT5VIaZRB +w0UamVP8jrOEwi0eUdtBQ8RDJ1E6+i19Xw36kMas3CoJ8SOpKJj87oqbitxhvAmx +uWU25Khi06s7HJsI0prS0HB5IahSP+nFKz0TJBijUK7WKNqIJOMj86rwWPEdPFC6 +a9XfUZXBlQEy3CcO+Kq6c1e1CANG5+Iy2w4TSHpajSuEfm5rcZUr4DDSKP/2rKOf +wWNMaUj5sBOM4Sv0XxL9XGiWdDrWhA7rSWT1NaepO5CL/BRlDuWFCdWBis8jdl+u +r4m1P0SLbTEaIBJo+YsAn1EqeVbXO8x3qPJUvdx4VV1C6b/qS7Lpvnnlush2TdEF +lBn2KdIgBQOuggXjVphkcpW/L3I5GxBXTwSs7miNzAqm5i8/gkjQ1CRANZ1Fza93 +zUpoMtib9d+155VjzgHYygtivPjIMaXKgy0A351xkxv+IQKUYIUsDNH2/omswJHq +3f1h5PG7hQkpCYEA2YfqoMcsxXqYeDQjD2pJcEWg24qxAh16qCBDwWrxdTxb/c+a +gzijYu4sHFItznq9ZAMe20ylRVyKNAnYszbU0phN8YzZmIqcBa95ytLAtEpatIQ4 +Tfw7Qi0IPU39Vhx4AUu4eLJp+HzRZhKvzz5nLqNPBh18h+YDQou8n4rqSjq++rEc +OdyTvY9v4IHodtgjG0ij +=c0cs -----END PGP SIGNATURE----- diff --git a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild index e4ba889a02cf..ce2574ba0085 100644 --- a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild +++ b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.1 2015/01/21 08:32:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.2 2015/01/22 06:44:52 mgorny Exp $ EAPI=5 -inherit multilib +inherit eutils multilib DESCRIPTION="Utility to change the OpenGL interface being used" HOMEPAGE="http://www.gentoo.org/" @@ -57,10 +57,12 @@ pkg_preinst() { } pkg_postinst() { - # delete broken symlinks - find "${EROOT}"/usr/lib*/opengl -xtype l -delete - # delete empty leftover directories (they confuse eselect) - find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} + + if path_exists "${EROOT}"/usr/lib*/opengl; then + # delete broken symlinks + find "${EROOT}"/usr/lib*/opengl -xtype l -delete + # delete empty leftover directories (they confuse eselect) + find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} + + fi if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then eselect opengl set "${OLD_IMPL}" |