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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 108 insertions, 14 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/Manifest b/net-libs/jreen/Manifest
index a0d75c81bcf9..f892e4e3e318 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -2,17 +2,26 @@
 Hash: SHA256
 
 DIST jreen-1.1.1.tar.gz 292082 SHA256 0bd81dc10cc1f7abd48ae0bc400e2232c57f4ac890ddbaf47ea4fd7df0c9af07 SHA512 7aaff72a158a89512ed7f233f465dc967ba8f82b3d28d45d79b2afda3a954a49ac3a6bfcf3e3cbf00cdb5df0978ec2a9b8a4e72cc198e4973767669f3c192089 WHIRLPOOL bbca80b56853eecc8ad5d94d347dfc911f0fd20bc410cfc08921fb0223f04f149fd909275b300256be83fbf71c677722f11c31de9e20183b752d043d10fbbc69
-EBUILD jreen-1.1.1.ebuild 779 SHA256 da0bcd95787edbb05b0dbbbd049170130096f9488c7d8748cb4fa32063323fa2 SHA512 c6085c52a5da1667ef486678362f705d1809f989d7b27ddc2afe585ecbb49460d5c9b528d91919109ba9ecec265d1cfc34c37d1074be3b8616e05dc3d21ba899 WHIRLPOOL 66f91e24dff8e352817d9db27b07e2c8f05da910a19e7b0d4ed663b1e37c9e7646102b6ced7d61550d1708fef55def1c7d7d8d637411e045e18b6fabcdb12f99
-MISC ChangeLog 2519 SHA256 5db854a6f8c2059e78dce56f8c5736e9f449a13b683655ab5c7a99995dbb32f6 SHA512 fdfcf869f0666acdf49e1337f9fb340ee7e8817d7c925350b96d31376904f721c71b20efbb2636b46e61ff64d4549f3a3cf87959bdce469b1252a9ee27a0d711 WHIRLPOOL 11fa34ce24f4ac669d170ba39b23bc354137db805003e4753c79d4609e19cbe0298f308695a8c36f1fdc493093df7ee1e22ec46a60475f19071fb8a1c2e393b0
+DIST jreen-1.2.0.tar.gz 279435 SHA256 cee3762015357bfd88f7f3eb71dd7f90ddf37fdff07c5cf99881fda051c5fe1b SHA512 36b5fb892c16fd113574904671c8d5d3da6b50e0ea128b8e24715cb517c97212adcc8641a2a230ba1edd4c7735f46211ea4729f9e27fbea14e292ad098c78b0c WHIRLPOOL 90f0904e35345a21db8fda314455421762e7e7d5f3150bc94d73a70b4337690e16cc69a70f1a4fc2000507172544813b265c34720d7f292fb4f1537dc9df676f
+EBUILD jreen-1.1.1.ebuild 786 SHA256 57f09f3375177eaf42f61eec872da19df0dd51af7472029c086b604f97e5fa1e SHA512 958b898641593acf1cc3a57405cb6d15b99bf52ebeb83ef876cd2387555e30399d900bddf8a956780b243397a1b38a00b60b1a980fcb816768ae5bc4545f6b3c WHIRLPOOL 5c8422de5ab27cdadaa34f63038597c9346abbe0ef514bc550811eb72f6155cd4d36c0a0dd1b06cbe6508bac59951fb737bce29a54facd39337741e160b02692
+EBUILD jreen-1.2.0.ebuild 1547 SHA256 2272bb726e4cefa4a29292603e580f4ca68456449a1b348af4ddc0c186b210cc SHA512 9229c8337d15c69a553d92770618d0643b705feda815bc48e493ceadcb5e2407962581a979ea35ab314dd1e31be2ed01e1dbb6759068dcfe89ab9dd70c961696 WHIRLPOOL bf3b1470067a36e81962cd5a2985b7d84cf9d0866c109d6bd0fc696aedf0c70aa102f296d417de1b9a0b11959b61da741087d05216ca722c7f37cd69fd37bac0
+MISC ChangeLog 2725 SHA256 a3f568e519b8002742d714bdeba3a97ccfba4646c52901539390c0d095ed7722 SHA512 4de92866c92d9965724ad01b6a49f0e7edee2b78a0fe404a4237643c699bee16c617941b426cba4d4a37057877e2ec085322629952c76a560fc12c5c81d14d4f WHIRLPOOL 759cb5570870890dbc0d209c2db30bfaf89170d277ef251b3793f3530c970aa558f40a368467a68d7ce11cdda42e2e51cdbdfe862056e141b8138f899c9789bf
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRc/SwAAoJEO+t9ga+3I3aLL4IANP2S85Gldw7jIeMfAlkIesG
-XRWw3MCUG0xab4hnN1u2aphWK/+wJ+zsFTv+A9Nj8CQGYwcGHBquazZvOYsIBNad
-WAxk3bqHuqZl4MTgi+P/nVoamls2A1a+LAss/9Wg8THABseEVo9K+QKcRpzS/Xbj
-5ohCMq3pLoUXzDpDNlOh/C9uLPPFbTSCIkD4DVdDgMZXnnUs8xKh+jrT+f9zwJwI
-gqB0nFygl1lXGmBmiiI84M+NayQwU+Lrru0ka/3ocCglBW5uvjO2/eZEw2nFM799
-dxDq8tZI9AXxTLUMRWisEApNH2GSpIe/X5EYSSrWCTlXF27hkKhYMOLiVh2fUXo=
-=1dvd
+iQJiBAEBCABMBQJTfi5iRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7FZpD/9TixPoHaIBSDU3Kiehii1ADRfw1vM/yC8qwqlxAQym7TfhaWvpzmFVhH4v
+RHnLkceVCdFdUSdgltyOdg2ZC9NSWiVdAjIl9WBN3M2y4E9JLngKL5xqEoPa1qKt
+jlNTcMGsWHI05ean+leBhDLwTDZcZGUhY2zz2kaaI57HSp95w6dqQW9+i0zAxYqj
+5XTg2isqm+P2bx5ffqfevHZ8NKFXKYsXnCmZpHEb61D6Q3euD11Ueqfc2uHsav+s
+B8pjccqtwRFtFHpYMccQMGyfB/06Ngzc9qIuD5T1EVIUoegXX6wNiCOLQMSBjXsK
+j7QAWIzui1dEZ5pL8aBZv1nXYqHnJYATD14R+aopZqyjWGtxGe02M0vaOyhSW+UF
+m9MzeQdH8dWDV8PzJPp3pFpjTCE7yaYDCN6RTcAKbyUo2/Ez45i5L010MYq5zw6l
+D4Z8yzQ2M7Mz1nlfug+moYNO7F0fuTVE2jSCVNDF19pyZ7HgXXaa4OqacuKGTxuX
+JR+dPZcMViIfWryAI8yN+6SkxiuGGR1F/g6uxYILuPf0V0CHRZbgcZ6NKPq96mIW
+KBuQe/dRI1mGxB2PrEgJPD6G3FUy0gsksmPugk81UlhyuuiiZI2qn7bH2TW9WM63
+q/rI5mQfvvb9pGFwbO5CHEHwucTgT1X0ceyLpmAJBDv1AW3BHw==
+=WNIm
 -----END PGP SIGNATURE-----
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
+}