Add multilib support by Karol Herbst <gentoo@karolherbst.de>.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 36a5a6cd72a79e598b8569cec113c16f38c394cb..829d11792ca89b042cf1139ccf0f2ecb776a66f5 100644 (file)
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.39 2015/01/30 20:40:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.40 2015/02/26 12:41:00 kensington Exp $
+
+*libdbusmenu-qt-0.9.3_pre20140619-r1 (26 Feb 2015)
+
+  26 Feb 2015; Michael Palimaka <kensington@gentoo.org>
+  +libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild:
+  Add multilib support by Karol Herbst <gentoo@karolherbst.de>.
 
   30 Jan 2015; Johannes Huber <johu@gentoo.org>
   libdbusmenu-qt-0.9.3_pre20140619.ebuild:

diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 8c917c9504f2102f44b325e555358bc7618732e9..a8a96ccc8fb9939e718c07bba119917d21cedd2b 100644 (file)
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -6,23 +6,25 @@ AUX libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch 383 SHA256 ecd136a04d75
 DIST libdbusmenu-qt-0.9.2.tar.xz 242888 SHA256 ecd1108f637c4c58946aff2aba70010f8060bd87c1acc85a917c2b3f43cf406d SHA512 93471a03cfc127babc58cf07b1caa30ae901ad2d213790d5085117f331a6cea0d2ab6b5ba21abdf582c40f172ff8e8168a185fa1a27d7d367a01a3b6ed731155 WHIRLPOOL b38e23c9def7802040c8ce94bcce6a644cf5e088a90fda091a2ba75b5a332b36d97f00d998f8c1b1942101eceecdb8c78612fcb3ee5f0604de98f65aa33cb3f7
 DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160
 EBUILD libdbusmenu-qt-0.9.2.ebuild 1584 SHA256 d5d2e3da65c5fb7b5e6d7a50a2b97999046e37082abca4f1456093f70a701294 SHA512 49af1dd63fd3bd975df7a2642f4758e89c2d30ca7fe6bfef6e1be5080f3afabe27d5512c17a769d7abe5d54894f39fd5b91b4a36200311a69d697320629048b3 WHIRLPOOL c213dde5f85466f8c3f964f9439e4146b6e09e527ef846b1da35c081842e41fd9c5ab9ef22cf3af92e80d2517365e4a4b9c07e5e1965ffc9baa1ce8897a5f850
+EBUILD libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild 3125 SHA256 677d29573d0c33fb3cccbcb6d4360f6dcf9ec9dbaf729f2a3e2fe9f36aaf9d32 SHA512 5e080b03c157371cf42f36fe7e5e61c5193814e275f18fa4468c0bb2a28519e6d5cb549a772c764e9a30edff94a7a9d0f9f4571ad63da324d41ae4e86124f337 WHIRLPOOL f291f01e3a4befb9353f2ead89337336a2bdb522fe4a6056762dcb12f43786481eb9a5247390ab8d00a2c6cd084b8ec480f2ced45d3187de71eb24eb4c478c2d
 EBUILD libdbusmenu-qt-0.9.3_pre20140619.ebuild 2341 SHA256 19640c1957284cb36100b73e2c7325132b2fc53a38ec13a6316c8ffc9441bb1a SHA512 6dc1c277b3cae007df65567819f502fe5807f8f31b8c746d59aed684afb1f4204ad40cdbfa69ac169d79a085b95477ba5ebe061a0fe7153ffd8a019a74f8af65 WHIRLPOOL 6c0e10dec4057a84a11f56276093165b6383bcd29a37d476de869b6b87e2ad3313f765a5fab8423b7745407b320b31e070368f73a016bb8a17e2187f75dc4395
-MISC ChangeLog 5961 SHA256 b2957dfad2e84bb9482f9bbedc72d0199c471f3e5be8ad9da515ae9ed2da193b SHA512 589ea1194ff783efd9bd35dac8f20f919ceac50a3f1135a72c6503306c796a194037dc2d9943f99f65d51514fb6dd21512edaa949bbfab2cfc1d384213550b08 WHIRLPOOL fae5923307a03cd317de758f7c010b3c16fd54f5b950dc32e4a68fb95b283d92b334012da0e7113aba4d9b3adb3849f1264639fea2b735eff26857d2770f4bdd
+MISC ChangeLog 6187 SHA256 45f60e4af104539dfd683cfee2b4d6c6e594929379eb9e160b7f6c5e77a31ec9 SHA512 3d1208b23e54ab51244f4395259a2239e51ba7247677dd9f2a071fe738b0ddf20bf82fac4e08ab7baa72ad36ec73757b969acf323e8d467ad958a9e5afac79ac WHIRLPOOL c8ca1f013e615a64758b49bd376509e0849cbee2006d72a60bf6f420592fc05b13b424d6346d8680cde3614a14d8c43ebc513c69bd6a4a1bacc628fd729c5829
 MISC metadata.xml 255 SHA256 dc41bad6a32aa70aaf9724aa119a3bfbe4b0c81e29add0cd88c3f71223344984 SHA512 b8add7d8b375b51c03bce2893170e1dea441882876963cf799f349a0bf894312f397d0f7373914e10073b4aa2f0efcd0ad824dde519f1d28aeff46b0c1cc1675 WHIRLPOOL 790f2d96fc4ca8e044eba597c3954a9ebd1a3fd0a372f4b443a1d61c9155d0c7c9ab3d27393568e1112ac376ef87652772b5313945d5b4691f17cfe4603d3efb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUy+xYAAoJEGVpnaTzz9K9us0P/1a5Kp/D3pOgaKiZu7PBYDYc
-jhE5lQqJ1Y+kXkYPA4yAO1NfGZqLzVAgeYA0H8MdrFjy0UL3zMT5HtXtBShkm6dG
-w3C6Mcf+Cak72JH0w8i+S0+Sl9U1Hdcj5qJqEWHIK1fvaFwoGc3b9hFl2cKRwuFo
-gq3jvDZr4TMSZf32HG9U9y+Px2zYo2JLBllZyPJjmJvi38ZswCIq3Xt7ASNiP5Xy
-8svgXf0Beua35OVqXhC6NV+xeuSQ08zRfbpooMwklUxTTTWPpyopT6+XqIqD2vPL
-TDnl61h9WediM7AiF3EM++4tn2r2cvt+CnK1U9/9v9+oxn45XoA7iEUU4We7xNC7
-NfYSSvXNXkyU8eq8FfExkOXBry6VwOfBMkn/ZBxtKWlQwILkLgFWmnLM7A4RfwUh
-2ew8beJ2XR0FziYE/SZRHarKWF2cawb5TKNZJmkxFz5xkaoU0HCbdQU9J0gGK4ih
-bWQLNhkMko6XR5ZopQcC1tV0sRM3PRpi5oZwepVmlVPhQG0UKBxEf4i3gGevxqlm
-qWIeGIE93nS1agENuPyM5roleMpLvbX62bMw1HhwvXG/iJibQZdVN5jZBmzN5qfY
-fZMdQ0Lnnzf5571K3qBTzx+qorZOPC/Ic/CUGZ1fKScaKP6PD5/TO7Y9UOvnQQLs
-kx/11GbIGxc99Sr4REjd
-=nxf8
+iQJiBAEBCABMBQJU7xSQRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7OJjEACZhv68BbJJEdYB+EwpxBUAIR0hB9+nO+v2nDM9PZIAK0Sma+WYW9LlLsoz
+JgV4n8gRa3GX4AlsYhYhv1b36f5a2C7AU2X/PYJPWmSDjLjTk/uZfDitvzf46vjO
+Z6Hu3CCAIMAZlpJP/6WL6qHZWpy5rtLBRZNzcQkhpCgzjuDlQ8oiCRiuGZxEc3fF
+PxAHhB9JhOP8wtNP3aAV9t0YQsILnRuZcVnuHVmKq7Zx+dHoHmSIhe55pNl5jchU
+muJK2THlHTSGiaeRG1Lod/QaHPwQoZgfQgbM2lEbA9wRydav+TcblZCnfmdWaENr
+tcFJmaPCfOGoaMIn1LONrqwWaVWUUphHZtAuXvpON6gDK4YZtlUdHKQW7TxCL/VB
+VIHS3gZaOsbomVomv/BC1hK+gJK0aHs5HA6t0UwKUNNoJBzmap9feQVsB7blF7JX
+Ou5xYLWiF76K0OEAw3gS4VbWQz0RyCE/yUDnN4Bpn7MSQawv+rh2vlYJDHmHhX2q
+2mnM2wE5v+nOS65u162JXcqcooh/M/IIb2SPR5/03lPnfm+TWVpGiVJ7pXUFgkKx
+CtpDGYxUoagADwAVH1QZ9r8+p7qAx+/sBeSQ9XHQ8EefHoQ+6XJbD089rrWXyIap
+hisyb6LcgPPZk1jVoSnstQxMKbcArNWbNJ6Qp84zuS8/qYt/3A==
+=9b9q
 -----END PGP SIGNATURE-----

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
new file mode 100644 (file)
index 0000000..e10d9d8
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild,v 1.1 2015/02/26 12:41:00 kensington Exp $
+
+EAPI=5
+
+EBZR_REPO_URI="lp:libdbusmenu-qt"
+
+[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
+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} == 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 ~x86-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[${MULTILIB_USEDEP}]
+               dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+               dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+       )
+       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[${MULTILIB_USEDEP}]
+               qt4? ( dev-qt/qttest:4[${MULTILIB_USEDEP}] )
+               qt5? ( dev-qt/qttest:5 )
+       )
+"
+
+DOCS=( NEWS README )
+
+# tests fail due to missing connection to dbus
+RESTRICT="test"
+
+pkg_setup() {
+       MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
+}
+
+src_prepare() {
+       [[ ${PV} == 9999* ]] && bzr_src_prepare
+       cmake-utils_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 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 \
+               VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+
+       BUILD_DIR=${builddir}
+}