new revision

Package-Manager: portage-2.1_pre5-r2

4 files changed, 25 insertions, 11 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 1c58e81e8eb2..a91fb87d6514 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.65 2006/03/04 15:00:35 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.66 2006/03/04 15:22:20 humpback Exp $
+
+*jabberd-1.4.4-r2 (04 Mar 2006)
+
+  04 Mar 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-1.4.4-r1.ebuild, +jabberd-1.4.4-r2.ebuild:
+  New revision, lets see if it clears #124906
 
 *jabberd-1.4.4-r1 (04 Mar 2006)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 8e55575e933f..ada4ee35dce8 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,6 +1,6 @@
-MD5 964ea79df014abce7854cfaac3bae76a ChangeLog 10562
-RMD160 8c11b898bf4252038572863a1d838484c0baea78 ChangeLog 10562
-SHA256 b70262920c7c2f8627f619540ea849935f9fce6ad1dc4a9a8f1a7da44f1ab4d6 ChangeLog 10562
+MD5 3e41bdaf73a08739f564b59fe8704971 ChangeLog 10753
+RMD160 242ef8d7a02bff46e57135a7793cbd811a59933e ChangeLog 10753
+SHA256 544313fc7cd4a37508a66736b1a3d1d239648ad5d64ca95226fb139670f44be5 ChangeLog 10753
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 files/README.Gentoo 984
 SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726 files/README.Gentoo 984
@@ -10,9 +10,9 @@ SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/di
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 RMD160 3f5222d7c706f069b3623ee2f5c7f5034869a741 files/digest-jabberd-1.4.3-r5 201
 SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/digest-jabberd-1.4.3-r5 201
-MD5 2b34306b5a0ea105e676d8153ad5cffe files/digest-jabberd-1.4.4-r1 479
-RMD160 372a5404f4e693a24960ac5c16330fe9026614d6 files/digest-jabberd-1.4.4-r1 479
-SHA256 63ec9adfe431cd468b8cde2b364a2fd36a60657b8280c234d2c04e9bd2dd764a files/digest-jabberd-1.4.4-r1 479
+MD5 2b34306b5a0ea105e676d8153ad5cffe files/digest-jabberd-1.4.4-r2 479
+RMD160 372a5404f4e693a24960ac5c16330fe9026614d6 files/digest-jabberd-1.4.4-r2 479
+SHA256 63ec9adfe431cd468b8cde2b364a2fd36a60657b8280c234d2c04e9bd2dd764a files/digest-jabberd-1.4.4-r2 479
 MD5 8524e0a5eec488ceb069462f4650cf1b files/digest-jabberd-2.0.10 66
 RMD160 8d772c60a5ef7ed469d9a2e9f33939427d64a4e2 files/digest-jabberd-2.0.10 66
 SHA256 aa25128fea5986576fe926dba3b8b1aaedd757e50d6af3a0fae73511bf4dad08 files/digest-jabberd-2.0.10 66
@@ -70,9 +70,9 @@ SHA256 0e32280f8d04636ab8c1f65258ee3aafeeb6f768a6ef8694b5c01aaefa70cf45 jabberd-
 MD5 798d2dd93ed39fc9c20919226a8d51b1 jabberd-1.4.3-r5.ebuild 5844
 RMD160 fbb8d5f1acd14506cb5c492104f2c597d48141db jabberd-1.4.3-r5.ebuild 5844
 SHA256 0dd37505e8a27d4825756197c13f6693b6bda7c2d110a3a6f16e0720dd667078 jabberd-1.4.3-r5.ebuild 5844
-MD5 ed371d2cb23015506632a094d555dca7 jabberd-1.4.4-r1.ebuild 4260
-RMD160 7aa1549c6c41e70f4a73342b6ca9c54d497c6ac3 jabberd-1.4.4-r1.ebuild 4260
-SHA256 92367c24cf98f084da2ccaeca354b71494089e987be9b2c0f15ae67813aff8e9 jabberd-1.4.4-r1.ebuild 4260
+MD5 8f8b1a480e1ef4ecf382be3e5a44c7f5 jabberd-1.4.4-r2.ebuild 4563
+RMD160 8bc7369843dab79e855d5be4fcf0236214dfd443 jabberd-1.4.4-r2.ebuild 4563
+SHA256 50611507bd45229ac581c9e3790d86b43b051b16ef69907ef99c12a9c6323064 jabberd-1.4.4-r2.ebuild 4563
 MD5 fca62ce7966e503d26de97e498881323 jabberd-2.0.10.ebuild 3493
 RMD160 c4277ffbc4c89fda31a7bd3e3b639b7784376787 jabberd-2.0.10.ebuild 3493
 SHA256 e3ed8681a7cfbd8495cb4c6f7083fc75ab8bda3d06ce309ca6e70e460c894a60 jabberd-2.0.10.ebuild 3493
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.4-r1 b/net-im/jabberd/files/digest-jabberd-1.4.4-r2
index 9239dca0546d..9239dca0546d 100644
--- a/net-im/jabberd/files/digest-jabberd-1.4.4-r1
+++ b/net-im/jabberd/files/digest-jabberd-1.4.4-r2
diff --git a/net-im/jabberd/jabberd-1.4.4-r1.ebuild b/net-im/jabberd/jabberd-1.4.4-r2.ebuild
index ac3aa7f5607f..722a28c315e6 100644
--- a/net-im/jabberd/jabberd-1.4.4-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r1.ebuild,v 1.1 2006/03/04 15:00:35 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r2.ebuild,v 1.1 2006/03/04 15:22:20 humpback Exp $
 
 inherit eutils
 
@@ -85,6 +85,14 @@ src_install() {
 	dosed 's/\/var\/lib\/spool\/jabberd/\/var\/spool\/jabber/g' /etc/jabber/jabber.xml.dist
 	dosed 's/\/var\/lib\/log\/jabberd/\/var\/log\/jabber/g' /etc/jabber/jabber.xml.dist
 	dosed 's/\/var\/lib\/run\/jabberd/\/var\/run\/jabber/g' /etc/jabber/jabber.xml.dist
+	dosed 's/jabber.pid/jabberd14.pid/g' /etc/jabber/jabber.xml
+	dosed 's/jabber.pid/jabberd14.pid/g' /etc/jabber/jabber.xml.dist
+
+	#Change the config file to the older name
+
+	mv ${D}/etc/jabber/jabber.xml ${D}/etc/jabber/multiple.xml
+	mv ${D}/etc/jabber/jabber.xml.dist ${D}/etc/jabber/multiple.xml.dist
+
 	}
 
 pkg_postinst() {