diff options
| author |   Tomáš Chvátal <scarabeus@gentoo.org> | 2010-07-11 11:52:11 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-07-11 11:52:11 +0200 |
| commit | a5e7936c0f77981dd020bf0c7d06d35f9ee9e04e (patch) | |
| tree | 273c314691b527ad4758b209eb6baa09f2445cf9 /x11-misc | |
| parent | x11-base/nouveau-drm: raise minimum kernel version (diff) | |
| download | x11-a5e7936c0f77981dd020bf0c7d06d35f9ee9e04e.tar.gz x11-a5e7936c0f77981dd020bf0c7d06d35f9ee9e04e.tar.bz2 x11-a5e7936c0f77981dd020bf0c7d06d35f9ee9e04e.zip | |
[x11-misc/xkeyboard-config] Migrate to xorg-2 eclass.
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xkeyboard-config/Manifest | 2 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 36 |
2 files changed, 13 insertions, 25 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 98f01b10..322e717e 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1 @@ -EBUILD xkeyboard-config-9999.ebuild 1171 RMD160 f9ecc430a561087d74fdd310022913760398eb07 SHA1 4117aaf263de808ac73ef3bd3adcd8fe1fbacee5 SHA256 11f0f21577267e0f824252023f011a5dbda7651617943ea49592fbe035430999 +EBUILD xkeyboard-config-9999.ebuild 1126 RMD160 d795cb02bfd40ec4f6e91b0832b4026c04b73038 SHA1 293be2b3e079841e081ac473791a7aa2df3bca88 SHA256 3d6c314db99b479766737dca4d1031027762b15a34ca485d3129baff2c6cd42b diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 26e5e617..010871ee 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -1,21 +1,17 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $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 $ 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://xlibs.freedesktop.org/xkbdesc/${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" +[[ ${PV} = 9999 ]] || 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 } |