Solve issue where multibuild image is discarded wrt bug #529686.

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

3 files changed, 109 insertions, 2 deletions

diff --git a/sys-auth/polkit-qt/ChangeLog b/sys-auth/polkit-qt/ChangeLog
index e3292e74aeb8..a38ff7e30f89 100644
--- a/sys-auth/polkit-qt/ChangeLog
+++ b/sys-auth/polkit-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/polkit-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-qt/ChangeLog,v 1.34 2014/10/05 15:36:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-qt/ChangeLog,v 1.35 2014/11/24 16:59:13 kensington Exp $
+
+*polkit-qt-0.112.0-r1 (24 Nov 2014)
+
+  24 Nov 2014; Michael Palimaka <kensington@gentoo.org>
+  +polkit-qt-0.112.0-r1.ebuild:
+  Solve issue where multibuild image is discarded wrt bug #529686.
 
   05 Oct 2014; Manuel Rüger <mrueg@gentoo.org> polkit-qt-0.112.0.ebuild:
   Mark stable on amd64. Bug #524294
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index 27b7de77489a..4ee845fb26de 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST polkit-qt-1-0.103.0.tar.bz2 67592 SHA256 2e32566b8e3d0fd7cf619497089763303c3dc08b7e5a666b2369720fced2274c SHA512 be26492f0c5a7917a4df6c3084a764aa962ff036195a34506230790deeabd9e043653f647b9562241071e02376503be4bce16016d99fa03cccef93c081c8bfb8 WHIRLPOOL 857bda4b3e91f427353d9e163ff4672b4f69780e30ad764805bfd5361ca2c904e08f18911094b0d2fbce9bdfb27604d268b9f8c7349c03128924f16011468575
 DIST polkit-qt-1-0.112.0.tar.bz2 67725 SHA256 67fb03bf6ca3e0bdbd98d374dfb5b1651a07d17ae6c23e11a81b4b084447e7c6 SHA512 4cb17389b54a09c53052f6d72aa5cbfe09ccb19f7fd4edf8b43ccd4751f5e88609c5f89777f4af92167d32eb2ce1e78537cea7bcfb60a90072d1fe02d6a59b50 WHIRLPOOL cf77234386646a145c807888ba361dad45f50e8857d8bea7d507b966fd52172b870ffa16c8c5df15296419ee04778614161fff9466d31af44661730916435f73
 EBUILD polkit-qt-0.103.0.ebuild 879 SHA256 69c67a3a6ca2458d087b833c93fc79af8ce4a710b8fa141cee4f9f5b15cf48f7 SHA512 d4eb0594d3be9a2b936010b4f8a17935d8954e4042144d4db7318f40182e6947bdf91e0a7aad4b803aba507fd786488226746577a44ea16a388c4ace194634b8 WHIRLPOOL d0dd7e43307b96d79fa4ba51ef780ac80189873d56eb888a3f5b8ac5fb9f450402f8718d8d77aff49ef3411259486d01a5e808eab80b46951f257bfb03c0f225
+EBUILD polkit-qt-0.112.0-r1.ebuild 1591 SHA256 ccca74d299719324ba1da65f8f6ce1092f925946885190058b94547bae3b0b4c SHA512 ed5ee139089636acc0a3f3af5590d852d088a2691976f96ba2676c8dd943b1f0a48351ae32e1afc52f5d72e241412eec0943bc12d7a517e10830b8379c4ded73 WHIRLPOOL 4cec512166d4ab17aac2cdbee6e2188992e9dc58e4d4b828d0b00334f17c491424d027ea8fd3757cdc96972e401dd5454120f743a7b1841c1239af115f2fce41
 EBUILD polkit-qt-0.112.0.ebuild 1551 SHA256 9935b8554d8abf1807fa5d73363ac59f8dc12239948200ad1c596bc01bdd8925 SHA512 6bd0de3abfd570ece5b449c1a1bda2c50eb9f77ebf9640ca266920eb8e431bccec4280f20de6f2d1bb108e4784a53161172abf219e3caaa3eff935dc6e70e8b7 WHIRLPOOL 99ef4768e15a6060bc0bee5a195d87eef60e97d64537ddaafd869ccb159efb1db17c5c5ab3900a018dfff8a4b74a3e1d7c1abab270d64eaad53163fbc235e6fd
-MISC ChangeLog 4388 SHA256 1ce3e31d57d83037e54b7ffbd5ff54a1b835ed3d722d7eb8633435b1ec3c57fa SHA512 5e5b2df9f8b7174388f5a6fb1e40724e9bee26b519dcf0fcc92f6df42d577b243dbef78d3c7cafec3ec7db27cf837c45408bd679b55a1103bb56648b93812ad8 WHIRLPOOL 835a51482f5bf827b4599e0e0d9676030c53264a550fd9e39a8f1ed459dc7d8361ea5ba54addffc800bc647a85aaecc675df3837faf291d7c04ae55a1d7f04ac
+MISC ChangeLog 4586 SHA256 8577155606046f9eefbdfa048898aa394ca8b1461f600838b05687ababce5b09 SHA512 01a4101793b79ffeadf74a86b49dda6b84ae94ebc1dda8680b0f508eda3e3862397f1121b14cb2ea798bf9b5641a0850990f062b5c66872f56d2c093f818bd2c WHIRLPOOL d23405a7f6d34810d62eab56a96e375a1b764a39dc73f2b9668385d0040bbaa4b73357232bb4faf24ac7e73b33a9dedc32891712dfbe878f4d05ee5f84c4b133
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJiBAEBCABMBQJUc2PyRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7HD2D/0TsfTYMvu7bBh/nQRbBiRUlYxhP0sCcfbn+YovBVCwP3WPCgFUOMiDTObA
+hgPpb1L7qxt3Asdu2PiRoX+VM9P65mutV6GOTSkhYTr0UTIbY5S9S7yJI9nOI0UQ
+UAn1DiU5f/bdURQ0E45bvhKqja9+WTpQnMtcKoAKlzm5TZGHj/AvhaCupntB+qB3
+BFHATziM5lnp/xunL5jVYQkcnEWoufVN/mUY84r6PK0trbKROq5pQZtcFO865IJL
+I/gR+uq55OiIowDhG2RR76LSp6iXRVEM73a4BDnsEu/9a38NeVyi1t8LpgsP8w7y
+8LNmVKKBTf98x6gZPLgc9/uF+1fLnS/10SfWPtXQ5EOEL2yJQuSVDjsJYfLthbOh
+kjUbJ60wOteX9tJWZEikCW9UQTZE8McTHIwJh1bP5lPGvfsGjC6crKVSus50R/Fi
+TPyuD3DrqFkBl8MpqGGCJ+/kp4jjZp9B7RB49Xuh5h/civ64Gj9g4j1pJ8qlMfHZ
+aRQrurmMwY0l61KkTFGgDpaMFWjQO+Z/VKRsaaR3oHCBWs6bIv9AdlB2dwKqb4cc
+lfDkLwT8tWYx4UJAxlaOFyL02fd4/6hF6TwevjjWdske9VYAJIYVXHYyGUa/8VPI
+0wr1NmOvJLzZQmpi9B7HlJWrU4Ms5Z9NM/Pxv7t78VydMBTUGw==
+=prEY
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild
new file mode 100644
index 000000000000..ca0982338dd1
--- /dev/null
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild,v 1.1 2014/11/24 16:59:13 kensington Exp $
+
+EAPI=5
+
+MY_P="${P/qt/qt-1}"
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="PolicyKit Qt4 API wrapper library"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/apps/KDE4.x/admin/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug examples +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=sys-auth/polkit-0.103
+	qt4? (
+		dev-qt/qtcore:4[glib]
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4[glib]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		examples? ( dev-qt/qtxml:5 )
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README README.porting TODO )
+
+S=${WORKDIR}/${MY_P}
+
+# bug #529686
+RESTRICT="test"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	use qt4 && MULTIBUILD_VARIANTS+=( qt4 )
+	use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+			$(cmake-utils_use_build examples)
+		)
+
+		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_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}