Drop old and make it depend on jabberd2.

Package-Manager: portage-2.1.10.59/cvs/Linux x86_64

5 files changed, 13 insertions, 128 deletions

diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index 5e1cd880a37c..02353b1c0467 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/mu-conference
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.25 2012/04/05 21:19:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.26 2012/05/13 17:13:55 pacho Exp $
+
+  13 May 2012; Pacho Ramos <pacho@gentoo.org> -mu-conference-0.6.0-r1.ebuild,
+  -mu-conference-0.6.0-r2.ebuild, mu-conference-0.7.ebuild:
+  Drop old and make it depend on jabberd2.
 
   05 Apr 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   mu-conference-0.7.ebuild:
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
index b80bb255c021..2f25adc1360e 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX README.Gentoo 1483 RMD160 f3f059fc9789e4b162485f72f43dd788418cdb24 SHA1 6131ff6d57cff11ae1d875bf983d71decbf74ebc SHA256 36efdb71c2d68941fe1d26c5989064a9ed18d91e6bfd83ae884e9088a17b6159
 AUX mu-conference-0.7.init 410 RMD160 56d96e68d1715beecf6e695f8a1d9d484291cd65 SHA1 8e5c152ba6afd1138ecc208f0de96232c28e3e1a SHA256 ab08f29e14514d3705c83a7149629b2081140d7ef2f27ff49e4ca58c94742c07
@@ -8,17 +8,14 @@ AUX mu-conference-makefile.patch 430 RMD160 ca5d8b9b8a12616c1b35dae285367e99d982
 AUX muc-transport.init 529 RMD160 b9b4f46012ee5e83a4772666432ec884ce14361c SHA1 d70825a0c1397dc2877f633d496b1fbcc74be6e1 SHA256 d4f772a6c94bc19ea45b3cb6e6a92f9ac26ccddb344112053485fb0db606e9bf
 AUX muc-transport.init-r2 532 RMD160 8cfa94e0e0510044bddd07bcabcac979d45735e0 SHA1 cd6424c1a2bf8c7a1e636ba0cb9a7ff482bedb15 SHA256 359b28c8218c5f26154d2ca051031c1d37cfb36e55de8a3d71f67d66893bdab2
 AUX muctrans.xml 908 RMD160 b2ddb59e7a85651b2478b717cf5182d326f2d857 SHA1 581cdb5badb9652d99b9717b034e2a4afa534599 SHA256 66b653cc18a1738520cd012e2d71079724a34d1f84e4c3aad5e9b84d485fc6aa
-DIST mu-conference-0.6.0.tar.gz 56272 RMD160 58b9bf9354a67dda3b8f5569dfb15f47d9509f14 SHA1 cc81619378a86c6c449c4122586c353102d4876e SHA256 9cc4d95f9dd8f658f174a156b768c64e0b2f30646acdd1915e97e3d1ac8c1466
 DIST mu-conference_0.7.tar.gz 112381 RMD160 82a02434414ec3eb925959401b5c847912088e6b SHA1 eb8e21f708587a02042f425a814db6fff6e0ba7e SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35
-EBUILD mu-conference-0.6.0-r1.ebuild 1333 RMD160 b11053a28dc76a49e28357c940710d09b0551fdb SHA1 8bebd1f5f8617c2a2f1cc665f22d9f9246935d2b SHA256 9fda036da25b9e581cfdb69e10ef4ef8c5f163307ff91d791284a4a0be3fa85f
-EBUILD mu-conference-0.6.0-r2.ebuild 1400 RMD160 de3bdc00a593bac65b738e50ccb44510e45cabf3 SHA1 017544acc1b0aa1bd2252ca4b1d6f5704c4a42ba SHA256 8587fd2ca0407f3b02ef9d84a74cb17f557259b5fa25ebb4b8926af4ec8f6172
-EBUILD mu-conference-0.7.ebuild 2305 RMD160 d2f93e64c128ef0016058cef805f5aafdd21e7a4 SHA1 e00d0a8ff227ab5ffb77801c5948b112e7b4761b SHA256 dc8f484af0bcc42b3a9faab5d2916dbfb509d197b5fd6b7bd91d93024492b274
-MISC ChangeLog 4268 RMD160 dd009779d1725972ef58892f35da8d134eadbeef SHA1 1ce57ac65ebbc8dc9331e7148a43b8b43b5ef668 SHA256 b53ec64374a952bff215a2db10f47285a23abb73133dc58b056688a2c8583635
+EBUILD mu-conference-0.7.ebuild 2278 RMD160 659214557baff9ea19ede4f5f2c40e9cbd3c7075 SHA1 2fd2c161dbb6331a9381d5a59bbac9a44bdebf96 SHA256 6e0a8e8c8bec224e4ddddd65ac3734285c926a213e5ee6dc67cc92495e94a8c4
+MISC ChangeLog 4445 RMD160 8e96db5c527af54b981f13950abd90667ba6d899 SHA1 ee1278bd94c0e132750c60b1a24df45abb3dee21 SHA256 1a81acd5d6d1122d025b1739e2ddcc1cbf4d63027da4c39933c5112c04cf033d
 MISC metadata.xml 229 RMD160 4740a90b645cef4c1d88103dcd0976975216aac5 SHA1 52f7612e7107ff9bfc6125185cf506bad9bcda75 SHA256 7ed5e1bef2ffc8878b85d96cc3eadcb716f4d15368a8a43cd818292e06afe434
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk9+DFgACgkQuUQtlDBCeQKWDwCeMuAR5MQqkVEBPBrJfgnp2Wml
-UNEAn0LqjOAfrJKon/+nDOL2Ldpq6PwE
-=xZ3P
+iEYEARECAAYFAk+v69gACgkQCaWpQKGI+9SMMgCfchqgZ16UlVxbZHu98OvH0o0A
+1scAnijgG38sNuSIhNHlO5kXGro90DGw
+=LPdt
 -----END PGP SIGNATURE-----
diff --git a/net-im/mu-conference/mu-conference-0.6.0-r1.ebuild b/net-im/mu-conference/mu-conference-0.6.0-r1.ebuild
deleted file mode 100644
index 43263f5d6759..000000000000
--- a/net-im/mu-conference/mu-conference-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.6.0-r1.ebuild,v 1.13 2009/07/12 18:20:33 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="http://mu-conference.jabberstudio.org/"
-SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-SLOT="0"
-
-DEPEND="net-im/jabberd
-		>=dev-libs/glib-2.2.1"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/mu-conference-makefile.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /etc/jabber /usr/lib/jabberd /var/log/jabber/conference
-	keepdir /var/log/jabber/conference/
-
-	insinto /usr/lib/jabberd
-	doins src/mu-conference.so
-
-	insinto /etc/jabber
-	doins  ${FILESDIR}/muctrans.xml
-
-	newinitd ${FILESDIR}/muc-transport.init muc-transport
-
-	dodoc README FAQ README.jcr ${FILESDIR}/README.Gentoo
-
-	fowners jabber:jabber /var/log/jabber/conference
-
-	fperms g-x /var/log/jabber/conference
-
-	fperms g+rw /var/log/jabber/conference
-}
-
-pkg_postinst() {
-	elog
-	elog "Please read README.Gentoo in /usr/share/doc/${PF}/"
-	elog "And please notice that now muc-transport comes with a init.d script"
-	elog "dont forget to add it to your runlevel."
-	elog
-}
diff --git a/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild b/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
deleted file mode 100644
index 91f7ef01abc7..000000000000
--- a/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild,v 1.12 2009/07/12 18:20:33 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="http://mu-conference.jabberstudio.org/"
-SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-SLOT="0"
-
-DEPEND="net-im/jabberd
-		>=dev-libs/glib-2.2.1"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/mu-conference-makefile.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /etc/jabber /usr/lib/jabberd /var/log/jabber/conference
-	keepdir /var/log/jabber/conference/
-
-	insinto /usr/lib/jabberd
-	doins src/mu-conference.so
-
-	insinto /etc/jabber
-	doins  ${FILESDIR}/muctrans.xml
-
-	newconfd ${FILESDIR}/mu-conference-conf.d muc-transport
-
-	newinitd ${FILESDIR}/muc-transport.init-r2 muc-transport
-
-	dodoc README FAQ README.jcr ${FILESDIR}/README.Gentoo
-
-	fowners jabber:jabber /var/log/jabber/conference
-
-	fperms g-x /var/log/jabber/conference
-
-	fperms g+rw /var/log/jabber/conference
-}
-
-pkg_postinst() {
-	elog
-	elog "Please read README.Gentoo in /usr/share/doc/${PF}/"
-	elog "And please notice that now muc-transport comes with a init.d script"
-	elog "dont forget to add it to your runlevel."
-	elog
-}
diff --git a/net-im/mu-conference/mu-conference-0.7.ebuild b/net-im/mu-conference/mu-conference-0.7.ebuild
index d67f5492e8ba..d042c0c85fe7 100644
--- a/net-im/mu-conference/mu-conference-0.7.ebuild
+++ b/net-im/mu-conference/mu-conference-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild,v 1.3 2012/04/05 21:19:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild,v 1.4 2012/05/13 17:13:55 pacho Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 DEPEND="dev-libs/expat
 	>=dev-libs/glib-2
 	net-dns/libidn
-	|| ( net-im/jabberd net-im/jabberd2 )
+	net-im/jabberd2
 	mysql? ( virtual/mysql )"
 RDEPEND="${DEPEND}"
 IUSE="mysql"