Drop old and make it depend on jabberd2.

(Portage version: 2.1.10.59/cvs/Linux x86_64)

4 files changed, 7 insertions, 119 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/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"