[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: ad8d7ddd1e78750d174d372a46f2c4fd5c73e7fe
Author: Johannes Huber gentoo org>
AuthorDate: Sat Sep 9 14:02:57 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Sep 9 14:04:43 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad8d7ddd
dev-libs/libdbusmenu-qt: Drop live pkg
Dead upstream. Repository is not accessible without account.
"You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data."
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 124 -
dev-libs/libdbusmenu-qt/metadata.xml | 8 --
2 files changed, 132 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
deleted file mode 100644
index 34335d9c8a..00
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == * ]] && inherit bzr
-inherit cmake-multilib multibuild virtualx
-
-DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
-if [[ ${PV} != * ]] ; then
- MY_PV=${PV/_pre/+16.04.}
-
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz;
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug qt4"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- qt4? (
- >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qttest:5
- qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
- )
-"
-
-[[ ${PV} == * ]] || S=${WORKDIR}/${PN}-${MY_PV}
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
-}
-
-src_prepare() {
- [[ ${PV} == * ]] && bzr_src_prepare
- cmake-utils_src_prepare
-
- cmake_comment_add_subdirectory tools
- use test || cmake_comment_add_subdirectory tests
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DWITH_DOC=OFF
- -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}
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_configure
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- multilib_src_configure
- fi
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- mycompile() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_compile
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- cmake-utils_src_compile
- fi
- }
-
- multibuild_foreach_variant mycompile
-}
-
-src_install() {
- myinstall() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_install
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- cmake-utils_src_install
- fi
- }
-
- multibuild_foreach_variant myinstall
-}
-
-src_test() {
- mytest() {
- if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
- cmake-multilib_src_test
- elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
- multilib_src_test
- fi
- }
-
- multibuild_foreach_variant mytest
-}
-
-multilib_src_test() {
- local builddir=${BUILD_DIR}
-
- BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
-
- BUILD_DIR=${builddir}
-}
diff --git a/dev-libs/libdbusmenu-qt/metadata.xml
b/dev-libs/libdbusmenu-qt/metadata.xml
deleted file mode 100644
index 2fdbf33d96..00
--- a/dev-libs/libdbusmenu-qt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
- k...@gentoo.org
- Gentoo KDE Project
-
-
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: 3b8f699e3ef9281bc5930b12f62197776704966b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 31 22:13:40 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 31 22:13:40 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b8f699e
dev-libs/libdbusmenu-qt: Drop USE=qt5, build it unconditionally
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 9434c8fa7e..34335d9c8a 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -6,9 +6,9 @@ EAPI=6
EBZR_REPO_URI="lp:libdbusmenu-qt"
[[ ${PV} == * ]] && inherit bzr
-inherit cmake-multilib multibuild multilib virtualx cmake-multilib
+inherit cmake-multilib multibuild virtualx
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
if [[ ${PV} != * ]] ; then
MY_PV=${PV/_pre/+16.04.}
@@ -18,27 +18,23 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="debug qt4"
RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
qt4? (
>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
)
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
"
DEPEND="${RDEPEND}
test? (
+ dev-qt/qttest:5
qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
- qt5? ( dev-qt/qttest:5 )
)
"
@@ -50,7 +46,7 @@ DOCS=( NEWS README )
RESTRICT="test"
pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
+ MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
}
src_prepare() {
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: a955f8c79a3797748cc0cfc9ee01f12ff1b73da2
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jul 20 15:46:46 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jul 20 15:46:49 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a955f8c7
dev-libs/libdbusmenu-qt: sync with main tree
Package-Manager: portage-2.3.0
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 27 --
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 368fc09..1a2aea3 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -6,26 +6,20 @@ EAPI=6
EBZR_REPO_URI="lp:libdbusmenu-qt"
-[[ ${PV} == * ]] && BZR_ECLASS="bzr"
-inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
+[[ ${PV} == * ]] && inherit bzr
+inherit cmake-multilib multibuild multilib virtualx cmake-multilib
DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
-if [[ ${PV} == * ]] ; then
- KEYWORDS=""
-else
- MY_PV=${PV/_pre/+14.10.}
+if [[ ${PV} != * ]] ; then
+ MY_PV=${PV/_pre/+16.04.}
SRC_URI="https://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="https://dev.gentoo.org/~scarabeus/${P}.tar.xz;
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
- PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2"
SLOT="0"
-IUSE="debug doc +qt4 qt5"
+IUSE="debug +qt4 qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -43,14 +37,14 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
test? (
- dev-libs/qjson[${MULTILIB_USEDEP}]
qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
qt5? ( dev-qt/qttest:5 )
)
"
+[[ ${PV} == * ]] || S=${WORKDIR}/${PN}-${MY_PV}
+
DOCS=( NEWS README )
# tests fail due to missing connection to dbus
@@ -70,7 +64,7 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- -DWITH_DOC=$(usex doc)
+ -DWITH_DOC=OFF
-DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
)
@@ -129,8 +123,7 @@ src_test() {
multilib_src_test() {
local builddir=${BUILD_DIR}
- BUILD_DIR=${BUILD_DIR}/tests \
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+ BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
BUILD_DIR=${builddir}
}
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: e8ad76eb2adbbeea3d5da003dc67375cbb49edfe
Author: Johannes Huber gentoo org>
AuthorDate: Mon Mar 21 17:43:53 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Mar 21 17:43:53 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8ad76eb
dev-libs/libdbusmenu-qt: EAPI 6
Package-Manager: portage-2.2.28
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 4f0e76e..368fc09 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EBZR_REPO_URI="lp:libdbusmenu-qt"
@@ -64,13 +64,13 @@ src_prepare() {
[[ ${PV} == * ]] && bzr_src_prepare
cmake-utils_src_prepare
- comment_add_subdirectory tools
- use test || comment_add_subdirectory tests
+ cmake_comment_add_subdirectory tools
+ use test || cmake_comment_add_subdirectory tests
}
multilib_src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_with doc)
+ -DWITH_DOC=$(usex doc)
-DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
)
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: 58d9706e5268d39ebd90efaff63b89e4130bc422
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Dec 8 14:51:48 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Dec 8 14:51:48 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=58d9706e
dev-libs/libdbusmenu-qt: sync with main tree
Package-Manager: portage-2.2.26
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 91 ++
1 file changed, 60 insertions(+), 31 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index c69e472..5dab70b 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -7,18 +7,20 @@ EAPI=5
EBZR_REPO_URI="lp:libdbusmenu-qt"
[[ ${PV} == * ]] && BZR_ECLASS="bzr"
-inherit cmake-utils multibuild virtualx ${BZR_ECLASS}
+inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
HOMEPAGE="https://launchpad.net/libdbusmenu-qt/;
if [[ ${PV} == * ]] ; then
KEYWORDS=""
else
- #SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2;
+ MY_PV=${PV/_pre/+14.10.}
+
SRC_URI="https://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 ~x86-fbsd
~amd64-linux ~x86-linux"
+ #SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz;
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
+ PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
fi
LICENSE="LGPL-2"
@@ -29,9 +31,9 @@ REQUIRED_USE="|| ( qt4 qt5 )"
RDEPEND="
qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
+ >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
)
qt5? (
dev-qt/qtcore:5
@@ -43,19 +45,19 @@ RDEPEND="
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
test? (
- dev-libs/qjson
- qt4? ( dev-qt/qttest:4 )
+ dev-libs/qjson[${MULTILIB_USEDEP}]
+ qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
qt5? ( dev-qt/qttest:5 )
)
"
DOCS=( NEWS README )
-# tests fail due to missing conection to dbus
+# tests fail due to missing connection to dbus
RESTRICT="test"
pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+ MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
}
src_prepare() {
@@ -66,42 +68,69 @@ src_prepare() {
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 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 )
+ local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_configure
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ multilib_src_configure
fi
-
- cmake-utils_src_configure
}
multibuild_foreach_variant myconfigure
}
src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
+ mycompile() {
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_compile
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ cmake-utils_src_compile
+ fi
+ }
+
+ multibuild_foreach_variant mycompile
}
-src_test() {
- mytest() {
- local builddir=${BUILD_DIR}
+src_install() {
+ myinstall() {
+ if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+ cmake-multilib_src_install
+ elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+ cmake-utils_src_install
+ fi
+ }
- BUILD_DIR=${BUILD_DIR}/tests \
-
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: c413821fb7f299e7bca464372baf9e9fd59d08a7
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Mar 1 15:34:57 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Mar 1 15:34:57 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c413821f
[dev-libs/libdbusmenu-qt] Fix multilib build when dev-libs/qjson is missing wrt
bug #541438.
Package-Manager: portage-2.2.17
---
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 64aa110..5b9d947 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -62,6 +62,7 @@ src_prepare() {
[[ ${PV} == * ]] bzr_src_prepare
cmake-utils_src_prepare
+ comment_add_subdirectory tools
use test || comment_add_subdirectory tests
}
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: 39cc8e28b467c66a7eb93cc7efa3d349a8fa1eb8
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Fri Jan 30 20:34:12 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri Jan 30 20:34:12 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=39cc8e28
[dev-libs/libdbusmenu-qt] Shorten pkg setup
Package-Manager: portage-2.2.15
---
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 88c2dc3..64aa110 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -55,9 +55,7 @@ DOCS=( NEWS README )
RESTRICT=test
pkg_setup() {
- MULTIBUILD_VARIANTS=()
- use qt4 MULTIBUILD_VARIANTS+=( qt4 )
- use qt5 MULTIBUILD_VARIANTS+=( qt5 )
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
}
src_prepare() {
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
commit: b318f1d45cba08ed5c42011fb904874a9cbae8f7
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Oct 15 13:49:39 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Oct 15 13:49:39 2014 +
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
---
...usmenu-qt-0.9.3_pre20140619-optionaltests.patch | 16 ---
.../libdbusmenu-qt-0.9.3_pre20140619.ebuild| 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..000
---
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..000
--- 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} == * ]] 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} == * ]] ; 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} == * ]] 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
-}
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/
commit: c9d32e068f2517cd40d7fd924273e9cd78e03a20
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Oct 15 13:50:26 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Oct 15 13:50:26 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c9d32e06
[dev-libs/libdbusmenu-qt] Sync KEYWORDS with portage.
Package-Manager: portage-2.2.12
---
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 20f22d3..c01b8fa 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
@@ -18,7 +18,7 @@ else
# 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
+ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux
fi
LICENSE=LGPL-2
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
commit: bd6d735e04b170bff78992c7b948c2f9e899e2fd
Author: Manuel Rüger manuel AT rueg DOT eu
AuthorDate: Fri Oct 10 19:20:49 2014 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Fri Oct 10 19:20:49 2014 +
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
---
...usmenu-qt-0.9.3_pre20140619-optionaltests.patch | 16 +++
.../libdbusmenu-qt-0.9.3_pre20140619.ebuild| 111 +
2 files changed, 127 insertions(+)
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
new file mode 100644
index 000..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)
+
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
new file mode 100644
index 000..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} == * ]] 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} == * ]] ; 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} == * ]] 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
+}
[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/files/, dev-libs/libdbusmenu-qt/
commit: ecdc17976494626862d53dcaca26983e08e6c76e
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Oct 1 15:45:04 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Oct 1 15:45:04 2014 +
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
---
.../files/libdbusmenu-qt-0.9.2-optionaltests.patch | 17 -
dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild | 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..000
--- 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)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
index 73f0c1e..20f22d3 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-.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} == * ]] 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)
)
