From 4f0d9e47176171f78f766b852074089d7593bc2d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 4 May 2008 18:53:39 +0000 Subject: more ebuild fixes git-svn-id: svn://mattst88.com/svn/compaq-c-overlay@16 8c41e67f-757b-4206-be13-12d8f16ad5be --- dev-lang/ccc/ccc-6.5.9.001.ebuild | 11 +++-------- dev-lang/cxx/cxx-6.5.9.31.ebuild | 17 ++++++----------- dev-libs/libcpml/libcpml-5.2.01.ebuild | 11 ++++------- dev-libs/libcxml/libcxml-5.2.0.ebuild | 9 +++------ dev-libs/libots/libots-2.2.7.ebuild | 6 +++--- 5 files changed, 19 insertions(+), 35 deletions(-) diff --git a/dev-lang/ccc/ccc-6.5.9.001.ebuild b/dev-lang/ccc/ccc-6.5.9.001.ebuild index 005b009..de88e57 100644 --- a/dev-lang/ccc/ccc-6.5.9.001.ebuild +++ b/dev-lang/ccc/ccc-6.5.9.001.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild,v 1.7 2007/07/02 14:39:33 peper Exp $ -# -# Ebuild contributed by Tavis Ormandy -# and edited by Aron Griffis +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001.ebuild,v 1.7 2007/07/02 14:39:33 peper Exp $ inherit eutils rpm @@ -24,11 +21,9 @@ DEPEND="sys-devel/gcc-config app-arch/rpm2targz >=sys-apps/sed-4 >=app-shells/bash-2.05b" -RDEPEND="virtual/libc - dev-libs/libots +RDEPEND="dev-libs/libots >=dev-libs/libcpml-5.2.01" - ccc_release="${PV}-6" src_unpack() { diff --git a/dev-lang/cxx/cxx-6.5.9.31.ebuild b/dev-lang/cxx/cxx-6.5.9.31.ebuild index fffdd01..dbd02bf 100644 --- a/dev-lang/cxx/cxx-6.5.9.31.ebuild +++ b/dev-lang/cxx/cxx-6.5.9.31.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild,v 1.13 2007/12/23 05:59:39 halcy0n Exp $ -# -# Ebuild contributed by Tavis Ormandy -# and edited by Aron Griffis +# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31.ebuild,v 1.13 2007/12/23 05:59:39 halcy0n Exp $ inherit eutils rpm @@ -19,15 +16,13 @@ SLOT="0" KEYWORDS="-* ~alpha" RESTRICT="fetch strip mirror" -RDEPEND="virtual/libc - dev-libs/libots - >=dev-libs/libcpml-5.2.01 - dev-lang/ccc" -DEPEND="${RDEPEND} - sys-devel/gcc-config +DEPEND="sys-devel/gcc-config app-arch/rpm2targz >=sys-apps/sed-4 >=app-shells/bash-2.05b" +RDEPEND="dev-libs/libots + >=dev-libs/libcpml-5.2.01 + dev-lang/ccc" cxx_release="${PV}-1" diff --git a/dev-libs/libcpml/libcpml-5.2.01.ebuild b/dev-libs/libcpml/libcpml-5.2.01.ebuild index d3e36d7..11ec781 100644 --- a/dev-libs/libcpml/libcpml-5.2.01.ebuild +++ b/dev-libs/libcpml/libcpml-5.2.01.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcpml/libcpml-5.2.01-r3.ebuild,v 1.5 2004/07/02 04:44:16 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcpml/libcpml-5.2.01.ebuild,v 1.5 2004/07/02 04:44:16 eradicator Exp $ inherit eutils rpm @@ -15,12 +15,9 @@ KEYWORDS="-* ~alpha" IUSE="ev6" RESTRICT="fetch strip mirror" -DEPEND="virtual/libc - sys-devel/binutils - dev-libs/libots +DEPEND="sys-devel/binutils sys-apps/findutils" -RDEPEND="${DEPEND} - virtual/libc" +RDEPEND="dev-libs/libots" S=${WORKDIR}/usr diff --git a/dev-libs/libcxml/libcxml-5.2.0.ebuild b/dev-libs/libcxml/libcxml-5.2.0.ebuild index dd62a4e..5e80a47 100644 --- a/dev-libs/libcxml/libcxml-5.2.0.ebuild +++ b/dev-libs/libcxml/libcxml-5.2.0.ebuild @@ -15,14 +15,11 @@ KEYWORDS="-* ~alpha" IUSE="ev6 doc" RESTRICT="fetch strip" -S="${WORKDIR}/usr" +S=${WORKDIR}/usr -DEPEND="virtual/libc - app-arch/rpm2targz - dev-libs/libots - dev-libs/libcpml" +DEPEND="app-arch/rpm2targz" RDEPEND="dev-libs/libots - dev-libs/libcpml" + dev-libs/libcpml" # non portage variable RELEASE="5.2.0-2" diff --git a/dev-libs/libots/libots-2.2.7.ebuild b/dev-libs/libots/libots-2.2.7.ebuild index 0e2f1fd..aaaa8ba 100644 --- a/dev-libs/libots/libots-2.2.7.ebuild +++ b/dev-libs/libots/libots-2.2.7.ebuild @@ -13,10 +13,10 @@ SLOT="0" KEYWORDS="-* ~alpha" RESTRICT="strip mirror" -DEPEND="virtual/libc - app-arch/rpm2targz" +DEPEND="app-arch/rpm2targz" +RDEPEND="" -S="${WORKDIR}/usr/lib/compaq/libots-2.2.7" +S=${WORKDIR}/usr/lib/compaq/libots-2.2.7 src_install() { dolib.so libots.so -- cgit v1.2.3