jlec 15/03/21 09:20:34 Modified: sqlitebrowser-3.5.1.ebuild ChangeLog Log: Fix tests (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.3 dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild?r1=1.2&r2=1.3 Index: sqlitebrowser-3.5.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sqlitebrowser-3.5.1.ebuild 21 Mar 2015 08:30:48 -0000 1.2 +++ sqlitebrowser-3.5.1.ebuild 21 Mar 2015 09:20:34 -0000 1.3 @@ -1,9 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild,v 1.2 2015/03/21 08:30:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild,v 1.3 2015/03/21 09:20:34 jlec Exp $ EAPI=5 +CMAKE_MAKEFILE_GENERATOR=ninja + inherit eutils cmake-utils DESCRIPTION="SQLite Database Browser" @@ -13,7 +15,7 @@ LICENSE="GPL-3 MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="qt4 qt5" +IUSE="qt4 qt5 test" REQUIRED_USE="^^ ( qt4 qt5 )" @@ -34,7 +36,7 @@ )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-3.3.1-unbundle.patch ) +PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) src_prepare() { # https://github.com/qingfengxia/qhexedit still bundled @@ -43,15 +45,24 @@ } src_configure() { - # Wait for unmask local mycmakeargs=( $(cmake-utils_use_use qt5) ) cmake-utils_src_configure + if use test; then + BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_configure + fi +} + +src_compile() { + cmake-utils_src_compile + if use test; then + BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_compile + fi } src_test() { - ls -l sqlb-unittests + tests/sqlb-unittests || die } src_install() { 1.21 dev-db/sqlitebrowser/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/ChangeLog?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/ChangeLog?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/sqlitebrowser/ChangeLog?r1=1.20&r2=1.21 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 21 Mar 2015 08:30:48 -0000 1.20 +++ ChangeLog 21 Mar 2015 09:20:34 -0000 1.21 @@ -1,6 +1,10 @@ # ChangeLog for dev-db/sqlitebrowser # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.20 2015/03/21 08:30:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.21 2015/03/21 09:20:34 jlec Exp $ + + 21 Mar 2015; Justin Lecher <[email protected]> + +files/sqlitebrowser-3.5.1-unbundle.patch, sqlitebrowser-3.5.1.ebuild: + Fix tests 21 Mar 2015; Justin Lecher <[email protected]> sqlitebrowser-3.3.1.ebuild, sqlitebrowser-3.5.1.ebuild:
