Proxy commit for Ian Stakenvicius, see ChangeLog for details

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

4 files changed, 100 insertions, 5 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index 2f9cadd2eda9..1e4fc393fe26 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.18 2009/09/08 14:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.19 2009/09/09 21:02:11 tommy Exp $
+
+  08 Sep 2009; Ian Stakenvicius <ian@aerobiology.ca>
+  dmraid-1.0.0_rc14.ebuild, +dmraid-1.0.0_rc15-r1.ebuild,
+  +files/dmraid-1.0.0_rc15-devsk-isw.patch,
+  +files/dmraid-1.0.0_rc15-undo-p-rename.patch:
+  Updated SRC_URI for rc14, bumped rc15 to -r1 (for ~ppc) to apply patches to
+  fix bug #275566 and bug #275451
 
   08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   dmraid-1.0.0_rc14.ebuild:
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 3c4db8f065b7..3d311aca056d 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 DIST dmraid-1.0.0.rc15.tar.bz2 190475 RMD160 045a58855a93082a7758cfedc6f9cd4cfd91668b SHA1 3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
-EBUILD dmraid-1.0.0_rc14.ebuild 2209 RMD160 25187ea1c2e8c12187872aff599ab91f25ec93d9 SHA1 b20910b5cfb0b9399f95d0b36ceb46663efdecff SHA256 b49f80a7a583f05815ef501858c5a1df05bab75fd87a83f8e0474f8630447ecd
+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
-MISC ChangeLog 3800 RMD160 e5e783fde3f19970fb65acf818491c3df644e06c SHA1 c3266ff4294edb6e9f215c92b9be77afb2eb8fa2 SHA256 99422576ca3557fe8ea4a5a72baaf2a34de539b5e4ec769beab8254cbda5855c
+MISC ChangeLog 4112 RMD160 62745fa6123c8ebbd59614da558feb2efa1d846f SHA1 ae9fa6774037680a39864046864ad3337bda0125 SHA256 2707ed5d0a89c3bc89d58f392f184f288c61cb2178976643b70e7727c6cb6469
 MISC metadata.xml 479 RMD160 f8f87fe9d61a0765e733ceb9a8fbf64baafe75f6 SHA1 3cef4c529760bece235360f92c2492b147210a09 SHA256 1896db02215d0604a855bcb58d442124ccecf6df5d8528166398d55793bf7d6f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iJwEAQECAAYFAkqoF94ACgkQG7kqcTWJkGexdQQAuPzptqbYU1AIzOcTQ7YMKU0q
+voUzapQ3LRv6eZc4DWWXS1/OqzPHvdzupC+cZitQxoNv3m0SKDxZIorvWsxdVMY9
+vQ/U66epEatTB6qI29LkIz5up32bMakbYY3IrA0/s7OVhImLNFJ6EAqBsjllwSpD
+e329tXrs6Jb5ndWNWZY=
+=dEJQ
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
index 0ab2983d73fc..382c5c08969e 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild
@@ -1,6 +1,6 @@
 # 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_rc14.ebuild,v 1.4 2009/09/08 14:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc14.ebuild,v 1.5 2009/09/09 21:02:11 tommy Exp $
 
 inherit linux-info flag-o-matic
 
@@ -9,7 +9,7 @@ MY_P=${PN}-${MY_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/${MY_P}.tar.bz2"
+SRC_URI="http://people.redhat.com/~heinzm/sw/dmraid/src/old/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild
new file mode 100644
index 000000000000..2f96bdf969b3
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild
@@ -0,0 +1,75 @@
+# 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_rc15-r1.ebuild,v 1.1 2009/09/09 21:02:11 tommy Exp $
+
+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"
+
+DEPEND="|| ( >=sys-fs/lvm2-2.02.45
+		sys-fs/device-mapper )
+	selinux? ( sys-libs/libselinux
+		   sys-libs/libsepol )"
+RDEPEND="${DEPEND}"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-destdir-fix.patch"
+	epatch "${FILESDIR}/${P}-devsk-isw.patch"
+	epatch "${FILESDIR}/${P}-undo-p-rename.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_enable static static_link) \
+		$(use_enable selinux libselinux) \
+		$(use_enable selinux libsepol)
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/* || die "dodoc failed"
+}
+
+pkg_postinst() {
+	einfo "For booting Gentoo from Device-Mapper RAID you can use Genkernel."
+	einfo " "
+	einfo "Genkernel will generate the kernel and the initrd with a statically "
+	einfo "linked dmraid binary (its own version which may not be the same as this version):"
+	einfo "  emerge -av sys-kernel/genkernel"
+	einfo "  genkernel --dmraid --udev all"
+	einfo " "
+	einfo "If you would rather use this version of DMRAID with Genkernel, copy the distfile"
+	einfo "from your distdir to '/usr/share/genkernel/pkg/' and update the following"
+	einfo "in /etc/genkernel.conf:"
+	einfo "  DMRAID_VER=\"${MY_PV/_/.}\""
+	einfo "  DMRAID_SRCTAR=\"\${GK_SHARE}/pkg/${A}\""
+	einfo " "
+	ewarn "DMRAID should be safe to use, but no warranties can be given"
+	einfo " "
+}