moved the plugins to /lib/evms, where they belong

3 files changed, 24 insertions, 15 deletions

diff --git a/sys-apps/evms/ChangeLog b/sys-apps/evms/ChangeLog
index d532ba52850f..f6cc0e2bf3c5 100644
--- a/sys-apps/evms/ChangeLog
+++ b/sys-apps/evms/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for sys-apps/evms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/ChangeLog,v 1.1 2002/04/27 07:17:49 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/ChangeLog,v 1.2 2002/04/30 17:31:06 woodchip Exp $
+
+*evms-1.0.0-r1 (30 Apr 2002)
+
+  30 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Moved the plugins to /lib/evms, where they belong.  Please unmerge the
+  older version of this package if you had it installed.
 
 *evms-1.0.0 (27 Apr 2002)
 
-  27 Apr 2002; Donny Davies <woodchip@gentoo.org> evms-1.0.0.ebuild :
+  27 Apr 2002; Donny Davies <woodchip@gentoo.org> :
 
   Made a package for IBM's Enterprise Volume Management System.
diff --git a/sys-apps/evms/evms-1.0.0.ebuild b/sys-apps/evms/evms-1.0.0-r1.ebuild
index 54d11760d0c9..d4852ce45b63 100644
--- a/sys-apps/evms/evms-1.0.0.ebuild
+++ b/sys-apps/evms/evms-1.0.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.0.0.ebuild,v 1.2 2002/04/27 16:12:01 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evms/evms-1.0.0-r1.ebuild,v 1.1 2002/04/30 17:31:06 woodchip Exp $
 
 # You need to have an evms-patched kernel source tree in /usr/src/linux
 # to build this.  Either take care of that yourself or do these steps :
 #
 #   o get a vanilla 2.4.18 kernel and unpack it in /usr/src/linux
-#   o ebuild evms-1.0.0.ebuild clean unpack
+#   o ebuild evms-1.0.0-r1.ebuild clean unpack
 #   o cd /usr/src/linux
-#   o patch -p1 < /tmp/portage/evms-1.0.0/work/evms-1.0.0/kernel/evms-1.0.0-linux-2.4.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.0/work/evms-1.0.0/kernel/evms-linux-2.4.18-common-files.patch
-#   o patch -p1 < /tmp/portage/evms-1.0.0/work/evms-1.0.0/kernel/linux-2.4.18-VFS-lock.patch
+#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/evms-1.0.0-linux-2.4.patch
+#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/evms-linux-2.4.18-common-files.patch
+#   o patch -p1 < /tmp/portage/evms-1.0.0-r1/work/evms-1.0.0/kernel/linux-2.4.18-VFS-lock.patch
 #
 # The third patch isn't totally required.  Now configure your kernel
 # and select the evms features that you want.  If you plan on using
@@ -23,12 +23,12 @@ DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
 HOMEPAGE="http://www.sourceforge.net/projects/evms"
 
 S=${WORKDIR}/${P}
-SRC_URI="http://prdownloads.sourceforge.net/evms/${P}.tar.gz"
+SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/${PN}/${P}.tar.gz"
 
 DEPEND="virtual/glibc gtk? ( =x11-libs/gtk+-1* ) ncurses? ( sys-libs/ncurses )"
 
 LICENSE="GPL"
-SLOT="1"
+SLOT="0"
 
 pkg_setup() {
 	if [ ! -f /usr/src/linux/include/linux/evms/evms.h ]
@@ -50,6 +50,7 @@ src_compile() {
 		--sbindir=/sbin \
 		--with-plugins=all \
 		--mandir=/usr/share/man \
+		--with-evmslib_dir=/lib \
 		--with-kernel=/usr/src/linux \
 		--with-interfaces=${interfaces} \
 		--host=${CHOST} || die "bad ./configure"
@@ -61,13 +62,14 @@ src_install() {
 	make -C engine DESTDIR=${D} install || die
 	dodoc CHANGES COPYING EVMS*.txt PLUGIN.IDS
 
-	# relocate the important stuff to /lib and fix the
-	# non-existant library symlinks.  i imagine this
-	# will be corrected in a future release?  hmmmm.
-	dodir /lib
-	mv ${D}/usr/lib/{libdlist-1.0.so,libevms-1.0.0.so} ${D}/lib
-	rm -f ${D}/usr/lib/{libdlist.so,libevms.so}
+	# no need for static libraries in /lib
+	dodir /usr/lib
+	mv ${D}/lib/*.a ${D}/usr/lib
+
+	# make the non-existant symlinks :/  i bet they'll fix
+	# this upstream in the near future...
 	cd ${D}/lib
+	rm -f libdlist.so libevms.so
 	ln -sf libevms-1.0.0.so libevms.so.1
 	ln -sf libevms.so.1 libevms.so
 	ln -sf libdlist-1.0.so libdlist.so.1
diff --git a/sys-apps/evms/files/digest-evms-1.0.0 b/sys-apps/evms/files/digest-evms-1.0.0-r1
index 28b34ad84b34..28b34ad84b34 100644
--- a/sys-apps/evms/files/digest-evms-1.0.0
+++ b/sys-apps/evms/files/digest-evms-1.0.0-r1