summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2004-01-17 18:03:58 +0000
committerAron Griffis <agriffis@gentoo.org>2004-01-17 18:03:58 +0000
commit7d7066e51876866d37eb3b59435910f475701e51 (patch)
tree0a43302bfeb00a8176e213cc88c397bcba083aaf /sys-apps/irda-utils
parentbug fixes (Manifest recommit) (diff)
downloadgentoo-2-7d7066e51876866d37eb3b59435910f475701e51.tar.gz
gentoo-2-7d7066e51876866d37eb3b59435910f475701e51.tar.bz2
gentoo-2-7d7066e51876866d37eb3b59435910f475701e51.zip
Fix bug 1797 by removing ${D}/etc/sysconfig if it is created by etc-install
Diffstat (limited to 'sys-apps/irda-utils')
-rw-r--r--sys-apps/irda-utils/ChangeLog7
-rw-r--r--sys-apps/irda-utils/irda-utils-0.9.15.ebuild9
2 files changed, 12 insertions, 4 deletions
diff --git a/sys-apps/irda-utils/ChangeLog b/sys-apps/irda-utils/ChangeLog
index b4014b41a1c0..06ee913bcb8b 100644
--- a/sys-apps/irda-utils/ChangeLog
+++ b/sys-apps/irda-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/irda-utils
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/ChangeLog,v 1.8 2003/06/12 22:09:15 msterret Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/ChangeLog,v 1.9 2004/01/17 18:03:58 agriffis Exp $
+
+ 17 Jan 2004; Aron Griffis <agriffis@gentoo.org> irda-utils-0.9.15.ebuild:
+ Fix bug 1797 by removing ${D}/etc/sysconfig if it is created by etc-install
12 Jun 2003; <msterret@gentoo.org> irda-utils-0.9.15.ebuild:
fix Header
diff --git a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
index 1ba62f6bbcf7..8d576f3c1a19 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Maintainer: Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.8 2003/09/08 08:03:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.9 2004/01/17 18:03:58 agriffis Exp $
S=${WORKDIR}/${P}
DESCRIPTION="IrDA Utilities, tools for IrDA communication"
@@ -26,6 +26,11 @@ src_install () {
make install PREFIX="${D}" ROOT="${D}" || die "Couldn't install from ${S}"
+ # irda-utils's install-etc installs files in /etc/sysconfig if
+ # that directory exists on the system, so clean up just in case.
+ # This is for bug 1797 (17 Jan 2004 agriffis)
+ rm -rf ${D}/etc/sysconfig 2>/dev/null
+
into /usr
dobin irsockets/irdaspray
dobin irsockets/ias_query