commit: 0e5dbc45bad9c39c64887428201e9e4c78d0f29c Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Mon May 2 19:18:30 2016 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Mon May 2 22:21:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5dbc45
net-im/mu-conference: #!/sbin/openrc-run instead of #!/sbin/runscript Gentoo-Bug: https://bugs.gentoo.org/573846 Package-Manager: portage-2.2.26 net-im/mu-conference/files/mu-conference-0.7.init | 2 +- net-im/mu-conference/files/muc-transport.init | 2 +- net-im/mu-conference/files/muc-transport.init-r2 | 2 +- net-im/mu-conference/mu-conference-0.7-r1.ebuild | 83 ++++++++++++++++++++ net-im/mu-conference/mu-conference-0.8-r2.ebuild | 90 ++++++++++++++++++++++ .../mu-conference/mu-conference-0.8.81-r1.ebuild | 88 +++++++++++++++++++++ 6 files changed, 264 insertions(+), 3 deletions(-) diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init index 20400ac..a41c470 100644 --- a/net-im/mu-conference/files/mu-conference-0.7.init +++ b/net-im/mu-conference/files/mu-conference-0.7.init @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run depend() { need net diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init index 39f6115..c10c0ae 100644 --- a/net-im/mu-conference/files/muc-transport.init +++ b/net-im/mu-conference/files/muc-transport.init @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run depend() { need net diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2 index 03978bd..f1d5379 100644 --- a/net-im/mu-conference/files/muc-transport.init-r2 +++ b/net-im/mu-conference/files/muc-transport.init-r2 @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run depend() { need net diff --git a/net-im/mu-conference/mu-conference-0.7-r1.ebuild b/net-im/mu-conference/mu-conference-0.7-r1.ebuild new file mode 100644 index 0000000..9b37494 --- /dev/null +++ b/net-im/mu-conference/mu-conference-0.7-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +DESCRIPTION="Multi-User Chat for jabberd" +HOMEPAGE="https://gna.org/projects/mu-conference/"; +SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"; + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc x86" +SLOT="0" + +DEPEND=" + dev-libs/expat + >=dev-libs/glib-2 + net-dns/libidn + net-im/jabberd2 + mysql? ( virtual/mysql )" +RDEPEND="${DEPEND}" +IUSE="mysql" + +S="${WORKDIR}/${PN}_${PV}" + +src_prepare() { + # Fix missing header in src/conference_user.c in order to + # make emerge happy and avoid QA notice. + sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die + + if use mysql; then + sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die + else + # Makefile is broken. Should not always link against mysql + sed -i 's/`mysql_config --libs`//' src/Makefile || die + fi + + eapply_user +} + +src_install() { + dobin src/mu-conference + fowners jabber:jabber /usr/bin/mu-conference + fperms 750 /usr/bin/mu-conference + + newinitd "${FILESDIR}/${P}".init mu-conference + + dodoc ChangeLog FAQ mu-conference.sql README + docinto scripts + dodoc scripts/* + + for i in log spool; do + dodir /var/${i}/jabber/mu-conference + keepdir /var/${i}/jabber/mu-conference + fowners jabber:jabber /var/${i}/jabber/mu-conference + fperms 770 /var/${i}/jabber/mu-conference + done + + insinto /etc/jabber + newins muc-default.xml mu-conference.xml + doins style.css + + cd "${D}/etc/jabber/" || die + sed -i \ + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \ + -e 's,./syslogs,/var/log/jabber,g' \ + -e 's,./logs,/var/log/jabber/mu-conference,g' \ + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \ + -e "s,../style.css,/etc/jabber/style.css,g" \ + -e "s,7009,5347,g" \ + mu-conference.xml || die "sed failed" +} + +pkg_postinst() { + echo + elog "For jabberd-2 connection:" + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml" + elog " match the address of your jabberd router." + elog "2. Set a common secret in mu-conference.xml and router.xml" + echo +} diff --git a/net-im/mu-conference/mu-conference-0.8-r2.ebuild b/net-im/mu-conference/mu-conference-0.8-r2.ebuild new file mode 100644 index 0000000..fa352c9 --- /dev/null +++ b/net-im/mu-conference/mu-conference-0.8-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Multi-User Chat for jabberd" +HOMEPAGE="https://gna.org/projects/mu-conference/"; +SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"; + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +SLOT="0" +IUSE="mysql" + +RDEPEND=" + dev-libs/expat + >=dev-libs/glib-2:2 + net-dns/libidn + net-im/jabberd2 + mysql? ( virtual/mysql )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${PN}_${PV} + +src_prepare() { + # Fix missing header in src/conference_user.c in order to + # make emerge happy and avoid QA notice. + sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die + + if use mysql; then + sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \ + -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die + fi + sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\ + -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\ + -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die + sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die + sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die + sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die + sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die + tc-export CC AR RANLIB + + eapply_user +} + +src_install() { + dobin src/mu-conference + fowners jabber:jabber /usr/bin/mu-conference + fperms 750 /usr/bin/mu-conference + + newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference + + dodoc ChangeLog FAQ mu-conference.sql README README.sql + docinto scripts + dodoc scripts/* + + local i + for i in log spool; do + dodir /var/${i}/jabber/mu-conference + keepdir /var/${i}/jabber/mu-conference + fowners jabber:jabber /var/${i}/jabber/mu-conference + fperms 770 /var/${i}/jabber/mu-conference + done + + insinto /etc/jabber + newins muc-default.xml mu-conference.xml + doins style.css + + sed -i \ + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \ + -e 's,./syslogs,/var/log/jabber,g' \ + -e 's,./logs,/var/log/jabber/mu-conference,g' \ + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \ + -e "s,../style.css,/etc/jabber/style.css,g" \ + -e "s,7009,5347,g" \ + "${D}"/etc/jabber/mu-conference.xml || die "sed failed" +} + +pkg_postinst() { + echo + elog "For jabberd-2 connection:" + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml" + elog " match the address of your jabberd router." + elog "2. Set a common secret in mu-conference.xml and router.xml" + echo +} diff --git a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild new file mode 100644 index 0000000..8b00445 --- /dev/null +++ b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Multi-User Chat for jabberd" +HOMEPAGE="https://gna.org/projects/mu-conference/"; +SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"; + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +SLOT="0" +IUSE="mysql" + +RDEPEND=" + dev-libs/expat + >=dev-libs/glib-2:2 + net-dns/libidn + net-im/jabberd2 + mysql? ( virtual/mysql )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + # Fix missing header in src/conference_user.c in order to + # make emerge happy and avoid QA notice. + sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die + + if use mysql; then + sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \ + -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die + fi + sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\ + -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\ + -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die + sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die + sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die + sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die + sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die + tc-export CC AR RANLIB + + eapply_user +} + +src_install() { + dobin src/mu-conference + fowners jabber:jabber /usr/bin/mu-conference + fperms 750 /usr/bin/mu-conference + + newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference + + dodoc ChangeLog FAQ mu-conference.sql README README.sql + docinto scripts + dodoc scripts/* + + local i + for i in log spool; do + dodir /var/${i}/jabber/mu-conference + keepdir /var/${i}/jabber/mu-conference + fowners jabber:jabber /var/${i}/jabber/mu-conference + fperms 770 /var/${i}/jabber/mu-conference + done + + insinto /etc/jabber + newins muc-default.xml mu-conference.xml + doins style.css + + sed -i \ + -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \ + -e 's,./syslogs,/var/log/jabber,g' \ + -e 's,./logs,/var/log/jabber/mu-conference,g' \ + -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \ + -e "s,../style.css,/etc/jabber/style.css,g" \ + -e "s,7009,5347,g" \ + "${D}"/etc/jabber/mu-conference.xml || die "sed failed" +} + +pkg_postinst() { + echo + elog "For jabberd-2 connection:" + elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml" + elog " match the address of your jabberd router." + elog "2. Set a common secret in mu-conference.xml and router.xml" + echo +}
