summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2013-08-13 08:01:33 +0000
committerManuel Rüger <mrueg@gentoo.org>2013-08-13 08:01:33 +0000
commit032e77f38598eeac973e351fd74a20ac1ef710a0 (patch)
tree32219ac9b3ea4e54130ee8db0e3a934457a67bb8 /net-im
parentBump -6.5 development version (diff)
downloadgentoo-2-032e77f38598eeac973e351fd74a20ac1ef710a0.tar.gz
gentoo-2-032e77f38598eeac973e351fd74a20ac1ef710a0.tar.bz2
gentoo-2-032e77f38598eeac973e351fd74a20ac1ef710a0.zip
Style fixes, thanks to Julian Ospald
(Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/mu-conference/ChangeLog8
-rw-r--r--net-im/mu-conference/mu-conference-0.8-r1.ebuild (renamed from net-im/mu-conference/mu-conference-0.8.ebuild)12
2 files changed, 13 insertions, 7 deletions
diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index 385a3a822805..95e25138d656 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/mu-conference
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.28 2013/08/12 23:27:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.29 2013/08/13 08:01:33 mrueg Exp $
+
+*mu-conference-0.8-r1 (13 Aug 2013)
+
+ 13 Aug 2013; Manuel Rüger <mrueg@gentoo.org> +mu-conference-0.8-r1.ebuild,
+ -mu-conference-0.8.ebuild:
+ Style fixes, thanks to Julian Ospald
*mu-conference-0.8 (12 Aug 2013)
diff --git a/net-im/mu-conference/mu-conference-0.8.ebuild b/net-im/mu-conference/mu-conference-0.8-r1.ebuild
index 718dbf796027..022d517a348a 100644
--- a/net-im/mu-conference/mu-conference-0.8.ebuild
+++ b/net-im/mu-conference/mu-conference-0.8-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 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.ebuild,v 1.1 2013/08/12 23:24:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.8-r1.ebuild,v 1.1 2013/08/13 08:01:33 mrueg Exp $
EAPI=5
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Multi-User Chat for jabberd"
HOMEPAGE="https://gna.org/projects/mu-conference/"
@@ -13,6 +13,7 @@ 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
@@ -21,9 +22,8 @@ RDEPEND="dev-libs/expat
mysql? ( virtual/mysql )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-IUSE="mysql"
-S="${WORKDIR}/${PN}_${PV}"
+S=${WORKDIR}/${PN}_${PV}
src_prepare() {
# Fix missing header in src/conference_user.c in order to
@@ -56,6 +56,7 @@ src_install() {
docinto scripts
dodoc scripts/*
+ local i
for i in log spool; do
dodir /var/${i}/jabber/mu-conference
keepdir /var/${i}/jabber/mu-conference
@@ -67,7 +68,6 @@ src_install() {
newins muc-default.xml mu-conference.xml
doins style.css
- cd "${D}/etc/jabber/"
sed -i \
-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
-e 's,./syslogs,/var/log/jabber,g' \
@@ -75,7 +75,7 @@ src_install() {
-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"
+ "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
}
pkg_postinst() {