From 34eeb7b1cf9bc0369d4e1b17dd3c4839b02e08a0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 6 Aug 2006 18:18:46 +0000 Subject: arm/m68k/s390/sh love (Portage version: 2.1.1_pre4) --- x11-libs/libxklavier/libxklavier-2.2.ebuild | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/x11-libs/libxklavier/libxklavier-2.2.ebuild b/x11-libs/libxklavier/libxklavier-2.2.ebuild index 03e4e5762bd4..44fba55d194b 100644 --- a/x11-libs/libxklavier/libxklavier-2.2.ebuild +++ b/x11-libs/libxklavier/libxklavier-2.2.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-libs/libxklavier/libxklavier-2.2.ebuild,v 1.8 2006/07/17 14:39:26 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.9 2006/08/06 18:18:46 vapier Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86" IUSE="doc" RDEPEND="|| ( ( @@ -20,27 +20,22 @@ RDEPEND="|| ( ( x11-libs/libxkbfile ) virtual/x11 ) dev-libs/libxml2" - DEPEND="${RDEPEND} dev-util/pkgconfig doc? ( app-doc/doxygen )" src_unpack() { - unpack ${A} - - cd ${S} + cd "${S}" # Do not error on warnings (for gcc4 support). Patch from Fedora. - epatch ${FILESDIR}/${PN}-1.14-werror.patch - + epatch "${FILESDIR}"/${PN}-1.14-werror.patch } src_compile() { - local xkbbase # see bug #113108 - if has_version x11-apps/xkbcomp; then + if has_version x11-apps/xkbcomp ; then xkbbase=/usr/share/X11/xkb else xkbbase=/usr/$(get_libdir)/X11/xkb @@ -52,15 +47,11 @@ src_compile() { $(use_enable doc doxygen) || die emake || die "emake failed" - } src_install() { - - make install DESTDIR=${D} || die - + make install DESTDIR="${D}" || die insinto /usr/share/libxklavier use sparc && doins "${FILESDIR}/sun.xml" dodoc AUTHORS CREDITS ChangeLog NEWS README - } -- cgit v1.2.3-65-gdbad