summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-01-21 08:32:56 +0000
committerMichał Górny <mgorny@gentoo.org>2015-01-21 08:32:56 +0000
commit38eeeb55b855fa30e6322ccee1034e0e7f688f7d (patch)
tree343c629b06cbf43e196c6e9b3603dca7991bc6c9 /app-admin
parentapp-misc/wcd: Version Bump (diff)
downloadhistorical-38eeeb55b855fa30e6322ccee1034e0e7f688f7d.tar.gz
historical-38eeeb55b855fa30e6322ccee1034e0e7f688f7d.tar.bz2
historical-38eeeb55b855fa30e6322ccee1034e0e7f688f7d.zip
Clean up broken symlinks and empty directories. Complain about custom xorg.conf.d files as well.
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/ChangeLog9
-rw-r--r--app-admin/eselect-opengl/Manifest32
-rw-r--r--app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild (renamed from app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild)27
3 files changed, 42 insertions, 26 deletions
diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index ef687edb21b1..bc4d006e46ca 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,13 @@
# 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.136 2015/01/03 23:34:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.137 2015/01/21 08:32:51 mgorny Exp $
+
+*eselect-opengl-1.3.1-r2 (21 Jan 2015)
+
+ 21 Jan 2015; Michał Górny <mgorny@gentoo.org> +eselect-opengl-1.3.1-r2.ebuild,
+ -eselect-opengl-1.3.1-r1.ebuild:
+ Clean up broken symlinks and empty directories. Complain about custom
+ xorg.conf.d files as well.
03 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1-r1.ebuild:
Complain about Files section until we find a more permanent solution.
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 5ffc716331ca..61b26b5b03d3 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-r1.ebuild 2252 SHA256 7c57721c21e76da554b8b20ed205873399bc160ac901d61d47f72699a891d397 SHA512 13e77445264eff5c4d01b581db3e984137bbc11015c2a83e4d4eacc54594289858a4ef86f34c46c6e70a2d9fb43e593df39076cca68623755e16dc5c60b7042b WHIRLPOOL 4f4e2de37c073de9d822562f430bc247f36c3321e6e9413fcd69be7278b7db97e484168750049d131f93e3cda4b2ae01aa0e96e98af928b519bbecaaf74c2fd3
-MISC ChangeLog 20114 SHA256 8b1ef914fa56489d7c989550029e49030d26a1f293313b3000487a76359bc553 SHA512 81654cdbefc0a3a23ea56c51ee2fbab5bf798b746c0241a92b296ef3fd7b8a707c261effa190ad36db9e0ab153ddd47188aef55a31d89d67fc7263ef2165a5a7 WHIRLPOOL 5cc9f9fd010cf0314c14eeb2dbcae22c34eea33587deec4ff58c92b3eb3b063325f371642741b54c9aec517ab9f6f5ab9964a098393007d122d5884e58dc055f
+EBUILD eselect-opengl-1.3.1-r2.ebuild 2556 SHA256 c00635cf3523b6147a22ec066a1cfe6b2273aa5d7d32944110927d95cab2a588 SHA512 8085547d4a6ce4871e2a7082be820a8d2aeaaf54f5ef4dba830a2e7393e340b0c2560565d56553903644636591bfc23f404eac20a10423023749e59c0ad4fdf6 WHIRLPOOL 35785f7369bea2628bc3e12d19917c67ce5b7db4a1cc032878e04e2fda86e2401bfa1218d4b0782800ecc236fa51467977e5e5bbb08591d5892bda87fd808eca
+MISC ChangeLog 20374 SHA256 225876b117da292b407c0563d033bebb4d2f2f486bc3d2dbf15233b68e9c7099 SHA512 8c948563345f4e61c0f41ed8634e984e4148ca51851f9c0851d2a518cd370c7dc37438e6ecad8b2d274c2c7edd22f43a6f9f339dee86f0ca23422a573e0f0afe WHIRLPOOL 772a39cd5c616c64ddf13f2445aa4e417e5987d037b2bbddf0dab05c8aa7a6110fb45376c1a5831ffc34faf6edeaa5b281bf3b1519a308ecf3b68968ea23562c
MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJUqHykXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUv2Q3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvXoP/jGyzi9qYs352/bfB0uNq7bt
-5mohxbY/CgjH8a83vjRhQAr8DPrYb7OzI7c1pIw5npys+cbPfC60F5QVFZZBRIRE
-2mjMusRlRVjE1rgBTGpw21sWaH8KW+IiEkWD2JNbxvLI+xp3Nvas0s5ts21mREBA
-elDLG1oNz1WkjhAzpXeCRuJ9avXqi6+3AH2rhOmOMl+echywS3WawwUG+N5JZeL5
-LJaWOvBLAQtD7oqbOs6t2Vw3mNpd2Up5XAna9To0MTQTi2LfuWEgPSYP/ZxJnU69
-HF6He22pkzp9K5bpBwQYwXJxhp2UXulGJ7Rztd6+HJ4FUz5jkxF+8OViWNYzPw9V
-LmJ9Tg5zNV+iVsRcz3tM1j7UVzAjmD4cc2BaUs+Bw5bNDCAfgCLXTSpYGTCI18Ze
-hdsZGdkDsXkUzMO2eKoixB1G9c/Xwv4q4ruL3PhIjzYEQBUl85IuL8JMyR9iz/ei
-xojt59c4oR7wQHsPRJoTQyQ1koM0QVWPjzvXXUXzaW8y+CVoe+oVa9JbH7JpwUbD
-OHgOHfgeCV93VI+QoIxIH98g8QeFGKgnz0qXIs5ZeQbQgB57XamWkLwJQ7ho+foq
-hbL3waOamiTE3oT7qizX4fsHMlkfJ1PKex5fa39Z7K4MNU0ghX7jAoKKS18190Dv
-5EgbuVFAAlxyrTSg+NhC
-=n3sr
+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
-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
index 7deb62e3dce6..e4ba889a02cf 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.2 2015/01/03 23:34:59 mgorny Exp $
+# $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 $
EAPI=5
@@ -37,14 +37,18 @@ RDEPEND=">=app-admin/eselect-1.2.4
S=${WORKDIR}
pkg_pretend() {
- if grep -q -s "Section.*Files" \
- "${EROOT%/}"/etc/X11/xorg.conf
- then
- ewarn 'Your /etc/X11/xorg.conf seems to contain Section "Files". This is'
- ewarn 'known to break eselect-opengl-1.3*. If you need a custom Files setup,'
- ewarn 'please downgrade to <eselect-opengl-1.3. We are sorry for the issues,'
- ewarn 'we are working on a more permanent solution.'
- fi
+ local f
+ for f in "${EROOT%/}"/etc/X11/xorg.conf{,.d/*}; do
+ if [[ ${f} != *20opengl.conf ]]; then
+ if grep -q -r -s "Section.*Files" "${f}"
+ then
+ ewarn "Your ${f} file seems to contain Section 'Files'. This is known to break"
+ ewarn 'eselect-opengl-1.3*. If you need a custom Files setup, please downgrade'
+ ewarn 'to <eselect-opengl-1.3. We are sorry for the issues, we are working'
+ ewarn 'on a more permanent solution.'
+ fi
+ fi
+ done
}
pkg_preinst() {
@@ -53,6 +57,11 @@ 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 [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
eselect opengl set "${OLD_IMPL}"
fi