new version by ian, "New Ebuild (version bump) for bugs #107826, #139860 -- thanks to genstef, ColdWind"

(Portage version: 2.1.1_rc1-r2)

4 files changed, 122 insertions, 1 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index cfc837529cb8..fde1969415c4 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/dmraid
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.3 2006/06/23 13:19:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.4 2006/09/01 20:21:56 genstef Exp $
+
+  01 Sep 2006; Ian Stakenvicius <ian@syndicated-productions.com>
+  dmraid-1.0.0_rc12.ebuild:
+  Updated src_uri to match upstream's fix
+
+  01 Sep 2006; Ian Stakenvicius <ian@syndicated-productions.com>
+  +dmraid-1.0.0_rc12.ebuild, +files/dmraid-manpage-destdir.patch:
+  New Ebuild (version bump) for bugs #107826, #139860 -- thanks to genstef,
+  ColdWind; 
 
   23 Jun 2006; Simon Stelling <blubb@gentoo.org> metadata.xml:
   it's maintainer-needed, not -wanted
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild
new file mode 100644
index 000000000000..fb0bede3500f
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 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_rc12.ebuild,v 1.1 2006/09/01 20:21:56 genstef Exp $
+
+inherit linux-info flag-o-matic
+
+MY_PV=${PV/_/.}-pre1
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE="static selinux"
+
+DEPEND="sys-fs/device-mapper
+	selinux? ( sys-libs/libselinux
+		   sys-libs/libsepol )
+	genkernel? ( sys-kernel/genkernel )"
+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}/dmraid-manpage-destdir.patch
+}
+
+src_compile() {
+	#inlining doesnt seem to work for dmraid
+	filter-flags -fno-inline
+
+	econf   $(use_enable static static_link) \
+		$(use_enable selinux libselinux) \
+		$(use_enable selinux libsepol) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	# Put the distfile into /usr/share/genkernel/pkg for genkernel
+	# in case the user wants to uuse this instead of genkernel's internal version
+	dodir /usr/share/genkernel/pkg
+	cp ${DISTDIR}/${A} ${D}/usr/share/genkernel/pkg/${A}
+
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
+}
+
+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 - not 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, update"
+	einfo "the following in /etc/genkernel.conf:"
+	einfo "DMRAID_VER=\"${MY_PV/_/.}\""
+	einfo "DMRAID_SRCTAR=\"\${GK_SHARE}/pkg/${A}\""
+	ewarn " "
+	ewarn "DMRAID should be safe to use, but no warranties can be given"
+	ewarn " "
+}
diff --git a/sys-fs/dmraid/files/digest-dmraid-1.0.0_rc12 b/sys-fs/dmraid/files/digest-dmraid-1.0.0_rc12
new file mode 100644
index 000000000000..a47c240efe32
--- /dev/null
+++ b/sys-fs/dmraid/files/digest-dmraid-1.0.0_rc12
@@ -0,0 +1,3 @@
+MD5 de8e53dee0bbc928138c1c988e9b6f26 dmraid-1.0.0.rc12-pre1.tar.bz2 181529
+RMD160 af3e64637e28610aaf68bc5368a8d0a5735ef6ea dmraid-1.0.0.rc12-pre1.tar.bz2 181529
+SHA256 c49a5221683d510a51f2abc1cf5ca31a0f84fef252b1eff0659f53cc828fcb91 dmraid-1.0.0.rc12-pre1.tar.bz2 181529
diff --git a/sys-fs/dmraid/files/dmraid-manpage-destdir.patch b/sys-fs/dmraid/files/dmraid-manpage-destdir.patch
new file mode 100644
index 000000000000..eee7c45b55d5
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-manpage-destdir.patch
@@ -0,0 +1,30 @@
+--- make.tmpl.in	2006-02-17 11:18:27.000000000 -0500
++++ make.tmpl.in	2006-08-22 16:48:28.000000000 -0400
+@@ -20,22 +20,22 @@
+ LD_DEPS += @LD_DEPS@
+ SOFLAG += @SOFLAG@
+ 
+ # Setup directory variables
+ prefix = $(DESTDIR)@prefix@
+-exec_prefix = $(DESTDIR)@exec_prefix@
++exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ ifeq ("@KLIBC@", "no")
+   libdir = @libdir@
+   sbindir = @sbindir@
+   includedir = @includedir@
+-  infodir = @infodir@
+-  mandir = @mandir@
++  infodir = $(DESTDIR)@infodir@
++  mandir = $(DESTDIR)@mandir@
+ else
+   libdir = $(DESTDIR)@KLIBC_LIB_DIR@
+   sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
+   includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
+-  infodir = @infodir@
+-  mandir = @mandir@
++  infodir = $(DESTDIR)@infodir@
++  mandir = $(DESTDIR)@mandir@
+ endif
+ 
+