From: Tiziano Müller <dev-zero@gentoo.org>
Date: Sat, 9 Dec 2006 09:09:27 +0000 (+0000)
Subject: Corrected dependencies to fix #157497, thanks to Gour.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b584681f72f27e968b39a996cd40fedb8724302;p=gentoo.git

Corrected dependencies to fix #157497, thanks to Gour.
Package-Manager: portage-2.1.2_rc2
---

diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 621e9ac93258..572d6789242c 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -59,22 +59,14 @@ EBUILD evms-2.5.5-r1.ebuild 2527 RMD160 e2dcac6d5c5876512720a5b3ccdfee4ad1612fe3
 MD5 65b8e5021b94072f3fd8176d84ae6660 evms-2.5.5-r1.ebuild 2527
 RMD160 e2dcac6d5c5876512720a5b3ccdfee4ad1612fe3 evms-2.5.5-r1.ebuild 2527
 SHA256 1a2da02d4f60befa28048583576801919835ef6c3169f35e5631850b6f7edd72 evms-2.5.5-r1.ebuild 2527
-EBUILD evms-2.5.5-r2.ebuild 2656 RMD160 98ac734c5c90db825d3238bd298c1d58826babe0 SHA1 ee896f51660ba99dc4d5e5187fbb97226e767235 SHA256 5a48641c54f65c0a4abd36363d98cea5a84352f3c746ef3bbb7f8cba3c7fab7b
-MD5 182a516ad0696c44af57e812c9302ffc evms-2.5.5-r2.ebuild 2656
-RMD160 98ac734c5c90db825d3238bd298c1d58826babe0 evms-2.5.5-r2.ebuild 2656
-SHA256 5a48641c54f65c0a4abd36363d98cea5a84352f3c746ef3bbb7f8cba3c7fab7b evms-2.5.5-r2.ebuild 2656
-EBUILD evms-2.5.5-r3.ebuild 3145 RMD160 5abf8957778a5a655be1c2d9000786995627f795 SHA1 c0edc08361955b16766d43e1ea13ca1c3c172c14 SHA256 70ada1911c4b8410e137f8c54cf100da8fd67946995118284a06d41edb19ae0d
-MD5 322f3704366ac2fbf17a23ea16b94d88 evms-2.5.5-r3.ebuild 3145
-RMD160 5abf8957778a5a655be1c2d9000786995627f795 evms-2.5.5-r3.ebuild 3145
-SHA256 70ada1911c4b8410e137f8c54cf100da8fd67946995118284a06d41edb19ae0d evms-2.5.5-r3.ebuild 3145
-EBUILD evms-2.5.5-r4.ebuild 3282 RMD160 0ab8e46ac59042b55507dd9b17eae128b59507cc SHA1 4d38fd1376a0a63f6050f1a2690afb423a8cabc0 SHA256 0cae8b0b1e147368ead46cd211380a74c48a84f2d57f8e53a3f737dccf5e7a3d
-MD5 1d7dc35b7710e61a73e00d60db719ab7 evms-2.5.5-r4.ebuild 3282
-RMD160 0ab8e46ac59042b55507dd9b17eae128b59507cc evms-2.5.5-r4.ebuild 3282
-SHA256 0cae8b0b1e147368ead46cd211380a74c48a84f2d57f8e53a3f737dccf5e7a3d evms-2.5.5-r4.ebuild 3282
-MISC ChangeLog 12386 RMD160 597ecb1265fb07bda98daf7813a2c9a5d4eb5008 SHA1 b50f67d8f728531732eaf9b60ebcba49b9cbb420 SHA256 5a2272f1e8aac3ccd1b534cc32206bd2d44dbad94d71f5c07e67cc2c53f10c3c
-MD5 16196dc52cbddee8b572252489bccca8 ChangeLog 12386
-RMD160 597ecb1265fb07bda98daf7813a2c9a5d4eb5008 ChangeLog 12386
-SHA256 5a2272f1e8aac3ccd1b534cc32206bd2d44dbad94d71f5c07e67cc2c53f10c3c ChangeLog 12386
+EBUILD evms-2.5.5-r4.ebuild 3290 RMD160 0af1268e2ae12aa09c1e46b4cf946d378ea25f14 SHA1 019588f199a3815f0907d8c715a35100d7e3a6cc SHA256 eece88a3ccc548e9bdb63d9e17b031f7d3924b6b0e4ed2a31b8059ab80521224
+MD5 bb8b52d9c62df14db5928b42c13daf64 evms-2.5.5-r4.ebuild 3290
+RMD160 0af1268e2ae12aa09c1e46b4cf946d378ea25f14 evms-2.5.5-r4.ebuild 3290
+SHA256 eece88a3ccc548e9bdb63d9e17b031f7d3924b6b0e4ed2a31b8059ab80521224 evms-2.5.5-r4.ebuild 3290
+MISC ChangeLog 12508 RMD160 002b4639ee63a9ddc59575c9802cc8fc0a98e83f SHA1 bc19fd47bf846a6b2ff732a516322c4add54e30d SHA256 58933f4bec736c839f5fff91fd4f3f12d52487e9855fba28a33c45512fd53c65
+MD5 083e2190b68f035ee7f22400c94e3956 ChangeLog 12508
+RMD160 002b4639ee63a9ddc59575c9802cc8fc0a98e83f ChangeLog 12508
+SHA256 58933f4bec736c839f5fff91fd4f3f12d52487e9855fba28a33c45512fd53c65 ChangeLog 12508
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
@@ -82,12 +74,6 @@ SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r1 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r1 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r1 235
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r2 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r2 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r2 235
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r3 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r3 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r3 235
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r4 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r4 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r4 235
diff --git a/sys-fs/evms/evms-2.5.5-r2.ebuild b/sys-fs/evms/evms-2.5.5-r2.ebuild
deleted file mode 100644
index ef32d464a42d..000000000000
--- a/sys-fs/evms/evms-2.5.5-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r2.ebuild,v 1.2 2006/08/20 21:23:00 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-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="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ncurses gtk nls"
-
-#EVMS uses libuuid from e2fsprogs
-RDEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	sys-fs/device-mapper
-	>=sys-apps/baselayout-1.9.4-r6
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses
-	           =dev-libs/glib-1* )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}/raid5_degrade_fix.patch
-	epatch "${FILESDIR}"/${PV}/md_super_fix.patch
-	epatch "${FILESDIR}"/${PV}/raid5_remove_spare_fix.patch
-	epatch "${FILESDIR}"/${PV}/raid5_remove_spare_fix_2.patch
-	epatch "${FILESDIR}"/evms-2.5.5-as-needed.patch
-}
-
-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 \
-		$(use_enable nls) \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Make install died"
-	dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/evms2-start.sh evms-start.sh || die "rcscript addon failed"
-
-	# 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
-
-	# Needed for bug #51252
-	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
-}
diff --git a/sys-fs/evms/evms-2.5.5-r3.ebuild b/sys-fs/evms/evms-2.5.5-r3.ebuild
deleted file mode 100644
index 87bad1132cad..000000000000
--- a/sys-fs/evms/evms-2.5.5-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r3.ebuild,v 1.1 2006/12/02 11:55:45 dev-zero Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils flag-o-matic multilib toolchain-funcs autotools
-
-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="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk ncurses nls"
-
-#EVMS uses libuuid from e2fsprogs
-RDEPEND="virtual/libc
-	sys-fs/e2fsprogs
-	sys-fs/device-mapper
-	>=sys-apps/baselayout-1.9.4-r6
-	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses
-	           =dev-libs/glib-2* )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}/md_super_fix.patch"
-	epatch "${FILESDIR}/${PV}/ntfs_unmkfs.patch"
-	epatch "${FILESDIR}/${PV}/raid5_degrade_fix.patch"
-	epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix.patch"
-	epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix_2.patch"
-	epatch "${FILESDIR}/${PV}/raid5_algorithm.patch"
-	epatch "${FILESDIR}/${PV}/cli_reload_options.patch"
-	epatch "${FILESDIR}/${PV}/cli_query_segfault.patch"
-	epatch "${FILESDIR}/${PV}/get_geometry.patch"
-	epatch "${FILESDIR}/${PV}/BaseName.patch"
-
-	epatch "${FILESDIR}/evms-2.5.5-as-needed.patch"
-	epatch "${FILESDIR}/evms-2.5.5-glib_dep.patch"
-	epatch "${FILESDIR}/evms-2.5.5-ocfs2.patch"
-
-	eautoreconf
-}
-
-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 \
-		$(use_enable nls) \
-		${excluded_interfaces} || die "Failed configure"
-	emake || die "Failed emake"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Make install died"
-	dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}/evms2-start.sh" evms-start.sh || die "rcscript addon failed"
-
-	# 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
-
-	# Needed for bug #51252
-	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
-}
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r2 b/sys-fs/evms/files/digest-evms-2.5.5-r2
deleted file mode 100644
index 33b12c6760ce..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321
-RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321
-SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r3 b/sys-fs/evms/files/digest-evms-2.5.5-r3
deleted file mode 100644
index 33b12c6760ce..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321
-RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321
-SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321