jlec 15/03/21 19:12:17
Modified: metadata.xml mu-conference-0.8-r1.ebuild
mu-conference-0.7.ebuild ChangeLog
Added: mu-conference-0.8.81.ebuild
Log:
use dobin instead of exeinto /usr/bin/ && doexe; Version BUmp; fix initscript
for deprecated options, #505598
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.4 net-im/mu-conference/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/metadata.xml?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/metadata.xml?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/mu-conference/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 22 May 2010 10:55:21 -0000 1.3
+++ metadata.xml 21 Mar 2015 19:12:17 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<herd>net-im</herd>
+ <herd>net-im</herd>
<longdescription>Multi User Conference for Jabber</longdescription>
</pkgmetadata>
1.4 net-im/mu-conference/mu-conference-0.8-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild?r1=1.3&r2=1.4
Index: mu-conference-0.8-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mu-conference-0.8-r1.ebuild 5 Aug 2014 18:34:10 -0000 1.3
+++ mu-conference-0.8-r1.ebuild 21 Mar 2015 19:12:17 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.8-r1.ebuild,v 1.3
2014/08/05 18:34:10 mrueg Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild,v 1.4
2015/03/21 19:12:17 jlec Exp $
EAPI=5
@@ -15,8 +15,9 @@
SLOT="0"
IUSE="mysql"
-RDEPEND="dev-libs/expat
- >=dev-libs/glib-2
+RDEPEND="
+ dev-libs/expat
+ >=dev-libs/glib-2:2
net-dns/libidn
net-im/jabberd2
mysql? ( virtual/mysql )"
@@ -45,8 +46,7 @@
}
src_install() {
- exeinto /usr/bin
- doexe src/mu-conference
+ dobin src/mu-conference
fowners jabber:jabber /usr/bin/mu-conference
fperms 750 /usr/bin/mu-conference
@@ -79,10 +79,10 @@
}
pkg_postinst() {
- elog
+ 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"
- elog
+ echo
}
1.6 net-im/mu-conference/mu-conference-0.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild?r1=1.5&r2=1.6
Index: mu-conference-0.7.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mu-conference-0.7.ebuild 5 Aug 2014 18:34:10 -0000 1.5
+++ mu-conference-0.7.ebuild 21 Mar 2015 19:12:17 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.5
2014/08/05 18:34:10 mrueg Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.7.ebuild,v 1.6
2015/03/21 19:12:17 jlec Exp $
inherit eutils
@@ -12,7 +12,8 @@
KEYWORDS="~amd64 ~ppc ~sparc x86"
SLOT="0"
-DEPEND="dev-libs/expat
+DEPEND="
+ dev-libs/expat
>=dev-libs/glib-2
net-dns/libidn
net-im/jabberd2
@@ -28,13 +29,13 @@
# 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
+ 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
+ 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
+ sed -i 's/`mysql_config --libs`//' src/Makefile || die
fi
}
@@ -43,8 +44,7 @@
}
src_install() {
- exeinto /usr/bin
- doexe src/mu-conference
+ dobin src/mu-conference
fowners jabber:jabber /usr/bin/mu-conference
fperms 750 /usr/bin/mu-conference
@@ -65,7 +65,7 @@
newins muc-default.xml mu-conference.xml
doins style.css
- cd "${D}/etc/jabber/"
+ 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' \
@@ -77,10 +77,10 @@
}
pkg_postinst() {
- elog
+ 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"
- elog
+ echo
}
1.32 net-im/mu-conference/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/ChangeLog?rev=1.32&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/ChangeLog?rev=1.32&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/ChangeLog?r1=1.31&r2=1.32
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog 5 Aug 2014 18:34:10 -0000 1.31
+++ ChangeLog 21 Mar 2015 19:12:17 -0000 1.32
@@ -1,6 +1,14 @@
# ChangeLog for net-im/mu-conference
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.31
2014/08/05 18:34:10 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.32
2015/03/21 19:12:17 jlec Exp $
+
+*mu-conference-0.8.81 (21 Mar 2015)
+
+ 21 Mar 2015; Justin Lecher <[email protected]> +mu-conference-0.8.81.ebuild,
+ files/mu-conference-0.7.init, metadata.xml, mu-conference-0.7.ebuild,
+ mu-conference-0.8-r1.ebuild:
+ use dobin instead of exeinto /usr/bin/ && doexe; Version BUmp; fix initscript
+ for deprecated options, #505598
05 Aug 2014; Manuel Rüger <[email protected]> mu-conference-0.7.ebuild,
mu-conference-0.8-r1.ebuild:
1.1 net-im/mu-conference/mu-conference-0.8.81.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.8.81.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/mu-conference/mu-conference-0.8.81.ebuild?rev=1.1&content-type=text/plain
Index: mu-conference-0.8.81.ebuild
===================================================================
# Copyright 1999-2015 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.8.81.ebuild,v 1.1
2015/03/21 19:12:17 jlec Exp $
EAPI=5
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
}
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
}
