Version bump. Respect CC, LDFLAGS, AR, RANLIB. Add missing dep on pkgconfig.

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64

3 files changed, 99 insertions, 19 deletions

diff --git a/net-im/mu-conference/ChangeLog b/net-im/mu-conference/ChangeLog
index 02353b1c0467..5700d27508ce 100644
--- a/net-im/mu-conference/ChangeLog
+++ b/net-im/mu-conference/ChangeLog
@@ -1,6 +1,11 @@
 # 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.26 2012/05/13 17:13:55 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/ChangeLog,v 1.27 2013/08/12 23:24:41 mrueg Exp $
+
+*mu-conference-0.8 (12 Aug 2013)
+
+  12 Aug 2013; Manuel Rüger <mrueg@gentoo.org> +mu-conference-0.8.ebuild:
+  Version bump. Respect CC, LDFLAGS, AR, RANLIB. Add missing dep on pkgconfig.
 
   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:
@@ -114,4 +119,3 @@
   files/mu-conference-makefile.patch, files/muctrans.xml:
   Initial check-in of separate mu-conference transport for jabberd. Thanks to
   Gustavo Felisberto
-
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
index d9e707278269..305c43327c94 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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-conf.d 435 SHA256 d1c13df4fe3be4cb15b830f4b5935fc51d0a09e827e99225ae189fafdbc7e741 SHA512 82238e058fbf712f159eb058e60a76d83f5ac6f9299ccf8ff29997176f73be62979fd2acaf36df23016d7844e9a42edbf25910e20a85207ba0738b66458966d2 WHIRLPOOL adf6542ae9360468b52c52c5c537f5d7ca8d3af735ced5e018eec776259feeb29328baa29c28932267b2d816249e51c1c6e19a323a2feb9134b871ddbbe9aa9b
@@ -8,18 +5,9 @@ AUX mu-conference-makefile.patch 430 SHA256 58e36385215a1da9278a914939e807c5379b
 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.7.tar.gz 112381 SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35
+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 6e0a8e8c8bec224e4ddddd65ac3734285c926a213e5ee6dc67cc92495e94a8c4 SHA512 42a0d7ef8a400b2548db448aa3dee72269337200bb5de43f6c178d703be267de738d813ad02447763832d4f1dcd844a1f1dffb17dfa7bf9b11eb5c963030b395 WHIRLPOOL a81f2d388fd4b2329beeadd347cc194ee6e1ee35c804cb3aab814e942fca1ba24809507a5427d12fba585d63027554c675a7b59ef044099f29db87dc58a962ba
-MISC ChangeLog 4445 SHA256 1a81acd5d6d1122d025b1739e2ddcc1cbf4d63027da4c39933c5112c04cf033d SHA512 5a6bcf77b1e9ddd06fe76687afb29aa95b50956549c650eba89d3970b10c2a4f9600e4e38ba5105ebd968acea402ccf3e05afb7c676525f8e642bd6502d06e43 WHIRLPOOL d3593698d0e0fbc596edb263fe517ac665090070defb0b202cde85d489153d4b11ffbff29dda3eba9cb652892e03e8ac01f99b89e362661e868d4f7e5d1488ef
+EBUILD mu-conference-0.8.ebuild 2696 SHA256 4d57a2b08e334223580817f426b5e7d4849de2ba19842dd2c3f30cb3e840b8c0 SHA512 546a9e499242a78bb48e4a00bb9167c302e6f1f20b744bd5860b53cc95990711171f18e2c1c32f2957ff672badefad571480e5b2562db3da3f8a2090c833caa4 WHIRLPOOL d16b6dce6dc3bf38efbb5ffd23ca59125d8d7055a3b50a8cc63120af7040a9ecba43409d0b133278781cc214d91fa8ea9a960fe53cb0b46a4761f73f34fcbb7a
+MISC ChangeLog 4633 SHA256 f5a5e01ca285fda06834bffb8a06a796575944876a8efea88ae690a8c1b0a976 SHA512 9cea8df025813a7c41c1bdd12408bc86e58c05928cd163011f12f46790183379c98d7dede856ff774f21bac98072c3eff05d50c0bcb896ac0a4f133b1dfd5ff8 WHIRLPOOL 0378acfd55e6214732c46c9bf4ccc8d530e42996db838e6e51ebb6ce35cefc56abdcb03a07e5a343272ce8a35ce0b9c2a41e531a5b1365d61979ffdcfafebf90
 MISC metadata.xml 229 SHA256 7ed5e1bef2ffc8878b85d96cc3eadcb716f4d15368a8a43cd818292e06afe434 SHA512 1aa9ce5623aa7a8d7caa2d5059e5b269095f9a12ed9fcc23b8537cdc5da49a1693dedde3f9309eda8de258457b6b7a4c4edcff53518030a9baf598445f5e6fd5 WHIRLPOOL 362601a3dfc4a8fdf99253bc43b49e8f7c43997576a2d796d39fdb8c03f15054fbf5bd198f2769a5562210e5b6c77a1392142e8c13a354bb86e64ba5afdf597c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQADETAAoJEO+t9ga+3I3aoAIIAMc5xPlIOzvz1/62ybBWTw60
-9GiOg9OkUl5sHZX1SWryXtqwsycMdaSjZ9qrI+jRb0x714+UehTtt0cjU9NuP6+Y
-qPWEnTSqYcY6OiHZ5LAgx4KfPqEy0XntSmBZDT0uvwXZqogKV3ePFZPiXZT8a7f2
-4XG69WHdDtaVYCMJ1yiTQLt4A82H1YH1sVqWkJncCWdP2iKU++yN7hIPb7QboAVZ
-dZ0QkTkJQfHeZqfW3BTGYftjLz9M3c6yiXSqWaiJjGIdRNpbj7yu9VQTFhVLYPv0
-7qV4b8zbz5s3dm0o5MY4DFhoJSqUi2qBeBmsYqcPI6czvaekr/POjjfiOM6RZrw=
-=SYUN
------END PGP SIGNATURE-----
diff --git a/net-im/mu-conference/mu-conference-0.8.ebuild b/net-im/mu-conference/mu-conference-0.8.ebuild
new file mode 100644
index 000000000000..718dbf796027
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.ebuild
@@ -0,0 +1,88 @@
+# 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 $
+
+EAPI=5
+
+inherit eutils 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"
+
+RDEPEND="dev-libs/expat
+	>=dev-libs/glib-2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+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 -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() {
+	exeinto /usr/bin
+	doexe 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 README.sql
+	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/"
+	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() {
+	elog
+	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
+}