summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2006-10-21 21:43:29 +0000
committerDavid Shakaryan <omp@gentoo.org>2006-10-21 21:43:29 +0000
commit2a5e4c753e97d09b85bf8c67e176a7f32cda02c3 (patch)
treeca63960c54c8d18be4a4f6dfced4928b65ce8d4f
parentRemove monolithic X from dependencies. (diff)
downloadgentoo-2-2a5e4c753e97d09b85bf8c67e176a7f32cda02c3.tar.gz
gentoo-2-2a5e4c753e97d09b85bf8c67e176a7f32cda02c3.tar.bz2
gentoo-2-2a5e4c753e97d09b85bf8c67e176a7f32cda02c3.zip
Remove monolithic X from dependencies and fix quotes.
(Portage version: 2.1.2_pre3-r6)
-rw-r--r--x11-misc/xkeycaps/ChangeLog5
-rw-r--r--x11-misc/xkeycaps/xkeycaps-2.46.ebuild26
2 files changed, 15 insertions, 16 deletions
diff --git a/x11-misc/xkeycaps/ChangeLog b/x11-misc/xkeycaps/ChangeLog
index e7946a313e82..a57a3adfb33b 100644
--- a/x11-misc/xkeycaps/ChangeLog
+++ b/x11-misc/xkeycaps/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xkeycaps
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.17 2006/10/11 11:32:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.18 2006/10/21 21:43:29 omp Exp $
+
+ 21 Oct 2006; David Shakaryan <omp@gentoo.org> xkeycaps-2.46.ebuild:
+ Remove monolithic X from dependencies and fix quotes.
11 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> xkeycaps-2.46.ebuild:
Add missing x11-misc/xbitmaps to DEPEND, see bug #150787.
diff --git a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild b/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
index 9d91247a0b3b..cd6f95af526d 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.46.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/xkeycaps/xkeycaps-2.46.ebuild,v 1.19 2006/10/11 11:32:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.46.ebuild,v 1.20 2006/10/21 21:43:29 omp Exp $
inherit eutils
@@ -13,25 +13,21 @@ KEYWORDS="x86 sparc ppc ~amd64 ppc64"
SLOT="0"
IUSE=""
-RDEPEND="|| ( (
- x11-misc/xbitmaps
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libXaw
- x11-libs/libXext )
- virtual/x11 )"
+RDEPEND="x11-misc/xbitmaps
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXaw
+ x11-libs/libXext"
DEPEND="${RDEPEND}
- || ( (
- x11-proto/xproto
- x11-misc/imake )
- virtual/x11 )
+ x11-proto/xproto
+ x11-misc/imake
>=sys-apps/sed-4"
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/Imakefile.patch
+ cd "${S}"
+ epatch "${FILESDIR}/Imakefile.patch"
}
src_compile() {