Drop dodir from dodir/insinto combination.

(Portage version: 2.1.2.5)

4 files changed, 12 insertions, 29 deletions

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 82096ad73318..aade2b8a207c 100644
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/wildfire
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.18 2007/02/06 00:29:55 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.19 2007/04/28 20:30:16 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> wildfire-3.1.0.ebuild,
+  wildfire-3.1.1.ebuild, wildfire-3.2.0_rc2.ebuild:
+  Drop dodir from dodir/insinto combination.
 
 *wildfire-3.2.0_rc2 (06 Feb 2007)
 
diff --git a/net-im/wildfire/wildfire-3.1.0.ebuild b/net-im/wildfire/wildfire-3.1.0.ebuild
index b77674ef963b..ae160b591275 100644
--- a/net-im/wildfire/wildfire-3.1.0.ebuild
+++ b/net-im/wildfire/wildfire-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.0.ebuild,v 1.4 2006/11/22 01:43:08 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.0.ebuild,v 1.5 2007/04/28 20:30:16 swegener Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,7 +18,7 @@ IUSE="doc"
 # For transports
 PROVIDE="virtual/jabber-server"
 
-RDEPEND=" >=virtual/jre-1.5 "
+RDEPEND=">=virtual/jre-1.5"
 # Doesn't build against Java 1.6 due to changes in JDBC API
 DEPEND="net-im/jabber-base
 		=virtual/jdk-1.5*
@@ -56,27 +56,20 @@ src_compile() {
 }
 
 src_install() {
-	dodir /opt/wildfire
-
 	doinitd ${FILESDIR}/init.d/wildfire
 	doconfd ${FILESDIR}/conf.d/wildfire
 
-	dodir /opt/wildfire/conf
 	insinto /opt/wildfire/conf
 	newins target/conf/wildfire.xml wildfire.xml.sample
 
-	dodir /opt/wildfire/logs
 	keepdir /opt/wildfire/logs
 
-	dodir /opt/wildfire/lib
 	insinto /opt/wildfire/lib
 	doins target/lib/*
 
-	dodir /opt/wildfire/plugins
 	insinto /opt/wildfire/plugins
 	doins -r target/plugins/*
 
-	dodir /opt/wildfire/resources
 	insinto /opt/wildfire/resources
 	doins -r target/resources/*
 
diff --git a/net-im/wildfire/wildfire-3.1.1.ebuild b/net-im/wildfire/wildfire-3.1.1.ebuild
index eb6d9cd3f745..8087c4a43262 100644
--- a/net-im/wildfire/wildfire-3.1.1.ebuild
+++ b/net-im/wildfire/wildfire-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.1.ebuild,v 1.2 2007/02/05 23:35:29 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.1.1.ebuild,v 1.3 2007/04/28 20:30:16 swegener Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,7 +18,7 @@ IUSE="doc"
 # For transports
 PROVIDE="virtual/jabber-server"
 
-RDEPEND=" >=virtual/jre-1.5 "
+RDEPEND=">=virtual/jre-1.5"
 # Doesn't build against Java 1.6 due to changes in JDBC API
 DEPEND="net-im/jabber-base
 		=virtual/jdk-1.5*
@@ -56,27 +56,20 @@ src_compile() {
 }
 
 src_install() {
-	dodir /opt/wildfire
-
 	doinitd ${FILESDIR}/init.d/wildfire
 	doconfd ${FILESDIR}/conf.d/wildfire
 
-	dodir /opt/wildfire/conf
 	insinto /opt/wildfire/conf
 	newins target/wildfire/conf/wildfire.xml wildfire.xml.sample
 
-	dodir /opt/wildfire/logs
 	keepdir /opt/wildfire/logs
 
-	dodir /opt/wildfire/lib
 	insinto /opt/wildfire/lib
 	doins target/wildfire/lib/*
 
-	dodir /opt/wildfire/plugins
 	insinto /opt/wildfire/plugins
 	doins -r target/wildfire/plugins/*
 
-	dodir /opt/wildfire/resources
 	insinto /opt/wildfire/resources
 	doins -r target/wildfire/resources/*
 
diff --git a/net-im/wildfire/wildfire-3.2.0_rc2.ebuild b/net-im/wildfire/wildfire-3.2.0_rc2.ebuild
index 149eee24eb9b..372adb95fab8 100644
--- a/net-im/wildfire/wildfire-3.2.0_rc2.ebuild
+++ b/net-im/wildfire/wildfire-3.2.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.2.0_rc2.ebuild,v 1.2 2007/03/06 01:00:48 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.2.0_rc2.ebuild,v 1.3 2007/04/28 20:30:16 swegener Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,7 +18,7 @@ IUSE="doc"
 # For transports
 PROVIDE="virtual/jabber-server"
 
-RDEPEND=" >=virtual/jre-1.5 "
+RDEPEND=">=virtual/jre-1.5"
 # Doesn't build against Java 1.6 due to changes in JDBC API
 DEPEND="net-im/jabber-base
 		=virtual/jdk-1.5*
@@ -56,27 +56,20 @@ src_compile() {
 }
 
 src_install() {
-	dodir /opt/wildfire
-	
 	doinitd ${FILESDIR}/init.d/wildfire
 	doconfd ${FILESDIR}/conf.d/wildfire
 
-	dodir /opt/wildfire/conf
 	insinto /opt/wildfire/conf
 	newins target/wildfire/conf/wildfire.xml wildfire.xml.sample
 
-	dodir /opt/wildfire/logs
 	keepdir /opt/wildfire/logs
 
-	dodir /opt/wildfire/lib
 	insinto /opt/wildfire/lib
 	doins target/wildfire/lib/*
 
-	dodir /opt/wildfire/plugins
 	insinto /opt/wildfire/plugins
 	doins -r target/wildfire/plugins/*
 
-	dodir /opt/wildfire/resources
 	insinto /opt/wildfire/resources
 	doins -r target/wildfire/resources/*