evms should start after modules and mdraid by default. If you need to change this, edit conf.d/evms. before checkroot -> before checkfs

Package-Manager: portage-2.1.3.12

6 files changed, 233 insertions, 5 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 4041e389cadf..e0ff6c249ded 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.72 2007/09/12 08:10:42 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.73 2007/10/08 22:01:17 cardoe Exp $
+
+*evms-2.5.5-r8 (08 Oct 2007)
+
+  08 Oct 2007; Doug Goldstein <cardoe@gentoo.org> +files/evms.conf-2.5.5-r8,
+  +files/evms.initd-2.5.5-r8, +evms-2.5.5-r8.ebuild:
+  evms should start after modules and mdraid by default. If you need to change
+  this, edit conf.d/evms. before checkroot -> before checkfs
 
   12 Sep 2007; Tiziano Müller <dev-zero@gentoo.org> files/evms.initd:
   Un-bash the init-script
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 2e3333fb6fea..9b6ee79180c8 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -66,10 +69,18 @@ AUX evms-2.5.5-use_disk_group.patch 1225 RMD160 7c69acdb48758c465429c56e4954214b
 MD5 baad56a65d2426219e2cfba9daf1dae7 files/evms-2.5.5-use_disk_group.patch 1225
 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e files/evms-2.5.5-use_disk_group.patch 1225
 SHA256 6ebd11a08a018a364f1155e9e961e421ecf8c96643b0253106fffe9ebf677184 files/evms-2.5.5-use_disk_group.patch 1225
+AUX evms.conf-2.5.5-r8 18 RMD160 d023eeee8746cdd4cd8fcca822257eff9d9a1528 SHA1 55714742409253b80928a0e7af436a769a462e28 SHA256 a7675581b31fd4919cd049b710232b7b651fff54a86af7a326831b26fdde3996
+MD5 7488a61e2adbc51bea9c2352cfd16d1f files/evms.conf-2.5.5-r8 18
+RMD160 d023eeee8746cdd4cd8fcca822257eff9d9a1528 files/evms.conf-2.5.5-r8 18
+SHA256 a7675581b31fd4919cd049b710232b7b651fff54a86af7a326831b26fdde3996 files/evms.conf-2.5.5-r8 18
 AUX evms.initd 659 RMD160 14c2e1f2ae98ae14bff354bbf680a18716a1915e SHA1 207bb8fcd9a3c9b831129d286b5780ba34425b19 SHA256 535b42bba0e4556f94c8854e6b9c5b373e4b4b8aebfe0291213d719d96d4c9eb
 MD5 4c8766449a2f5c9edf156e90c0aba5d2 files/evms.initd 659
 RMD160 14c2e1f2ae98ae14bff354bbf680a18716a1915e files/evms.initd 659
 SHA256 535b42bba0e4556f94c8854e6b9c5b373e4b4b8aebfe0291213d719d96d4c9eb files/evms.initd 659
+AUX evms.initd-2.5.5-r8 579 RMD160 720b7372b70dd98f9c1ce915bccc05ec38b755a1 SHA1 d4274055a2e9ced581543d60b72c819392c6b6c8 SHA256 16690dcdaf1c494cbea3e7c3ed002c639890d7d2adf629a1d6e9f3359ff296d3
+MD5 4fc47d25d6bbc57af0989d1950d19d14 files/evms.initd-2.5.5-r8 579
+RMD160 720b7372b70dd98f9c1ce915bccc05ec38b755a1 files/evms.initd-2.5.5-r8 579
+SHA256 16690dcdaf1c494cbea3e7c3ed002c639890d7d2adf629a1d6e9f3359ff296d3 files/evms.initd-2.5.5-r8 579
 AUX evms2-start.sh 384 RMD160 ab9713e9ad046c22b069229f1b99c338c1f01f21 SHA1 a73a54b8cfe8604570b5737eee143be6e44fc902 SHA256 993d7ca52936780698f46bc9fc148c326db545986baee4b0f9786264d905cb5a
 MD5 be9a8d57ec7c718e34a5841012d91d62 files/evms2-start.sh 384
 RMD160 ab9713e9ad046c22b069229f1b99c338c1f01f21 files/evms2-start.sh 384
@@ -87,10 +98,14 @@ EBUILD evms-2.5.5-r7.ebuild 5427 RMD160 d741f3bc66913bc2cff008a78238ff66842098da
 MD5 a5fb7cd4c59b6777686e5ecaf2291f2e evms-2.5.5-r7.ebuild 5427
 RMD160 d741f3bc66913bc2cff008a78238ff66842098da evms-2.5.5-r7.ebuild 5427
 SHA256 fb56c990f2b2d68816278f9ed6eb99694a74d7b58164858e8717ee56c90c3f1b evms-2.5.5-r7.ebuild 5427
-MISC ChangeLog 15007 RMD160 34af009848bd52f92a490d1bdf6df6296231d1f6 SHA1 9027d89293810be06a119995d2f01a64708bc3f7 SHA256 5d89d9f26a54e4f8cdd471d15c199302320094a01718aa757cb04100e5bcef99
-MD5 b9fa920eeb1f024ff18a9973c6f46327 ChangeLog 15007
-RMD160 34af009848bd52f92a490d1bdf6df6296231d1f6 ChangeLog 15007
-SHA256 5d89d9f26a54e4f8cdd471d15c199302320094a01718aa757cb04100e5bcef99 ChangeLog 15007
+EBUILD evms-2.5.5-r8.ebuild 5427 RMD160 74ed776f5642f67036617034f55b1f9d0e41b5a5 SHA1 71e4c76f1c36985824db6c0dd9a091471d29f535 SHA256 62bf55725bd61c49a89986e3caf61a3f59d9654a44c6fab54337f5c864b4c517
+MD5 17bfbef5fd9f23d3e47b6eedb020558c evms-2.5.5-r8.ebuild 5427
+RMD160 74ed776f5642f67036617034f55b1f9d0e41b5a5 evms-2.5.5-r8.ebuild 5427
+SHA256 62bf55725bd61c49a89986e3caf61a3f59d9654a44c6fab54337f5c864b4c517 evms-2.5.5-r8.ebuild 5427
+MISC ChangeLog 15306 RMD160 0afec8e62af1c94ef4e1dd6c230032334cc07898 SHA1 631e2650e21dc6d5c35095575fad37fc43cba9fd SHA256 f187186e8c2fb357f08c930e62af9ca9138c08c09c56393e96aa84dba8a9b3fe
+MD5 91de0d1b3604b69cb9e950350fcbd9f3 ChangeLog 15306
+RMD160 0afec8e62af1c94ef4e1dd6c230032334cc07898 ChangeLog 15306
+SHA256 f187186e8c2fb357f08c930e62af9ca9138c08c09c56393e96aa84dba8a9b3fe ChangeLog 15306
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
@@ -104,3 +119,13 @@ SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/di
 MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r7 235
 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r7 235
 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r7 235
+MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r8 235
+RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r8 235
+SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r8 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHCqi1oeSe8B0zEfwRAkDlAJ9omJlw4WKZ29r2K1t+/jH0UDiI9gCggozb
+w94RL3tEfGqzJrAV8O37cHs=
+=cny7
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/evms/evms-2.5.5-r8.ebuild b/sys-fs/evms/evms-2.5.5-r8.ebuild
new file mode 100644
index 000000000000..cacae0ce9ddc
--- /dev/null
+++ b/sys-fs/evms/evms-2.5.5-r8.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2007 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-r8.ebuild,v 1.1 2007/10/08 22:01:17 cardoe 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 ~ppc ~sparc ~x86"
+IUSE="debug gtk hb hb2 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*
+		=dev-libs/glib-1* )
+	hb? ( !hb2? ( =sys-cluster/heartbeat-1* ) )
+	hb2? ( >=sys-cluster/heartbeat-2 )
+	ncurses? ( sys-libs/ncurses
+		>=dev-libs/glib-2.12.4-r1 )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use hb && use hb2 ; then
+		ewarn "It's not possible to have support for heartbeat version 1 and 2 at the same time."
+		ewarn "Assuming  that you want heartbeat-2, if not, please do not enable the hb2 use flag."
+	fi
+}
+
+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_v2.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}/${PV}/disk_cache.patch"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-glib_dep.patch"
+	epatch "${FILESDIR}/${P}-ocfs2.patch"
+	epatch "${FILESDIR}/${P}-use_disk_group.patch"
+	epatch "${FILESDIR}/${P}-pagesize.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"
+
+	# hb2 should override hb
+	local myconf="$(use_enable hb ha) --disable-hb2"
+	use hb2 && myconf="--disable-ha --enable-hb2"
+
+	# We have to link statically against glib because evmsn resides in /sbin
+	econf \
+		--libdir=/$(get_libdir) \
+		--sbindir=/sbin \
+		--includedir=/usr/include \
+		--with-static-glib \
+		$(use_with debug) \
+		$(use_enable nls) \
+		${myconf} \
+		${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
+
+	newinitd "${FILESDIR}/evms.initd"
+}
+
+src_test() {
+	if [[ -z ${EVMS_TEST_VOLUME} ]] ; then
+		eerror "This is a volume manager and it therefore needs a volume"
+		eerror "for testing. You have to define EVMS_TEST_VOLUME as"
+		eerror "a volume evms can operate on."
+		eerror "Example: export EVMS_TEST_VOLUME=sda"
+		eerror "Note: The volume-name can not be a symlink."
+		eerror "WARNING: EVMS WILL DESTROY EVERYTHING ON IT."
+		einfo "If you don't have an empty disk, you can use the loopback-device:"
+		einfo "- Create a large file using dd (this creates a 4GB file):"
+		einfo "  dd if=/dev/zero of=/tmp/evms_test_file bs=1M count=4096"
+		einfo "- Activate a loop device on this file:"
+		einfo "  losetup /dev/loop0 /tmp/evms_test_file"
+		einfo "- export EVMS_TEST_VOLUME=loop/0"
+		einfo "The disk has to be at least 4GB!"
+		einfo "To deactivate the loop-device afterwards:"
+		einfo "- losetup -d /dev/loop0"
+		hasq userpriv ${FEATURES} && ewarn "These tests have to run as root. Disable userpriv!"
+		die "need test-volume"
+	fi
+
+	if hasq userpriv ${FEATURES} ; then
+		eerror "These tests need root privileges. Disable userpriv!"
+		die "userpriv is not supported"
+	fi
+
+	volume=$(readlink "/dev/${EVMS_TEST_VOLUME}")
+	einfo "Disabling sandbox for:"
+	einfo " - /dev/${volume:-${EVMS_TEST_VOLUME}}"
+	addwrite /dev/${volume:-${EVMS_TEST_VOLUME}}
+	einfo " - /dev/evms"
+	addwrite /dev/evms
+	einfo " - /var/lock/evms-engine"
+	addwrite /var/lock/evms-engine
+
+	cd "${S}/tests/suite"
+	PATH="${S}/ui/cli:${S}/tests:/sbin:${PATH}" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
+}
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r8 b/sys-fs/evms/files/digest-evms-2.5.5-r8
new file mode 100644
index 000000000000..33b12c6760ce
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.5.5-r8
@@ -0,0 +1,3 @@
+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/evms.conf-2.5.5-r8 b/sys-fs/evms/files/evms.conf-2.5.5-r8
new file mode 100644
index 000000000000..154aaf061243
--- /dev/null
+++ b/sys-fs/evms/files/evms.conf-2.5.5-r8
@@ -0,0 +1 @@
+RC_AFTER="mdraid"
diff --git a/sys-fs/evms/files/evms.initd-2.5.5-r8 b/sys-fs/evms/files/evms.initd-2.5.5-r8
new file mode 100755
index 000000000000..732601a28f1a
--- /dev/null
+++ b/sys-fs/evms/files/evms.initd-2.5.5-r8
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/files/evms.initd-2.5.5-r8,v 1.1 2007/10/08 22:01:18 cardoe Exp $
+
+depend() {
+	if [ -e /lib/librc.so ]; then
+		# on baselayout-1 this causes
+		# a dependency loop with checkroot (before *)
+		before checkfs
+	fi
+}
+
+start() {
+	if [ ! -e /lib/librc.so ]; then
+		eerror "The ${SVCNAME} init script is written for baselayout-2"
+		eerror "Please do not use it with baselayout-1"
+		return 1
+	fi
+
+	start_addon evms
+}