diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-03-09 07:46:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-03-09 07:46:45 +0000 |
| commit | dda039b04403768b3f459ad7827f74b44f2e86e8 (patch) | |
| tree | 6f50d5f8e066cb1e9e43ab2d5d796ef7b9d98ccf /x11-misc | |
| parent | old (diff) | |
| download | gentoo-2-dda039b04403768b3f459ad7827f74b44f2e86e8.tar.gz gentoo-2-dda039b04403768b3f459ad7827f74b44f2e86e8.tar.bz2 gentoo-2-dda039b04403768b3f459ad7827f74b44f2e86e8.zip | |
Stop using virtual/x11 and remove redudant checks for it.
(Portage version: 2.1.2.2)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xvkbd/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-2.6.ebuild | 39 |
2 files changed, 19 insertions, 27 deletions
diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index 748f1eca0210..005c6c1c97bb 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,9 @@ # 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.15 2006/10/11 11:48:22 nelchael Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.16 2007/03/09 07:46:45 drac Exp $ + + 09 Mar 2007; Samuli Suominen <drac@gentoo.org> xvkbd-2.6.ebuild: + Stop using virtual/x11 and remove redudant checks for it. 11 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> xvkbd-2.6.ebuild: Add missing x11-misc/gccmakedep to DEPEND, see bug #150802. diff --git a/x11-misc/xvkbd/xvkbd-2.6.ebuild b/x11-misc/xvkbd/xvkbd-2.6.ebuild index 25ae94dfd6a7..a9eb7ed58a8b 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 +# Copyright 1999-2007 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.11 2006/10/11 11:48:22 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.12 2007/03/09 07:46:45 drac Exp $ DESCRIPTION="virtual keyboard for X window system" HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/" @@ -11,39 +11,28 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND="|| ( ( - x11-libs/libXtst - x11-libs/libXmu - ) <virtual/x11-7 ) +RDEPEND="x11-libs/libXtst + x11-libs/libXmu x11-libs/Xaw3d" - DEPEND="${RDEPEND} - || ( ( x11-misc/imake - x11-misc/gccmakedep - x11-proto/xproto - app-text/rman - x11-proto/xextproto - ) - <virtual/x11-7 - )" - -pkg_setup() { - has_version '<x11-base/xorg-x11-7' && \ - appdefaultsdir="/etc/X11/app-defaults/" || \ - appdefaultsdir="/usr/share/X11/app-defaults/" -} + x11-misc/imake + x11-misc/gccmakedep + x11-proto/xproto + app-text/rman + x11-proto/xextproto" src_compile() { - xmkmf -a || die + xmkmf -a || die "xmkmf failed." emake \ - XAPPLOADDIR="${appdefaultsdir}" \ + XAPPLOADDIR="/usr/share/X11/app-defaults" \ LOCAL_LDFLAGS="${LDFLAGS}" \ - CDEBUGFLAGS="${CFLAGS}" || die "emake failed" + CDEBUGFLAGS="${CFLAGS}" || die "emake failed." } src_install() { - emake XAPPLOADDIR="${appdefaultsdir}" DESTDIR="${D}" install || die "make install failed" + emake XAPPLOADDIR="/usr/share/X11/app-defaults" DESTDIR="${D}" install \ + || die "emake install failed." rm -rf "${D}/usr/lib/X11" dodoc README |