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

[Davide Pesavento]

commit:     30f81d5fe4e08b17dc34eee44b9964091f487050
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  7 00:21:46 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul  7 00:21:46 2014 +0000
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 c3bacb8b3f58d52b7c32ba80000da06d7aa70de058e5d3e23236191934c016e822abf2f39c7d27522c2c7fe1c45e74557b303151b352bd6c82786747b6ccbd18

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="!<dev-qt/qtcore-4.8.6:4"
 
-S=${WORKDIR}/${MY_P}
+qtchooser_make() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		LFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		"$@"
+}
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" LFLAGS="${LDFLAGS}"
+	qtchooser_make
 }
 
 src_test() {
-	emake CXX="$(tc-getCXX)" LFLAGS="${LDFLAGS}" check
+	qtchooser_make check
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
+	qtchooser_make INSTALL_ROOT="${D}" install
+
+	# TODO: bash and zsh completion
+	# newbashcomp scripts/${PN}.bash ${PN}
 }