Fix /etc installation (bug #328789).

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

4 files changed, 19 insertions, 58 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/Manifest b/app-misc/fdutils/Manifest
index 6f2041857312..4f077341a9c6 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -7,14 +7,13 @@ DIST fdutils-5.4-20020222.diff.gz 25310 RMD160 abbee8f7bc9f27cd89e73956106cf4cfa
 DIST fdutils-5.4.tar.gz 190535 RMD160 d624551da1ba198460c2b7efdaf0a15141725e37 SHA1 e81edb8438776dc6baa900168c5e557c79c3a84c SHA256 20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9
 DIST fdutils-5.5.tar.gz 222801 RMD160 3fb4c2d747d565e7311ef4f9fbedbbe819d36846 SHA1 3e7478d321ff2f9bc1f53ed09f9585e6e8ca813f SHA256 87d5bbe8094558463acc5902664c58afd794322b0ea3ab3c2ed7b362c583a48a
 EBUILD fdutils-5.4.20020222-r1.ebuild 1062 RMD160 bb3b8a73bd446448a431b1691fae46f1391aa9f5 SHA1 f5188bdba7f2e0bd5be9b5c93a0c4e64baa97d3e SHA256 54e1d03b8ed7bd67ae443738838957b42a1520b5e1ddf8ffd3cdb9d3f562c7ac
-EBUILD fdutils-5.5-r1.ebuild 1167 RMD160 26c5544025bf82461368dc66d7549b21e3565500 SHA1 4d88e3f5768c13eadb514fd62ab665438b4af6dd SHA256 e6c0696fbef87dc9d5982555ffb010faa41fe27fa4d9437f95290cb9b0016342
-EBUILD fdutils-5.5.ebuild 983 RMD160 51597deab296f684f9c0966cddba9076239850be SHA1 393e563dbd4723a99a568eb241bd65c152f7e244 SHA256 2c58e2bfbac4c3a2445f5bac1d79ed77fce9efa1c709ae5c01897a749c492fa4
-MISC ChangeLog 3344 RMD160 3617ea81d7706fc2767b17524f387be276255417 SHA1 24e01678fcaa9060ee94f7b959544e28d95bc2ab SHA256 ea6bc6adda72e97f2ff6100c001e92ba110880d311167d3cf28833dad631ae43
+EBUILD fdutils-5.5-r2.ebuild 1186 RMD160 5e31f4dca1e8d1f9cd589b20176020ea50f62eb9 SHA1 7f817491ece0a883263e235c4e1fdb468750b003 SHA256 76f7962285c04564c088195214855fa95e62f931751b2405cc0ce0cdebe6fa66
+MISC ChangeLog 3542 RMD160 d111f84abbb6be40345a58cd98e10695885b0fb4 SHA1 e7c9329f9af0b2747ae4d8990b8912504f3c0480 SHA256 f12b84f5c802ed380701548fce87c9c6686d5476e82773ea8a4c0075e5be3c04
 MISC metadata.xml 164 RMD160 dbe3031de69fe3fad413460e8e09b6eacdc6d918 SHA1 5626e640d90b48bd766991e846b1cde8ff9cc7cd SHA256 3b1b59f5a5a6e3a377f6124aa855936c20e9b883f7bbbef0210fdef022da34f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvIRAcACgkQAiZjviIA2Xjx6gCgpFKucQeaQV6w2pHDr3pT+YDQ
-n7gAoLpmoBroRrO9dHld2gB9N04WqZhh
-=qZ1m
+iEYEARECAAYFAkyJJmQACgkQAiZjviIA2Xh8wQCfXyNXVVluSpfWbmeHyof2C43h
+bHEAoN1nLSkXPeXgA6iIMH7RTF2hSaqM
+=5BHW
 -----END PGP SIGNATURE-----
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
-}