dependency to sys-fs/lvm-user instead of sys-apps/lvm-user. Closes bug #36534 by Adam Gelwarg <adam@gelwarg.net>

5 files changed, 34 insertions, 29 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 00e95bc052fb..b3ff58deeb8d 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.7 2003/12/26 18:23:25 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.8 2003/12/27 03:47:28 seemant Exp $
+
+  26 Dec 2003; Seemant Kulleen <seemant@gentoo.org> lvm2-2.00.06.ebuild,
+  lvm2-2.00.07.ebuild, lvm2-2.00.08.ebuild:
+  dependency to sys-fs/lvm-user instead of sys-apps/lvm-user. Closes bug #36534
+  by Adam Gelwarg <adam@gelwarg.net>
 
   26 Dec 2003; Ciaran McCreesh <ciaranm@gentoo.org> lvm2-2.00.08.ebuild:
   Added ~sparc keyword
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index d67d97e94647..c3d8e12a55d4 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,8 +1,8 @@
-MD5 31714679f60d95f7460e89c6c3254748 lvm2-2.00.06.ebuild 769
-MD5 bfddc29aee2282f7ff140b570d8453d8 lvm2-2.00.08.ebuild 793
-MD5 6649420b4bb93d9d4600794e918c4a9c ChangeLog 2475
-MD5 f076831c34aa8e820915513d982864b0 lvm2-2.00.07.ebuild 769
+MD5 a4adb0912c81836990293b5c668e4445 lvm2-2.00.06.ebuild 783
+MD5 612c87e96e059a12ee8a9fed8c0bb2ca lvm2-2.00.08.ebuild 803
+MD5 ecdef1c69bb24109c76b818cf238859b lvm2-2.00.07.ebuild 783
+MD5 6e179cb1b7d96d48f83c189cc5e9393d ChangeLog 2710
 MD5 8ef457f9ac46b73b855b4a4e5ff9d7d3 metadata.xml 243
-MD5 7d15c279aadf5df9c1486c878916c893 files/digest-lvm2-2.00.08 61
 MD5 8c3382128e49f3ef18e3dd27e3a9dc3e files/digest-lvm2-2.00.06 61
 MD5 1cea97a35f7140790ce28d5c321e7c86 files/digest-lvm2-2.00.07 61
+MD5 7d15c279aadf5df9c1486c878916c893 files/digest-lvm2-2.00.08 61
diff --git a/sys-fs/lvm2/lvm2-2.00.06.ebuild b/sys-fs/lvm2/lvm2-2.00.06.ebuild
index 57961074a016..03b8d4ba5176 100644
--- a/sys-fs/lvm2/lvm2-2.00.06.ebuild
+++ b/sys-fs/lvm2/lvm2-2.00.06.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.06.ebuild,v 1.3 2003/10/21 22:52:59 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.06.ebuild,v 1.4 2003/12/27 03:47:28 seemant Exp $
 
+MY_P=${PN/lvm/LVM}.${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${PN/lvm/LVM}.${PV}.tgz"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -12,18 +14,16 @@ KEYWORDS="x86"
 
 DEPEND=">=sys-libs/device-mapper-1"
 RDEPEND="${DEPEND}
-	!sys-apps/lvm-user"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+	!sys-fs/lvm-user"
 
 src_compile() {
-	econf
+	econf || die
 
 	# parallel build doesn't work
 	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	einstall sbindir="${D}/sbin"
+	einstall sbindir="${D}/sbin" || die
 	dodoc BUGS COPYING* INSTALL INTRO README TODO VERSION doc/*
 }
diff --git a/sys-fs/lvm2/lvm2-2.00.07.ebuild b/sys-fs/lvm2/lvm2-2.00.07.ebuild
index 78f28870139b..e0340cfbe609 100644
--- a/sys-fs/lvm2/lvm2-2.00.07.ebuild
+++ b/sys-fs/lvm2/lvm2-2.00.07.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.07.ebuild,v 1.2 2003/10/21 22:52:59 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.07.ebuild,v 1.3 2003/12/27 03:47:28 seemant Exp $
 
+MY_P=${PN/lvm/LVM}.${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${PN/lvm/LVM}.${PV}.tgz"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${MY_P}.tgz"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND=">=sys-libs/device-mapper-1"
 RDEPEND="${DEPEND}
-	!sys-apps/lvm-user"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+	!sys-fs/lvm-user"
 
 src_compile() {
-	econf
+	econf || die
 
 	# parallel build doesn't work
 	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	einstall sbindir="${D}/sbin"
+	einstall sbindir="${D}/sbin" || die
 	dodoc BUGS COPYING* INSTALL INTRO README TODO VERSION doc/*
 }
diff --git a/sys-fs/lvm2/lvm2-2.00.08.ebuild b/sys-fs/lvm2/lvm2-2.00.08.ebuild
index 657014a68633..4fded80f3690 100644
--- a/sys-fs/lvm2/lvm2-2.00.08.ebuild
+++ b/sys-fs/lvm2/lvm2-2.00.08.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.08.ebuild,v 1.4 2003/12/26 18:23:25 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.00.08.ebuild,v 1.5 2003/12/27 03:47:28 seemant Exp $
 
+MY_P=${PN/lvm/LVM}.${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${PN/lvm/LVM}.${PV}.tgz"
+SRC_URI="ftp://ftp.sistina.com/pub/LVM2/tools/${MY_P}.tgz"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~sparc"
 
 DEPEND=">=sys-libs/device-mapper-1.00.07"
 RDEPEND="${DEPEND}
-	!sys-apps/lvm-user"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+	!sys-fs/lvm-user"
 
 src_compile() {
-	econf
+	econf || die
 
 	# Parallel build doesn't work.
 	emake -j1 || die "compile problem"
 }
 
 src_install() {
-	einstall sbindir="${D}/sbin"
+	einstall sbindir="${D}/sbin" || die
 	dodoc BUGS COPYING* INSTALL INTRO README TODO VERSION doc/*
 }