diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2005-12-28 18:11:08 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2005-12-28 18:11:08 +0000 |
| commit | 2cf35b9956028a96bc1e5ccec8a7560ddbefd051 (patch) | |
| tree | 28e1922ac27079e37c72cea36c530f35667c34ca /x11-misc/xvkbd | |
| parent | Fix *DEPEND for modular X. See bug #115650. (diff) | |
| download | historical-2cf35b9956028a96bc1e5ccec8a7560ddbefd051.tar.gz historical-2cf35b9956028a96bc1e5ccec8a7560ddbefd051.tar.bz2 historical-2cf35b9956028a96bc1e5ccec8a7560ddbefd051.zip | |
Fixed *DEPEND for modular X (bug #115703), removed old version.
Package-Manager: portage-2.1_pre2
Diffstat (limited to 'x11-misc/xvkbd')
| -rw-r--r-- | x11-misc/xvkbd/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xvkbd/files/digest-xvkbd-2.5a | 1 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-2.5a.ebuild | 27 | ||||
| -rw-r--r-- | x11-misc/xvkbd/xvkbd-2.6.ebuild | 17 |
4 files changed, 20 insertions, 31 deletions
diff --git a/x11-misc/xvkbd/ChangeLog b/x11-misc/xvkbd/ChangeLog index bdaaaf0439e5..e8a337fbe557 100644 --- a/x11-misc/xvkbd/ChangeLog +++ b/x11-misc/xvkbd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xvkbd # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.11 2005/12/15 22:01:01 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/ChangeLog,v 1.12 2005/12/28 18:11:08 nelchael Exp $ + + 28 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xvkbd-2.5a.ebuild, + xvkbd-2.6.ebuild: + Fixed *DEPEND for modular X (bug #115703), removed old version. 15 Dec 2005; Herbie Hopkins <herbs@gentoo.org> xvkbd-2.6.ebuild: Stable on amd64. diff --git a/x11-misc/xvkbd/files/digest-xvkbd-2.5a b/x11-misc/xvkbd/files/digest-xvkbd-2.5a deleted file mode 100644 index eeb7d35b40e7..000000000000 --- a/x11-misc/xvkbd/files/digest-xvkbd-2.5a +++ /dev/null @@ -1 +0,0 @@ -MD5 792cbca00c96b6ff54828a0a02f3a621 xvkbd-2.5a.tar.gz 58572 diff --git a/x11-misc/xvkbd/xvkbd-2.5a.ebuild b/x11-misc/xvkbd/xvkbd-2.5a.ebuild deleted file mode 100644 index 41ad5af6d6d9..000000000000 --- a/x11-misc/xvkbd/xvkbd-2.5a.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.5a.ebuild,v 1.5 2005/01/05 14:33:08 sekretarz Exp $ - -DESCRIPTION="virtual keyboard for X window system" -HOMEPAGE="http://member.nifty.ne.jp/tsato/xvkbd/" -SRC_URI="http://member.nifty.ne.jp/tsato/xvkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND="virtual/x11 - x11-libs/Xaw3d" - -src_compile() { - xmkmf -a || die - emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - - dodoc README - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xvkbd/xvkbd-2.6.ebuild b/x11-misc/xvkbd/xvkbd-2.6.ebuild index da5a24b45d10..320e237817ca 100644 --- a/x11-misc/xvkbd/xvkbd-2.6.ebuild +++ b/x11-misc/xvkbd/xvkbd-2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7 2005/12/15 22:01:01 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvkbd/xvkbd-2.6.ebuild,v 1.8 2005/12/28 18:11:08 nelchael Exp $ DESCRIPTION="virtual keyboard for X window system" HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/" @@ -11,9 +11,22 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -DEPEND="virtual/x11 +RDEPEND="|| ( ( x11-libs/libICE + x11-libs/libSM + x11-libs/libXtst + ) + virtual/x11 + ) x11-libs/Xaw3d" +DEPEND="${RDEPEND} + || ( ( x11-misc/imake + x11-proto/xproto + x11-proto/xextproto + ) + virtual/x11 + )" + src_compile() { xmkmf -a || die emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed" |