From d9a7198c54caec5a11cc62093a8622dda7434c91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Dec 2017 03:48:52 +0000 Subject: dev-libs/libdbusmenu-qt : version bump --- .../libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild | 21 ----- .../libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild | 21 +++++ dev-libs/libdbusmenu-qt5/Manifest | 2 +- ...smenu-qt5-0.9.3_pre20140619-optionaltests.patch | 16 ---- .../libdbusmenu-qt5-0.9.3_pre20140619-r1.ebuild | 99 ---------------------- .../libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild | 99 ++++++++++++++++++++++ 6 files changed, 121 insertions(+), 137 deletions(-) delete mode 100644 dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild create mode 100644 dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild delete mode 100644 dev-libs/libdbusmenu-qt5/files/libdbusmenu-qt5-0.9.3_pre20140619-optionaltests.patch delete mode 100644 dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20140619-r1.ebuild create mode 100644 dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild deleted file mode 100644 index 41bdea20..00000000 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="A library providing Qt implementation of DBusMenu specification (meta mackage)" -HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" -LICENSE="LGPL-2" -KEYWORDS="amd64 x86" -SLOT="0" -IUSE="debug doc +qt4 qt5" - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - qt4? ( ~dev-libs/libdbusmenu-qt4-${PV} ) - qt5? ( ~dev-libs/libdbusmenu-qt5-${PV} ) -" -DEPEND="" -RESTRICT="test" diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild new file mode 100644 index 00000000..41bdea20 --- /dev/null +++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="A library providing Qt implementation of DBusMenu specification (meta mackage)" +HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" +LICENSE="LGPL-2" +KEYWORDS="amd64 x86" +SLOT="0" +IUSE="debug doc +qt4 qt5" + +REQUIRED_USE="|| ( qt4 qt5 )" + +RDEPEND=" + qt4? ( ~dev-libs/libdbusmenu-qt4-${PV} ) + qt5? ( ~dev-libs/libdbusmenu-qt5-${PV} ) +" +DEPEND="" +RESTRICT="test" diff --git a/dev-libs/libdbusmenu-qt5/Manifest b/dev-libs/libdbusmenu-qt5/Manifest index bbaa0893..0a93c8d6 100644 --- a/dev-libs/libdbusmenu-qt5/Manifest +++ b/dev-libs/libdbusmenu-qt5/Manifest @@ -1 +1 @@ -DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160 +DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 SHA256 a8e6358a31c44ccdf1bfc46c95a77a6bfc7fc1f536aadb913ed4f4405c570cf6 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9 WHIRLPOOL 7832fc56c09e232415befdd032db9498499e722a727215d27796db8cfff104ef7e6b11c8534d42496e4be7dcaec33116d7b2cabe443562a5a364fe5a6dc59a3e diff --git a/dev-libs/libdbusmenu-qt5/files/libdbusmenu-qt5-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt5/files/libdbusmenu-qt5-0.9.3_pre20140619-optionaltests.patch deleted file mode 100644 index 7f6d82eb..00000000 --- a/dev-libs/libdbusmenu-qt5/files/libdbusmenu-qt5-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-qt5/libdbusmenu-qt5-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20140619-r1.ebuild deleted file mode 100644 index 5f71aa0a..00000000 --- a/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20140619-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MY_PN="${PN/qt5/qt}" -MY_PV=${PV/_pre/+14.10.} - -inherit multibuild multilib virtualx cmake-multilib - -DESCRIPTION="A library providing Qt implementation of DBusMenu specification" -HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" -SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${MY_PV}.orig.tar.gz" -KEYWORDS="amd64 x86" -PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" ) -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +qt5" -S=${WORKDIR}/${MY_PN}-${MY_PV} - -RDEPEND="dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-qt/qttest:5 - ) -" - -DOCS=( NEWS README ) - -# tests fail due to missing connection to dbus -RESTRICT="test" - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usex qt5 5) ) -} - -src_prepare() { - cmake-utils_src_prepare - - comment_add_subdirectory tools - use test || comment_add_subdirectory tests -} - -multilib_src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with doc) - -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON - -DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake" - ) - cmake-utils_src_configure -} - -src_configure() { - myconfigure() { - local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT} - multilib_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - mycompile() { - cmake-utils_src_compile - } - - multibuild_foreach_variant mycompile -} - -src_install() { - myinstall() { - cmake-utils_src_install - } - - multibuild_foreach_variant myinstall -} - -src_test() { - mytest() { - multilib_src_test - } - - multibuild_foreach_variant mytest -} - -multilib_src_test() { - local builddir=${BUILD_DIR} - - BUILD_DIR=${BUILD_DIR}/tests \ - VIRTUALX_COMMAND=cmake-utils_src_test virtualmake - - BUILD_DIR=${builddir} -} diff --git a/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild new file mode 100644 index 00000000..526d6a9e --- /dev/null +++ b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MY_PN="${PN/qt5/qt}" +MY_PV=${PV/_pre/+16.04.} + +inherit multibuild multilib virtualx cmake-multilib + +DESCRIPTION="A library providing Qt implementation of DBusMenu specification" +HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" +SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${MY_PV}.orig.tar.gz" +KEYWORDS="amd64 x86" +PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" ) +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug doc +qt5" +S=${WORKDIR}/${MY_PN}-${MY_PV} + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( + dev-qt/qttest:5 + ) +" + +DOCS=( NEWS README ) + +# tests fail due to missing connection to dbus +RESTRICT="test" + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usex qt5 5) ) +} + +src_prepare() { + cmake-utils_src_prepare + + comment_add_subdirectory tools + use test || comment_add_subdirectory tests +} + +multilib_src_configure() { + local mycmakeargs=( + $(cmake-utils_use_with doc) + -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON + -DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake" + ) + cmake-utils_src_configure +} + +src_configure() { + myconfigure() { + local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT} + multilib_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + mycompile() { + cmake-utils_src_compile + } + + multibuild_foreach_variant mycompile +} + +src_install() { + myinstall() { + cmake-utils_src_install + } + + multibuild_foreach_variant myinstall +} + +src_test() { + mytest() { + multilib_src_test + } + + multibuild_foreach_variant mytest +} + +multilib_src_test() { + local builddir=${BUILD_DIR} + + BUILD_DIR=${BUILD_DIR}/tests \ + VIRTUALX_COMMAND=cmake-utils_src_test virtualmake + + BUILD_DIR=${builddir} +} -- cgit v1.2.3