RDEPEND fixed to block sys-fs/lvm2 NOT sys-apps/lvm2. closing bug #42774 by Mike Ossmann <mike@ossmann.com>. Also cleaned out old and crusty versions

15 files changed, 15 insertions, 302 deletions

diff --git a/sys-fs/lvm-user/ChangeLog b/sys-fs/lvm-user/ChangeLog
index 2b0bc5a369eb..c2a5e0381a52 100644
--- a/sys-fs/lvm-user/ChangeLog
+++ b/sys-fs/lvm-user/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm-user
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.3 2004/01/13 00:11:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/ChangeLog,v 1.4 2004/02/24 18:13:20 seemant Exp $
+
+  24 Feb 2004; Seemant Kulleen <seemant@gentoo.org>
+  lvm-user-1.0.1_rc4-r1.ebuild, lvm-user-1.0.1_rc4.ebuild,
+  lvm-user-1.0.3.ebuild, lvm-user-1.0.4.ebuild, lvm-user-1.0.5.ebuild,
+  lvm-user-1.0.6.ebuild, lvm-user-1.0.7-r1.ebuild, lvm-user-1.0.7.ebuild:
+  RDEPEND fixed to block sys-fs/lvm2 NOT sys-apps/lvm2. closing bug #42774 by
+  Mike Ossmann <mike@ossmann.com>. Also cleaned out old and crusty versions
 
   12 Jan 2004; Aron Griffis <agriffis@gentoo.org> lvm-user-1.0.7-r1.ebuild:
   stable on alpha
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4
deleted file mode 100644
index fd8734f99104..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1aa87a35a1d808534cc78f32af0a1b2d lvm_1.0.1-rc4.tar.gz 359540
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4-r1 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4-r1
deleted file mode 100644
index fd8734f99104..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.1_rc4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1aa87a35a1d808534cc78f32af0a1b2d lvm_1.0.1-rc4.tar.gz 359540
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.3 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.3
deleted file mode 100644
index a512893bb7e8..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17c5a6c1a32a1042a069e20893579709 lvm_1.0.3.tar.gz 371951
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.4 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.4
deleted file mode 100644
index 954e6701c88a..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9081ae96e94bef6c4c2e8c5f2dcc654c lvm_1.0.4.tar.gz 373104
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.5 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.5
deleted file mode 100644
index 6495b9b6c1ad..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6d644019cb8fa4ff36fe59b15be6ab6 lvm_1.0.5.tar.gz 374023
diff --git a/sys-fs/lvm-user/files/digest-lvm-user-1.0.6 b/sys-fs/lvm-user/files/digest-lvm-user-1.0.6
deleted file mode 100644
index 8d509eea4135..000000000000
--- a/sys-fs/lvm-user/files/digest-lvm-user-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88f8c5c839708c0bc627d0e1238dc061 lvm_1.0.6.tar.gz 374900
diff --git a/sys-fs/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
deleted file mode 100644
index 227950a5a2c1..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.1_rc4-r1.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-NV=1.0.1-rc4
-S=${WORKDIR}/LVM/${NV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
-HOMEPAGE="http://www.mosix.org"
-KEYWORDS="x86 amd64"
-SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
-
-KS=/usr/src/linux
-
-src_compile() {
-	cd ${S}
-	#This ebuild doesn't like this opt setting; closes bug #598
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	if [ -f "Makefile" ]; then
-		make clean || die
-	fi
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" || die
-	make || die
-}
-
-src_install () {
-	cd ${S}/tools
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		make install \
-		-e prefix=${D} \
-		mandir=${D}/usr/share/man \
-		sbindir=${D}/sbin \
-		libdir=${D}/lib || die
-	#no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-}
-
diff --git a/sys-fs/lvm-user/lvm-user-1.0.1_rc4.ebuild b/sys-fs/lvm-user/lvm-user-1.0.1_rc4.ebuild
deleted file mode 100644
index 632a894b0543..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.1_rc4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.1_rc4.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-#our version, but with "eh" formatting
-NV=1.0.1-rc4
-S=${WORKDIR}/LVM/${NV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
-HOMEPAGE="http://www.mosix.org"
-KEYWORDS="x86 amd64"
-SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
-
-KS=/usr/src/linux
-
-src_compile() {
-	cd ${S}
-	if [ -f "Makefile" ];then
-		make clean || die
-	fi
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" || die
-	make || die
-}
-
-src_install () {
-	cd ${S}/tools
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		make install \
-		-e prefix=${D} \
-		mandir=${D}/usr/share/man \
-		sbindir=${D}/sbin \
-		libdir=${D}/lib || die
-	#no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-}
-
diff --git a/sys-fs/lvm-user/lvm-user-1.0.3.ebuild b/sys-fs/lvm-user/lvm-user-1.0.3.ebuild
deleted file mode 100644
index 43f88c972b5f..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.3.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-NV=1.0.3
-S=${WORKDIR}/LVM/${NV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
-HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 amd64 sparc "
-SLOT="0"
-LICENSE="GPL-2 | LGPL-2"
-
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
-
-KS=/usr/src/linux
-
-src_compile() {
-	cd ${S}
-	#This ebuild doesn't like this opt setting; closes bug #598
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	if [ -f "Makefile" ]; then
-		make clean || die
-	fi
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" || die
-	make || die
-}
-
-src_install () {
-	cd ${S}/tools
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		make install \
-		-e prefix=${D} \
-		mandir=${D}/usr/share/man \
-		sbindir=${D}/sbin \
-		libdir=${D}/lib || die
-	#no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-}
-
diff --git a/sys-fs/lvm-user/lvm-user-1.0.4.ebuild b/sys-fs/lvm-user/lvm-user-1.0.4.ebuild
deleted file mode 100644
index a7309f297959..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.4.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-NV=1.0.4
-S=${WORKDIR}/LVM/${NV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${NV}.tar.gz"
-HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 amd64 -ppc sparc "
-
-DEPEND="virtual/glibc
-	virtual/linux-sources"
-RDEPEND="virtual/glibc
-	!sys-apps/lvm2"
-LICENSE="GPL-2 | LGPL-2"
-SLOT="0"
-
-KS=/usr/src/linux
-
-src_compile() {
-	cd ${S}
-	#This ebuild doesn't like this opt setting; closes bug #598
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer/}"
-	if [ -f "Makefile" ]; then
-		make clean || die
-	fi
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" || die
-	make || die
-}
-
-src_install() {
-	cd ${S}/tools
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		make install \
-		-e prefix=${D} \
-		mandir=${D}/usr/share/man \
-		sbindir=${D}/sbin \
-		libdir=${D}/lib || die
-	#no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-	cd ${S}
-	dodoc ABSTRACT CHANGELOG CONTRIBUTORS COPYING COPYING.LIB KNOWN_BUGS FAQ INSTALL LVM-HOWTO README TODO WHATSNEW
-}
-
diff --git a/sys-fs/lvm-user/lvm-user-1.0.5.ebuild b/sys-fs/lvm-user/lvm-user-1.0.5.ebuild
deleted file mode 100644
index 020a1fe7bc64..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.5.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-inherit flag-o-matic
-
-S=${WORKDIR}/LVM/${PV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
-HOMEPAGE="http://www.sistina.com/"
-KEYWORDS="x86 amd64 -ppc sparc "
-
-DEPEND="virtual/glibc
-	virtual/linux-sources"
-RDEPEND="virtual/glibc
-	!sys-apps/lvm2"
-LICENSE="GPL-2 | LGPL-2"
-SLOT="0"
-
-KS=/usr/src/linux
-
-src_compile() {
-	addwrite /dev/stderr
-	filter-flags -fomit-frame-pointer
-	if [ -f "Makefile" ];then
-		make clean || die
-	fi
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" || die
-	make || die
-}
-
-src_install() {
-	cd ${S}/tools
-	CFLAGS="${CFLAGS} -I${KS}/include" \
-		make install \
-		-e prefix=${D} \
-		mandir=${D}/usr/share/man \
-		sbindir=${D}/sbin \
-		libdir=${D}/lib || die
-	#no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-	cd ${S}
-	dodoc ABSTRACT CHANGELOG CONTRIBUTORS COPYING COPYING.LIB KNOWN_BUGS FAQ INSTALL LVM-HOWTO README TODO WHATSNEW
-}
-
diff --git a/sys-fs/lvm-user/lvm-user-1.0.6.ebuild b/sys-fs/lvm-user/lvm-user-1.0.6.ebuild
deleted file mode 100644
index bdac2cfd99de..000000000000
--- a/sys-fs/lvm-user/lvm-user-1.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.6.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
-
-IUSE="static"
-
-inherit flag-o-matic
-
-S=${WORKDIR}/LVM/${PV}
-DESCRIPTION="User-land utilities for LVM (Logical Volume Manager) software"
-SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
-HOMEPAGE="http://www.sistina.com/products_lvm.htm"
-KEYWORDS="x86 amd64 -ppc ~sparc"
-
-# I have confirmed with the EVMS development team and from testing that
-# evms-1.0.6 no longer requires kernel sources to be installed to compile
-# properly. I have removed this dependency. (drobbins, 12 Jan 2003)
-
-DEPEND=">=sys-apps/sed-4.0"
-RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
-
-LICENSE="GPL-2 | LGPL-2"
-SLOT="0"
-
-KS=/usr/src/linux
-
-src_compile() {
-	local myconf
-
-	# bug 598 -- -pipe used by default
-	filter-flags "-fomit-frame-pointer -pipe"
-
-	use static && myconf="--enable-static_link"
-
-	./configure --prefix=/ \
-		--mandir=/usr/share/man \
-		--with-kernel_dir="${KS}" ${myconf} || die "configure failed"
-
-	# Fix flags
-	sed -i -e "54,56d" -e "73d" make.tmpl
-
-	make || die "Make failed"
-}
-
-src_install() {
-
-	einstall sbindir=${D}/sbin libdir=${D}/lib
-
-	# no need for a static library in /lib
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	dodoc ABSTRACT CONTRIBUTORS COPYING* INSTALL LVM-HOWTO TODO CHANGELOG FAQ KNOWN_BUGS README WHATSNEW
-}
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
index d2f7bcebc68e..71a896041a2d 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.2 2004/01/13 00:11:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7-r1.ebuild,v 1.3 2004/02/24 18:13:20 seemant Exp $
 
 IUSE="static"
 
@@ -12,9 +12,11 @@ SRC_URI="ftp://ftp.sistina.com/pub/LVM/1.0/lvm_${PV}.tar.gz"
 HOMEPAGE="http://www.sistina.com/products_lvm.htm"
 KEYWORDS="~x86 ~amd64 -ppc ~sparc ~hppa alpha"
 
-DEPEND=">=sys-apps/sed-4.0 virtual/linux-sources"
+DEPEND=">=sys-apps/sed-4.0
+	virtual/linux-sources"
+
 RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
+	!sys-fs/lvm2"
 
 LICENSE="GPL-2 | LGPL-2"
 SLOT="0"
diff --git a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
index 74cd32a07983..e72300ea3f90 100644
--- a/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
+++ b/sys-fs/lvm-user/lvm-user-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.1 2003/09/15 17:46:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm-user/lvm-user-1.0.7.ebuild,v 1.2 2004/02/24 18:13:20 seemant Exp $
 
 IUSE="static"
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 amd64 -ppc sparc hppa"
 
 DEPEND=">=sys-apps/sed-4.0 virtual/linux-sources"
 RDEPEND="${DEPEND}
-	!sys-apps/lvm2"
+	!sys-fs/lvm2"
 
 LICENSE="GPL-2 | LGPL-2"
 SLOT="0"