Introduce speex, theora and vpx use flags, update 9999 ebuild. Drop unneeded dev-qt/qtgui dependecy. Thanks to 0xd34df00d.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

4 files changed, 82 insertions, 6 deletions

diff --git a/net-libs/qxmpp/ChangeLog b/net-libs/qxmpp/ChangeLog
index c8122c057eeb..d2ac20232775 100644
--- a/net-libs/qxmpp/ChangeLog
+++ b/net-libs/qxmpp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/qxmpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.36 2013/03/11 10:14:05 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.37 2013/08/19 16:33:28 maksbotan Exp $
+
+*qxmpp-0.7.6-r1 (19 Aug 2013)
+
+  19 Aug 2013; Maxim Koltsov <maksbotan@gentoo.org> +qxmpp-0.7.6-r1.ebuild,
+  metadata.xml, qxmpp-9999.ebuild:
+  Introduce speex, theora and vpx use flags, update 9999 ebuild. Drop unneeded
+  dev-qt/qtgui dependecy. Thanks to 0xd34df00d.
 
 *qxmpp-0.7.6 (11 Mar 2013)
 
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index a33ec58d9bf8..d7b5b09e5cfe 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -6,4 +6,7 @@
 	<remote-id type="google-code">qxmpp</remote-id>
 	<changelog>http://code.google.com/p/qxmpp/source/browse/CHANGELOG</changelog>
 </upstream>
+<use>
+	<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild b/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..d8fdbc6b5067
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild,v 1.1 2013/08/19 16:33:28 maksbotan Exp $
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework."
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc +speex test theora vpx"
+
+RDEPEND="dev-qt/qtcore:4
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	vpx? ( media-libs/libvpx )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+	if ! use doc; then
+		sed -i \
+			-e '/SUBDIRS/s/doc//' \
+			-e '/INSTALLS/d' \
+			qxmpp.pro || die "sed for removing docs failed"
+	fi
+	if ! use test; then
+		sed -i -e '/SUBDIRS/s/tests//' \
+			qxmpp.pro || die "sed for removing tests failed"
+	fi
+	qt4-r2_src_prepare
+}
+
+src_configure(){
+	local conf_speex
+	local conf_theora
+	local conf_vpx
+
+	use speex && conf_speex="QXMPP_USE_SPEEX=1"
+	use theora && conf_theora="QXMPP_USE_THEORA=1"
+	use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+	eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+}
+
+src_install() {
+	qt4-r2_src_install
+	if use doc; then
+		# Use proper path for documentation
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+	fi
+}
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 208dc187a72b..da92a072eb99 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.14 2013/03/11 10:14:05 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.15 2013/08/19 16:33:28 maksbotan Exp $
 
 EAPI=5
 
@@ -14,11 +14,12 @@ HOMEPAGE="http://code.google.com/p/qxmpp/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc test"
+IUSE="debug doc +speex test theora vpx"
 
 RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/speex"
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	vpx? ( media-libs/libvpx )"
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:4 )"
 
@@ -37,7 +38,15 @@ src_prepare(){
 }
 
 src_configure(){
-	eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)"
+	local conf_speex
+	local conf_theora
+	local conf_vpx
+
+	use speex && conf_speex="QXMPP_USE_SPEEX=1"
+	use theora && conf_theora="QXMPP_USE_THEORA=1"
+	use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+	eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
 }
 
 src_install() {