Remove dependency on jabberd.

Package-Manager: portage-2.1.2.9

4 files changed, 32 insertions, 24 deletions

diff --git a/net-im/gg-transport/ChangeLog b/net-im/gg-transport/ChangeLog
index 1bae730f2f95..9be78b86b199 100644
--- a/net-im/gg-transport/ChangeLog
+++ b/net-im/gg-transport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gg-transport
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/ChangeLog,v 1.11 2006/10/24 08:01:39 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/ChangeLog,v 1.12 2007/06/12 12:31:31 nelchael Exp $
+
+  12 Jun 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/jggtrans-2.2.2-r1, gg-transport-2.2.2-r1.ebuild:
+  Remove dependency on jabberd.
 
   24 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> -files/jggtrans,
   -gg-transport-2.2.1.ebuild:
diff --git a/net-im/gg-transport/Manifest b/net-im/gg-transport/Manifest
index 6605eb979791..beac4feb1728 100644
--- a/net-im/gg-transport/Manifest
+++ b/net-im/gg-transport/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX jggtrans-2.2.2-r1 599 RMD160 84dd784978a7a502057da58f23d15d8f0449e3be SHA1 abcd0d91f7cce33e45126c97d932b23f0101c711 SHA256 642b2a212e16f3b99dc6a466f4d0a9beb79c0c9a5a1fa12156eeedab90363651
-MD5 30d8074101c68085de099488d849717b files/jggtrans-2.2.2-r1 599
-RMD160 84dd784978a7a502057da58f23d15d8f0449e3be files/jggtrans-2.2.2-r1 599
-SHA256 642b2a212e16f3b99dc6a466f4d0a9beb79c0c9a5a1fa12156eeedab90363651 files/jggtrans-2.2.2-r1 599
+AUX jggtrans-2.2.2-r1 600 RMD160 6f975836d6a42956be3360caa9ad361c109c0205 SHA1 79738b0cc26603617ac2ce6cc2814dc92ead166f SHA256 0557916f203c9ad233390867e7246e2080bc556b922b35dc815b251c3fcb9fbd
+MD5 62a77a57f1a4c481242c4006fcb09c99 files/jggtrans-2.2.2-r1 600
+RMD160 6f975836d6a42956be3360caa9ad361c109c0205 files/jggtrans-2.2.2-r1 600
+SHA256 0557916f203c9ad233390867e7246e2080bc556b922b35dc815b251c3fcb9fbd files/jggtrans-2.2.2-r1 600
 DIST jggtrans-2.2.2.tar.gz 1176462 RMD160 5e43d51ed600f09aba3b47c90d4226770f3b4cc0 SHA1 4452f94fdd848a9da7f9cf1eda4aed27cb36e940 SHA256 00a4956ec2aaf22eacb28b8af2ab0742caa3deffbd895ce86bcd76b6f604a007
-EBUILD gg-transport-2.2.2-r1.ebuild 1062 RMD160 d8f081b6403cea8b070f87d8a51307b6fdbabd35 SHA1 93998e54b4bcbeae0b5c6b067e5c5a135cb52440 SHA256 142bf96d5bafda9ad1d48d9e2daa5c55ab7788dd40942c708c3122abd283330f
-MD5 d02fe3c508174219a102dd9ba6ce5566 gg-transport-2.2.2-r1.ebuild 1062
-RMD160 d8f081b6403cea8b070f87d8a51307b6fdbabd35 gg-transport-2.2.2-r1.ebuild 1062
-SHA256 142bf96d5bafda9ad1d48d9e2daa5c55ab7788dd40942c708c3122abd283330f gg-transport-2.2.2-r1.ebuild 1062
-MISC ChangeLog 2005 RMD160 53561764338c61be4e69b42e72b17dce4fd475b7 SHA1 e305416b6d485c3cedff0c86c2465d62d2e5584d SHA256 7ea48e68a96be395442e3877e592e70b00ed8ef7539f30f4b8d741bc1f1a39f8
-MD5 c73ee5337318f4d230b8624e3bc729e7 ChangeLog 2005
-RMD160 53561764338c61be4e69b42e72b17dce4fd475b7 ChangeLog 2005
-SHA256 7ea48e68a96be395442e3877e592e70b00ed8ef7539f30f4b8d741bc1f1a39f8 ChangeLog 2005
+EBUILD gg-transport-2.2.2-r1.ebuild 1204 RMD160 b43aa385524b27ad6091a6ac6a6f3c7b78647d38 SHA1 6aeff63a962a694c26bb96089641b0ffc6e1a081 SHA256 ccf0a7baef275c74b67a565f26e9a715f548e73f05f42e705669df1d82b85c81
+MD5 6fb18f0157866dd0bbae83a803c7bb61 gg-transport-2.2.2-r1.ebuild 1204
+RMD160 b43aa385524b27ad6091a6ac6a6f3c7b78647d38 gg-transport-2.2.2-r1.ebuild 1204
+SHA256 ccf0a7baef275c74b67a565f26e9a715f548e73f05f42e705669df1d82b85c81 gg-transport-2.2.2-r1.ebuild 1204
+MISC ChangeLog 2148 RMD160 3f57951cc5bf2d81b7792aedadde6979b1f47d34 SHA1 8fc21ebf711ebfc88459259386179794dabc7fe2 SHA256 c21bb9bc9cddadf40d5587c767350e698c0d3be5541d379a2b63a48d0a12f807
+MD5 4af62f0f1ab2908bcb2d0afdfc6a5793 ChangeLog 2148
+RMD160 3f57951cc5bf2d81b7792aedadde6979b1f47d34 ChangeLog 2148
+SHA256 c21bb9bc9cddadf40d5587c767350e698c0d3be5541d379a2b63a48d0a12f807 ChangeLog 2148
 MISC metadata.xml 398 RMD160 30435a8048fb12d424512fe2ac289b80bcedf064 SHA1 74680536b9e0964ae0ff7abbba0fa8aaa32c929c SHA256 36762a51d0215661e9b8ffc9de6a61670a377e7e55a1c4e7de0c3a58b8dddfcc
 MD5 84a420a79421a67856530682145017f6 metadata.xml 398
 RMD160 30435a8048fb12d424512fe2ac289b80bcedf064 metadata.xml 398
@@ -22,9 +22,9 @@ MD5 e153e0b83d1a3dbfec500a99fcb34a99 files/digest-gg-transport-2.2.2-r1 247
 RMD160 5c674962631907bc1227b2025f4b0815e828b079 files/digest-gg-transport-2.2.2-r1 247
 SHA256 8105437af7afb5db78541a6a014dc264013da7c01c67e67b5b46ed23b1da5788 files/digest-gg-transport-2.2.2-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFPchsgo/w9rxVVVERAlnHAKCVd46C4lKlruitMmzDEhYg93Nh/wCgljJ8
-NnAlhGNc+PDGg68Jr/Z1vC0=
-=D5NN
+iD8DBQFGbpJego/w9rxVVVERAu9bAKC7qSwjXUqZ592u2GO0tb3D/Mea1QCfQ0dJ
+bsVOIaBDJzQckmr08SVIGdc=
+=ZfxT
 -----END PGP SIGNATURE-----
diff --git a/net-im/gg-transport/files/jggtrans-2.2.2-r1 b/net-im/gg-transport/files/jggtrans-2.2.2-r1
index 8d05a74cb0e2..a7dad49631fa 100644
--- a/net-im/gg-transport/files/jggtrans-2.2.2-r1
+++ b/net-im/gg-transport/files/jggtrans-2.2.2-r1
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/files/jggtrans-2.2.2-r1,v 1.1 2006/10/04 14:48:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/files/jggtrans-2.2.2-r1,v 1.2 2007/06/12 12:31:31 nelchael Exp $
 
 depend() {
-	need net jabber-server
+	after net jabber-server
 }
 
 start() {
diff --git a/net-im/gg-transport/gg-transport-2.2.2-r1.ebuild b/net-im/gg-transport/gg-transport-2.2.2-r1.ebuild
index bb61b87bb273..856f9121e147 100644
--- a/net-im/gg-transport/gg-transport-2.2.2-r1.ebuild
+++ b/net-im/gg-transport/gg-transport-2.2.2-r1.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/gg-transport/gg-transport-2.2.2-r1.ebuild,v 1.4 2006/10/24 03:30:26 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/gg-transport-2.2.2-r1.ebuild,v 1.5 2007/06/12 12:31:31 nelchael Exp $
 
 DESCRIPTION="Gadu-Gadu transport for Jabber"
 HOMEPAGE="http://jggtrans.jajcus.net/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="net-im/jabberd
+DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/glib-2.6.4
 	net-dns/libidn"
 
@@ -21,8 +21,12 @@ src_install() {
 
 	make DESTDIR="${D}" install || die "install failed"
 
-	keepdir /var/spool/jabber/gg/
+	keepdir /var/spool/jabber/gg
+	keepdir /var/run/jabber
+	keepdir /var/log/jabber
 	fowners jabber:jabber /var/spool/jabber/gg
+	fowners jabber:jabber /var/run/jabber
+	fowners jabber:jabber /var/log/jabber
 
 	newinitd ${FILESDIR}/jggtrans-${PVR} jggtrans