Revision bump, fixes bug 331899 and bug 332737

Package-Manager: portage-2.2_rc67-r8/cvs/Linux x86_64

7 files changed, 43 insertions, 181 deletions

diff --git a/sys-fs/dmraid/ChangeLog b/sys-fs/dmraid/ChangeLog
index d77708e69313..bf3e704ae04f 100644
--- a/sys-fs/dmraid/ChangeLog
+++ b/sys-fs/dmraid/ChangeLog
@@ -1,6 +1,15 @@
 # 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.22 2009/12/01 17:03:54 tommy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/ChangeLog,v 1.23 2010/08/17 19:47:55 tommy Exp $
+
+*dmraid-1.0.0_rc16-r2 (17 Aug 2010)
+
+  17 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -dmraid-1.0.0_rc15-r1.ebuild, -dmraid-1.0.0_rc16.ebuild,
+  -dmraid-1.0.0_rc16-r1.ebuild, +dmraid-1.0.0_rc16-r2.ebuild,
+  -files/dmraid-1.0.0_rc16-as-needed.patch,
+  +files/dmraid-1.0.0_rc16-as-needed2.patch:
+  Revision bump, fixes bug 331899 and bug 332737
 
 *dmraid-1.0.0_rc16-r1 (01 Dec 2009)
 
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index f9300bacefea..dfba088455af 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -3,7 +3,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-as-needed2.patch 429 RMD160 f78e5cafba9bda8bd1d82820755752435c20dead SHA1 b430be423178b8419253b89893f308be8c6e27e7 SHA256 d66d681b126c3fbdd34a177436b6ee7f925403467b65ce688bd957cfd28560ee
 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
@@ -11,18 +11,16 @@ DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95e
 DIST dmraid-1.0.0.rc15.tar.bz2 190475 RMD160 045a58855a93082a7758cfedc6f9cd4cfd91668b SHA1 3fa1f184a497fd2cc6cefa4cb2892ffb1ede64bf SHA256 30847258b7f946ed908e79af4058bbf2c9a3791728b8231f7c490ca601566c05
 DIST dmraid-1.0.0.rc16.tar.bz2 1042907 RMD160 b5fe992f4bc2e1a0716fc0c9e689b214667982d1 SHA1 99e76332bb03c5a79406e3c8cb12b6746288635d SHA256 f849c44d041f8891c61419ddf906e6e34b44948939ae9e550be662ffc2492255
 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 4685 RMD160 5d71e6084ab158bd5e30e925fff2d01f3e30510f SHA1 0c175b2c9921858c83571e6173ca39b47b45afcd SHA256 00f254be9880955e900da4c201e806a13e81d574ee5dc7858b4ab072edf06ed7
+EBUILD dmraid-1.0.0_rc16-r2.ebuild 2673 RMD160 240238c981b1da6636ea44bf399f7490b95bb50c SHA1 851a30bb65f417716be5f65b81ba90659ca8998f SHA256 2e998793256150b29470a00a15fa9f202dde2952e659f7f00890bf09cc6d0804
+MISC ChangeLog 5041 RMD160 042e246f2f86c548dfbde5a07f2d5dbb59e969a4 SHA1 6c1e158378750f772d5dff2026875a46a1e18d44 SHA256 2232399c73bf9439d38d0fe9fadbf3c03fd814c79292cd6e00d2dac0eb35d07a
 MISC metadata.xml 641 RMD160 0d68aa675dd3761869e561d052545cda545ad6a8 SHA1 204907c6eef47ce8dabcc8014a2158a7e5fb720f SHA256 1b896ee56e674a91567b4817566fd038f0ccf40046dd920eed13dbafb93bcc18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAksVTIYACgkQG7kqcTWJkGcCDAQAtuxjHpCOEbODYCadcGjgQNhb
-OEP/ZGxyzU8EnkHBHBZIHSg1VkFyqQaXHIC1PuZZlhXlrWURA0MhFMy/yl1mMQas
-eBachWfJQzaVg5YsyWTMXvexaD5qyqp56Nz26zI8qWZ9afSplgqViyD7cyHJBL7s
-g5ld2I+b+Aqy8e+ND3U=
-=hlXP
+iJwEAQECAAYFAkxq53YACgkQG7kqcTWJkGeEOAQAmhoItf27lp9dbtDfqDbQMLcs
+2yIS0X6KtV020uNAHjIt8yOjQozMqKjvZrr80mxSgHv5c+dJBm8u+PN0LLoFsPjG
+1FV/+ZHJYb4PqIrzumJDJbEfpwY6P4DxKS4JFKVjWMSx0bFhKO+wUFKH1z1jA7md
+28dUIlAGnVkCkCojeTM=
+=rHkc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild
deleted file mode 100644
index 2f96bdf969b3..000000000000
--- a/sys-fs/dmraid/dmraid-1.0.0_rc15-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 " "
-}
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild
index fde3d2219838..1f13a162d37f 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r1.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dmraid/dmraid-1.0.0_rc16-r2.ebuild,v 1.1 2010/08/17 19:47:55 tommy Exp $
 
 EAPI="2"
 
@@ -21,7 +21,8 @@ RDEPEND="|| ( >=sys-fs/lvm2-2.02.45
 		sys-fs/device-mapper )
 	selinux? ( sys-libs/libselinux
 		   sys-libs/libsepol )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	static? ( dev-util/pkgconfig )"
 
 S=${WORKDIR}/${PN}/${MY_PV}
 
@@ -41,7 +42,14 @@ 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
+		"${FILESDIR}"/${P}-as-needed2.patch
+
+	if use static; then
+		local myflags
+		myflags=`/usr/bin/pkg-config --libs --static devmapper`
+		sed -i -e "s#^LIBS += -ldl#LIBS += -ldl $myflags#" \
+			tools/Makefile.in || die "sed failed"
+	fi
 
 	# archive the patched source for use with genkernel
 	cd "${WORKDIR}"
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16.ebuild
deleted file mode 100644
index 45f4d4a7a074..000000000000
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.ebuild,v 1.1 2009/09/18 14:49:12 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}"/${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-as-needed.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed.patch
deleted file mode 100644
index b7c0c8b4b990..000000000000
--- a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1.0.0.rc16/make.tmpl.in	2009-09-17 17:40:28.000000000 -0400
-+++ 1.0.0.rc16/make.tmpl.in.new	2009-09-17 17:52:40.000000000 -0400
-@@ -136,7 +136,7 @@
- 
- %.so: $(OBJECTS)
- 	$(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
--	-Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event
-+	-Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -ldl
- 
- $(LIB_STATIC): $(OBJECTS)
- 	$(RM) $@
\ No newline at end of file
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
new file mode 100644
index 000000000000..cf3018863ffd
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
@@ -0,0 +1,11 @@
+--- 1.0.0.rc16/make.tmpl.in	2010-08-16 10:22:32.000000000 -0400
++++ 1.0.0.rc16/make.tmpl.in	2010-08-16 10:42:49.000000000 -0400
+@@ -136,7 +136,7 @@
+ 
+ %.so: $(OBJECTS)
+ 	$(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
+-	-Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event
++	$(LDFLAGS) -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event -ldl
+ 
+ $(LIB_STATIC): $(OBJECTS)
+ 	$(RM) $@