Drop dodir from dodir/insinto combination.

Package-Manager: portage-2.1.2.5

5 files changed, 32 insertions, 49 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/Manifest b/net-im/wildfire/Manifest
index 8b0b06df3eff..14e7796529e7 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -24,22 +24,22 @@ SHA256 2bc37ba293e67806a83600b46eec26625f6830fd4f0f4677c3b5636be2090c42 files/in
 DIST wildfire_src_3_1_0.tar.gz 17263810 RMD160 0643ae65b761f33ebb3fb5492f13f5d82fadd35d SHA1 e491f51c2270afb9c9924d404f11ff74318bd29f SHA256 aef071a915a127dac1d3b6f488c246e55d0be9233d53caecf79662368c757ee6
 DIST wildfire_src_3_1_1.tar.gz 13963780 RMD160 6f215f19eee92151c03b1d1c5fe0020be416a982 SHA1 9aa2a47292a1894cd2c8fa2b997e80b5eb507108 SHA256 cbe0e162e1e483adafae65ca01f42ef9a402041f6d6e90e419c0688488b7c831
 DIST wildfire_src_3_2_0_rc2.tar.gz 15272793 RMD160 6005e860d836ec7ff9b1202130b6468e95495eb8 SHA1 c854fc5be32233fa4bc020d44988ffe9302be68e SHA256 688bf3605b26493f27683fcf253efae29417143ffeb9cfb4578bf971761fa4fe
-EBUILD wildfire-3.1.0.ebuild 2527 RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b SHA1 da49e05ddec814449764c565f1bac8c0a9ad8978 SHA256 aed11d0a8a41b6136cb083b5cd8d7810f4b88dfdde572db7f741701db2db19fc
-MD5 ecf90e26796c248cb7e27107d67471a8 wildfire-3.1.0.ebuild 2527
-RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b wildfire-3.1.0.ebuild 2527
-SHA256 aed11d0a8a41b6136cb083b5cd8d7810f4b88dfdde572db7f741701db2db19fc wildfire-3.1.0.ebuild 2527
-EBUILD wildfire-3.1.1.ebuild 2586 RMD160 b2393562b6dce34350770010610ed9880302ef67 SHA1 3ff4566394e61715bb1bc7e9cef99cacfcb43b4f SHA256 e97d792e2298edc8a5d330079bd968fa40556ec792964a396d53dbc65d666f35
-MD5 e53d7d31af7f9b8c1ba8597f73e4608a wildfire-3.1.1.ebuild 2586
-RMD160 b2393562b6dce34350770010610ed9880302ef67 wildfire-3.1.1.ebuild 2586
-SHA256 e97d792e2298edc8a5d330079bd968fa40556ec792964a396d53dbc65d666f35 wildfire-3.1.1.ebuild 2586
-EBUILD wildfire-3.2.0_rc2.ebuild 2563 RMD160 47996b2ac69457ff6458d24c8269ffcba655bbd7 SHA1 bf50949e1e0a8f88d69f2699ee1c6a957c306126 SHA256 5d1f42af029d9956db911a9a9c962c337b329a7ca294bee8a142627562de2dd2
-MD5 cf4abf1f4b0ff29e546ce1ea4f6d7022 wildfire-3.2.0_rc2.ebuild 2563
-RMD160 47996b2ac69457ff6458d24c8269ffcba655bbd7 wildfire-3.2.0_rc2.ebuild 2563
-SHA256 5d1f42af029d9956db911a9a9c962c337b329a7ca294bee8a142627562de2dd2 wildfire-3.2.0_rc2.ebuild 2563
-MISC ChangeLog 4172 RMD160 814f0b28df913aad546fff581f9f82dfc59cb687 SHA1 9c2704e9cd5468d9b713a4caf66f0cfa760d4522 SHA256 54768631a290121cd7167b1cfeeb218159f3bffcd043142a2350d51c941e5205
-MD5 f10c03fedf6c72c2a84daa39aff99f6b ChangeLog 4172
-RMD160 814f0b28df913aad546fff581f9f82dfc59cb687 ChangeLog 4172
-SHA256 54768631a290121cd7167b1cfeeb218159f3bffcd043142a2350d51c941e5205 ChangeLog 4172
+EBUILD wildfire-3.1.0.ebuild 2366 RMD160 f89b74306b71fb150fc4b5f63cde20fb458d1846 SHA1 973c3991a17d11ac0466b20e821fe1d5807b932e SHA256 ce387cd9df76ca67c561dc3559751e400b6c59b1426e83b169baf0a8f062d442
+MD5 3acc714b756873ea58a07f8ec82e6a17 wildfire-3.1.0.ebuild 2366
+RMD160 f89b74306b71fb150fc4b5f63cde20fb458d1846 wildfire-3.1.0.ebuild 2366
+SHA256 ce387cd9df76ca67c561dc3559751e400b6c59b1426e83b169baf0a8f062d442 wildfire-3.1.0.ebuild 2366
+EBUILD wildfire-3.1.1.ebuild 2425 RMD160 482939e96b08aafc374a4fa13e9696f1fa5c8926 SHA1 fb944c8af5151dfae1c867f06dd7d5a9029809af SHA256 9d6ed0219e97f399532e8eadabf4927e9eaf20fa72b80a5a9c35323545a882f7
+MD5 45df53a582400e74f12520fffd9f09c8 wildfire-3.1.1.ebuild 2425
+RMD160 482939e96b08aafc374a4fa13e9696f1fa5c8926 wildfire-3.1.1.ebuild 2425
+SHA256 9d6ed0219e97f399532e8eadabf4927e9eaf20fa72b80a5a9c35323545a882f7 wildfire-3.1.1.ebuild 2425
+EBUILD wildfire-3.2.0_rc2.ebuild 2401 RMD160 9e1a71026793cb0031a46ae7d302962c0e0cef2f SHA1 ed86928b44dd838dcf209b0c4be46009da44bfa7 SHA256 4cbf9ff955bc38d5ac516874b52ac96b9ac699cf5bbab1b43ada6d40ace7bea3
+MD5 0bb901e7b14acc62818099a16fd4ef72 wildfire-3.2.0_rc2.ebuild 2401
+RMD160 9e1a71026793cb0031a46ae7d302962c0e0cef2f wildfire-3.2.0_rc2.ebuild 2401
+SHA256 4cbf9ff955bc38d5ac516874b52ac96b9ac699cf5bbab1b43ada6d40ace7bea3 wildfire-3.2.0_rc2.ebuild 2401
+MISC ChangeLog 4343 RMD160 0ae869152a60d32d70dbdc64327ea7177fbc612b SHA1 d81754362d841aa61e06e9af0e0ce32c516ff391 SHA256 cda82742762cc73459f89e8db60bdaac7d1eb1522cc439ea9d8387cfdcfc9973
+MD5 fe0d0d39c797e00c823a6feb04b09f02 ChangeLog 4343
+RMD160 0ae869152a60d32d70dbdc64327ea7177fbc612b ChangeLog 4343
+SHA256 cda82742762cc73459f89e8db60bdaac7d1eb1522cc439ea9d8387cfdcfc9973 ChangeLog 4343
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -54,9 +54,9 @@ MD5 e9b07ada9605dbc065f04ef8cc567bd8 files/digest-wildfire-3.2.0_rc2 274
 RMD160 8b4ec81463439bfa213d5e2289e563904ad236ae files/digest-wildfire-3.2.0_rc2 274
 SHA256 b17922032294a4bf72e484499a0795a521c425effe355736f4a463e38c5f4205 files/digest-wildfire-3.2.0_rc2 274
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7L1V8zY1VwezZiERAg7EAKCeTakCfUiNYFKflnIqxMQ+HkRYjgCfdS3z
-2Cj1oqRNSiL9q6/eAuHvVCI=
-=CAdV
+iD8DBQFGM67wI1lqEGTUzyQRAteUAKDUPQ8Bn26ZwvXR/kUPz782EiNn+wCgj4LZ
+USIkN+/ZUCAzx1xDk+FdJaY=
+=l4V6
 -----END PGP SIGNATURE-----
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/*