Revision bump to include new upstream patches. Included the glib-patch provided by Jimmy Jazz (bug #152293) and the ocfs2-patch (bug #147276, thanks to Brad Plant). Solved bug #147281 and #154924. Dropped old version.

Package-Manager: portage-2.1.2_rc2

3 files changed, 47 insertions, 120 deletions

diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index a70ec21e6e01..0e8a74a95f17 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,10 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 2.5.5/BaseName.patch 1109 RMD160 922e523aa410d438dc6a676e15aed823606f2c3e SHA1 b683e95ced4adb7b051fd3424ac7ff378f9c9b22 SHA256 55db771bb69320ad39baee9edf11a36f18e9f815b66195c0acb413d06e71bd8a
+MD5 e0af09fee4898e9ae63e1902f116c18a files/2.5.5/BaseName.patch 1109
+RMD160 922e523aa410d438dc6a676e15aed823606f2c3e files/2.5.5/BaseName.patch 1109
+SHA256 55db771bb69320ad39baee9edf11a36f18e9f815b66195c0acb413d06e71bd8a files/2.5.5/BaseName.patch 1109
+AUX 2.5.5/cli_query_segfault.patch 1255 RMD160 d156c4ce75c3a5270e3964a06b0bcb7f8ba2ae4d SHA1 487c78f8e08eb7ae0bfeee732aedcf884a099575 SHA256 f1427baf8aa6abd1ef0e340da286d28b597d7bad313caa7541bfe8980a476dd7
+MD5 4d0610bd1f8b70bc477ccb2376f1a6f5 files/2.5.5/cli_query_segfault.patch 1255
+RMD160 d156c4ce75c3a5270e3964a06b0bcb7f8ba2ae4d files/2.5.5/cli_query_segfault.patch 1255
+SHA256 f1427baf8aa6abd1ef0e340da286d28b597d7bad313caa7541bfe8980a476dd7 files/2.5.5/cli_query_segfault.patch 1255
+AUX 2.5.5/cli_reload_options.patch 542 RMD160 e9a6be80b7fe665cbc58e5538a36fd09615fe3e8 SHA1 9abc5bee789d1920597d82b924747fa4b71f4441 SHA256 6d824343f2675dbf1a9ae0a8e211a913c1a8d22b95c712a113c729433046bc57
+MD5 9daa792a87326c97077dccd007ac9af7 files/2.5.5/cli_reload_options.patch 542
+RMD160 e9a6be80b7fe665cbc58e5538a36fd09615fe3e8 files/2.5.5/cli_reload_options.patch 542
+SHA256 6d824343f2675dbf1a9ae0a8e211a913c1a8d22b95c712a113c729433046bc57 files/2.5.5/cli_reload_options.patch 542
+AUX 2.5.5/get_geometry.patch 1230 RMD160 7ee1fe8344a5d8154d2916baa7cfdd9506f8e4b9 SHA1 10bfc8d74c5768d1ce516aadcf92c611f26b2ead SHA256 86e1fba9bfcf0ab2aecaec29945df57ed482c26497bb795c1d30418be9956922
+MD5 2122d3cb2374153f2569f05d14fdee13 files/2.5.5/get_geometry.patch 1230
+RMD160 7ee1fe8344a5d8154d2916baa7cfdd9506f8e4b9 files/2.5.5/get_geometry.patch 1230
+SHA256 86e1fba9bfcf0ab2aecaec29945df57ed482c26497bb795c1d30418be9956922 files/2.5.5/get_geometry.patch 1230
 AUX 2.5.5/md_super_fix.patch 2618 RMD160 331da16472918dd5029fdf07b9f51378b493daa6 SHA1 566df932d383b247af8236f5f6e679d4a9997421 SHA256 ade82c9d21c14486592a1aac347361c2fd207dac9634dae9f55225c302b21f5d
 MD5 e48c5d6f6536b378e4f4d38e3187b8e7 files/2.5.5/md_super_fix.patch 2618
 RMD160 331da16472918dd5029fdf07b9f51378b493daa6 files/2.5.5/md_super_fix.patch 2618
 SHA256 ade82c9d21c14486592a1aac347361c2fd207dac9634dae9f55225c302b21f5d files/2.5.5/md_super_fix.patch 2618
+AUX 2.5.5/ntfs_unmkfs.patch 1605 RMD160 cbba9dded226d9e0b88d5320ff39986bf3ac974d SHA1 2d12347846e7c306454177032542fbbddac38064 SHA256 9f88d2ab8547bd9af95f5be5f0cf767c0d647d102e78a3b0ec17bd5a99cb803d
+MD5 5c3794821a2521dbfe2e540023bcc108 files/2.5.5/ntfs_unmkfs.patch 1605
+RMD160 cbba9dded226d9e0b88d5320ff39986bf3ac974d files/2.5.5/ntfs_unmkfs.patch 1605
+SHA256 9f88d2ab8547bd9af95f5be5f0cf767c0d647d102e78a3b0ec17bd5a99cb803d files/2.5.5/ntfs_unmkfs.patch 1605
+AUX 2.5.5/raid5_algorithm.patch 562 RMD160 8667ae00f5cb52ef2d953d31f754992252a1a22b SHA1 cd12f145df7f7690f679365bf84d515e74f5a347 SHA256 b6f826ac31143367b9faedb663f1cfa1ceef6596c0ee54058fba01c7736c10ed
+MD5 1e0739ff2aaecafd3d6355c43a1eb637 files/2.5.5/raid5_algorithm.patch 562
+RMD160 8667ae00f5cb52ef2d953d31f754992252a1a22b files/2.5.5/raid5_algorithm.patch 562
+SHA256 b6f826ac31143367b9faedb663f1cfa1ceef6596c0ee54058fba01c7736c10ed files/2.5.5/raid5_algorithm.patch 562
 AUX 2.5.5/raid5_degrade_fix.patch 1533 RMD160 0cfc05d686faf41abc5f9363c3a59833ce04811a SHA1 219c52a98f9a4bb1e6b0035f75a8c2fe122bc64c SHA256 8c2eb03ec4d18150349ca91344e5d63e9a807e3033760baae69f5110e36c2a2c
 MD5 06dd078a53af7de2b7d8b287fd91b874 files/2.5.5/raid5_degrade_fix.patch 1533
 RMD160 0cfc05d686faf41abc5f9363c3a59833ce04811a files/2.5.5/raid5_degrade_fix.patch 1533
@@ -21,6 +42,14 @@ AUX evms-2.5.5-as-needed.patch 482 RMD160 ebef1e696e0490ebd2c530909c03ec96b52dda
 MD5 19e17ea80b35e5574777ed8e42b4210a files/evms-2.5.5-as-needed.patch 482
 RMD160 ebef1e696e0490ebd2c530909c03ec96b52ddacf files/evms-2.5.5-as-needed.patch 482
 SHA256 695811a6a22a17a2d7247a7109a3d081d4b3d376f6fdce1c64f2a574b9acdf3b files/evms-2.5.5-as-needed.patch 482
+AUX evms-2.5.5-glib_dep.patch 1341 RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 SHA1 4635d1f2a873457c4db2fef06631980de8da143a SHA256 5320524979a3a22490854ef8289c4f363dfb8dd5a09a64b2ff8fa5b29dfc79bf
+MD5 03cd65ccd0b2d5a07ec56cb8631ac769 files/evms-2.5.5-glib_dep.patch 1341
+RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 files/evms-2.5.5-glib_dep.patch 1341
+SHA256 5320524979a3a22490854ef8289c4f363dfb8dd5a09a64b2ff8fa5b29dfc79bf files/evms-2.5.5-glib_dep.patch 1341
+AUX evms-2.5.5-ocfs2.patch 634 RMD160 03cffc2ca996ac64b93b020fd49f3e18232b1091 SHA1 bb0e111478447382910dec5c04252b04c699f8be SHA256 e69be9be13725811d49a40cdee9c6eea7d60cea94e62129ba830e5d205b4ad53
+MD5 0b916cf6f5faaf97ed9dc149f1294382 files/evms-2.5.5-ocfs2.patch 634
+RMD160 03cffc2ca996ac64b93b020fd49f3e18232b1091 files/evms-2.5.5-ocfs2.patch 634
+SHA256 e69be9be13725811d49a40cdee9c6eea7d60cea94e62129ba830e5d205b4ad53 files/evms-2.5.5-ocfs2.patch 634
 AUX evms2-start.sh 382 RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a SHA1 0d84590bd35b9ef91d74eb55456f0b8e56079ed1 SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021
 MD5 5eb632aa94b0537e1983f935e3706d74 files/evms2-start.sh 382
 RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a files/evms2-start.sh 382
@@ -34,31 +63,24 @@ EBUILD evms-2.5.5-r2.ebuild 2656 RMD160 98ac734c5c90db825d3238bd298c1d58826babe0
 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.ebuild 2457 RMD160 7200163664f1b08384ae3bbfcc042087ef9295d7 SHA1 05d216a2424f5ba417f36ee723d9e3e506a5d268 SHA256 49483ead3b7d238d4a0ef4c10dbac228fbaaeaab88ebf07594a0e8a560caaa6d
-MD5 bba355becadbd0eac6140a1df877a772 evms-2.5.5.ebuild 2457
-RMD160 7200163664f1b08384ae3bbfcc042087ef9295d7 evms-2.5.5.ebuild 2457
-SHA256 49483ead3b7d238d4a0ef4c10dbac228fbaaeaab88ebf07594a0e8a560caaa6d evms-2.5.5.ebuild 2457
-MISC ChangeLog 11472 RMD160 fbd8d76eab96b6876c111c701c710f33f58a22e5 SHA1 574444a4ef1c56e67533cc860fd9765eb9e3b8f9 SHA256 30512d76276ea33d024679091ea1982329c2f889103dd454f707053bde1df72d
-MD5 360bc73c057fa7301ee1c2c0382e2fbe ChangeLog 11472
-RMD160 fbd8d76eab96b6876c111c701c710f33f58a22e5 ChangeLog 11472
-SHA256 30512d76276ea33d024679091ea1982329c2f889103dd454f707053bde1df72d ChangeLog 11472
-MISC metadata.xml 387 RMD160 17a7b8226f7c5ef9dd45acd6fa6c9cfe7ba6dcc2 SHA1 1f4e79e4972fd749331a9260389aef08ace8c01e SHA256 b63984a06d4d8c776e0a1bffb39f36e1835e730d2636ff2a15550b17bb52eb03
-MD5 59d559390ca6a6d365a5d6c3012c0343 metadata.xml 387
-RMD160 17a7b8226f7c5ef9dd45acd6fa6c9cfe7ba6dcc2 metadata.xml 387
-SHA256 b63984a06d4d8c776e0a1bffb39f36e1835e730d2636ff2a15550b17bb52eb03 metadata.xml 387
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5 235
+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
+MISC ChangeLog 12120 RMD160 6d8a36a99f6672ef9358b97e1eadbd078017faf0 SHA1 1641d1e3a8f8f4a8792701c84e8358f5342004c9 SHA256 fbc93a0ae01767022db427f7e90fe5d639136bf615b720493ec9e1ddccf93c1c
+MD5 7ba50d8cc94d71065f977671b006a88e ChangeLog 12120
+RMD160 6d8a36a99f6672ef9358b97e1eadbd078017faf0 ChangeLog 12120
+SHA256 fbc93a0ae01767022db427f7e90fe5d639136bf615b720493ec9e1ddccf93c1c ChangeLog 12120
+MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
+MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
+RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
+SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata.xml 383
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFE6NMCamhnQswr0vIRApuhAKCcpUJyesf2AFV89XmGGhuG8aH33QCgkt6o
-S7/FXbw5F4DyKyqz8271Jlo=
-=vntC
------END PGP SIGNATURE-----
+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
diff --git a/sys-fs/evms/evms-2.5.5.ebuild b/sys-fs/evms/evms-2.5.5.ebuild
deleted file mode 100644
index 343c715f6454..000000000000
--- a/sys-fs/evms/evms-2.5.5.ebuild
+++ /dev/null
@@ -1,92 +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.ebuild,v 1.4 2006/05/08 01:58:10 seemant Exp $
-
-inherit eutils flag-o-matic multilib
-
-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 sparc ~x86"
-IUSE="ncurses gtk"
-
-#EVMS uses libuuid from e2fsprogs
-DEPEND="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}/corrolator_race.patch
-#	epatch ${FILESDIR}/${PV}/degraded_raid.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/files/digest-evms-2.5.5 b/sys-fs/evms/files/digest-evms-2.5.5
deleted file mode 100644
index 33b12c6760ce..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.5
+++ /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