Fix /etc installation (bug #328789).

(Portage version: 2.2_rc78/cvs/Linux x86_64)

3 files changed, 13 insertions, 51 deletions

diff --git a/app-misc/fdutils/ChangeLog b/app-misc/fdutils/ChangeLog
index 6d648c29ddd9..bdbabd43fdd0 100644
--- a/app-misc/fdutils/ChangeLog
+++ b/app-misc/fdutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/fdutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.24 2010/04/16 11:03:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.25 2010/09/09 18:24:17 flameeyes Exp $
+
+*fdutils-5.5-r2 (09 Sep 2010)
+
+  09 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org> -fdutils-5.5.ebuild,
+  -fdutils-5.5-r1.ebuild, +fdutils-5.5-r2.ebuild:
+  Fix /etc installation (bug #328789).
 
   16 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   fdutils-5.5-r1.ebuild:
diff --git a/app-misc/fdutils/fdutils-5.5-r1.ebuild b/app-misc/fdutils/fdutils-5.5-r2.ebuild
index b6f13775b533..2970e49f15b3 100644
--- a/app-misc/fdutils/fdutils-5.5-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5-r1.ebuild,v 1.2 2010/04/16 11:03:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5-r2.ebuild,v 1.1 2010/09/09 18:24:17 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,9 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-fs/mtools-3
+RDEPEND=">=sys-fs/mtools-3"
+
+DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
 src_unpack() {
@@ -29,16 +31,12 @@ src_compile() {
 	econf --enable-fdmount-floppy-only || die
 
 	# parallel make unsafe (bug#315577)
-	if use doc;
-	then
-		emake -j1 || die
-	else
-		emake -j1 compile || die
-	fi
+	emake -j1 $(use doc || echo compile) || die "emake failed"
 }
 
 src_install() {
 	dodoc Changelog
 	use doc && dodir /usr/share/info/
+	dodir /etc
 	emake -j1 DESTDIR="${D}" install || die
 }
diff --git a/app-misc/fdutils/fdutils-5.5.ebuild b/app-misc/fdutils/fdutils-5.5.ebuild
deleted file mode 100644
index 8facdc2f15c4..000000000000
--- a/app-misc/fdutils/fdutils-5.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5.ebuild,v 1.6 2008/09/03 08:50:52 opfer Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/"
-SRC_URI="http://fdutils.linux.lu/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=sys-fs/mtools-3
-	doc? ( virtual/texi2dvi )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# the man 4 fd manpage is better in the man-pages package, so stop it
-	# from installing
-	epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
-	epatch "${FILESDIR}/${P}-destdirfix.patch"
-}
-
-src_compile() {
-	econf --enable-fdmount-floppy-only || die
-
-	if use doc;
-	then
-		make || die
-	else
-		make compile || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog
-	use doc && dodir /usr/share/info/
-	emake -j1 DESTDIR="${D}" install || die
-}