From: Mike Frysinger Date: Sun, 31 Oct 2004 05:02:03 +0000 (+0000) Subject: fix sed DEPEND #44817 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4cfd86567c56f9790309ba1e679aaa73bf0da24;p=gentoo.git fix sed DEPEND #44817 --- diff --git a/app-editors/jed/jed-0.99.16-r1.ebuild b/app-editors/jed/jed-0.99.16-r1.ebuild index 325e28985738..23fcfdd7b799 100644 --- a/app-editors/jed/jed-0.99.16-r1.ebuild +++ b/app-editors/jed/jed-0.99.16-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.16 2004/09/27 09:09:53 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.17 2004/10/31 04:59:25 vapier Exp $ P0=${PN}-0.99-16 S=${WORKDIR}/${P0} @@ -13,12 +13,13 @@ SLOT="0" KEYWORDS="x86 ppc sparc amd64" IUSE="X gpm truetype" -DEPEND=">=sys-libs/slang-1.4.5 - >=sys-apps/sed-4 +RDEPEND=">=sys-libs/slang-1.4.5 X? ( virtual/x11 ) gpm? ( sys-libs/gpm ) X? ( truetype? ( virtual/xft >=media-libs/freetype-2.0 ) )" +DEPEND="${RDEPEND} + >=sys-apps/sed-4" PROVIDE="virtual/editor" src_compile() { diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild index 06173a267614..9d79135f1670 100644 --- a/app-editors/jed/jed-0.99.16-r2.ebuild +++ b/app-editors/jed/jed-0.99.16-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.10 2004/10/05 12:19:43 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.11 2004/10/31 04:59:25 vapier Exp $ inherit eutils @@ -16,11 +16,12 @@ KEYWORDS="x86 ppc sparc amd64 ~ppc64" IUSE="X gpm truetype" DEPEND=">=sys-libs/slang-1.4.5 - >=sys-apps/sed-4 X? ( virtual/x11 ) gpm? ( sys-libs/gpm ) X? ( truetype? ( virtual/xft >=media-libs/freetype-2.0 ) )" +DEPEND="${RDEPEND} + >=sys-apps/sed-4" PROVIDE="virtual/editor" src_unpack() { diff --git a/app-editors/scite/scite-1.6.1.ebuild b/app-editors/scite/scite-1.6.1.ebuild index 25346d54dc52..0b17f4550525 100644 --- a/app-editors/scite/scite-1.6.1.ebuild +++ b/app-editors/scite/scite-1.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.1.ebuild,v 1.8 2004/10/27 05:00:36 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.1.ebuild,v 1.9 2004/10/31 05:02:03 vapier Exp $ inherit toolchain-funcs @@ -8,14 +8,18 @@ MY_PV=${PV//./} DESCRIPTION="A very powerful editor for programmers" HOMEPAGE="http://www.scintilla.org" SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz" + LICENSE="PYTHON" SLOT="0" -KEYWORDS="x86 ppc sparc" +KEYWORDS="ppc sparc x86" IUSE="gtk2 lua" -DEPEND="gtk2? ( >=x11-libs/gtk+-2 ) + +RDEPEND="gtk2? ( >=x11-libs/gtk+-2 ) !gtk2? ( =x11-libs/gtk+-1.2* ) - >=sys-apps/sed-4 lua? ( >=dev-lang/lua-5 )" +DEPEND="${RDEPEND} + >=sys-apps/sed-4" + S=${WORKDIR}/${PN}/gtk src_unpack() { @@ -48,7 +52,7 @@ src_compile() { emake ${makeopts} || die "make failed" } -src_install () { +src_install() { dodir /usr dodir /usr/bin dodir /usr/share @@ -67,7 +71,5 @@ src_install () { doins ${FILESDIR}/scite.desktop doman ../doc/scite.1 - dodoc ../License.txt ../README - + dodoc ../README } -