summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2006-10-21 22:37:29 +0000
committerDavid Shakaryan <omp@gentoo.org>2006-10-21 22:37:29 +0000
commit2be7e1dc4032bd29d15f6c28fa7e4f276dbd200d (patch)
treed71c21dc5c61e386ed75db59fc3192c2b42ecd25 /x11-misc/xkbd
parentRespect EXTRA_ECONF #146651 by Triphon Penakov. (diff)
downloadgentoo-2-2be7e1dc4032bd29d15f6c28fa7e4f276dbd200d.tar.gz
gentoo-2-2be7e1dc4032bd29d15f6c28fa7e4f276dbd200d.tar.bz2
gentoo-2-2be7e1dc4032bd29d15f6c28fa7e4f276dbd200d.zip
Remove monolithic X from dependencies, `` to $() and other minor cleanup.
(Portage version: 2.1.2_pre3-r6)
Diffstat (limited to 'x11-misc/xkbd')
-rw-r--r--x11-misc/xkbd/ChangeLog5
-rw-r--r--x11-misc/xkbd/xkbd-0.8.12.ebuild37
2 files changed, 16 insertions, 26 deletions
diff --git a/x11-misc/xkbd/ChangeLog b/x11-misc/xkbd/ChangeLog
index ae347f3811f6..08e8a1854bbd 100644
--- a/x11-misc/xkbd/ChangeLog
+++ b/x11-misc/xkbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xkbd
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.10 2006/01/14 12:14:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/ChangeLog,v 1.11 2006/10/21 22:37:29 omp Exp $
+
+ 21 Oct 2006; David Shakaryan <omp@gentoo.org> xkbd-0.8.12.ebuild:
+ Remove monolithic X from dependencies, `` to $() and other minor cleanup.
14 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xkbd-0.8.12.ebuild:
Removed sys-devel/libtool from RDEPEND.
diff --git a/x11-misc/xkbd/xkbd-0.8.12.ebuild b/x11-misc/xkbd/xkbd-0.8.12.ebuild
index 261bbb7ef5c0..27d50ea30331 100644
--- a/x11-misc/xkbd/xkbd-0.8.12.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.12.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/xkbd/xkbd-0.8.12.ebuild,v 1.11 2006/01/14 12:14:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbd/xkbd-0.8.12.ebuild,v 1.12 2006/10/21 22:37:29 omp Exp $
DESCRIPTION="Xkbd - onscreen soft keyboard for X11"
HOMEPAGE="http://handhelds.org/~mallum/xkbd/"
@@ -8,44 +8,31 @@ SRC_URI="http://handhelds.org/~mallum/xkbd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-
KEYWORDS="~amd64 ~ppc x86"
-
IUSE="doc debug"
-RDEPEND="|| ( ( x11-libs/libXrender
- x11-libs/libX11
- virtual/xft
- x11-libs/libXtst
- x11-libs/libXpm
- )
- virtual/x11
- )
+RDEPEND="x11-libs/libXrender
+ x11-libs/libX11
+ virtual/xft
+ x11-libs/libXtst
+ x11-libs/libXpm
media-libs/freetype
dev-libs/expat
sys-libs/zlib
doc? ( app-text/docbook-sgml-utils )"
-
DEPEND="${RDEPEND}
- || ( ( x11-proto/xproto
- x11-proto/xextproto
- )
- virtual/x11
- )"
+ x11-proto/xproto
+ x11-proto/xextproto"
src_compile() {
- econf\
- `use_enable debug` || die "econf failed"
+ econf $(use_enable debug) || die "econf failed"
+ emake || die "emake failed"
- emake || die
-
- if use doc; then
- docbook2html README
- fi
+ use doc && docbook2html README
}
src_install() {
- einstall || die
+ einstall || die "einstall failed"
dodoc AUTHORS NEWS README
if use doc; then