[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2022-10-11 Thread Andreas Sturmlechner 
commit: 98cf675ba95f0dfd5107da19c263a84fd19139e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 11 16:26:53 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 11 16:27:37 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=98cf675b

net-libs/jreen: treeclean

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/jreen/jreen-.ebuild | 36 
 net-libs/jreen/metadata.xml  | 11 ---
 2 files changed, 47 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
deleted file mode 100644
index 5a0737db47..00
--- a/net-libs/jreen/jreen-.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != ** ]]; then
-   SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc ~x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git;
-fi
-inherit cmake
-
-DESCRIPTION="Qt XMPP library"
-HOMEPAGE="https://github.com/euroelessar/jreen;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5
-   media-libs/speex
-   net-libs/libgsasl
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DJREEN_FORCE_QT4=OFF
-   )
-   cmake_src_configure
-}

diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
deleted file mode 100644
index 50d1e85274..00
--- a/net-libs/jreen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   k...@gentoo.org
-   Gentoo KDE Project
-   
-   
-   euroelessar/jreen
-   
-

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2018-10-13 Thread Andreas Sturmlechner 
commit: 1708e728abb23c6bd4b12fcc272c33cf0014dff8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 13 01:45:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 13 11:46:02 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1708e728

net-libs/jreen: EAPI-7 bump

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-libs/jreen/jreen-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index e71c537a02..88176151ac 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != ** ]]; then
SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -29,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( AUTHORS ChangeLog README.md )
-
 src_configure() {
local mycmakeargs=(
-DJREEN_FORCE_QT4=OFF

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2018-01-30 Thread Michael Palimaka 
commit: 1621ee760ff8b1b45751424efc762fc427fd6b19
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Jan 30 10:45:12 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Jan 30 10:45:23 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1621ee76

net-libs/jreen: sync with main tree

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/jreen/jreen-.ebuild | 52 +++-
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 28f97670c7..e71c537a02 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -8,66 +8,32 @@ if [[ ${PV} != ** ]]; then
KEYWORDS="~amd64 ~ppc ~x86"
 else
GIT_ECLASS="git-r3"
-   EGIT_REPO_URI=( "https://github.com/euroelessar/${PN}; )
+   EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git;
 fi
 
-inherit cmake-utils multibuild ${GIT_ECLASS}
+inherit cmake-utils ${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 )"
+IUSE="debug"
 
 DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5
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 )
 
-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_test() {
-   multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-   multibuild_foreach_variant cmake-utils_src_install
+   local mycmakeargs=(
+   -DJREEN_FORCE_QT4=OFF
+   )
+   cmake-utils_src_configure
 }

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2017-08-30 Thread Andreas Sturmlechner 
commit: a9f8acfba5e5bcaa6f021518ecaacfa953988dfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 30 21:36:29 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 30 21:36:29 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9f8acfb

net-libs/jreen: Switch to USE=qt5 default

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-libs/jreen/jreen-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 3d7a38fe56..7d4450e640 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/euroelessar/jreen;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +qt4 qt5"
+IUSE="debug qt4 +qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"

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

2016-11-01 Thread Johannes Huber 
commit: 2116b43fac2e1c0813ad053bcab6ad7c15ddf520
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Nov  1 20:54:00 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Nov  1 20:54:00 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2116b43f

net-libs/jreen: Remove upstreamed patch

Package-Manager: portage-2.3.2

 net-libs/jreen/files/jreen-qt5.6.patch | 15 ---
 net-libs/jreen/jreen-.ebuild   |  2 --
 2 files changed, 17 deletions(-)

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..000
--- 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 
- #include 
--#include 
-+#include 
- #include "jreen.h"
- 
- class QXmlStreamWriter;

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 7f5a934..c3e0ec1 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -10,7 +10,6 @@ if [[ ${PV} != ** ]]; then
 else
GIT_ECLASS="git-r3"
EGIT_REPO_URI=( "https://github.com/euroelessar/${PN}; )
-   KEYWORDS=""
 fi
 
 inherit cmake-utils multibuild ${GIT_ECLASS}
@@ -40,7 +39,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
-PATCHES=( "${FILESDIR}/${PN}-qt5.6.patch" )
 
 pkg_setup() {
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2016-07-06 Thread Michael Palimaka 
commit: dda41baabc62dd6b849a68966d9fbfa9a46f850c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jul  6 13:13:59 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul  6 13:15:02 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dda41baa

net-libs/jreen: sort phases

Package-Manager: portage-2.3.0

 net-libs/jreen/jreen-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index a44569b..7f5a934 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -67,10 +67,10 @@ 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
 }
+
+src_install() {
+   multibuild_foreach_variant cmake-utils_src_install
+}

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

2016-04-06 Thread Michael Palimaka 
commit: 69ec4ed722665e56ba20d4494ff11b4f7ff940c4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Apr  6 19:52:34 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Apr  6 19:52:54 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=69ec4ed7

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-.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 000..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 
+ #include 
+-#include 
++#include 
+ #include "jreen.h"
+ 
+ class QXmlStreamWriter;

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 1544368..6969640 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.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] proj/kde:master commit in: net-libs/jreen/

2016-03-21 Thread Johannes Huber 
commit: 141528b786e81b49617b760d3319beacd35a8ebc
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Mar 21 15:12:58 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Mar 21 15:12:58 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=141528b7

net-libs/jreen: EAPI 6

Package-Manager: portage-2.2.28

 net-libs/jreen/jreen-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 4c3da0d..1544368 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} != ** ]]; then
SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -29,8 +29,8 @@ DEPEND="
net-libs/libgsasl
sys-libs/zlib
qt4? (
-   >=dev-qt/qtcore-4.6.0:4[ssl]
-   >=dev-qt/qtgui-4.6.0:4
+   dev-qt/qtcore:4[ssl]
+   dev-qt/qtgui:4
)
qt5? (
dev-qt/qtcore:5

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2016-01-18 Thread Michael Palimaka 
commit: b3b031a7cc314e900c7b2772ea899bacb377c1db
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jan 18 14:47:20 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan 18 14:47:20 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b3b031a7

net-libs/jreen: add missing USE dependency

Gentoo-bug: 572266

Package-Manager: portage-2.2.26

 net-libs/jreen/jreen-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 6c48a44..4c3da0d 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -29,7 +29,7 @@ DEPEND="
net-libs/libgsasl
sys-libs/zlib
qt4? (
-   >=dev-qt/qtcore-4.6.0:4
+   >=dev-qt/qtcore-4.6.0:4[ssl]
>=dev-qt/qtgui-4.6.0:4
)
qt5? (

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2015-07-28 Thread Johannes Huber 
commit: 6dcde61f36f8703ad60d8751d7a320ff3ca79747
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Tue Jul 28 21:26:15 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Tue Jul 28 21:26:15 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6dcde61f

[net-libs/jreen] Add github remote id

Package-Manager: portage-2.2.20

 net-libs/jreen/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
index a23f444..1f5e912 100644
--- a/net-libs/jreen/metadata.xml
+++ b/net-libs/jreen/metadata.xml
@@ -2,4 +2,7 @@
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
herdkde/herd
+   upstream
+   remote-id type=githubeuroelessar/jreen/remote-id
+   /upstream
 /pkgmetadata

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2015-01-31 Thread Johannes Huber 
commit: f76d950f19cbb62714347adcacbf5fa1b00a51f5
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Jan 31 12:14:31 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Jan 31 12:14:46 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f76d950f

[net-libs/jreen] Update DOCS

Package-Manager: portage-2.2.15

---
 net-libs/jreen/jreen-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 50843d9..a1c6f89 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -39,7 +39,7 @@ DEPEND=
 
 RDEPEND=${DEPEND}
 
-DOCS=( AUTHORS ChangeLog README )
+DOCS=( AUTHORS ChangeLog README.md )
 
 pkg_setup() {
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2015-01-30 Thread Johannes Huber 
commit: 065d20964e3d07a43698025d9eeb25c1f047877b
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Fri Jan 30 20:46:42 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri Jan 30 20:46:42 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=065d2096

[net-libs/jreen] Shorten pkg setup

Package-Manager: portage-2.2.15

---
 net-libs/jreen/jreen-.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 48aa0d0..50843d9 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -42,13 +42,7 @@ 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
+   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2014-06-12 Thread Michael Palimaka 
commit: abb3ebf3fe97a0d0460ad2fe9b010812e66125b4
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Jun 12 15:01:40 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Jun 12 15:01:40 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=abb3ebf3

[net-libs/jreen] Library needs to be built against at least one version of Qt, 
wrt bug #512386.

Package-Manager: portage-2.2.10

---
 net-libs/jreen/jreen-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 4303f90..ca8a191 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -22,6 +22,8 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=debug +qt4 qt5
 
+REQUIRED_USE=|| ( qt4 qt5 )
+
 DEPEND=
media-libs/speex
net-libs/libgsasl

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2014-05-22 Thread Michael Palimaka 
commit: 108aee04dc38fc4dae1dcc73f495da182d10b2ce
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu May 22 16:33:16 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu May 22 16:33:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=108aee04

[net-libs/libidn] Remove unused dependency.

Upstream commit 853304952eb97f156839b6cfede7c52a1ce70850.

Package-Manager: portage-2.2.8-r1

---
 net-libs/jreen/jreen-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 8c1ad34..fc95c69 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -24,7 +24,6 @@ IUSE=debug +qt4 qt5
 
 DEPEND=
media-libs/speex
-   =net-dns/libidn-1.20
net-libs/libgsasl
sys-libs/zlib
qt4? (

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2014-05-22 Thread Michael Palimaka 
commit: 6231ff4e84f1a6f11d3f4f50590e418eb945de69
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu May 22 16:35:45 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu May 22 16:35:45 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6231ff4e

[net-libs/jreen] Whitespace.

Package-Manager: portage-2.2.8-r1

---
 net-libs/jreen/jreen-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 55521c7..4303f90 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -42,22 +42,24 @@ DOCS=( AUTHORS ChangeLog README )
 pkg_setup() {
MULTIBUILD_VARIANTS=()
if use qt4; then
-   MULTIBUILD_VARIANTS+=(qt4)
+   MULTIBUILD_VARIANTS+=( qt4 )
fi
if use qt5; then
-   MULTIBUILD_VARIANTS+=(qt5)
+   MULTIBUILD_VARIANTS+=( qt5 )
fi
 }
 
 src_configure() {
myconfigure() {
local mycmakeargs=()
+
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=(-DJREEN_FORCE_QT4=ON)
+   mycmakeargs+=( -DJREEN_FORCE_QT4=ON )
fi
if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-   mycmakeargs+=(-DJREEN_FORCE_QT4=OFF)
+   mycmakeargs+=( -DJREEN_FORCE_QT4=OFF )
fi
+
cmake-utils_src_configure
}

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2014-05-06 Thread Michael Palimaka 
commit: 4920600fb5c548f791b29870c863c198b19a58c7
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Tue May  6 15:42:48 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue May  6 15:51:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4920600f

[net-libs/jreen] Qt4 and Qt5 version can be installed in parallel

Package-Manager: portage-2.2.10

---
 net-libs/jreen/jreen-.ebuild | 41 +---
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 6ed620b..3d70569 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -13,7 +13,7 @@ else
KEYWORDS=
 fi
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit cmake-utils multibuild ${GIT_ECLASS}
 
 DESCRIPTION=Qt XMPP library
 HOMEPAGE=https://github.com/euroelessar/jreen;
@@ -22,8 +22,6 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=debug +qt4 qt5
 
-REQUIRED_USE=^^ ( qt4 qt5 )
-
 DEPEND=
media-libs/speex
=net-dns/libidn-1.20
@@ -43,10 +41,39 @@ 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() {
-   local mycmakeargs=(
-   $(cmake-utils_use qt4 JREEN_FORCE_QT4)
-   )
+   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
+}
 
-   cmake-utils_src_configure
+src_test() {
+   multibuild_foreach_variant cmake-utils_src_test
 }

[gentoo-commits] proj/kde:master commit in: net-libs/jreen/

2014-05-06 Thread Michael Palimaka 
commit: 27448b6f8f02fab1363edf9125127f62e7f507f4
Author: Uwe L. Korn uwelk AT xhochy DOT com
AuthorDate: Tue May  6 16:59:19 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue May  6 17:05:18 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=27448b6f

[net-libs/jreen] Update dependencies

* QCA is no longer used (fully replaced by gsasl)
* zlib is a direct dependency

Package-Manager: portage-2.2.10

---
 net-libs/jreen/jreen-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-libs/jreen/jreen-.ebuild b/net-libs/jreen/jreen-.ebuild
index 3d70569..8c1ad34 100644
--- a/net-libs/jreen/jreen-.ebuild
+++ b/net-libs/jreen/jreen-.ebuild
@@ -26,13 +26,12 @@ DEPEND=
media-libs/speex
=net-dns/libidn-1.20
net-libs/libgsasl
+   sys-libs/zlib
qt4? (
-   =app-crypt/qca-2.0.3[qt4(+)]
=dev-qt/qtcore-4.6.0:4
=dev-qt/qtgui-4.6.0:4
)
qt5? (
-   =app-crypt/qca-[qt5]
dev-qt/qtcore:5
dev-qt/qtnetwork:5
)