Version bump for a bugfix release. Removing old version. Added glib-1 dependency when USE=ncurses -gtk. Closes bug #83503.

(Portage version: 2.0.51.18)

7 files changed, 28 insertions, 24 deletions

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 32cc90c1b249..541f9814fbdc 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/evms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.27 2005/02/26 11:17:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.28 2005/03/04 23:48:07 eradicator Exp $
+
+*evms-2.5.2 (04 Mar 2005)
+
+  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  evms-2.3.4-r1.ebuild, -evms-2.4.1.ebuild, evms-2.5.1.ebuild,
+  +evms-2.5.2.ebuild:
+  Version bump for a bugfix release. Removing old version. Added glib-1
+  dependency when USE=ncurses -gtk. Closes bug #83503.
 
   26 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> evms-2.5.1.ebuild:
   Stable amd64, x86.
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index c4dbb9a91b4a..af2361927afc 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,12 +1,12 @@
 MD5 b9e15a58b5401ce52f0435b46f91edf5 ChangeLog 7170
 MD5 6f3337a11ad0aaa0602e5c120248c7ec evms-1.2.1-r1.ebuild 1953
+MD5 a0a4cf42cfdf0d5cf85c5af8a9d35fb1 evms-2.3.4-r1.ebuild 2240
+MD5 5a27d4544e9073af6775f23791958652 evms-2.5.2.ebuild 2148
 MD5 eab25fc0bfde7fd3c7fdf3c937fa52f6 metadata.xml 450
-MD5 7b77a37c67bf683b08172ba53f823ea4 evms-2.3.4-r1.ebuild 2211
-MD5 718003a487837565b33321494cb7e19a evms-2.5.1.ebuild 2119
-MD5 f76aadada35e2ec41b9d883f228c1f49 evms-2.4.1.ebuild 2307
+MD5 5a27d4544e9073af6775f23791958652 evms-2.5.1.ebuild 2148
 MD5 cd670e457535a10c1c329aea559f7696 files/digest-evms-1.2.1-r1 63
 MD5 634b1de02d7c1f3df88366c87f655a96 files/digest-evms-2.3.4-r1 63
+MD5 996ea6d43e86cc65954540da80e56061 files/digest-evms-2.5.2 63
 MD5 8f95e61903246ea287b1025913864ad9 files/evms-init 1000
 MD5 bef1ae81a93d9fe33c78e7883409a889 files/evms2-init 379
 MD5 c97914ac1e8937d3b2fbf71f045ac808 files/digest-evms-2.5.1 63
-MD5 eca42f6495fe088ae4a486904f270b6a files/digest-evms-2.4.1 63
diff --git a/sys-fs/evms/evms-2.3.4-r1.ebuild b/sys-fs/evms/evms-2.3.4-r1.ebuild
index d9e6127a136f..124c1bcadbea 100644
--- a/sys-fs/evms/evms-2.3.4-r1.ebuild
+++ b/sys-fs/evms/evms-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.9 2005/03/01 23:16:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.3.4-r1.ebuild,v 1.10 2005/03/04 23:48:07 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -18,7 +18,8 @@ DEPEND="virtual/libc
 	sys-fs/e2fsprogs
 	sys-fs/device-mapper
 	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses )"
+	ncurses? ( sys-libs/ncurses
+	           =dev-libs/glib-1* )"
 
 src_compile() {
 	# Bug #54856
diff --git a/sys-fs/evms/evms-2.5.1.ebuild b/sys-fs/evms/evms-2.5.1.ebuild
index 81e011e6743f..11f6e6ece25a 100644
--- a/sys-fs/evms/evms-2.5.1.ebuild
+++ b/sys-fs/evms/evms-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.1.ebuild,v 1.3 2005/03/01 23:16:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.1.ebuild,v 1.4 2005/03/04 23:48:07 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,7 +19,8 @@ DEPEND="virtual/libc
 	sys-fs/device-mapper
 	>=sys-apps/baselayout-1.9.4-r6
 	gtk? ( =x11-libs/gtk+-1* )
-	ncurses? ( sys-libs/ncurses )"
+	ncurses? ( sys-libs/ncurses
+	           =dev-libs/glib-1* )"
 
 src_compile() {
 	# Bug #54856
diff --git a/sys-fs/evms/evms-2.4.1.ebuild b/sys-fs/evms/evms-2.5.2.ebuild
index 135dabaaa525..4fb8939db438 100644
--- a/sys-fs/evms/evms-2.4.1.ebuild
+++ b/sys-fs/evms/evms-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.4.1.ebuild,v 1.3 2005/03/01 23:16:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.2.ebuild,v 1.1 2005/03/04 23:48:07 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,15 +10,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~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 )"
+	ncurses? ( sys-libs/ncurses
+	           =dev-libs/glib-1* )"
 
 src_compile() {
 	# Bug #54856
@@ -39,8 +41,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Make install died"
-	dodoc ChangeLog COPYING INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
+	make DESTDIR="${D}" install || die "Make install died"
+	dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
 
 	# install the sample configuration into the doc dir
 	dodoc ${D}/etc/evms.conf.sample
@@ -74,14 +76,6 @@ src_install() {
 		mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evms2-init evms
-
 	# Needed for bug #51252
-	dosym libevms-2.4.so.0.0 /$(get_libdir)/libevms-2.4.so.0
-}
-
-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."
+	dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
 }
diff --git a/sys-fs/evms/files/digest-evms-2.4.1 b/sys-fs/evms/files/digest-evms-2.4.1
deleted file mode 100644
index 3e981bbb0828..000000000000
--- a/sys-fs/evms/files/digest-evms-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fa2e6eb64305358e2ba4e0aeb09d58c evms-2.4.1.tar.gz 2362988
diff --git a/sys-fs/evms/files/digest-evms-2.5.2 b/sys-fs/evms/files/digest-evms-2.5.2
new file mode 100644
index 000000000000..d565bd559480
--- /dev/null
+++ b/sys-fs/evms/files/digest-evms-2.5.2
@@ -0,0 +1 @@
+MD5 5374d003f4478db737720c9b62e7cb86 evms-2.5.2.tar.gz 2235846