summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-03-13 10:53:01 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-03-13 10:53:01 +0000
commitf1ea686db350c83512f341d963ff5f61d3459bf6 (patch)
treeede3f7b56a3a9941fddc8500e9d5cbd9f366f95a /media-libs/phonon
parentFix bug #500782 and #500784 (diff)
downloadhistorical-f1ea686db350c83512f341d963ff5f61d3459bf6.tar.gz
historical-f1ea686db350c83512f341d963ff5f61d3459bf6.tar.bz2
historical-f1ea686db350c83512f341d963ff5f61d3459bf6.zip
Introduce designer USE flag wrt bug #504460.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'media-libs/phonon')
-rw-r--r--media-libs/phonon/ChangeLog8
-rw-r--r--media-libs/phonon/Manifest35
-rw-r--r--media-libs/phonon/metadata.xml1
-rw-r--r--media-libs/phonon/phonon-4.7.1.ebuild13
-rw-r--r--media-libs/phonon/phonon-9999.ebuild13
5 files changed, 39 insertions, 31 deletions
diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 127597fc6be4..95221d3c0eab 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/phonon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.54 2013/12/06 12:54:16 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.55 2014/03/13 10:52:48 kensington Exp $
+
+ 13 Mar 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml,
+ phonon-4.7.1.ebuild, phonon-9999.ebuild:
+ Introduce designer USE flag wrt bug #504460.
*phonon-4.7.1 (06 Dec 2013)
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index af90ad87d68a..b97de9571360 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -7,24 +7,25 @@ AUX phonon-4.7.0-plugin-install.patch 1252 SHA256 a56f24ac961ab9c422d1a06adb602f
DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 SHA512 d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d WHIRLPOOL 9ec4ae833e3824683ea5c469d3be4b2248645e47d9df199efb717364cf6f67eaffb1e5747e3e0cb0aa71fd5ec3c270119a187a8f5ef2bf6134427b48640740a9
DIST phonon-4.7.1.tar.xz 329900 SHA256 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d SHA512 64d0695bed48837d7c9a047500a18931014e1f52b7add491d8aa219ebe66a74724257ce644fac41bf1f237e7dc3d655003feb884d74c36a43fe285fb2265c902 WHIRLPOOL 7fe337d08e8114a709f4067438321973d1faea906cd41396c531faec57d0c348a900f5e8fd9cd5dcae1ca3275855faa25b036fe090fa3a75042f3cb7a0ac0359
EBUILD phonon-4.6.0-r1.ebuild 2241 SHA256 391af060ed7195b30ab641fdb5c22192eba93064739f728c2eac617ed6ee98d1 SHA512 be3a1416953f5e9166b32a915c33e4bf3a8aa9ad24e353733e2f8d2ad587f43f5bc67cfc00c74ccba255e1b818409319bb8232a93c9c0fbc658775008413207b WHIRLPOOL 360fbf823e7848be981d2ba2bc236304e4a3c6c3b0469e5b5883ce33fe623f5202263e18039617e303b2313620129601141ac6641576dd50a65a49b43bc5c564
-EBUILD phonon-4.7.1.ebuild 2406 SHA256 84dabdbfeeea2eed4fa1cc37d038d1fd66547bca7b31f08b9fd40e678f5d2d31 SHA512 6ce1bc9efffbc6a54c4a6f054a6160437aad368c297534a75d3528af21fde6fd959b6291ded4cabc4517767d2474e3716f9e0df4dec4ea8ff9afe0d2f3a412f7 WHIRLPOOL e9b8f66ded54b09cb78da69daecc3d822b804aec2f6df310ea52d904d7b9ed5c2eec9f7e32cbc9cb9a4d2d9c9b37ec018c73b91e141cd261c57232fc8ff44075
-EBUILD phonon-9999.ebuild 2406 SHA256 284293b10edc45639ce5c3b12a6662b4c46a1fe0905451e3f8c4ebd6a500502a SHA512 4ece8edf5b00260ee5a03c8cc5783ca264f55fc3222ab1a999b98d332c7cf993e665c519f5263d7523b41537cad4f8cb0630902adbef3019b061f9d939a341c0 WHIRLPOOL 42ed4eae1906c252c58be43691a51dbfdb3dd9f2f0f17389d78aa83f45b9ac093013c8990932a01c7e576cef9ae0157718f9cc3b133c210e66f51ae46d7f37c5
-MISC ChangeLog 17545 SHA256 43a3042fee04b01466ad5b231e68ef943d1e2379f821553210dca84c1fee51f4 SHA512 f93b956b98bd882b55110a345d5192e90992726fb320ed55ba717d3db557a720820dc4fbd92b3ecdbd5af9bbdfa2ccf3fdea4e51293112f3ba17cb77dca553b9 WHIRLPOOL 72800e620c28d25db24953b4c1d26617347bf90f2924dfcee40279a86dcc80106d4dd56e51a68f6ec5c096d1c86f989c1a8ddc27b1ac2db9c9870a4af8da75fa
-MISC metadata.xml 300 SHA256 30942d7da188e105a7f745018a518ecc4438fc8ae8840ecbbabd676eed725bc0 SHA512 06a922941c56ea38b578d632109105238b6c32d0027bb519e88ccad31ccb6685097b008ac3ecd57925e0b0caf8cc55115f2db0d7090a5355d4a5054b2561fff7 WHIRLPOOL 01a73fde630c918ed1e968db3e3b5f519a7a9b57d73f720d5db8527fbb18e3278292aadd1774b5836aee1fc4bf99364bfec9082983a42da0a27f5464bc17ea90
+EBUILD phonon-4.7.1.ebuild 2514 SHA256 1e2a92b73c794227ed3869cd61cc777a05c49891309afb113050ee29fe995b91 SHA512 f4aae5f61f610c87ccda376c12034afd6f8c1d79611450ff3671b69dcff8eee2387e4f0b3adc8e11d53de5186c88f2834621d76708fc702c64706aeceb992ae9 WHIRLPOOL 6f4684e2c244055cac740e50ea02ab18bf234c98277b7f57ecba578d2fe94fb0ed001ed6c01c4e56d694faed1405072a5d701e3bf26fb0c3880c83e7c1f6d83c
+EBUILD phonon-9999.ebuild 2514 SHA256 76ee9a075bb5031573533bea3d0ac68b5ee876a316386998f61f1a34832f87a2 SHA512 20b42a2c0333136c80290498f3d576558b80036ca2a0b8ebf28e458ce85dad9b04967bf93572428e8074a01d8dda988f49dea8e257b9e3d5fd1fb57bd58bd296 WHIRLPOOL 4d42d5a9d7f518814b9bda908bd98317755c6e0349f6193f124673bba9dc37fa127544e71ce998c13ad78d74ac78ead616b19a565e1ed1de4d63f3b2af44dbde
+MISC ChangeLog 17712 SHA256 9090e7fc8c6537a2c9e2dd920dab0d450e67569222896d35fe06c7a88f389f48 SHA512 003795f5f45c00b04ed6dfeb4bf95516c409d1ebde722ec721f622769d154fbe14df2c52f1c92a01fcc6a25aca54a6e621a1a012aea721a0e4b004c8dda97373 WHIRLPOOL eccd0cbe36babba89668b2e41f6ee7caeed07e675bf8165acb8baa4ef96fd799b4138142587ba2b704fffa64e48703cc66c9756e672606553df4c468fd2097e5
+MISC metadata.xml 376 SHA256 b6e977c91e7d978354256178dccb1ac955d3450e8ebee18fdb7a92fca474dd25 SHA512 050b89a54756ef31146d2dd64ddad0335fbcbb4b22124d0bcf58de7f8a80555c9acf97523f8b581bafde53a67c1f27959ab13ff2e0030eae42a5c445bb676508 WHIRLPOOL d42c2272219d11d23d3e0e59b003e9c94cefbde390e47fd6009651fb6f5d2c18d8b7374f06c7b79c6622f2b7241af7f00d21a0087c84f0603e2ddf9493480535
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSocj9AAoJEGVpnaTzz9K9M68P/ik8WjCCMCJifFCGwTMuOk48
-j1c3LKvdEXkkHzXZcKW8H/6J+nwoTLnMH2CuQmV7UyzXkTid0JvZLsukD9hSzVvi
-9vR1QUhNfkZDraXjV6Lihz7FGlfVpZbWckfi4f55UZkTUDtqiGjwgdTfc88eIKyA
-LMQUZteYfsdge02zfydkze0WFMgsrHSCWj1r3m+R9nVEYiARyqubZhvILyqPCJ5m
-m6PV5t5d7g3hKlU5munnszqH0MYqnTxyINuGlgGV/ED0QYp6lgFwLthGJa3BGd0N
-xsidEeictw6FvpT5auK/BL+6qRFvnEJ+h03ZwI2vDoNWKbeRPW0ziG/KDeY942AG
-4Z0HyrIdhVZcp7N67ofJp/JkjRRQ2KsTfmD1wrMUk4eym/kNyqCE1NVgjIZZ2aIl
-0HoDiESHbqXMZQF50auoCAp8rsLD5V81fv0gdE4U+dtylKAz2LmA5dVWjjXplUVs
-imag5hwjWt7Io4X2a50prAAJS7MWXsFuzeWZABXD3GiuTMP9tPOJH8o2E4pxKJRB
-+/CRkQB8nEEGSUAh5u3Cavj5RvC8k6IEs4XWu0FochcjByjy5uetjiir7NCv2lxN
-34Vkusb6a2VP3mv24ix1nxSiknR8+S/fT7pbU0JZkc4DDsfRmKf59IpwmQBGJKEQ
-n+QYo+KgPnKDBo7pp9Vn
-=zBZO
+iQJiBAEBCABMBQJTIY4GRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7HT2D/9gR1NEpPLB7kPfGAEL1q0gTX7YJIVPi4wrHpEHVG5U3voyCTr85NGeXUIV
+QxYeEv+7a8l7hH1/AGyyBX4vDfSAOZDVWR13zYAi8WuBd+jPfBWLmBEMGymtx97i
+Fa1ZQuQmiK1Qwi9oINkr4eJMAsDLC2XmBu8wLVyW/ZR0wVqesEYa01nBoTBJa1f8
+dYZZIByj8Vv4hDjKZdEyo2gPvb71PDETAi5lBh/K90/pZnkSA7izzV8ReazBpUhE
+7CxWKiDHj/zJVugrgc/eHWVYToDsRY0oqsnoHosurc5wHFxE2nM+KhMzR1uNwBDm
+UyCEKq1aoU8Tsms6yZLzMhdS7XjqIkL0JGSO71ZTdX3L4E2bKqgl+XC5j2eDi428
+1EmsDyMYsS181zfRIyqAeoiSQqkTD5FrE8qhNfhUoCvz+0BKbxCmfTCYrlHmcYLD
+I5sVq3rSft3qoVJbcjyTWcla49at/70g10DzWpi4SzzgFT4h0gK+Lpc3vDD95U7K
+7IlhS2/lGvG0JoOqJu1uBE834lxEZUMOMM6jEsuaFn5vErsYwTzxAJzoVzUkFsNL
+Ad+Fj3U1C2fAR8hv9hmqzF8U3Z5wafmRTHTnKvuCLXP3lywHxQrdy7RfcLu6soUs
+De397VPHaYcB1R3buSj2Lo6wXYxgQXpSuMXcnU7kIWLlD1zM1w==
+=v6gz
-----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 10f0c216eeba..330295c472b4 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>kde</herd>
<use>
+ <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
<flag name="vlc">Install VLC Phonon backend</flag>
<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
</use>
diff --git a/media-libs/phonon/phonon-4.7.1.ebuild b/media-libs/phonon/phonon-4.7.1.ebuild
index fc064563c0a6..d5a38d29ca68 100644
--- a/media-libs/phonon/phonon-4.7.1.ebuild
+++ b/media-libs/phonon/phonon-4.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.1.ebuild,v 1.1 2013/12/06 12:54:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.1.ebuild,v 1.2 2014/03/13 10:52:48 kensington Exp $
EAPI=5
@@ -20,16 +20,15 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
COMMON_DEPEND="
!!dev-qt/qtphonon:4
qt4? (
dev-qt/qtcore:4
- dev-qt/designer:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
- dev-qt/qttest:4
+ designer? ( dev-qt/designer:4 )
)
qt5? (
dev-qt/qtcore:5
@@ -37,7 +36,8 @@ COMMON_DEPEND="
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtopengl:5
- dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
)
pulseaudio? (
dev-libs/glib:2
@@ -78,6 +78,7 @@ src_configure() {
myconfigure() {
local mycmakeargs=(
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+ $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
$(cmake-utils_use_with pulseaudio GLIB2)
$(cmake-utils_use_with pulseaudio PulseAudio)
)
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index c2784f7fe0ef..84dccd2e654e 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.20 2013/11/11 21:05:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.21 2014/03/13 10:52:48 kensington Exp $
EAPI=5
@@ -20,16 +20,15 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
+IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
COMMON_DEPEND="
!!dev-qt/qtphonon:4
qt4? (
dev-qt/qtcore:4
- dev-qt/designer:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
- dev-qt/qttest:4
+ designer? ( dev-qt/designer:4 )
)
qt5? (
dev-qt/qtcore:5
@@ -37,7 +36,8 @@ COMMON_DEPEND="
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtopengl:5
- dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
)
pulseaudio? (
dev-libs/glib:2
@@ -78,6 +78,7 @@ src_configure() {
myconfigure() {
local mycmakeargs=(
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+ $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
$(cmake-utils_use_with pulseaudio GLIB2)
$(cmake-utils_use_with pulseaudio PulseAudio)
)