diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-07-04 04:26:03 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-07-04 04:26:03 +0000 |
| commit | 507f418f12e5eab32bd5c2d13f1391b60a050a25 (patch) | |
| tree | 00178c7638f6a6fedcab6ad22279157dc1154898 /x11-misc/xkeyboard-config | |
| parent | Fixed typo that shouldn't affect compiles (diff) | |
| download | historical-507f418f12e5eab32bd5c2d13f1391b60a050a25.tar.gz historical-507f418f12e5eab32bd5c2d13f1391b60a050a25.tar.bz2 historical-507f418f12e5eab32bd5c2d13f1391b60a050a25.zip | |
Some old XKB thing (xkbdata?) installed /usr/share/X11/xkb/symbols/pc as a directory. Now we install it as a file, but portage won't let a file replace a directory so it doesn't get installed. This breaks XKB setups, with numerous reports. Check for the directory in pkg_setup().
Package-Manager: portage-2.1.1_pre1-r5
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/Manifest | 16 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild | 11 |
3 files changed, 26 insertions, 10 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 9af5374d6a6f..0ea81a0f52da 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.16 2006/06/30 23:50:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.17 2006/07/04 04:26:03 spyderous Exp $ + + 04 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>; + xkeyboard-config-0.8.ebuild: + Some old XKB thing (xkbdata?) installed /usr/share/X11/xkb/symbols/pc as a + directory. Now we install it as a file, but portage won't let a file replace + a directory so it doesn't get installed. This breaks XKB setups, with + numerous reports. Check for the directory in pkg_setup(). 30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; xkeyboard-config-0.8.ebuild: diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index dae75cd5ee1e..fcdb01833805 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,12 +1,12 @@ DIST xkeyboard-config-0.8.tar.bz2 410194 RMD160 f870d34f97c677a542fd953e3767b9516d10347c SHA1 5309e5e68343e6e6949c954bdbd9b54cb1c1d628 SHA256 55994318727ecdb61a7937862a87262b32c3655e2a39fb50cff514fb92793abb -EBUILD xkeyboard-config-0.8.ebuild 1299 RMD160 3f9626b1a3e0ca31408ec3e2916d6d1034af6a0a SHA1 f6c9139f66e43fe0d00765df9259cd7d1964696d SHA256 857e6789e3e626d06fa1b68c2859a365879062bf1bc49881ebabd208a133f473 -MD5 411aa21ec2651e285a71f8187011c6ba xkeyboard-config-0.8.ebuild 1299 -RMD160 3f9626b1a3e0ca31408ec3e2916d6d1034af6a0a xkeyboard-config-0.8.ebuild 1299 -SHA256 857e6789e3e626d06fa1b68c2859a365879062bf1bc49881ebabd208a133f473 xkeyboard-config-0.8.ebuild 1299 -MISC ChangeLog 2817 RMD160 3bf4f8fd19a971240e19cbad06a4c850a9cedc7f SHA1 ccb3997a3dce1e50b1cd8d11f7f8d59fb316fd0b SHA256 036c41463ac2850f4cbb04a85df06189ff116591b2823ac1f5193eb4c053e2f1 -MD5 7e6f8d73c78636d03a715f87c28ef207 ChangeLog 2817 -RMD160 3bf4f8fd19a971240e19cbad06a4c850a9cedc7f ChangeLog 2817 -SHA256 036c41463ac2850f4cbb04a85df06189ff116591b2823ac1f5193eb4c053e2f1 ChangeLog 2817 +EBUILD xkeyboard-config-0.8.ebuild 1630 RMD160 e164d54ad962cb0aea8a9f66f9be59a82a80af33 SHA1 2610e60c631a99f9f1918cbd55f886d5c597bd98 SHA256 4013281292e91e4475ad9ccf5051a2f275bd6a2092b2ab4f3054bb1a2e4909a5 +MD5 072142ed7d64fa07b6d2ff471e99cfa0 xkeyboard-config-0.8.ebuild 1630 +RMD160 e164d54ad962cb0aea8a9f66f9be59a82a80af33 xkeyboard-config-0.8.ebuild 1630 +SHA256 4013281292e91e4475ad9ccf5051a2f275bd6a2092b2ab4f3054bb1a2e4909a5 xkeyboard-config-0.8.ebuild 1630 +MISC ChangeLog 3192 RMD160 0af8290e15ec9c6ae84f1b8fd7d7ec789cf95101 SHA1 1a5ef3d9aaa42141bff851dbb2e5b86a15130c79 SHA256 9611feda385151eecfaf988fa230177ff51856be1e635adb381612c13957c18c +MD5 cc62aa06fde0082b739726b07dcf37ed ChangeLog 3192 +RMD160 0af8290e15ec9c6ae84f1b8fd7d7ec789cf95101 ChangeLog 3192 +SHA256 9611feda385151eecfaf988fa230177ff51856be1e635adb381612c13957c18c ChangeLog 3192 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild index 24fde90c774a..fdffec4cdee0 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild,v 1.5 2006/06/30 23:50:52 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.8.ebuild,v 1.6 2006/07/04 04:26:03 spyderous Exp $ inherit eutils multilib @@ -23,6 +23,15 @@ pkg_setup() { eerror "manually deleted/renamed/relocated before installing!" die "Manually remove ${DIR}" fi + + # The old xkbdata 'pc' directory can screw stuff up, because portage won't + # let us overwrite a directory with a file + local PC="${ROOT}usr/share/X11/xkb/symbols/pc" + if [[ -d ${PC} ]] ; then + eerror "Directory ${PC} should be" + eerror "manually deleted/renamed/relocated before installing!" + die "Manually remove ${PC}" + fi } src_compile() { |