Version bump fixing configure failure with old cmake wrt bug #510590.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 89 insertions, 4 deletions

diff --git a/net-libs/jreen/ChangeLog b/net-libs/jreen/ChangeLog
index 2adc5bcf4bcf..9d90ec5e8234 100644
--- a/net-libs/jreen/ChangeLog
+++ b/net-libs/jreen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/jreen
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/ChangeLog,v 1.12 2013/04/21 14:16:05 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/ChangeLog,v 1.13 2014/05/22 17:05:29 kensington Exp $
+
+*jreen-1.2.0 (22 May 2014)
+
+  22 May 2014; Michael Palimaka <kensington@gentoo.org> +jreen-1.2.0.ebuild,
+  jreen-1.1.1.ebuild:
+  Version bump fixing configure failure with old cmake wrt bug #510590.
 
   21 Apr 2013; Johannes Huber <johu@gentoo.org>
   -files/jreen-1.0.5-fix-typo.patch, -jreen-9999.ebuild, metadata.xml:
diff --git a/net-libs/jreen/jreen-1.1.1.ebuild b/net-libs/jreen/jreen-1.1.1.ebuild
index 4f77faa1654e..7c69faab6fef 100644
--- a/net-libs/jreen/jreen-1.1.1.ebuild
+++ b/net-libs/jreen/jreen-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.1.1.ebuild,v 1.3 2013/03/27 18:06:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.1.1.ebuild,v 1.4 2014/05/22 17:05:29 kensington Exp $
 
 EAPI=5
 
diff --git a/net-libs/jreen/jreen-1.2.0.ebuild b/net-libs/jreen/jreen-1.2.0.ebuild
new file mode 100644
index 000000000000..727ae6b19427
--- /dev/null
+++ b/net-libs/jreen/jreen-1.2.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/jreen/jreen-1.2.0.ebuild,v 1.1 2014/05/22 17:05:29 kensington Exp $
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://github.com/euroelessar/${PN}" )
+	KEYWORDS=""
+fi
+
+inherit cmake-utils multibuild ${GIT_ECLASS}
+
+DESCRIPTION="Qt XMPP library"
+HOMEPAGE="https://github.com/euroelessar/jreen"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +qt4 qt5"
+
+DEPEND="
+	media-libs/speex
+	net-libs/libgsasl
+	sys-libs/zlib
+	qt4? (
+		>=dev-qt/qtcore-4.6.0:4
+		>=dev-qt/qtgui-4.6.0:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=( qt4 )
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=( qt5 )
+	fi
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=( -DJREEN_FORCE_QT4=ON )
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=( -DJREEN_FORCE_QT4=OFF )
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}