* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
@ 2012-05-22 16:55 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2012-05-22 16:55 UTC (permalink / raw
To: gentoo-commits
commit: cb556a7270039d0bb1eae694258043fac2d248f5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 16:43:51 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue May 22 16:45:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb556a72
[dev-libs/libdbusmenu-qt] Fix optional buildings of tests wrt bug #416845.
(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)
---
| 17 +++++++++++++++++
| 3 ++-
2 files changed, 19 insertions(+), 1 deletions(-)
--git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
new file mode 100644
index 0000000..35df463
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
@@ -0,0 +1,17 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -59,8 +59,13 @@
+ DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+
++
++option(BUILD_TESTS "Build tests" ON)
++
+ add_subdirectory(src)
+-add_subdirectory(tests)
++if(BUILD_TESTS)
++ add_subdirectory(tests)
++endif(BUILD_TESTS)
+ add_subdirectory(tools)
+
+ if(WITH_DOC)
--git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index a7a8d19..1eb8bb0 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -39,7 +39,8 @@ DEPEND="${RDEPEND}
)
"
-DOCS=(NEWS README)
+DOCS=( NEWS README )
+PATCHES=( "${FILESDIR}/${PN}-0.9.2-optionaltests.patch" )
# tests fail due to missing conection to dbus
RESTRICT="test"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
@ 2014-10-01 15:45 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2014-10-01 15:45 UTC (permalink / raw
To: gentoo-commits
commit: ecdc17976494626862d53dcaca26983e08e6c76e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 1 15:45:04 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 1 15:45:04 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ecdc1797
[dev-libs/libdbusmenu-qt] Fix configure when test deps are not present wrt bug #524174
Package-Manager: portage-2.2.10
---
| 17 -----------------
| 9 +++++++--
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
deleted file mode 100644
index 35df463..0000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -59,8 +59,13 @@
- DESTINATION lib${LIB_SUFFIX}/pkgconfig
- )
-
-+
-+option(BUILD_TESTS "Build tests" ON)
-+
- add_subdirectory(src)
--add_subdirectory(tests)
-+if(BUILD_TESTS)
-+ add_subdirectory(tests)
-+endif(BUILD_TESTS)
- add_subdirectory(tools)
-
- if(WITH_DOC)
--git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 73f0c1e..20f22d3 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
"
DOCS=( NEWS README )
-PATCHES=( "${FILESDIR}/${PN}-0.9.2-optionaltests.patch" )
# tests fail due to missing conection to dbus
RESTRICT="test"
@@ -61,10 +60,16 @@ pkg_setup() {
use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
}
+src_prepare() {
+ [[ ${PV} == 9999* ]] && bzr_src_prepare
+ cmake-utils_src_prepare
+
+ use test || comment_add_subdirectory tests
+}
+
src_configure() {
myconfigure() {
local mycmakeargs=(
- $(cmake-utils_use_build test TESTS)
$(cmake-utils_use_with doc)
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
@ 2014-10-10 19:21 Manuel Rüger
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Rüger @ 2014-10-10 19:21 UTC (permalink / raw
To: gentoo-commits
commit: bd6d735e04b170bff78992c7b948c2f9e899e2fd
Author: Manuel Rüger <manuel <AT> rueg <DOT> eu>
AuthorDate: Fri Oct 10 19:20:49 2014 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 19:20:49 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bd6d735e
[dev-libs/libdbusmenu-qt] Add snapshot
Package-Manager: portage-2.2.14_rc1
---
| 16 +++
| 111 +++++++++++++++++++++
2 files changed, 127 insertions(+)
--git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
new file mode 100644
index 0000000..7f6d82e
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
@@ -0,0 +1,16 @@
+--- CMakeLists.txt.old 2014-10-10 21:14:47.139654992 +0200
++++ CMakeLists.txt 2014-10-10 21:16:17.114656451 +0200
+@@ -90,8 +90,12 @@
+ )
+
+ add_subdirectory(src)
++
++option(BUILD_TESTS "Build tests for qt4" ON)
+ if (NOT USE_QT5) # TODO port tests to Qt5
+-add_subdirectory(tests)
++ if(BUILD_TESTS)
++ add_subdirectory(tests)
++ endif(BUILD_TESTS)
+ endif()
+ add_subdirectory(tools)
+
--git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
new file mode 100644
index 0000000..c023e70
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBZR_REPO_URI="lp:libdbusmenu-qt"
+
+[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
+inherit cmake-utils multibuild virtualx ${BZR_ECLASS}
+
+DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
+if [[ ${PV} == 9999* ]] ; then
+ KEYWORDS=""
+else
+ MY_PV=${PV/_pre/+14.10.}
+ SRC_URI="http://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
+ # upstream has no permissions to use some kde written code so repack git
+ # repo every time
+ #SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+ PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc +qt4 qt5"
+S=${WORKDIR}/${PN}-${MY_PV}
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-libs/qjson
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( NEWS README )
+
+# tests fail due to missing connection to dbus
+RESTRICT="test"
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=()
+ use qt4 && MULTIBUILD_VARIANTS+=( qt4 )
+ use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
+}
+
+src_prepare() {
+ [[ ${PV} == 9999* ]] && bzr_src_prepare
+ cmake-utils_src_prepare
+
+ use test || comment_add_subdirectory tests
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with doc)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+ mycmakeargs+=( -DUSE_QT4=ON )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+ mycmakeargs+=( -DUSE_QT5=ON )
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local builddir=${BUILD_DIR}
+
+ BUILD_DIR=${BUILD_DIR}/tests \
+ VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+
+ BUILD_DIR=${builddir}
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
@ 2014-10-15 13:49 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2014-10-15 13:49 UTC (permalink / raw
To: gentoo-commits
commit: b318f1d45cba08ed5c42011fb904874a9cbae8f7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 15 13:49:39 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 13:49:39 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b318f1d4
[dev-libs/libdbusmenu-qt] In portage.
Package-Manager: portage-2.2.12
---
| 16 ---
| 111 ---------------------
2 files changed, 127 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
deleted file mode 100644
index 7f6d82e..0000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.old 2014-10-10 21:14:47.139654992 +0200
-+++ CMakeLists.txt 2014-10-10 21:16:17.114656451 +0200
-@@ -90,8 +90,12 @@
- )
-
- add_subdirectory(src)
-+
-+option(BUILD_TESTS "Build tests for qt4" ON)
- if (NOT USE_QT5) # TODO port tests to Qt5
--add_subdirectory(tests)
-+ if(BUILD_TESTS)
-+ add_subdirectory(tests)
-+ endif(BUILD_TESTS)
- endif()
- add_subdirectory(tools)
-
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
deleted file mode 100644
index c023e70..0000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
-inherit cmake-utils multibuild virtualx ${BZR_ECLASS}
-
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-if [[ ${PV} == 9999* ]] ; then
- KEYWORDS=""
-else
- MY_PV=${PV/_pre/+14.10.}
- SRC_URI="http://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
- # upstream has no permissions to use some kde written code so repack git
- # repo every time
- #SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
- PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +qt4 qt5"
-S=${WORKDIR}/${PN}-${MY_PV}
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? (
- dev-libs/qjson
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=()
- use qt4 && MULTIBUILD_VARIANTS+=( qt4 )
- use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
-}
-
-src_prepare() {
- [[ ${PV} == 9999* ]] && bzr_src_prepare
- cmake-utils_src_prepare
-
- use test || comment_add_subdirectory tests
-}
-
-src_configure() {
- myconfigure() {
- local mycmakeargs=(
- $(cmake-utils_use_with doc)
- )
-
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
- mycmakeargs+=( -DUSE_QT4=ON )
- fi
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
- mycmakeargs+=( -DUSE_QT5=ON )
- fi
-
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
- mytest() {
- local builddir=${BUILD_DIR}
-
- BUILD_DIR=${BUILD_DIR}/tests \
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-
- BUILD_DIR=${builddir}
- }
-
- multibuild_foreach_variant mytest
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-15 13:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-10 19:21 [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/ Manuel Rüger
-- strict thread matches above, loose matches on Subject: below --
2014-10-15 13:49 Michael Palimaka
2014-10-01 15:45 Michael Palimaka
2012-05-22 16:55 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox