fix test logic

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

3 files changed, 72 insertions, 5 deletions

diff --git a/media-libs/libmygpo-qt/ChangeLog b/media-libs/libmygpo-qt/ChangeLog
index 4fb36e290c6c..8a4af70118ba 100644
--- a/media-libs/libmygpo-qt/ChangeLog
+++ b/media-libs/libmygpo-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmygpo-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmygpo-qt/ChangeLog,v 1.4 2014/06/16 13:11:01 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmygpo-qt/ChangeLog,v 1.5 2014/07/04 20:40:11 hasufell Exp $
+
+*libmygpo-qt-1.0.7-r1 (04 Jul 2014)
+
+  04 Jul 2014; Julian Ospald <hasufell@gentoo.org>
+  +libmygpo-qt-1.0.7-r1.ebuild, libmygpo-qt-9999.ebuild:
+  fix test logic
 
   16 Jun 2014; Chema Alonso <nimiux@gentoo.org> libmygpo-qt-1.0.7.ebuild:
   Stable for amd64 wrt bug #508100
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..668b14ecaa44
--- /dev/null
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmygpo-qt/libmygpo-qt-1.0.7-r1.ebuild,v 1.1 2014/07/04 20:40:11 hasufell Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
+HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-qt/qtcore:4
+	>=dev-libs/qjson-0.5"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:4
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:4 )"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use test ; then
+		sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use test MYGPO_BUILD_TESTS)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
index f312b6ba1f2a..ef28058e4cf0 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-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/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild,v 1.1 2013/10/26 11:33:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild,v 1.2 2014/07/04 20:40:11 hasufell Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -20,12 +20,27 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE=""
+IUSE="test"
 
 RDEPEND="dev-qt/qtcore:4
 	>=dev-libs/qjson-0.5"
 DEPEND="${RDEPEND}
 	dev-qt/qttest:4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:4 )"
 
 DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use test ; then
+		sed -i -e '/find_package/s/QtTest//' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use test MYGPO_BUILD_TESTS)
+	)
+	cmake-utils_src_configure
+}