version bump, and initscript fix (the stop function was calling the absent evms_deactivate, which apparently doesn't need to exist)

6 files changed, 101 insertions, 16 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index a39eb493c703..6f9c8e1f3452 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/evms
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.5 2003/12/22 16:50:28 iggy Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.6 2004/01/24 08:37:30 seemant Exp $
+
+*evms-2.2.2 (24 Jan 2004)
+
+  24 Jan 2004; Seemant Kulleen <seemant@gentoo.org> evms-2.2.1.ebuild,
+  evms-2.2.2.ebuild, files/evms2-init:
+  version bump, and initscript fix (the stop function was calling the absent
+  evms_deactivate, which apparently doesn't need to exist)
 
   22 Dec 2003; Brian Jackson <iggy@gentoo.org> evms-2.1.1.ebuild,
   evms-2.2.1.ebuild:
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 7f69eb5e6470..246b01fcfb98 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,10 +1,12 @@
 MD5 1b51bf14fd8e6afcff2ebce354720a51 evms-1.2.1-r1.ebuild 1994
+MD5 f5ccbde8be9c47ab27146e16743f5b81 evms-2.2.2.ebuild 2056
 MD5 3fc8eb3a3af280f6d3bdd8a6084514ed evms-2.1.1.ebuild 2428
 MD5 90166c2b0ca156bc7d0499e51dded6eb ChangeLog 3409
-MD5 082ac7d439e15663a518a7c6eeb8950b evms-2.2.1.ebuild 2133
+MD5 f5ccbde8be9c47ab27146e16743f5b81 evms-2.2.1.ebuild 2056
 MD5 4ab6cd8fbc16df61b759d8a1b4ab8ae6 metadata.xml 435
 MD5 cd670e457535a10c1c329aea559f7696 files/digest-evms-1.2.1-r1 63
 MD5 91353d131bc33bd047c4ae2e263895ed files/digest-evms-2.1.1 129
 MD5 f5f06dba52196ddf3ebedf916f7c6f97 files/digest-evms-2.2.1 63
+MD5 bbf4b9e76bc984677b897fe19c107185 files/digest-evms-2.2.2 63
 MD5 d4808be7c9cf9f68c724cd9a6c2b0058 files/evms2-init 369
 MD5 8f1eecefba4d91d0f4b06cb099ac9034 files/evms-init 1018
diff --git a/sys-fs/evms/evms-2.2.1.ebuild b/sys-fs/evms/evms-2.2.1.ebuild
index bd56c72e45d2..d93173b2d5ef 100644
--- a/sys-fs/evms/evms-2.2.1.ebuild
+++ b/sys-fs/evms/evms-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.2.1.ebuild,v 1.3 2003/12/22 16:50:28 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.2.1.ebuild,v 1.4 2004/01/24 08:37:30 seemant Exp $
 
 IUSE="ncurses gtk"
 
@@ -26,11 +26,9 @@ src_compile() {
 	use ncurses || excluded_interfaces="--disable-text-mode"
 	use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
 
-	./configure \
-		--prefix=/usr \
+	econf \
 		--libdir=/lib \
 		--sbindir=/sbin \
-		--mandir=/usr/share/man \
 		--includedir=/usr/include \
 		${excluded_interfaces} || die "Failed configure"
 	emake || die "Failed emake"
@@ -38,7 +36,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die "Make install died"
-	dodoc ChangeLog COPYING TERMINOLOGY PLUGIN.IDS INSTALL INSTALL.HA INSTALL.initrd
+	dodoc ChangeLog COPYING TERMINOLOGY PLUGIN.IDS INSTALL*
 
 	# move static libraries to /usr/lib
 	dodir /usr/lib
@@ -76,7 +74,6 @@ src_install() {
 
 pkg_postinst() {
 
-	ewarn "Presently gentoo-sources-2.4.22 has basic support for evms2, but doesn't"
-	ewarn "support some of the more advanced features."
-
+	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.2.2.ebuild b/sys-fs/evms/evms-2.2.2.ebuild
new file mode 100644
index 000000000000..cdf542a6c57c
--- /dev/null
+++ b/sys-fs/evms/evms-2.2.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/01/24 08:37:30 seemant Exp $
+
+IUSE="ncurses gtk"
+
+inherit eutils
+
+DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.sourceforge.net/projects/evms"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 -amd64 -ppc -sparc -alpha -arm -hppa -mips"
+
+#EVMS uses libuuid from e2fsprogs
+DEPEND="virtual/glibc
+	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
+
+	# realize these symlinks now so they get included
+	cd ${D}/lib
+	rm -f libdlist.so libevms.so
+	ln -sf libevms-${PV}.so libevms.so.1
+	ln -sf libevms.so.1 libevms.so
+	ln -sf libdlist-1.0.so libdlist.so.1
+	ln -sf libdlist.so.1 libdlist.so
+
+	# the gtk+ frontend should live in /usr/sbin
+	if [ -n "`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."
+}
diff --git a/sys-fs/evms/files/digest-evms-2.2.2 b/sys-fs/evms/files/digest-evms-2.2.2
new file mode 100644
index 000000000000..31cca8633d48
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.2.2
@@ -0,0 +1 @@
+MD5 fa82dc24a068b2313f06daf99ea6a241 evms-2.2.2.tar.gz 1838443
diff --git a/sys-fs/evms/files/evms2-init b/sys-fs/evms/files/evms2-init
index a487bc53d617..b62b5ba074ae 100644
--- a/sys-fs/evms/files/evms2-init
+++ b/sys-fs/evms/files/evms2-init
@@ -1,16 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/files/evms2-init,v 1.1 2003/09/15 17:46:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/files/evms2-init,v 1.2 2004/01/24 08:37:30 seemant Exp $
 
 start() {
 	ebegin "Starting evms"
 	evms_activate
-	eend 0
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping evms"
-	evms_deactivate
 	eend 0
 }