Proxy commit, see ChangeLog for details

Package-Manager: portage-2.2_rc54-r1/cvs/Linux x86_64

4 files changed, 107 insertions, 8 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index 77506f739e07..d77708e69313 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.21 2009/09/18 14:49:12 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.22 2009/12/01 17:03:54 tommy Exp $
+
+*dmraid-1.0.0_rc16-r1 (01 Dec 2009)
+
+  01 Dec 2009; Ian Stakenvicius <ian@aerobiology.ca>
+  +dmraid-1.0.0_rc16-r1.ebuild,
+  +files/dmraid-1.0.0_rc16-return-all-sets.patch:
+  fixed bug # 275451 on rc16, thanks to devsk for the patch
 
 *dmraid-1.0.0_rc16 (18 Sep 2009)
 
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 38d72b17a09a..f9300bacefea 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX dmraid-1.0.0_rc15-devsk-isw.patch 723 RMD160 e5843d1f06eb78db37281a22571905dc8e9f3f19 SHA1 4a8029f5709c3b86ec317461721f3808075cbc52 SHA256 fa7f184b8f76812fbc379265a2e5563cf0242bdf381f8485e4ea781b7172fd43
 AUX dmraid-1.0.0_rc15-undo-p-rename.patch 531 RMD160 118b97bb99868033d37c8ce7bebb485f4600af2f SHA1 cbcc203e42894b936ce3adce0ff36eaf1ebe7edf SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670
 AUX dmraid-1.0.0_rc16-as-needed.patch 421 RMD160 0ea2eea22bfc25f6cdcd41979134d8d784238700 SHA1 16a287f21e2d73295981bb95e63e618cb83469cd SHA256 89fdaa0f393f7df7833d348a4caabaf4b64aa1893c76b575b62671c2f4531ab5
+AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 RMD160 04fceadf5893d2860e74f9966d8010e39c0939a4 SHA1 79cb330ed0576381b98544f0b7fd9a672d5ba976 SHA256 a45054960405e41ec81bfe113adbf273d5c3292897233d58500ea12305c3c7cc
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 RMD160 118b97bb99868033d37c8ce7bebb485f4600af2f SHA1 cbcc203e42894b936ce3adce0ff36eaf1ebe7edf SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670
 AUX dmraid-destdir-fix.patch 902 RMD160 8641454fcab27ff5f122e50cc1cdc4559e484692 SHA1 8dac0fd6d374cbdd490f101817677ac66dfc87ce SHA256 4a275211bd2036ceec2181e1ac1bc4d14d522cb254c81e596af6e1481db1d667
 DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
@@ -12,15 +13,16 @@ DIST dmraid-1.0.0.rc16.tar.bz2 1042907 RMD160 b5fe992f4bc2e1a0716fc0c9e689b21466
 EBUILD dmraid-1.0.0_rc14.ebuild 2209 RMD160 06b4fd23216718242e2f9c20ce2e85b243f0bb43 SHA1 f1635d2629fcb946f251fc0f28a3a85d326d22f2 SHA256 557dc539b6a138f061a1a5e27aa0395c62a225e7ae4f2fa5944e182fc347eb5f
 EBUILD dmraid-1.0.0_rc15-r1.ebuild 2316 RMD160 2448f9352973cdb0f21dbb4b68da126a93e72488 SHA1 dc5eb4af5df7d1f52581b2a802e74527e0ca4165 SHA256 34e8cd1f921df769d3d845d200503ff58cd700647d5ead09f429c0185219622a
 EBUILD dmraid-1.0.0_rc15.ebuild 2223 RMD160 69c0ff36a37bf9f683dec8bcdfb74a458f4a2ed8 SHA1 203f1c99bdf68f86aff8a017084d75be71e94346 SHA256 c85c488dc8e0b7455651722e54fe00ec5382cee373af5f198146e75187d50fef
+EBUILD dmraid-1.0.0_rc16-r1.ebuild 2444 RMD160 ae45c0969ed2a58e22d57676506078b965dbd10c SHA1 b3f8595ff7be26e12ea65f407e59a970c19fddc0 SHA256 0b5a8c63b26d0ddb28347f75cc7b94e2fa15e57ecdcaab8b9908624859a8b614
 EBUILD dmraid-1.0.0_rc16.ebuild 2396 RMD160 88ed40ecaf0c5552894aa3968019e74bc34c83d7 SHA1 b7b3fb8d15dc56aab602e18a58e0d9275d766a86 SHA256 e3361343cd286039babc862a10ab610f3a23e94c81889fa88bffff3adc91df30
-MISC ChangeLog 4452 RMD160 4ead4a45f8324ff0cf541e9ec11ac0b284480479 SHA1 4bfc05a253735407684fe5594b03b23e7bc1896d SHA256 b2da087365baa8c46ac9de1c85449382fb3c632000ef96f5ba716267e453799b
+MISC ChangeLog 4685 RMD160 5d71e6084ab158bd5e30e925fff2d01f3e30510f SHA1 0c175b2c9921858c83571e6173ca39b47b45afcd SHA256 00f254be9880955e900da4c201e806a13e81d574ee5dc7858b4ab072edf06ed7
 MISC metadata.xml 641 RMD160 0d68aa675dd3761869e561d052545cda545ad6a8 SHA1 204907c6eef47ce8dabcc8014a2158a7e5fb720f SHA256 1b896ee56e674a91567b4817566fd038f0ccf40046dd920eed13dbafb93bcc18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iJwEAQECAAYFAkqznfMACgkQG7kqcTWJkGeyhQP/ZQr0dGNhka2QCnc2QWKqpsVe
-deJW3w+kafiZnyCjhXkeH8XWq+Y77K89EzkL27fL8uJNy0bW2ppQ8tO3S7UqIcus
-YiDfpSic1eSP/9Ee8MeHqjAUbrZKROs1xV9s4C6k6at7iMlnivs46BPtStIl+M1W
-xnxy1nkiz3XHlu1FCK0=
-=+BNe
+iJwEAQECAAYFAksVTIYACgkQG7kqcTWJkGcCDAQAtuxjHpCOEbODYCadcGjgQNhb
+OEP/ZGxyzU8EnkHBHBZIHSg1VkFyqQaXHIC1PuZZlhXlrWURA0MhFMy/yl1mMQas
+eBachWfJQzaVg5YsyWTMXvexaD5qyqp56Nz26zI8qWZ9afSplgqViyD7cyHJBL7s
+g5ld2I+b+Aqy8e+ND3U=
+=hlXP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild
new file mode 100644
index 000000000000..fde3d2219838
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild,v 1.1 2009/12/01 17:03:54 tommy Exp $
+
+EAPI="2"
+
+inherit linux-info flag-o-matic
+
+MY_PV=${PV/_/.}
+
+DESCRIPTION="Device-mapper RAID tool and library"
+HOMEPAGE="http://people.redhat.com/~heinzm/sw/dmraid/"
+SRC_URI="http://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static selinux"
+
+RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
+		sys-fs/device-mapper )
+	selinux? ( sys-libs/libselinux
+		   sys-libs/libsepol )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}/${MY_PV}
+
+pkg_setup() {
+	if kernel_is lt 2 6 ; then
+		ewarn "You are using a kernel < 2.6"
+		ewarn "DMraid uses recently introduced Device-Mapper features."
+		ewarn "These might be unavailable in the kernel you are running now."
+	fi
+	if use static && use selinux ; then
+		eerror "ERROR - cannot compile static with libselinux / libsepol"
+		die "USE flag conflicts."
+	fi
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
+		"${FILESDIR}"/${P}-return-all-sets.patch \
+		"${FILESDIR}"/${PN}-destdir-fix.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
+
+	# archive the patched source for use with genkernel
+	cd "${WORKDIR}"
+	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static static_link) \
+		$(use_enable selinux libselinux) \
+		$(use_enable selinux libsepol)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/* || die "dodoc failed"
+	insinto /usr/share/${PN}
+	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 || die
+}
+
+pkg_postinst() {
+	elog "For booting Gentoo from Device-Mapper RAID you can use Genkernel."
+	elog " "
+	elog "Genkernel will generate the kernel and the initrd with a statically "
+	elog "linked dmraid binary (its own version which may not be the same as this version):"
+	elog "\t emerge -av sys-kernel/genkernel"
+	elog "\t genkernel --dmraid all"
+	elog " "
+	elog "If you would rather use this version of DMRAID with Genkernel, update the following"
+	elog "in /etc/genkernel.conf:"
+	elog "\t DMRAID_VER=\"${MY_PV}\""
+	elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
+	elog " "
+	ewarn "DMRAID should be safe to use, but no warranties can be given"
+}
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch
new file mode 100644
index 000000000000..1e6c71322498
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch
@@ -0,0 +1,11 @@
+--- a/1.0.0.rc16/lib/metadata/metadata.c	2009-11-27 21:57:50.182129589 -0800
++++ b/1.0.0.rc16/lib/metadata/metadata.c	2009-11-27 21:57:58.950964293 -0800
+@@ -839,7 +839,7 @@
+ 		 */
+ 		if (T_GROUP(rs)) {
+ 			_discover_partitions(lc, &rs->sets);
+-			return;
++			continue;
+ 		}
+ 
+ 		/*