fix inherit

3 files changed, 8 insertions, 102 deletions

diff --git a/dev-libs/root/files/digest-root-3.03.04-r1 b/dev-libs/root/files/digest-root-3.03.04-r1
deleted file mode 100644
index ef93a97a2fdb..000000000000
--- a/dev-libs/root/files/digest-root-3.03.04-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70edd37d08af7efb281abafd014bd9d4 root_v3.03.04.source.tar.gz 5367020
diff --git a/dev-libs/root/root-3.03.04-r1.ebuild b/dev-libs/root/root-3.03.04-r1.ebuild
deleted file mode 100644
index 0d4072a27080..000000000000
--- a/dev-libs/root/root-3.03.04-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r1.ebuild,v 1.10 2003/02/22 10:39:32 kain Exp $
-
-IUSE="mysql postgres opengl"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-SRC_URI="ftp://root.cern.ch/root/root_v3.03.04.source.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-inherit flag-o-matic
-inherit eutils
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc"
-
-DEPEND="virtual/x11
-	>=media-libs/xpm-3.4k
-	>=media-libs/freetype-2.0.9
-	opengl? ( virtual/opengl virtual/glu )
-	mysql? ( >=dev-db/mysql-3.23.49 )
-	postgres? ( >=dev-db/postgresql-7.1.3-r4 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/root-makefile.patch
-	epatch ${FILESDIR}/pgsql-no-libpq-int.patch
-}
-
-src_compile() {
-	
-	use opengl \
-		&& myconf="${myconf} --enable-opengl" \
-		|| myconf="${myconf} --disable-opengl"
-
-	use mysql \
-		&& myconf="${myconf} --enable-mysql" \
-		|| myconf="${myconf} --disable-mysql"
-
-	use postgres \
-		&& myconf="${myconf} --enable-pgsql" \
-		|| myconf="${myconf} --disable-pgsql"
-
-	case $SYSTEM_ARCH in
-		ppc)
-			append-flags "-fsigned-char";;
-	esac
-	export GENTOO_CFLAGS="${CFLAGS}" GENTOO_CXXFLAGS="${CXXFLAGS}" 
-	./configure \
-		linux \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/${P} \
-		--enable-shared \
-		--disable-rpath \
-		--enable-thread \
-		--enable-star \
-		--enable-ttf \
-		--disable-cern \
-		--disable-sapdb \
-		--disable-rfio \
-		--disable-dcache \
-		--disable-srp \
-		--disable-afs \
-		--disable-krb5 \
-		--enable-shadowpw \
-		--disable-pythia \
-		--disable-pythia6 \
-		--disable-venus \
-		--enable-soversion \
-		${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/root" > ${D}/etc/env.d/60root
-}
diff --git a/dev-libs/root/root-3.03.04-r2.ebuild b/dev-libs/root/root-3.03.04-r2.ebuild
index 005590a7b1e7..259101d72085 100644
--- a/dev-libs/root/root-3.03.04-r2.ebuild
+++ b/dev-libs/root/root-3.03.04-r2.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r2.ebuild,v 1.1 2003/02/22 10:39:32 kain Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/root/root-3.03.04-r2.ebuild,v 1.2 2003/02/28 21:59:21 vapier Exp $
 
-IUSE="mysql postgres opengl"
+inherit flag-o-matic eutils
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="An Object-Oriented Data Analysis Framework"
-SRC_URI="ftp://root.cern.ch/root/root_v3.03.04.source.tar.gz"
+SRC_URI="ftp://root.cern.ch/root/root_v${PV}.source.tar.gz"
 HOMEPAGE="http://root.cern.ch/"
 
-inherit flag-o-matic
-inherit eutils
-
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 sparc ~ppc"
+IUSE="mysql postgres opengl"
 
 DEPEND="virtual/x11
 	>=media-libs/xpm-3.4k
@@ -31,18 +29,6 @@ src_unpack() {
 }
 
 src_compile() {
-	
-	use opengl \
-		&& myconf="${myconf} --enable-opengl" \
-		|| myconf="${myconf} --disable-opengl"
-
-	use mysql \
-		&& myconf="${myconf} --enable-mysql" \
-		|| myconf="${myconf} --disable-mysql"
-
-	use postgres \
-		&& myconf="${myconf} --enable-pgsql" \
-		|| myconf="${myconf} --disable-pgsql"
 
 	case $SYSTEM_ARCH in
 		ppc)
@@ -70,11 +56,14 @@ src_compile() {
 		--disable-pythia6 \
 		--disable-venus \
 		--enable-soversion \
+		`use_enable opengl` \
+		`use_enable mysql` \
+		`use_enable postgres pgsql` \
 		${myconf} || die "./configure failed"
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	
 	dodir /etc/env.d