Update ebuilds and version bump

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key F82F92E6)

4 files changed, 127 insertions, 58 deletions

diff --git a/app-office/QtBitcoinTrader/ChangeLog b/app-office/QtBitcoinTrader/ChangeLog
index cc67241ff4fd..1d66f60aa082 100644
--- a/app-office/QtBitcoinTrader/ChangeLog
+++ b/app-office/QtBitcoinTrader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/QtBitcoinTrader
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/ChangeLog,v 1.6 2013/12/14 03:28:27 alexxy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/ChangeLog,v 1.7 2014/10/14 19:34:24 alexxy Exp $
+
+*QtBitcoinTrader-1.08.01 (14 Oct 2014)
+
+  14 Oct 2014; Alexey Shvetsov <alexxy@gentoo.org>
+  +QtBitcoinTrader-1.08.01.ebuild, -QtBitcoinTrader-1.07.96.4.ebuild,
+  QtBitcoinTrader-9999.ebuild:
+  Update ebuilds and version bump
 
 *QtBitcoinTrader-1.07.96.4 (14 Dec 2013)
 
diff --git a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild b/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild
deleted file mode 100644
index e006545418fc..000000000000
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild,v 1.1 2013/12/14 03:28:27 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/JulyIGHOR/QtBitcoinTrader.git
-		https://github.com/JulyIGHOR/QtBitcoinTrader.git"
-	EGIT_BRANCH="testing"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	eclass=vcs-snapshot
-	SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit base fdo-mime qt4-r2 ${eclass}
-
-DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
-HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtgui:4
-	dev-qt/qtmultimedia:4"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake4 \
-		src/${PN}_Desktop.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.08.01.ebuild b/app-office/QtBitcoinTrader/QtBitcoinTrader-1.08.01.ebuild
new file mode 100644
index 000000000000..431adedbbebc
--- /dev/null
+++ b/app-office/QtBitcoinTrader/QtBitcoinTrader-1.08.01.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-1.08.01.ebuild,v 1.1 2014/10/14 19:34:24 alexxy Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	eclass=git-2
+	EGIT_REPO_URI="
+		git://github.com/JulyIGHOR/QtBitcoinTrader.git
+		https://github.com/JulyIGHOR/QtBitcoinTrader.git"
+	EGIT_BRANCH="testing"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	eclass=vcs-snapshot
+	SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit base fdo-mime qmake-utils ${eclass}
+
+DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
+HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="qt4 qt5"
+
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+"
+
+DEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qtscript:4
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtmultimedia:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	if use qt4; then
+		eqmake4 \
+			src/${PN}_Desktop.pro \
+			PREFIX="${EPREFIX}/usr" \
+			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+			ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	elif use qt5; then
+		eqmake5 \
+			src/${PN}_Desktop.pro \
+			PREFIX="${EPREFIX}/usr" \
+			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+			ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild b/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild
index f7596f2f182d..b7c101bc8f9f 100644
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild
+++ b/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.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/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild,v 1.4 2013/12/14 03:28:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild,v 1.5 2014/10/14 19:34:24 alexxy Exp $
 
 EAPI=5
 
@@ -18,26 +18,57 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit base fdo-mime qt4-r2 ${eclass}
+inherit base fdo-mime qmake-utils ${eclass}
 
 DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
 HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="qt4 qt5"
+
+REQUIRED_USE="
+	^^ ( qt4 qt5 )
+"
 
 DEPEND="
-	dev-qt/qtgui:4
-	dev-qt/qtmultimedia:4"
+	dev-libs/openssl
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtmultimedia:4
+		dev-qt/qtscript:4
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtmultimedia:5
+	)
+"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	eqmake4 \
-		src/${PN}_Desktop.pro \
-		PREFIX="${EPREFIX}/usr" \
-		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	if use qt4; then
+		eqmake4 \
+			src/${PN}_Desktop.pro \
+			PREFIX="${EPREFIX}/usr" \
+			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+			ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	elif use qt5; then
+		eqmake5 \
+			src/${PN}_Desktop.pro \
+			PREFIX="${EPREFIX}/usr" \
+			DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+			ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }
 
 pkg_postinst() {