diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2008-01-30 23:57:16 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-01-30 23:57:16 +0000 |
| commit | e4e86fae855a3838468a520f2df8daba903966df (patch) | |
| tree | 877158d72cd2a7f5c19cdba66d645c007d009eeb /x11-misc | |
| parent | bump to 2.18.3 (diff) | |
| download | gentoo-2-e4e86fae855a3838468a520f2df8daba903966df.tar.gz gentoo-2-e4e86fae855a3838468a520f2df8daba903966df.tar.bz2 gentoo-2-e4e86fae855a3838468a520f2df8daba903966df.zip | |
Bump.
(Portage version: 2.1.4)
Diffstat (limited to 'x11-misc')
4 files changed, 65 insertions, 4 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 54837c1937c7..d22cdc48c097 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.44 2008/01/27 19:18:32 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.45 2008/01/30 23:57:15 dberkholz Exp $ + +*xkeyboard-config-1.2 (30 Jan 2008) + + 30 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xkeyboard-config-1.2.ebuild: + Bump. 27 Jan 2008; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-1.1.ebuild: diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1 index 51e05aa10adb..3a48613b9b1b 100644 --- a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1 +++ b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1 @@ -1,3 +1,3 @@ -MD5 2c76b91bd31bff78db771566578fe520 xkeyboard-config-1.1.tar.bz2 540972 -RMD160 a127ab79ba3d6afac487baa34d8f6b97f46d72c6 xkeyboard-config-1.1.tar.bz2 540972 -SHA256 fef905029f033859c7f8897f19dce6b7f10d107c51b8ad7c782214d7b2035ce6 xkeyboard-config-1.1.tar.bz2 540972 +MD5 deef7884b9d9cc280f0d2ef4b60e4d98 xkeyboard-config-1.1.tar.bz2 538464 +RMD160 65ada216daf84c2952f98104731890bce10f3b32 xkeyboard-config-1.1.tar.bz2 538464 +SHA256 d487ff7eb2ab21bf743ced5e1c027920d35de2f398c315120c927c7898ab44bd xkeyboard-config-1.1.tar.bz2 538464 diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.2 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.2 new file mode 100644 index 000000000000..9328fa28815c --- /dev/null +++ b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.2 @@ -0,0 +1,3 @@ +MD5 667c582a54d5715d24110c20e8c4be38 xkeyboard-config-1.2.tar.bz2 586629 +RMD160 a42f603630dd6ef67fb281207a022e55b79f3007 xkeyboard-config-1.2.tar.bz2 586629 +SHA256 64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7 xkeyboard-config-1.2.tar.bz2 586629 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild new file mode 100644 index 000000000000..e2b30b80a14c --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.2.ebuild,v 1.1 2008/01/30 23:57:15 dberkholz Exp $ + +inherit eutils multilib + +DESCRIPTION="X keyboard configuration database" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" + +RDEPEND="x11-apps/xkbcomp + !x11-misc/xkbdata" +DEPEND="${RDEPEND} + dev-perl/XML-Parser" + +pkg_setup() { + # (#130590) The old XKB directory can screw stuff up + local DIR="${ROOT}usr/$(get_libdir)/X11/xkb" + if [[ -d ${DIR} ]] ; then + eerror "Directory ${DIR} should be" + 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() { + econf \ + --with-xkb-base=/usr/share/X11/xkb \ + --enable-compat-rules \ + --disable-xkbcomp-symlink \ + --with-xkb-rules-symlink=xorg \ + || die "configure failed" + + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" +} |