projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84e91e1)
Fix tests
authorJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 09:20:39 +0000 (09:20 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 09:20:39 +0000 (09:20 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

dev-db/sqlitebrowser/ChangeLog patch | blob | history
dev-db/sqlitebrowser/Manifest patch | blob | history
dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch [new file with mode: 0644] patch | blob
dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild patch | blob | history

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index 746562a88f276d3d7ab574e01cca97d52207157a..5faed4ea4ce579851284e6e9476ffd61bc6a1dc3 100644 (file)
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -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 <jlec@gentoo.org>
+  +files/sqlitebrowser-3.5.1-unbundle.patch, sqlitebrowser-3.5.1.ebuild:
+  Fix tests
 
   21 Mar 2015; Justin Lecher <jlec@gentoo.org> sqlitebrowser-3.3.1.ebuild,
   sqlitebrowser-3.5.1.ebuild:
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index a11b10068467e69da5cf3c568bc83b34a1b9193b..2d34bd005f29260beb3de126c914fe5fcdb38e78 100644 (file)
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX sqlitebrowser-3.3.1-unbundle.patch 1270 SHA256 96f7c153df04b75883eded47ae0efe412818522a5f2c77128068dee1ac395553 SHA512 e8e050b6fc7dc85ebfc8543adf00ae07e66a1054c4c5a93c861f7d21b297b769807620b5caa8216a1ec8e0af9231967d6c2c8cd1e47d9fadeffc4ba8e1339282 WHIRLPOOL 243e1c75508460e0bc3066626452ec17fd12b9de997fdefd723d9ae3c89d6e6ae9f5dfc635d370408784a2699cd7805d1aa3fd351fe4f911828e2aabe80362b0
+AUX sqlitebrowser-3.5.1-unbundle.patch 1996 SHA256 2f04ec93b2c43968fe3c1d5fa650cf0c6e5496f93f27a5b0940ed13a05bbf2eb SHA512 7040f7a5c51afef584a20ceac2206ffba99fbcf9693fe09357c74e71acdf1b00d1493b70f7f0cd7134d78b44facb0a51ed0d0504481a426ea475a1b22bd47389 WHIRLPOOL 42cdb6d965b2498e7477f8259f8332623e4f013c62697b7698cdda43ca49728f1e55a8619413a8e6a8fdc2bfdebc4c1d972c0d50d20382a87008ad8e8a80d0e4
 DIST sqlitebrowser-3.3.1.tar.gz 818842 SHA256 5113d3b4c219585fe017047556363d4934b2b3e3f7c3f0968b87e9eac0156d22 SHA512 3cb44631f39b1c1a90b86502761826830054f440509faaece36052958af361185d41335f763499cec5fc005cc90eb7be403c4ac2a5cec655fe63d989434880bc WHIRLPOOL c4ab107ac97800c14ce788e4742beb528f40c74dc787217fdc9fe5dc1f0d8a67b97cd3fc9e6842b54e321d287fff925f050a20d22fbfe5e7491d4c2140c1f6de
 DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
 EBUILD sqlitebrowser-3.3.1.ebuild 1018 SHA256 fe6fcc6b890bf39edce13a9e9763051f6ccd8802cd2d600f6183eb4f5945a8ee SHA512 6db433b952bd05c7c0dccb842173adef133c9195b722439c2dcae1cb08c99e9a21a0b7a1170bed4d975b59d3b594886aa77bcf86683841ab7a788b1f28c916ea WHIRLPOOL 51ba299896ecee17c0928f05b30216449850086445ba4b41407526e370203dce0306d968aafa329547207ce6f3d7908da56439ceb8a7794b5d6de4616250fe36
-EBUILD sqlitebrowser-3.5.1.ebuild 1274 SHA256 d889106a24b6b43a685ae7fe6e9012ea056167190c5d63ea00b56c89c666d28d SHA512 25ec8dbd33571ff27cc3276d7a0aa1e8340e1768f8ac4a2db101d587eae0966adcb46bfeeeb2daaeb66b9dfe5c0d9c0dfbb6257bbb7e2332df71541a9c6b4f59 WHIRLPOOL 6ffd2e0a01a15b2efc3d463c3eb9cf3d4fce76855803c9a6955b004c220b9e9339979ab3eb07a8c683358a35174c8f2b168766b374bba38090fb6f1212c7dfd9
-MISC ChangeLog 3612 SHA256 e9d797d1fbcaebd3ff7bba5f2a5de4a4b75674f815ac608295040569f0c23672 SHA512 a42efb96e1695a0e7189fded673e2f72589196f2b9446ee1f28ab05f41e581b08e9c8984911265775044812aa48c4a0c2423db550f727958378662d149a24611 WHIRLPOOL 118e15ece0b8bfb05d2ea2af3700ee441bcf20934797e48c70dc0ff7a2dba90c7a83cdcb1976eb7d4b9e1e576975e411d516c0170c3433223c8d777bfae8594c
+EBUILD sqlitebrowser-3.5.1.ebuild 1536 SHA256 a30ba3f8323997092e0c424f9f20c228cea4a90d8494cacf73e7af08ad095277 SHA512 c952b31a236cead139f59ddd9bb0e57edc3697da0da9f5265c51ce12946383f022110e6d8e13a114e06bcb158ad70d9e0b3d14a201bebb46b963ce1dd8747c23 WHIRLPOOL 275b551c32dc47fabbeea62f27238a4c29bfd01b0aeefa8c710d82de9de4ac9b0256e44cf2a5ad18d4b494205c125c58874aebcef57ffd50e1c6f327029f4340
+MISC ChangeLog 3745 SHA256 83b4d3e26e858c3746e14505597af94866443a7cb6cf75ae733f6548ea15186d SHA512 f4f50cfe0742bcb787ec29fd1267d6dffae7b77975a77514d893aed9bf777463d79fa39025f6c6cf0aad5b9f00854ab3c6f9b7942ecb6252ce7c6eae705922c2 WHIRLPOOL cd0da41835fb4eefb3fc5a762e14320242a7d174c1f6d4043425b8a405266a34c47c50f6f32eb42d1933d6f4cd031e58a66e5545cc93de2fa65259d4ea86d134
 MISC metadata.xml 630 SHA256 3e72d77ccd73849eb1199ef695e13bf39557e9577e03758ef285d15ad50aa354 SHA512 0b58cee1916972db03c0acabc76974f59b0d0113efaf835edd68a1250aaa228479915fe7e696e622e3efd269828d0a5630285d417701dce50b46691a63d79a44 WHIRLPOOL e40465371d099279cced523b851aa5181bdc759493d510ab760cc1fa066fc456f113829a1abc485f3e62b77bcb5911b017140c78cbb9ac75d12a91e255e2988b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDSw8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVDTfnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirjI4QAJkRMI/H7UTek5QySql70QNT
-ahkhwQ4JInbnkN5ca2gMWiweKD5IctR9qhH/k6pPanfgvw1JUYEbXWntssJ7UsB7
-yZ77bKtEciV4BfMwTYLn1shKomTFcsIg6sDYs8mSiG+Jx6xlAnfEV5+UhCw1fz47
-7QWIKfuYpJo1XcGhi/+3DFtQ5V5AQr+B6qxi6GWjY+IiuhTol/TYTvdncvdbf+D9
-aoqKFzXkf4+c11EquBbBUtRp8Q7Fh86I+KarbkXjkvXi2uf4M7iv8DvaJo6YERp+
-ZCn/8f6b9AxKB5sN7v8D45xVDqVfkP0uHgnhFVoA+yRL8/4q/GtHzJxC98cdmIFP
-w6D1UlLblJ2laS8zz5KuXq6TUDcOc9gMEgZkx1ob+ehcloIANaI1rbD3dy+5ahPo
-2Nu/opONeDfCnMRA5rGp92s1YbAatVgIb8lE4bKTWwY+SMiE55Xh77XsWBUgJSfu
-4Rlu33BzqeIIikJ+u9cs+LsM3CemffNSMG5NQgSMq+RXUqusmMZRQL0IrBgjLEmO
-Yi67qVNTjLWsV7/ikcuWxO9RmJCgKF/VwY6BOOXbjsfgtMEVGSaS0tvL8S4w2HS3
-HWXG34xKfMZKoyu/I1Ujr2eo7VJ9V8KKjw9Y0amGi9FicLfu6sz+G+JqSUZgSC8e
-HDjSHoGoxiPCONjWwEdb
-=bo3o
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircX8P/1Qpv/sVpKc+TgyivbnfhW3d
+2Kh0bcTO19tPwD/ld+5j1759x7Q4wo+ovYMm+FkfEQrgpvUJjhcnAFrrEiClXOlT
+PDO/l/JkJpRaGbKDr+r8Q1jQnHtr2CmzGj0zOEEPylwxe27f+IFjHUVQH1aBQDbo
+2pvzxhtYnVHbewDRw+nM0MdV3m0jKAarcas+Z3LmfClPn2fuwRUCbKAEJn+YJbBO
+T6BcJuY8P2DjCNwLrDdkknwWRDDAd/k5LdkAFOV1JgquTvbmp0HAFLhA1AIAICwa
+Zj65ezYy5qZKdIYtO+t+zS793OxRh5k6CBKFi3v7yfRgIYmO1bvPc3xQxSAgUJTF
+lETxwbzYgqvxJuW8w7spoDwzdNi2eNeM3mlu5au1eKqswOKp+pKr5rUNBTsTWNr6
+Z90igR6HY1WjxyReKWdOV0VQdD8uJNfKq0AZrToTH+jPGAOb2Fx4ir5Se6xB/mc8
+cb3etinxh1pIiSIXxtN298HQm2WhdZpkw42RWo/7cs9FWnPetfmnJX16btETbLlC
+WglxXgQoyPTw1vONonS8W55X7L/SQTJxbdvbG5MvLKMMd1/qen7oHkxBZUUa6jDB
+Hkd3wPuFtJexMLE90tg1XbrD+IseoeFu/mkSctNtNGq0u673nnk2VQN3EILFJmjV
+I9LpwQPH3Xnfr5WqLZZz
+=jl/h
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
new file mode 100644 (file)
index 0000000..203ddfb
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.5.1-unbundle.patch
@@ -0,0 +1,70 @@
+ CMakeLists.txt       | 12 ++----------
+ tests/CMakeLists.txt |  5 +----
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a76947..a58510b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release")
+ endif()
+ 
+-set(ANTLR_DIR libs/antlr-2.7.7)
+ set(QHEXEDIT_DIR libs/qhexedit)
+-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
+ 
+-add_subdirectory(${ANTLR_DIR})
+ add_subdirectory(${QHEXEDIT_DIR})
+-add_subdirectory(${QCUSTOMPLOT_DIR})
+ 
+ if(USE_QT5)
+       find_package(Qt5Widgets REQUIRED)
+@@ -191,9 +187,7 @@ endif(EXTRAPATH)
+ 
+ include_directories(
+               "${CMAKE_CURRENT_BINARY_DIR}"
+-              ${ANTLR_DIR}
+               ${QHEXEDIT_DIR}
+-              ${QCUSTOMPLOT_DIR}
+               ${ADDITIONAL_INCLUDE_PATHS}
+               src)
+ 
+@@ -210,12 +204,10 @@ if(USE_QT5)
+     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
+     set(QT_LIBRARIES "")
+ endif()
+-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
++add_dependencies(${PROJECT_NAME} qhexedit)
+ 
+ link_directories(
+-              "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
+-              "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
+-              "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
++              "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
+ 
+ target_link_libraries(${PROJECT_NAME}
+               antlr
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 75009dc..6fd7f48 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Release")
+ endif()
+ 
+-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
+-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
+-
+ if(USE_QT5)
+     find_package(Qt5Widgets REQUIRED)
+     set(CMAKE_AUTOMOC ON)
+@@ -56,7 +53,7 @@ if(NOT USE_QT5)
+     QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
+ endif()
+ 
+-include_directories("${ANTLR_DIR}" ../src)
++include_directories(../src)
+ 
+ add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})
+ 
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
index 9449eeddf156a78925f72397b33271d82cbdf8d3..b137b3472b274eab151b1061ba001c27eda889a5 100644 (file)
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
@@ -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 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 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 @@ DEPEND="
                )"
 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_prepare() {
 }
 
 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() {
Unnamed repository; edit this file 'description' to name the repository.