diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 21:17:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 21:17:04 +0000 |
| commit | b5c2738510bed4d628c3f97317efaa16eb4324ed (patch) | |
| tree | 08245423a0e80613f1045a32ca7f901e9fd47257 /x11-misc/xkeyboard-config | |
| parent | Fix wrong doins. (diff) | |
| download | historical-b5c2738510bed4d628c3f97317efaa16eb4324ed.tar.gz historical-b5c2738510bed4d628c3f97317efaa16eb4324ed.tar.bz2 historical-b5c2738510bed4d628c3f97317efaa16eb4324ed.zip | |
rm
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-1.5.ebuild | 56 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-1.6.ebuild | 37 |
3 files changed, 5 insertions, 94 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index d3cb1511f8ed..ebaf17af3e4d 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.89 2010/01/19 20:28:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.90 2010/01/23 21:17:04 scarabeus Exp $ + + 23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild: + rm 19 Jan 2010; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-1.7.ebuild: diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.5.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.5.ebuild deleted file mode 100644 index ca0565698e04..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-1.5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2009 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.5.ebuild,v 1.12 2009/06/23 21:23:43 remi 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="xkeyboard-config" -SLOT="0" - -IUSE="" -RDEPEND="!x11-misc/xkbdata" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.30 - dev-perl/XML-Parser - x11-apps/xkbcomp" - -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" - dodoc ChangeLog NEWS README -} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.6.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.6.ebuild deleted file mode 100644 index ff0515a814f1..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-1.6.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 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.6.ebuild,v 1.11 2009/12/03 16:54:00 ranger Exp $ - -inherit eutils - -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="xkeyboard-config" -SLOT="0" - -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.30 - dev-perl/XML-Parser - x11-apps/xkbcomp" - -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" - dodoc ChangeLog NEWS README -} |