Version bump and cleanup.

Package-Manager: portage-2.0.51-r15

14 files changed, 30 insertions, 281 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 80b52a06335f..a32881d50d11 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/evms
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.25 2004/12/28 04:17:05 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.26 2005/02/05 10:00:28 eradicator Exp $
+
+*evms-2.5.1 (05 Feb 2005)
+
+  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> -evms-2.2.2.ebuild,
+  -evms-2.3.2-r1.ebuild, -evms-2.4.0.ebuild, -evms-2.5.0.ebuild,
+  +evms-2.5.1.ebuild:
+  Version bump and cleanup.
 
 *evms-2.5.0 (27 Dec 2004)
 
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index d40f30ca49d8..261444b12508 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e28375e37b87538c6cbd72dacbd48083 ChangeLog 6852
-MD5 eaf8f6a7d79d64294bfa75183906f803 evms-1.2.1-r1.ebuild 1951
-MD5 15b44ca0a4828e1342e2074a3c6518d6 evms-2.2.2.ebuild 1784
-MD5 7d83b4377b3a73413d1b9fd14db69907 evms-2.4.0.ebuild 2313
-MD5 fd272d625ba14756145436ab81ccd44c evms-2.3.2-r1.ebuild 2143
+MD5 967fbbf5d25c81c50b69e62caba89a35 ChangeLog 7072
+MD5 6f3337a11ad0aaa0602e5c120248c7ec evms-1.2.1-r1.ebuild 1953
+MD5 f52e48b41e907c9249c8211c865c44a9 evms-2.3.4-r1.ebuild 2217
+MD5 ef1da66f1e9b597f3859c2d56db03283 evms-2.4.1.ebuild 2313
 MD5 eab25fc0bfde7fd3c7fdf3c937fa52f6 metadata.xml 450
-MD5 592511daa287d41db6acf3355035a699 evms-2.3.4-r1.ebuild 2215
-MD5 fad0c70c6ef02b160a0ef3d466613a38 evms-2.4.1.ebuild 2313
-MD5 df607c4b53bc347c7b95388eb5dc584b evms-2.5.0.ebuild 2309
+MD5 f18ea40f50b9035029df07190bf6b06f evms-2.5.1.ebuild 2127
 MD5 cd670e457535a10c1c329aea559f7696 files/digest-evms-1.2.1-r1 63
-MD5 bbf4b9e76bc984677b897fe19c107185 files/digest-evms-2.2.2 63
-MD5 0a317817eea119e0888984775b8734e0 files/digest-evms-2.3.2-r1 63
 MD5 634b1de02d7c1f3df88366c87f655a96 files/digest-evms-2.3.4-r1 63
+MD5 eca42f6495fe088ae4a486904f270b6a files/digest-evms-2.4.1 63
 MD5 8f95e61903246ea287b1025913864ad9 files/evms-init 1000
 MD5 bef1ae81a93d9fe33c78e7883409a889 files/evms2-init 379
-MD5 d6a26be5028e70e5d6ff233f2f47ac21 files/digest-evms-2.4.0 63
-MD5 eca42f6495fe088ae4a486904f270b6a files/digest-evms-2.4.1 63
-MD5 d5359312f8889b72546c4b6f2b93a632 files/digest-evms-2.5.0 63
+MD5 c97914ac1e8937d3b2fbf71f045ac808 files/digest-evms-2.5.1 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB0N5aArHZZzCEUG0RAppjAJoCLCwYSNFpkhPQjrV/wbNPpAo0TwCfWlSo
-a2YYcoPZCgnzTa4eZttdYOs=
-=2i1w
+iD8DBQFCBJlGArHZZzCEUG0RAtNBAJ49zsbD5QVpat74bdp1fwFRFLM50ACfRXHC
+kCRdifEqaXNV/Kfu0T5eI7Q=
+=PSeZ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/evms/evms-1.2.1-r1.ebuild b/sys-fs/evms/evms-1.2.1-r1.ebuild
index b30883064676..cc7b96a56a7f 100644
--- a/sys-fs/evms/evms-1.2.1-r1.ebuild
+++ b/sys-fs/evms/evms-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-1.2.1-r1.ebuild,v 1.7 2004/09/03 19:16:58 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-1.2.1-r1.ebuild,v 1.8 2005/02/05 10:00:28 eradicator Exp $
 
 inherit eutils
 
diff --git a/sys-fs/evms/evms-2.2.2.ebuild b/sys-fs/evms/evms-2.2.2.ebuild
deleted file mode 100644
index 7f3c534c20c0..000000000000
--- a/sys-fs/evms/evms-2.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.2.2.ebuild,v 1.10 2004/09/03 19:16:58 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-IUSE="ncurses gtk"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses )"
-
-src_compile() {
-	local excluded_interfaces=""
-	use ncurses || excluded_interfaces="--disable-text-mode"
-	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
-
-	econf \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--includedir=/usr/include \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Make install died"
-	dodoc ChangeLog COPYING TERMINOLOGY PLUGIN.IDS INSTALL*
-
-	# move static libraries to /usr/lib
-	dodir /usr/lib
-	mv -f ${D}/lib/*.a ${D}/usr/lib
-
-	# Create linker scripts for dynamic libs in /lib, else gcc
-	# links to the static ones in /usr/lib first.  Bug #4411.
-	for x in ${D}/usr/lib/*.a
-	do
-		if [ -f ${x} ]
-		then
-			local lib="${x##*/}"
-			gen_usr_ldscript ${lib/\.a/\.so}
-		fi
-	done
-
-	# the gtk+ frontend should live in /usr/sbin
-	if use gtk
-	then
-		dodir /usr/sbin
-		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms2-init evms
-}
-
-pkg_postinst() {
-	ewarn "Presently gentoo-sources-2.4.22 has basic support for evms2,"
-	ewarn "but does NOT support some of the more advanced features."
-
-	# Needed for bug #51252
-	ldconfig
-}
diff --git a/sys-fs/evms/evms-2.3.2-r1.ebuild b/sys-fs/evms/evms-2.3.2-r1.ebuild
deleted file mode 100644
index d929275fd72a..000000000000
--- a/sys-fs/evms/evms-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.2-r1.ebuild,v 1.8 2004/09/03 19:16:58 pvdabeel Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-IUSE="ncurses gtk"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses )"
-
-src_compile() {
-	# Bug #54856
-	filter-flags "-fstack-protector"
-
-	local excluded_interfaces=""
-	use ncurses || excluded_interfaces="--disable-text-mode"
-	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
-
-	econf \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--includedir=/usr/include \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Make install died"
-	dodoc ChangeLog COPYING INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
-	# install the sample configuration into the doc dir
-	dodoc ${D}/etc/evms.conf.sample
-	rm -f ${D}/etc/evms.conf.sample
-
-	# the kernel patches may come handy for people compiling their own kernel
-	docinto kernel/2.4
-	dodoc kernel/2.4/*
-	docinto kernel/2.6
-	dodoc kernel/2.6/*
-
-	# move static libraries to /usr/lib
-	dodir /usr/lib
-	mv -f ${D}/lib/*.a ${D}/usr/lib
-
-	# Create linker scripts for dynamic libs in /lib, else gcc
-	# links to the static ones in /usr/lib first.  Bug #4411.
-	for x in ${D}/usr/lib/*.a
-	do
-		if [ -f ${x} ]
-		then
-			local lib="${x##*/}"
-			gen_usr_ldscript ${lib/\.a/\.so}
-		fi
-	done
-
-	# the gtk+ frontend should live in /usr/sbin
-	if use gtk
-	then
-		dodir /usr/sbin
-		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms2-init evms
-}
-
-pkg_postinst() {
-	ewarn "Presently gentoo-sources-2.4.22 has basic support for evms2,"
-	ewarn "but does NOT support some of the more advanced features."
-
-	# Needed for bug #51252
-	ldconfig
-}
diff --git a/sys-fs/evms/evms-2.3.4-r1.ebuild b/sys-fs/evms/evms-2.3.4-r1.ebuild
index 1511f9f9250c..13549262201e 100644
--- a/sys-fs/evms/evms-2.3.4-r1.ebuild
+++ b/sys-fs/evms/evms-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.7 2004/09/03 19:16:58 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.8 2005/02/05 10:00:28 eradicator Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sys-fs/evms/evms-2.4.0.ebuild b/sys-fs/evms/evms-2.4.0.ebuild
deleted file mode 100644
index 8660d00048cb..000000000000
--- a/sys-fs/evms/evms-2.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.4.0.ebuild,v 1.2 2004/10/07 07:23:53 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-IUSE="ncurses gtk"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	sys-libs/device-mapper
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses )"
-
-src_compile() {
-	# Bug #54856
-	# filter-flags "-fstack-protector"
-	replace-flags -O3 -O2
-	replace-flags -Os -O2
-
-	local excluded_interfaces=""
-	use ncurses || excluded_interfaces="--disable-text-mode"
-	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
-
-	econf \
-		--libdir=/$(get_libdir) \
-		--sbindir=/sbin \
-		--includedir=/usr/include \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Make install died"
-	dodoc ChangeLog COPYING INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
-	# install the sample configuration into the doc dir
-	dodoc ${D}/etc/evms.conf.sample
-	rm -f ${D}/etc/evms.conf.sample
-
-	# the kernel patches may come handy for people compiling their own kernel
-	docinto kernel/2.4
-	dodoc kernel/2.4/*
-	docinto kernel/2.6
-	dodoc kernel/2.6/*
-
-	# move static libraries to /usr/lib
-	dodir /usr/$(get_libdir)
-	mv -f ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir)
-
-	# Create linker scripts for dynamic libs in /lib, else gcc
-	# links to the static ones in /usr/lib first.  Bug #4411.
-	for x in ${D}/usr/$(get_libdir)/*.a
-	do
-		if [ -f ${x} ]
-		then
-			local lib="${x##*/}"
-			gen_usr_ldscript ${lib/\.a/\.so}
-		fi
-	done
-
-	# the gtk+ frontend should live in /usr/sbin
-	if use gtk
-	then
-		dodir /usr/sbin
-		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms2-init evms
-
-	# Needed for bug #51252
-	dosym libevms-2.4.so.0.0 /$(get_libdir)/libevms-2.4.so.0
-}
-
-pkg_postinst() {
-	ewarn "Presently gentoo-sources-2.4.22 has basic support for evms2,"
-	ewarn "but does NOT support some of the more advanced features."
-}
diff --git a/sys-fs/evms/evms-2.4.1.ebuild b/sys-fs/evms/evms-2.4.1.ebuild
index c89b1d4a64dc..9d5a70b25143 100644
--- a/sys-fs/evms/evms-2.4.1.ebuild
+++ b/sys-fs/evms/evms-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.4.1.ebuild,v 1.1 2004/11/11 07:16:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.4.1.ebuild,v 1.2 2005/02/05 10:00:28 eradicator Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sys-fs/evms/evms-2.5.0.ebuild b/sys-fs/evms/evms-2.5.1.ebuild
index 3017c4446107..96d5382f3f04 100644
--- a/sys-fs/evms/evms-2.5.0.ebuild
+++ b/sys-fs/evms/evms-2.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.0.ebuild,v 1.1 2004/12/28 04:17:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.1.ebuild,v 1.1 2005/02/05 10:00:28 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,6 +17,7 @@ IUSE="ncurses gtk"
 DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	sys-libs/device-mapper
+	>=sys-apps/baselayout-1.9.4-r6
 	gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
 
@@ -74,14 +75,6 @@ src_install() {
 		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms2-init evms
-
 	# Needed for bug #51252
 	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
 }
-
-pkg_postinst() {
-	ewarn "Presently gentoo-sources-2.4.22 has basic support for evms2,"
-	ewarn "but does NOT support some of the more advanced features."
-}
diff --git a/sys-fs/evms/files/digest-evms-2.2.2 b/sys-fs/evms/files/digest-evms-2.2.2
deleted file mode 100644
index 31cca8633d48..000000000000
--- a/sys-fs/evms/files/digest-evms-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa82dc24a068b2313f06daf99ea6a241 evms-2.2.2.tar.gz 1838443
diff --git a/sys-fs/evms/files/digest-evms-2.3.2-r1 b/sys-fs/evms/files/digest-evms-2.3.2-r1
deleted file mode 100644
index ec3ba5531049..000000000000
--- a/sys-fs/evms/files/digest-evms-2.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69212549a2edc2b350bad3b00b2fd083 evms-2.3.2.tar.gz 1772181
diff --git a/sys-fs/evms/files/digest-evms-2.4.0 b/sys-fs/evms/files/digest-evms-2.4.0
deleted file mode 100644
index ca22ca27dcac..000000000000
--- a/sys-fs/evms/files/digest-evms-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50be066be9c23774663605187f99b9ff evms-2.4.0.tar.gz 2178515
diff --git a/sys-fs/evms/files/digest-evms-2.5.0 b/sys-fs/evms/files/digest-evms-2.5.0
deleted file mode 100644
index 52a9638245ac..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d6fb5bcc3ce93784fc47ae75e24a77c evms-2.5.0.tar.gz 2231591
diff --git a/sys-fs/evms/files/digest-evms-2.5.1 b/sys-fs/evms/files/digest-evms-2.5.1
new file mode 100644
index 000000000000..d9880a71d609
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.5.1
@@ -0,0 +1 @@
+MD5 c718d22890e308e8c10618e416ab10b6 evms-2.5.1.tar.gz 2232981