remove lvm2-2.01.14.ebuild;Change device-mapper depend; add selinux suport; gcc patch

(Portage version: 2.0.53_rc7)

5 files changed, 53 insertions, 12 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 4a026d30441c..6376296519c2 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-fs/lvm2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.48 2005/11/02 21:01:32 rocket Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.49 2006/01/31 23:27:59 rocket Exp $
 
-  02 Nov 2005; Eric Edgar <rocket@gentoo.org> files/lvm2-stop.sh:
-  Update lvm2-stop.sh for bug 57229
+*lvm2-2.01.14-r1 (31 Jan 2006)
+
+  31 Jan 2006; Eric Edgar <rocket@gentoo.org> +files/lvm2-2.01.14.patch,
+  -lvm2-2.01.14.ebuild, +lvm2-2.01.14-r1.ebuild:
+  remove lvm2-2.01.14.ebuild;Change device-mapper depend; add selinux suport;
+  gcc patch
 
 *lvm2-2.01.14 (14 Oct 2005)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 657845bd8ac6..75f8aa1f2208 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,12 +1,13 @@
-MD5 978eac9c193536df555068459c951079 ChangeLog 8172
+MD5 93d22a66b44efe7e08e1cf1a545ffef1 ChangeLog 8314
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61
 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09-r1 61
 MD5 d1e295db9aa6771cdc6506033bc98f69 files/digest-lvm2-2.01.13 61
-MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14 61
+MD5 bd5702de4e53595969129c176cb028dc files/digest-lvm2-2.01.14-r1 61
+MD5 3216475436df8fbd33aa3ef4e2889ef8 files/lvm2-2.01.14.patch 1034
 MD5 bb8fbbf10fb41b8538aba9cafb65094b files/lvm2-start.sh 990
 MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940
 MD5 03b3cb1f6d49f4b6fe96c6ad3a9c47f0 lvm2-2.01.09-r1.ebuild 1399
 MD5 97aaa43ef70e84140f8d1b940eb73025 lvm2-2.01.09.ebuild 1277
 MD5 bfbb6af0f144e530589562ca3b79c61a lvm2-2.01.13.ebuild 1402
-MD5 b21dfc442b0736529f8950c5f2081c85 lvm2-2.01.14.ebuild 1400
+MD5 b573626a6e1a31a79ca93091e3bdcc34 lvm2-2.01.14-r1.ebuild 1537
 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250
diff --git a/sys-fs/lvm2/files/digest-lvm2-2.01.14 b/sys-fs/lvm2/files/digest-lvm2-2.01.14-r1
index 84344c21ccc9..84344c21ccc9 100644
--- a/sys-fs/lvm2/files/digest-lvm2-2.01.14
+++ b/sys-fs/lvm2/files/digest-lvm2-2.01.14-r1
diff --git a/sys-fs/lvm2/files/lvm2-2.01.14.patch b/sys-fs/lvm2/files/lvm2-2.01.14.patch
new file mode 100644
index 000000000000..049d5e8fcc39
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.01.14.patch
@@ -0,0 +1,30 @@
+Index: LVM2.2.01.14/lib/mm/pool-fast.c
+===================================================================
+--- LVM2.2.01.14.orig/lib/mm/pool-fast.c
++++ LVM2.2.01.14/lib/mm/pool-fast.c
+@@ -30,8 +30,8 @@ struct pool {
+ 	unsigned object_alignment;
+ };
+ 
+-void _align_chunk(struct chunk *c, unsigned alignment);
+-struct chunk *_new_chunk(struct pool *p, size_t s);
++static void _align_chunk(struct chunk *c, unsigned alignment);
++static struct chunk *_new_chunk(struct pool *p, size_t s);
+ 
+ /* by default things come out aligned for doubles */
+ #define DEFAULT_ALIGNMENT __alignof__ (double)
+@@ -204,12 +204,12 @@ void pool_abandon_object(struct pool *p)
+ 	p->object_alignment = DEFAULT_ALIGNMENT;
+ }
+ 
+-void _align_chunk(struct chunk *c, unsigned alignment)
++static void _align_chunk(struct chunk *c, unsigned alignment)
+ {
+ 	c->begin += alignment - ((unsigned long) c->begin & (alignment - 1));
+ }
+ 
+-struct chunk *_new_chunk(struct pool *p, size_t s)
++static struct chunk *_new_chunk(struct pool *p, size_t s)
+ {
+ 	struct chunk *c;
+ 
diff --git a/sys-fs/lvm2/lvm2-2.01.14.ebuild b/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild
index 018893329a7d..45555ac6d431 100644
--- a/sys-fs/lvm2/lvm2-2.01.14.ebuild
+++ b/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.01.14.ebuild,v 1.1 2005/10/14 02:58:05 rocket Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.01.14-r1.ebuild,v 1.1 2006/01/31 23:27:59 rocket Exp $
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
 HOMEPAGE="http://sources.redhat.com/lvm2/"
@@ -9,14 +9,20 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="readline nolvmstatic"
+IUSE="readline nolvmstatic selinux"
 
-DEPEND=">=sys-fs/device-mapper-1.01"
+DEPEND="=sys-fs/device-mapper-1.01*"
 RDEPEND="${DEPEND}
 	!sys-fs/lvm-user"
 
 S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
+inherit eutils
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+	epatch ${FILESDIR}/lvm2-2.01.14.patch
+}
 src_compile() {
 	# Static compile of lvm2 so that the install described in the handbook works
 	# http://www.gentoo.org/doc/en/lvm2.xml
@@ -27,7 +33,7 @@ src_compile() {
 	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 	use hppa && myconf="${myconf} --disable-o_direct"
 
-	econf $(use_enable readline) ${myconf}
+	econf $(use_enable readline) $(use_enable selinux) ${myconf} || die
 	emake || die "compile problem"
 }