Add new ebuild with the patch from bug #230373, which builds with --as-needed and works on 64-bit arches. Mark older version -amd64 since it segfaults there.

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r5 x86_64)

3 files changed, 58 insertions, 5 deletions

diff --git a/sys-fs/diskdev_cmds/ChangeLog b/sys-fs/diskdev_cmds/ChangeLog
index dcc530c6ec56..14a9fed6b879 100644
--- a/sys-fs/diskdev_cmds/ChangeLog
+++ b/sys-fs/diskdev_cmds/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/diskdev_cmds
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/diskdev_cmds/ChangeLog,v 1.2 2007/12/08 09:30:37 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/diskdev_cmds/ChangeLog,v 1.3 2008/12/10 23:35:17 flameeyes Exp $
+
+*diskdev_cmds-332.14_p1 (10 Dec 2008)
+
+  10 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  diskdev_cmds-332.14.ebuild, +diskdev_cmds-332.14_p1.ebuild:
+  Add new ebuild with the patch from bug #230373, which builds with
+  --as-needed and works on 64-bit arches. Mark older version -amd64 since it
+  segfaults there.
 
   08 Dec 2007; Samuli Suominen <drac@gentoo.org> diskdev_cmds-332.14.ebuild:
   ~amd64 wrt #201299
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
index 19b82adb53c0..22cd2a92c785 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild,v 1.2 2007/12/08 09:30:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/diskdev_cmds/diskdev_cmds-332.14.ebuild,v 1.3 2008/12/10 23:35:17 flameeyes Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${PV}.tar
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="-amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
new file mode 100644
index 000000000000..a5c0ef49ef7c
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild,v 1.1 2008/12/10 23:35:17 flameeyes Exp $
+
+inherit eutils
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+DEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/diskdev_cmds-${PV}.patch
+}
+
+src_compile() {
+	emake -f Makefile.lnx || die "emake failed"
+}
+
+src_install() {
+	into /
+	dosbin fsck_hfs.tproj/fsck_hfs || die "dosbin fsck failed"
+	dosbin newfs_hfs.tproj/newfs_hfs || die "dosbin newfs failed"
+	dosym /sbin/newfs_hfs /sbin/mkfs.hfs || die "dosym mkfs.hfs failed"
+	dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus || die "dosym mkfs.hfsplus failed"
+	dosym /sbin/fsck_hfs /sbin/fsck.hfs || die "dosym fsck.hfs failed"
+	dosym /sbin/fsck_hfs /sbin/fsck.hfsplus || die "dosym fsck.hfsplus failed"
+	doman newfs_hfs.tproj/newfs_hfs.8 || die "doman newfs_hfs.8 failed"
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8 || die "doman mkfs.hfs.8 failed"
+	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8 || die "doman mkfs.hfsplus.8 failed"
+	doman fsck_hfs.tproj/fsck_hfs.8 || die "doman fsck_hfs.8 failed"
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8 || die "doman fsck.hfs.8 failed"
+	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8 || die "doman fsck.hfsplus.8 failed"
+}