use dobin instead of exeinto /usr/bin/ && doexe; Version BUmp; fix initscript for deprecated options, #505598

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 146 insertions, 28 deletions

diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index b37e60c82aa2..2fc2b6ce5316 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -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 <jlec@gentoo.org> +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 <mrueg@gentoo.org> mu-conference-0.7.ebuild,
   mu-conference-0.8-r1.ebuild:
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
index 7b15ccb2064f..3158151aa640 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,13 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX README.Gentoo 1483 SHA256 36efdb71c2d68941fe1d26c5989064a9ed18d91e6bfd83ae884e9088a17b6159 SHA512 8b5cf8cce355fd9d1672fd5482df5ff2fc5cbe1279f692b2a5645836cc66d7158b1f316b421129cf7082c3c080f47ed27603c92723bc9906052b0734745f3449 WHIRLPOOL 2a0fdaa4ce53a4aca89b69f86f77fab348bec5744296657f9802e590811eb70f568dadbf3398dc3d718d0f27753b5fa9900dd6a8f011fa84eb3a4159ca89832d
-AUX mu-conference-0.7.init 410 SHA256 ab08f29e14514d3705c83a7149629b2081140d7ef2f27ff49e4ca58c94742c07 SHA512 ea861b7699c4134b7b2e051e84103a0f6d6bd18b8924c2094e802866f9dd3e6519e3eb83ea6833000cd348eb5c5cafccecd7710ab586323a902e1211fda08988 WHIRLPOOL 89ab2d2762591964f485d8e4ed4753e1de7e7240947d033c067c5d2f4449ada166cc55829bc0a66ce46b240b4115a693e7538da94b78184bac8f2cac3722a2fc
+AUX mu-conference-0.7.init 409 SHA256 2c4e5da8bef97b2623cca0ea703a9779385fbc0da44939f42d2ac3043ae7eb95 SHA512 42b99ecde4fa0053e13bb5434250589b3fe520a462e2130e11442820f4adde5da78bb49db6d4e4d822a1eae70f4196ebbfccdf1c8d37ae97836661d216d486ab WHIRLPOOL c3b67d0ca212934e2b30d8d8454e1b21fb1385462b52147408d35f225530893a0919b306b8eb22a8dfcf550e659cb8640ae6c9d4bbffda5ff3630515406df3ea
 AUX mu-conference-conf.d 435 SHA256 d1c13df4fe3be4cb15b830f4b5935fc51d0a09e827e99225ae189fafdbc7e741 SHA512 82238e058fbf712f159eb058e60a76d83f5ac6f9299ccf8ff29997176f73be62979fd2acaf36df23016d7844e9a42edbf25910e20a85207ba0738b66458966d2 WHIRLPOOL adf6542ae9360468b52c52c5c537f5d7ca8d3af735ced5e018eec776259feeb29328baa29c28932267b2d816249e51c1c6e19a323a2feb9134b871ddbbe9aa9b
 AUX mu-conference-makefile.patch 430 SHA256 58e36385215a1da9278a914939e807c5379b0960cae645ac8f288e9d29dd93d3 SHA512 ca961c7a9961001481b87c6a038c5e78c76143d7951a9b6a07cd8a5f7a3cd0d57537eb0000bad3c19d12ff7714ed72cebc841d0db1305c07829ed82dc09a1e3a WHIRLPOOL 5e9d453e07913e1619e616995ad130e88971056c27d9323dc15d1b50f15819d10c64ca54a1a0a8a4683fb13c43ef6deb3781f5040e0c86dae6a0cfc93a7c7812
 AUX muc-transport.init 529 SHA256 d4f772a6c94bc19ea45b3cb6e6a92f9ac26ccddb344112053485fb0db606e9bf SHA512 0a42a58ec7921e86afd6f11b36eb181ed277bc7d93bb6cf9d96e2feeb0450e1efa1388f44274d4dd87d51c6e76b93c49f14c38091a1e670d502c4f9b27863f2c WHIRLPOOL 8b2ead2f44da0024bbbe0776b1631d5e062e244b7ed1b5604caf2b81ac18b03b1149fe1adbc14e22df561b3771d990aa1804b0002629a98e1a3daf367ec65b1f
 AUX muc-transport.init-r2 532 SHA256 359b28c8218c5f26154d2ca051031c1d37cfb36e55de8a3d71f67d66893bdab2 SHA512 120e83997be849bac20683657c4d90f188ba8aa5cd4a5719b0b4311a20e228c705a7d720edff7810c7fe782e52cac6a395fd5d4fe3d24f8719a22abaf485b9e7 WHIRLPOOL 49740562e42d1976619ac7254f547174de9db82e65bf71f9b7d4acec20e4b03c524ac5b57c16dbcaf3a381be251aacb1163b843a59d858c83654fd7dc9398e52
 AUX muctrans.xml 908 SHA256 66b653cc18a1738520cd012e2d71079724a34d1f84e4c3aad5e9b84d485fc6aa SHA512 f030819b4e464bebbce495e15dde77bf9745cd41526b6f7db0d3831d3d7e825f21eaa02e3be7b8b1868655e58b2de77f6872fe7ebf828af4e674b265206c8e82 WHIRLPOOL eb7796dfdd3d5f4e34dfc19ce4775be5af29ea02cfc8ada486592efdbd1e3814f4a9b324af181d865a453df37dff1d617bf235617b55513fdd4b26269b76dfbb
+DIST mu-conference-0.8.81.tar.gz 247649 SHA256 d3c8f2f0539b06e32b8bcd48dfae008c84961815ada0922ecf095be36b599862 SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 WHIRLPOOL b6da089299d22b3b4e68d79f6451de981e5ccbd7144cf765c2a4073c6b7d58f276c687e4693ab34bbca57275b5b5e48886eded5adc3e5382c61add4d23b9467a
 DIST mu-conference_0.7.tar.gz 112381 SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35 SHA512 55efde6f7605b0d76038c9d67a3e0acb2f0041f896e9a70db0496dec4dbcb28a86539e9efc23df67c4b2eea64c221d1d7d99df2a02f212d46c5172da61d8d6a1 WHIRLPOOL cc9cfe32cff1b21ace94a55d8003038aa28df881b4aaf8759f9e53f53f76a5da4b4dbe7c27985ab2e638deafa4bb7a03cbaa3494c9387b56fb7204b073187f7e
 DIST mu-conference_0.8.tar.gz 110356 SHA256 d9f4399573a83f20c84af55cb56b405c706a943898cb14a5d220d35b89db429b SHA512 e5c410b77091d5fa4cba657a3362704fe1c148b9125984dc1cad832fd48ed343de78e044bafa10c8b8e38160406f4023444009281cb2236c300fbc17d4b85d7f WHIRLPOOL d49fe19bdd09081ba44b16126c9e71e1f9a07a285dea7efe64e487baeb0ac2d3eae04374c245b2451293805f60f935f9243d9e93f1df0f8de9cf98b54e42e53c
-EBUILD mu-conference-0.7.ebuild 2278 SHA256 b8bb300b5f89123b002a387c56e9ae074249543203230a2d5a5a1a222fa9be73 SHA512 e4ad23e2b77488b2afafe65883c420c042dc952550d3f8daf381f69092604b66bcdd46c5778ceb685915c97e5692ad6f3d2a8cc822f2f1ecf7f6564dc9ba5aba WHIRLPOOL 7985cd52ce7194e3e8ecfb91369795e1df3edae378d29d06e54a83801c4fe77333ee71460c11491c52a7c8513162d2bc2a716823336db8f3637a90caa7af6000
-EBUILD mu-conference-0.8-r1.ebuild 2699 SHA256 bebd5515fad4e25c5233b9bcbc40b9f08cd90e8a812d32c1f0b2b5aabca575ef SHA512 365d6ce2fa30fb1aa406217b1de35a121b70735cf63cfbf43431834123e2916f0148cf2fd987783766ffc06a3508b412420107a4eddb7180848ccc2c61bebac4 WHIRLPOOL 00b0ec6fc1acbd31c5d75448cc7f1da2bca50c5d75f14301a760e1483ece7f590dd0ba16dde6be1d86727310fd91a745dac0595e77be95fed24beba98968e386
-MISC ChangeLog 5092 SHA256 f5537527f5e862f72fdfc93ac1d49a3c01f20e4bfc4f7a06c322ef455ac4db90 SHA512 50a8cf69d1886fa9d06cab7325449233dab57ce36050de5feaca54cb174bc3a3cbce71b43662d31bd272addc8a1ae5f306c8bc15fd489de7034c9336aef9111e WHIRLPOOL 381f4c97f3b1366526bf33f3fc44d5a8ae4ab4759bb662aa9a34c02368fa593136e128e9254936ad373a911b1edb3e79d9c3e542b218944ca12118c6e164c1d2
-MISC metadata.xml 229 SHA256 7ed5e1bef2ffc8878b85d96cc3eadcb716f4d15368a8a43cd818292e06afe434 SHA512 1aa9ce5623aa7a8d7caa2d5059e5b269095f9a12ed9fcc23b8537cdc5da49a1693dedde3f9309eda8de258457b6b7a4c4edcff53518030a9baf598445f5e6fd5 WHIRLPOOL 362601a3dfc4a8fdf99253bc43b49e8f7c43997576a2d796d39fdb8c03f15054fbf5bd198f2769a5562210e5b6c77a1392142e8c13a354bb86e64ba5afdf597c
+EBUILD mu-conference-0.7.ebuild 2289 SHA256 c248b5d1fe0336f82ea4fcd6bd01b24bb4327518003e262262cd958d3ef2a6ab SHA512 ed929a5c5bd1c7f459383f46cb0c428733bf3d74e173b528017279f913614fe09685da0f3e089a02133681b58c755204b2aceb795d2dbb68aeabdaa566d08d86 WHIRLPOOL 0c509fc01c2bae90a1502e7adb6c5f63902c701ba049bb223d85859825261d67fbedabbec3071e24a4d743df0212bfff5d13893a41c5a996814e13fdd6d6a0d4
+EBUILD mu-conference-0.8-r1.ebuild 2684 SHA256 6700b23f52ee41d878e96d405b6d4f190d49d1edf5a389a4a93989c765fc5b15 SHA512 cc717da334a9c32b0fe40f3dfca155511e0f31435fa9811141905e16bfb3b81037ebf2b0911066939110402462e67ed7bda810436a30f88b2c741e07cabc1f59 WHIRLPOOL 4898ffd9dbf301b40de3cd3abedd0de6c433d9f9a3547cdb1dbefa25cc2083a8ed5f3c1fc2cdcb8d7b4b3c88d200e5965783003068a59b7ad6feb723815bdf83
+EBUILD mu-conference-0.8.81.ebuild 2651 SHA256 0195f220eda0c9d9c3ba747bfad41f6f96e619b508f6016fd1fb152899968f34 SHA512 71a927430895b694c08d51935ad5afc38a60a5bf5a1d1144d28a53a9dc54c9703b33b3210742e9f111f3d4950e92c5aa53d0a38cafb52c18312e2916c9d95486 WHIRLPOOL 226ef41cd0a9a89660e2cddf0622ed64004e17211eeb6082686a2ba4a3d06b82be67cf440f91a9acebb47e473c5a7e4318f1da0bc93025b3be764d3bb84bcbf1
+MISC ChangeLog 5423 SHA256 e5432fcfb335eadec43ea6ebfd74a3f90cf055fa2c9be2675ccf207d21dbebaa SHA512 86fe9777c9e7b398ead5da0148ae895d9dd745d5089a73f5b2527b6ec5c49668bb23c94f3a3ef7eaf7e1841c181b2fa6ca34b70813e992a0825bf4ba532838b9 WHIRLPOOL cf19152468ce79f9117cc86fe4a794071d2beed1a9a4ac3f49657059d63c062e3c5a0f7b47cd5e41fea639fba0f1beeb087eb308f85eb131855018101b057ecb
+MISC metadata.xml 231 SHA256 d90715b0447712aae26009774cc6c0b85d98acba1344f25bec60721ce1f93b7a SHA512 d85dc048df8473dd9c217fbc9ee7f8dfbdfece6a75b86e7712cc70ed89cb5ffdb5f9658ec7ef78944998cc74ad19c8dbcd4e57814c72f94dd4ec7c161c62cd12 WHIRLPOOL 42f9859575b1a64d853249d574a406d84f7f36cf1b9e10b3b953d1b561d650cf84e5b7b355c73fe74bd04122430ece60c9f3977f0ac0b6f75142195342dc1d35
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVDcKVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6i4P/RZk4VXXBtKwDgzj1CCHUaUE
+C3R8SxPAYS86l9oqae+7WObVZEIvr4Ybax1Fyakq55E3jNuJ1TX4OZOZbhVFm2Gh
+LUrHTbKbealllxyPI5IiuLgycikwShT/Lz6Jeo0NGgB6MoCjdwXg+Jz79wv6Agbf
+yuJA9wfVO52JmmDjx3pTeN+UsXnyiCOqSSWZTrfMt7vvd21D90vqPp6dQWBU9ANV
+J+vhUVB99BNfx9k+Li47f9dt22dXVeW9xGhshPe1JoDNQwfNM12ly375FBNmk4Xj
+BYDQX0N8R22PxOEQ9iVnYCITNytcr+daRAaz3Fx907tlkVTve5Sw5m1KP68gR93g
+x2eNWjLgKyZ5ZOEEXVNnj4Qlq0XWZujZA1yKTJOCQSGkH+RcVvngcrBtCz8ZlLQF
+fxLMRZHEfe8b7gBJQOC5M4xjbMH5QriODvqfJZwwUR0cOiCKXvye7NUFtLxmP64N
+5D8ebgyRrPO5EOM9h4opPodKv7EehhR3JuXRHkIIh3GccDtlUA8cUxw2OLeW64nj
+BKgCCrijQpEzJBGKx7wSgCMMCJKDH8mj49+aG13KwrXv+Y9HQgSYG0uut7wr0ESM
+wkdJbqdGgunZ/D4wiBY5T9nOhSSALlM6IiuC8eM5T82FoEl9lPApdx5B0iWsR/B5
+R3PtkQ+MgfTqQh2RFr++
+=lzMp
+-----END PGP SIGNATURE-----
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 0ac2f6357913..20400acb9a3f 100644
--- a/net-im/mu-conference/files/mu-conference-0.7.init
+++ b/net-im/mu-conference/files/mu-conference-0.7.init
@@ -10,7 +10,7 @@ start() {
 	start-stop-daemon \
 		--background \
 		--start  \
-		--chuid jabber:jabber \
+		--user jabber:jabber \
 		--exec /usr/bin/mu-conference \
 		-- -c /etc/jabber/mu-conference.xml
 	eend $?
diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
index f38e191b9622..2b8a7eb73128 100644
--- a/net-im/mu-conference/metadata.xml
+++ b/net-im/mu-conference/metadata.xml
@@ -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>
diff --git a/net-im/mu-conference/mu-conference-0.7.ebuild b/net-im/mu-conference/mu-conference-0.7.ebuild
index d71e291b1a30..8def06f11bf5 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-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 @@ LICENSE="GPL-2"
 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 @@ src_unpack() {
 
 	# 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_compile() {
 }
 
 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 @@ src_install() {
 	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 @@ src_install() {
 }
 
 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
 }
diff --git a/net-im/mu-conference/mu-conference-0.8-r1.ebuild b/net-im/mu-conference/mu-conference-0.8-r1.ebuild
index 89e973a2049d..49927c8d63d6 100644
--- a/net-im/mu-conference/mu-conference-0.8-r1.ebuild
+++ b/net-im/mu-conference/mu-conference-0.8-r1.ebuild
@@ -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 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 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_prepare() {
 }
 
 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 @@ src_install() {
 }
 
 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
 }
diff --git a/net-im/mu-conference/mu-conference-0.8.81.ebuild b/net-im/mu-conference/mu-conference-0.8.81.ebuild
new file mode 100644
index 000000000000..ecdc0461a314
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.81.ebuild
@@ -0,0 +1,86 @@
+# 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
+}