diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-10 17:51:12 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-10 17:51:12 +0000 |
| commit | 7a31af15543d89972377d56423d65579d6e27e46 (patch) | |
| tree | edc7dc237d53bf0118304b52c2c75b12c005cfda | |
| parent | Test-Builder-Tester (diff) | |
| download | gentoo-2-7a31af15543d89972377d56423d65579d6e27e46.tar.gz gentoo-2-7a31af15543d89972377d56423d65579d6e27e46.tar.bz2 gentoo-2-7a31af15543d89972377d56423d65579d6e27e46.zip | |
Improve support for Modular Xorg by using the correct path for app-defaults, pinpointing the virtual/x11 dependency and respecting LDFLAGS. See bug #139820.
(Portage version: 2.1.1_pre2-r6)
| -rw-r--r-- | x11-misc/xvkbd/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-2.6.ebuild | 29 |
2 files changed, 25 insertions, 11 deletions
diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index afd86fd1b28c..1611b183a7d8 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xvkbd # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.13 2006/02/11 16:34:52 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.14 2006/07/10 17:51:12 flameeyes Exp $ + + 10 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xvkbd-2.6.ebuild: + Improve support for Modular Xorg by using the correct path for app-defaults, + pinpointing the virtual/x11 dependency and respecting LDFLAGS. See bug + #139820. 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> xvkbd-2.6.ebuild: Added rman do DEPEND, fixes bug #122466. diff --git a/x11-misc/xvkbd/xvkbd-2.6.ebuild b/x11-misc/xvkbd/xvkbd-2.6.ebuild index b256d2f34397..c09e7b9155a5 100644 --- a/x11-misc/xvkbd/xvkbd-2.6.ebuild +++ b/x11-misc/xvkbd/xvkbd-2.6.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-misc/xvkbd/xvkbd-2.6.ebuild,v 1.9 2006/02/11 16:34:52 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.10 2006/07/10 17:51:12 flameeyes Exp $ DESCRIPTION="virtual keyboard for X window system" HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/" @@ -11,12 +11,10 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND="|| ( ( x11-libs/libICE - x11-libs/libSM - x11-libs/libXtst - ) - virtual/x11 - ) +RDEPEND="|| ( ( + x11-libs/libXtst + x11-libs/libXmu + ) <virtual/x11-7 ) x11-libs/Xaw3d" DEPEND="${RDEPEND} @@ -25,16 +23,27 @@ DEPEND="${RDEPEND} app-text/rman x11-proto/xextproto ) - virtual/x11 + <virtual/x11-7 )" +pkg_setup() { + has_version '<x11-base/xorg-x11-7' && \ + appdefaultsdir="/etc/X11/app-defaults/" || \ + appdefaultsdir="/usr/share/X11/app-defaults/" +} + src_compile() { xmkmf -a || die - emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed" + + emake \ + XAPPLOADDIR="${appdefaultsdir}" \ + LOCAL_LDFLAGS="${LDFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" || die "emake failed" } src_install() { - make DESTDIR=${D} install || die "make install failed" + emake XAPPLOADDIR="${appdefaultsdir}" DESTDIR="${D}" install || die "make install failed" + rm -rf "${D}/usr/lib/X11" dodoc README newman ${PN}.man ${PN}.1 |