[gentoo-commits] repo/gentoo:master commit in: net-libs/jreen/, net-libs/jreen/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/jreen/, net-libs/jreen/files/

[Michael Palimaka]

commit:     da9049b49494f5852a73ce7704fed35bfbfb1712
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 19:56:38 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 19:56:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9049b4

net-libs/jreen: add patch to solve build failure with Qt 5.6

Gentoo-bug: 578912

Package-Manager: portage-2.2.28

 net-libs/jreen/files/jreen-qt5.6.patch | 15 +++++++++++++++
 net-libs/jreen/jreen-1.2.1.ebuild      |  1 +
 2 files changed, 16 insertions(+)

diff --git a/net-libs/jreen/files/jreen-qt5.6.patch b/net-libs/jreen/files/jreen-qt5.6.patch
new file mode 100644
index 0000000..da6f085
--- /dev/null
+++ b/net-libs/jreen/files/jreen-qt5.6.patch
@@ -0,0 +1,15 @@
+Fix build with Qt 5.6
+
+Gentoo-bug: 578912
+
+--- a/src/stanzaextension.h
++++ b/src/stanzaextension.h
+@@ -28,7 +28,7 @@
+ 
+ #include <QObject>
+ #include <QSharedPointer>
+-#include <QMetaTypeId>
++#include <QMetaType>
+ #include "jreen.h"
+ 
+ class QXmlStreamWriter;

diff --git a/net-libs/jreen/jreen-1.2.1.ebuild b/net-libs/jreen/jreen-1.2.1.ebuild
index 1544368..6969640 100644
--- a/net-libs/jreen/jreen-1.2.1.ebuild
+++ b/net-libs/jreen/jreen-1.2.1.ebuild
@@ -40,6 +40,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
+PATCHES=( "${FILESDIR}/${PN}-qt5.6.patch" )
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )

[gentoo-commits] repo/gentoo:master commit in: net-libs/jreen/, net-libs/jreen/files/

[Johannes Huber]

commit:     09e29c69ed5cdc2d72a512dda3629f1c688bbdac
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 16:43:23 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 16:43:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e29c69

net-libs/jreen: Remove 1.2.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/jreen/Manifest                |  1 -
 net-libs/jreen/files/jreen-qt5.6.patch | 15 -------
 net-libs/jreen/jreen-1.2.1.ebuild      | 75 ----------------------------------
 3 files changed, 91 deletions(-)

diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
index 8499573..5ad50b0 100644
--- a/net-libs/jreen/Manifest
+++ b/net-libs/jreen/Manifest
@@ -1,2 +1 @@
-DIST jreen-1.2.1.tar.gz 279584 SHA256 be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd SHA512 3ab28cf2a2c2a595892b15acb9e49c7aa64dbb3b2ac13138ce011b16c2c6b3abeb524231d271fb0f4a6da028548ae6995b34bd70ee9c40fb54e6d64fac2633a2 WHIRLPOOL ff0f76b18252b8601e2e3c7a6c784bf3eb579c4e421e44081a24f726ea10a3cb1a3373c4a80bbf51200ddf346cff43453667182c080acd500097a1c28b18fb94
 DIST jreen-1.3.0.tar.gz 287827 SHA256 f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e SHA512 7b8267aa7d0e18c28dfeb6a1c7c0495d87bd2712fe10a0c6283f0cf89b72d2c67f98f97a812c9f34496af43eb00ddd94b7e60e942634fb03d0119f94a3d08464 WHIRLPOOL 6a6e0f469e344eab2f0c745411091867bddeaeabf0dad8ff8ebb58521d1d9a0b07d6bb389fb9cf937cfc2974b834951baf4de514eef6ae5c087f72c6c0d6f604

diff --git a/net-libs/jreen/files/jreen-qt5.6.patch b/net-libs/jreen/files/jreen-qt5.6.patch
deleted file mode 100644
index da6f085..00000000
--- a/net-libs/jreen/files/jreen-qt5.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with Qt 5.6
-
-Gentoo-bug: 578912
-
---- a/src/stanzaextension.h
-+++ b/src/stanzaextension.h
-@@ -28,7 +28,7 @@
- 
- #include <QObject>
- #include <QSharedPointer>
--#include <QMetaTypeId>
-+#include <QMetaType>
- #include "jreen.h"
- 
- class QXmlStreamWriter;

diff --git a/net-libs/jreen/jreen-1.2.1.ebuild b/net-libs/jreen/jreen-1.2.1.ebuild
deleted file mode 100644
index 9924c3d..00000000
--- a/net-libs/jreen/jreen-1.2.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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}" )
-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"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	media-libs/speex
-	net-libs/libgsasl
-	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md )
-PATCHES=( "${FILESDIR}/${PN}-qt5.6.patch" )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-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
-}