[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2022-11-05 Thread Andreas Sturmlechner
commit: 5a9af7d439cc87fad1d311751ccefd31134b7727
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Aug 28 03:53:08 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov  5 16:46:47 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5a9af7d4

dev-qt/qtchooser: keyword 66-r2 for ~loong

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

 dev-qt/qtchooser/qtchooser-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index cd50a5c9..64621cfc 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz";
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/files/, dev-qt/qtchooser/

2022-03-21 Thread Andreas Sturmlechner
commit: aa03e562bc2a040b9e9f31eb6116ee3d7cb00c92
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 22 20:48:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 21 10:04:45 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa03e562

dev-qt/qtchooser: Drop tools colliding with Qt 5.15.3 links

Upstream repo has diverged from 66 release so rebase patch.

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtchooser--qt-5.15.3-compat.patch| 35 ++
 dev-qt/qtchooser/qtchooser-.ebuild | 10 +++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtchooser/files/qtchooser--qt-5.15.3-compat.patch 
b/dev-qt/qtchooser/files/qtchooser--qt-5.15.3-compat.patch
new file mode 100644
index ..316c3b86
--- /dev/null
+++ b/dev-qt/qtchooser/files/qtchooser--qt-5.15.3-compat.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
 b/Makefile
+@@ -4,22 +4,17 @@
+ TOOLS = \
+   androiddeployqt \
+   androidtestrunner \
+-  assistant \
+   balsam \
+   balsamui \
+   designer \
+   instancer \
+   lconvert \
+-  linguist \
+   lrelease \
+   lupdate \
+   meshdebug \
+   moc \
+-  pixeltool \
+   qcollectiongenerator \
+-  qdbus \
+   qdbuscpp2xml \
+-  qdbusviewer \
+   qdbusxml2cpp \
+   qdistancefieldgenerator \
+   qdoc \
+   repc \
+   shadergen \
+   uic \
+-  uic3 \
+-  xmlpatterns \
+-  xmlpatternsvalidator \
++  uic3
+ 
+ # keep the above line empty
+ 

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index 46e20878..cd50a5c9 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
inherit git-r3
 else
-   SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz";
+   SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz";
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -25,9 +25,9 @@ DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
)"
-RDEPEND="
-   !

[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2021-09-22 Thread Andreas Sturmlechner
commit: 2b796a969e031b409c7cfadafcf2c6054aba5420
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 22 15:33:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 22 17:41:27 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2b796a96

dev-qt/qtchooser: Sync dev-qt/qtcore blocker with Gentoo ebuild repo

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtchooser/qtchooser-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index dfc85ff1..46e20878 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -26,7 +26,7 @@ DEPEND="test? (
dev-qt/qttest:5
)"
 RDEPEND="
-   !

[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2020-12-28 Thread Andreas Sturmlechner
commit: 3c8326395824d21435cec3a09b56b6c93fafce47
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 22 09:03:11 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 27 01:32:25 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c832639

dev-qt/qtchooser: Move config file install from qt5-build.eclass

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtchooser/qtchooser-.ebuild | 35 +++---
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index c15146a3..aacf7457 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils toolchain-funcs git-r3
+inherit qmake-utils toolchain-funcs
 
 DESCRIPTION="Tool to quickly switch between multiple Qt installations"
 HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
-EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
+   inherit git-r3
+else
+   SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz";
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
-
 RESTRICT="!test? ( test )"
 
 DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
)"
-RDEPEND=""
+RDEPEND="
+   ! "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
+   $(qt5_get_bindir)
+   $(qt5_get_libdir)
+   _EOF_
+
+   (
+   insinto /etc/xdg/qtchooser
+   doins "${T}/qt5-${CHOST}.conf"
+   )
+
+   # convenience symlinks
+   dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+   dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+   dosym qt5.conf /etc/xdg/qtchooser/default.conf
 
# TODO: bash and zsh completion
# newbashcomp scripts/${PN}.bash ${PN}



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2019-12-25 Thread Andreas Sturmlechner
commit: 782d4345f499a5fc5a4ef5414bb085a045ecb97b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 25 19:08:31 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 25 19:08:38 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=782d4345

dev-qt/qtchooser: Add missing RESTRICT="test? ( test)"

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtchooser/qtchooser-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index ba405ef6..c15146a3 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2019-01-07 Thread Davide Pesavento
commit: ffd7947ba02972bd7b1ead592cc9573a06a821dc
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 19:28:35 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 19:28:35 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ffd7947b

dev-qt/qtchooser: sync with gentoo.git

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtchooser/qtchooser-.ebuild | 32 
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index 144fa7ab..ba405ef6 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils toolchain-funcs git-r3
 
-DESCRIPTION="Qt4/Qt5 version chooser"
+DESCRIPTION="Tool to quickly switch between multiple Qt installations"
 HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
 EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
 
@@ -18,31 +18,7 @@ DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
)"
-RDEPEND="
-   !

[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2017-09-02 Thread Davide Pesavento
commit: b8a328f00e35e91bc005085901b2f9dcb7533d11
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Sep  3 00:29:49 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Sep  3 00:29:49 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b8a328f0

dev-qt/qtchooser: simplify

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtchooser/qtchooser-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index bb5f3854..2de22ab2 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -7,7 +7,7 @@ inherit qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="Qt4/Qt5 version chooser"
 HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
-EGIT_REPO_URI=("https://code.qt.io/qtsdk/qtchooser.git";)
+EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git";
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2017-09-02 Thread Davide Pesavento
commit: d549718aef3edd685cfc71ae0c27db8f92915ecb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Sep  3 00:15:50 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Sep  3 00:15:50 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d549718a

dev-qt/qtchooser: sync

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtchooser/qtchooser-.ebuild | 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index 9b76ebf2..bb5f3854 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -7,21 +7,17 @@ inherit qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="Qt4/Qt5 version chooser"
 HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
-EGIT_REPO_URI=(
-   "git://code.qt.io/qtsdk/${PN}.git"
-   "https://code.qt.io/git/qtsdk/${PN}.git";
-   "https://github.com/qtproject/${PN}.git";
-)
+EGIT_REPO_URI=("https://code.qt.io/qtsdk/qtchooser.git";)
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt5 test"
+IUSE="test"
 
-DEPEND="qt5? ( test? (
+DEPEND="test? (
dev-qt/qtcore:5
dev-qt/qttest:5
-   ) )"
+   )"
 RDEPEND="
!/dev/null || die
eqmake5
popd >/dev/null || die



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2017-06-18 Thread Michael Palimaka
commit: 7f57d18aa432410be32044863d1eff69be23a78c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 09:03:34 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 09:03:48 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f57d18a

dev-qt/qtchooser: update HOMEPAGE & EGIT_REPO_URI

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtchooser/qtchooser-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index bb8202a0..9b76ebf2 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -6,10 +6,10 @@ EAPI=6
 inherit qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/";
+HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/";
 EGIT_REPO_URI=(
-   "git://code.qt.io/qt/${PN}.git"
-   "https://code.qt.io/git/qt/${PN}.git";
+   "git://code.qt.io/qtsdk/${PN}.git"
+   "https://code.qt.io/git/qtsdk/${PN}.git";
"https://github.com/qtproject/${PN}.git";
 )
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2016-10-28 Thread Michael Palimaka
commit: a0c1b6b1785f985e1c9497ef9920a97a8d648a35
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 28 15:46:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 28 16:12:44 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a0c1b6b1

dev-qt/qtchooser: EAPI 6

Package-Manager: portage-2.3.2

 dev-qt/qtchooser/qtchooser-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index 0a3fd9a..5c9298c 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit qmake-utils toolchain-funcs git-r3
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2015-03-30 Thread Davide Pesavento
commit: 7c2ba289094eb227693569c7b7a32c55ecb67953
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Mar 30 19:38:33 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Mar 30 19:38:33 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7c2ba289

[dev-qt/qtchooser] Switch EGIT_REPO_URI to code.qt.io and add github mirror.

Package-Manager: portage-2.2.18

 dev-qt/qtchooser/qtchooser-.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index 92c2811..787c314 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -7,8 +7,12 @@ EAPI=5
 inherit qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="https://qt.gitorious.org/qt/qtchooser";
-EGIT_REPO_URI="https://gitorious.org/qt/${PN}.git";
+HOMEPAGE="https://code.qt.io/cgit/qt/qtchooser.git/";
+EGIT_REPO_URI=(
+   "git://code.qt.io/qt/${PN}.git"
+   "https://code.qt.io/git/qt/${PN}.git";
+   "https://github.com/qtproject/${PN}.git";
+)
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-11-15 Thread Davide Pesavento
commit: 7e1717abb6bb9f61369b59967ccb6d90bfa044d4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 16 01:26:50 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 16 01:26:50 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e1717ab

[dev-qt/qtchooser] Sync.

Package-Manager: portage-2.2.14

---
 dev-qt/qtchooser/qtchooser-.ebuild | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index cf050d1..035b5dd 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild,v 1.1 
2014/11/13 02:59:00 pesa Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild,v 1.2 
2014/11/15 17:13:08 pesa Exp $
 
 EAPI=5
 
@@ -19,7 +19,31 @@ DEPEND="qt5? ( test? (
dev-qt/qtcore:5
dev-qt/qttest:5
) )"
-RDEPEND="!

[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-11-12 Thread Davide Pesavento
commit: 2911bb6a6ded667350532950698345f77af13d34
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Nov 13 03:35:20 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Nov 13 03:35:20 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2911bb6a

[dev-qt/qtchooser] Delete 0_p20140613 (now in tree) and add live ebuild.

Package-Manager: portage-2.2.14

---
 dev-qt/qtchooser/Manifest | 1 -
 .../{qtchooser-0_p20140613.ebuild => qtchooser-.ebuild}   | 8 
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
deleted file mode 100644
index 0499873..000
--- a/dev-qt/qtchooser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtchooser-0_p20140613.tar.xz 30920 SHA256 
c536f0cc31aa432215413e04a4cf145c9e6c077c865f2eb9a85b18c6d3fd74a5 SHA512 
f4c6f306389eb1c04b962edd493269f286da2bb484101fe581c97af23653d9c9086caf0632193b5d1e6110d870db81c5b2c1b3eec349c4429879347223d33d2c
 WHIRLPOOL 
c3bacb8b3f58d52b7c32ba8da06d7aa70de058e5d3e23236191934c016e822abf2f39c7d27522c2c7fe1c45e74557b303151b352bd6c82786747b6ccbd18

diff --git a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
similarity index 78%
rename from dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
rename to dev-qt/qtchooser/qtchooser-.ebuild
index 88daa6b..cf050d1 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild,v 1.1 
2014/11/13 02:59:00 pesa Exp $
 
 EAPI=5
 
-inherit qmake-utils toolchain-funcs
+inherit qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="Qt4/Qt5 version chooser"
 HOMEPAGE="https://qt.gitorious.org/qt/qtchooser";
-SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz";
+EGIT_REPO_URI="https://gitorious.org/qt/${PN}.git";
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="qt5 test"
 
 DEPEND="qt5? ( test? (



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-11-12 Thread Davide Pesavento
commit: 99ab5bf98cf3d54061f7f46d7ad27e00f22af9ce
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Nov 13 02:48:59 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Nov 13 02:48:59 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=99ab5bf9

[dev-qt/qtchooser] Tests seem to require qt5.

Package-Manager: portage-2.2.14

---
 dev-qt/qtchooser/qtchooser-0_p20140613.ebuild | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild 
b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
index ec25b71..88daa6b 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs
+inherit qmake-utils toolchain-funcs
 
 DESCRIPTION="Qt4/Qt5 version chooser"
 HOMEPAGE="https://qt.gitorious.org/qt/qtchooser";
@@ -13,9 +13,12 @@ SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz";
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="qt5 test"
 
-DEPEND="test? ( dev-qt/qttest )"
+DEPEND="qt5? ( test? (
+   dev-qt/qtcore:5
+   dev-qt/qttest:5
+   ) )"
 RDEPEND="!/dev/null || die
+   eqmake5
+   popd >/dev/null || die
+
qtchooser_make check
 }
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-07-06 Thread Davide Pesavento
commit: 7abb4173391ccc5f8bc15b108c6a1bfe84b1a0f3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jul  7 00:29:36 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jul  7 00:29:36 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7abb4173

[dev-qt/qtchooser] Add keepdir.

Package-Manager: portage-2.2.10

---
 dev-qt/qtchooser/qtchooser-0_p20140613.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild 
b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
index fe26210..ec25b71 100644
--- a/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
@@ -37,6 +37,8 @@ src_test() {
 src_install() {
qtchooser_make INSTALL_ROOT="${D}" install
 
+   keepdir /etc/xdg/qtchooser
+
# TODO: bash and zsh completion
# newbashcomp scripts/${PN}.bash ${PN}
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-07-06 Thread Davide Pesavento
commit: 30f81d5fe4e08b17dc34eee44b9964091f487050
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jul  7 00:21:46 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jul  7 00:21:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=30f81d5f

[dev-qt/qtchooser] New snapshot and change versioning scheme.

Package-Manager: portage-2.2.10

---
 dev-qt/qtchooser/Manifest  |  2 +-
 ...oser-39.ebuild => qtchooser-0_p20140613.ebuild} | 23 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 94accf1..0499873 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1 +1 @@
-DIST qtchooser-39-g4717841.tar.gz 32194 SHA256 
4681d0561bf96599bf9bf5eb25103d07ee8f045f31576dc2e72b8529587a67c6 SHA512 
477f903fce7cd2a040b4556aa26129f242f3e24d5c94fdca19c1e5d36109af70baf8a89ece606fb4cca08fcdeea69f3cb873384e9c008ee444f0ad4d77b4f32d
 WHIRLPOOL 
646353fc87bdf28827f2f261da71e1911bd8ddd79a83b0c1e856a60611b92d2a11ca7135fbbe1472506f57214faa0fa5a32016f66a21da22ff5112480d77c7d5
+DIST qtchooser-0_p20140613.tar.xz 30920 SHA256 
c536f0cc31aa432215413e04a4cf145c9e6c077c865f2eb9a85b18c6d3fd74a5 SHA512 
f4c6f306389eb1c04b962edd493269f286da2bb484101fe581c97af23653d9c9086caf0632193b5d1e6110d870db81c5b2c1b3eec349c4429879347223d33d2c
 WHIRLPOOL 
c3bacb8b3f58d52b7c32ba8da06d7aa70de058e5d3e23236191934c016e822abf2f39c7d27522c2c7fe1c45e74557b303151b352bd6c82786747b6ccbd18

diff --git a/dev-qt/qtchooser/qtchooser-39.ebuild 
b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
similarity index 54%
rename from dev-qt/qtchooser/qtchooser-39.ebuild
rename to dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
index 1b3438d..fe26210 100644
--- a/dev-qt/qtchooser/qtchooser-39.ebuild
+++ b/dev-qt/qtchooser/qtchooser-0_p20140613.ebuild
@@ -6,30 +6,37 @@ EAPI=5
 
 inherit toolchain-funcs
 
-MY_P=${P}-g4717841
-
 DESCRIPTION="Qt4/Qt5 version chooser"
 HOMEPAGE="https://qt.gitorious.org/qt/qtchooser";
-SRC_URI="http://macieira.org/${PN}/${MY_P}.tar.gz";
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz";
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-qt/qttest )"
 RDEPEND="!

[gentoo-commits] proj/qt:master commit in: dev-qt/qtchooser/

2014-05-19 Thread Davide Pesavento
commit: d8db9f653e1eaba0ab206ce77d04f7b61d6d4747
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon May 19 17:10:01 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon May 19 17:10:01 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d8db9f65

[dev-qt/qtchooser] Update blocker and homepage.

Package-Manager: portage-2.2.10

---
 dev-qt/qtchooser/qtchooser-39.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-39.ebuild 
b/dev-qt/qtchooser/qtchooser-39.ebuild
index cf9c9a9..1b3438d 100644
--- a/dev-qt/qtchooser/qtchooser-39.ebuild
+++ b/dev-qt/qtchooser/qtchooser-39.ebuild
@@ -9,8 +9,8 @@ inherit toolchain-funcs
 MY_P=${P}-g4717841
 
 DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="http://macieira.org/qtchooser/";
-SRC_URI="http://macieira.org/qtchooser/${MY_P}.tar.gz";
+HOMEPAGE="https://qt.gitorious.org/qt/qtchooser";
+SRC_URI="http://macieira.org/${PN}/${MY_P}.tar.gz";
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 DEPEND="test? ( dev-qt/qttest )"
-RDEPEND="!dev-qt/qtcore:4" # FIXME
+RDEPEND="!