summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild')
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild36
1 files changed, 12 insertions, 24 deletions
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
index 4256efe27ba5..086023ce9c7f 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
@@ -1,21 +1,17 @@
# Copyright 1999-2010 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.9.ebuild,v 1.1 2010/06/20 19:23:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild,v 1.2 2010/07/11 09:51:26 scarabeus Exp $
EAPI=3
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git"
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-else
- GIT_ECLASS=
- SRC_URI="http://people.freedesktop.org/~svu/${P}.tar.bz2"
-fi
+XORG_STATIC=no
+inherit xorg-2
-inherit ${GIT_ECLASS} autotools
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
DESCRIPTION="X keyboard configuration database"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+SRC_URI="${BASE_INDIVIDUAL_URI}/data/xkeyboard-config/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
@@ -28,22 +24,14 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.30
dev-perl/XML-Parser"
-src_prepare() {
- if [[ ${PV} = 9999* ]]; then
- intltoolize
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
- --enable-compat-rules \
- --with-xkb-rules-symlink=xorg
-}
+CONFIGURE_OPTIONS="
+ --with-xkb-base=${EPREFIX}/usr/share/X11/xkb
+ --enable-compat-rules
+ --with-xkb-rules-symlink=xorg"
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
+ xorg-2_src_install
+
+ echo "CONFIG_PROTECT=\"${EPREFIX}/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
doenvd "${T}"/10xkeyboard-config
}