Allow either dev-qt/qtphonon or media-libs/phonon to satisfy a

dependency. Fixes b.g.o bug 530102.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

diff --git a/app-office/odeskteam/ChangeLog b/app-office/odeskteam/ChangeLog
index 319be286019aec42d83ed490b1360e7b8bbd6664..aea22e327a388b8a6d61f183844df9d459fc4949 100644 (file)
--- a/app-office/odeskteam/ChangeLog
+++ b/app-office/odeskteam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/odeskteam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.13 2014/11/04 12:43:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.14 2014/11/26 14:49:57 titanofold Exp $
+
+  26 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  odeskteam-3.12.9.ebuild:
+  Allow either dev-qt/qtphonon or media-libs/phonon to satisfy a
+  dependency. Fixes b.g.o bug 530102.
 
 *odeskteam-3.12.9 (04 Nov 2014)
 

diff --git a/app-office/odeskteam/Manifest b/app-office/odeskteam/Manifest
index 4f8f0c4ba4f6ff7e407f0dc8627c9ff77fa5bc44..4e5c90a58e4ff78c0dba4bb723bc83187c22b38f 100644 (file)
--- a/app-office/odeskteam/Manifest
+++ b/app-office/odeskteam/Manifest
@@ -6,14 +6,14 @@ DIST odeskteam-3.12.9.i386.rpm 1586118 SHA256 b80895d6b68414ddfe22b0cf584de82835
 DIST odeskteam-3.12.9.x86_64.rpm 1649196 SHA256 199febfb3de1fcacfa14de0116b6831955345ba57dabb87cb31d7b4da2396773 SHA512 fb0e12dc82741a7fea1574b3c8e54a7ec7f7ac87dd96996eab3d6647adb4c4780e5313b4c2279d040848e63d5b91f60a2a055773e17638fac73cda173c734a95 WHIRLPOOL c15e124afde3441f9740e789d856d62fad80c8fa298d7685cf844b89a709fa13bd4d2ca1e7de9514f5b265df6b2a16babecc81e56b9ec771203a6c1a19d1066a
 DIST odeskteam-3.6.1-1fc17.i386.rpm 1495558 SHA256 a2e3708a04f4441b8626a2608469c88a5993241e8baef13ff503a0ac627f76e9 SHA512 2fd2d5906a1ede4f1e014ad8c67b696e265f38765d5ec3d870aca797ab4471a5b6868adf8730dbdd14254421ca3b579f6d63b4688174e2d9f098f9e6b865be67 WHIRLPOOL 6a75262e42038707fe0659e3418b578ec253e9f85fab7c91176b6e5456e5d78863546f64c079fa53cc30e8c9ebb45388a6965ba468d9437ff24a5040a53e4df6
 DIST odeskteam-3.6.1-1fc17.x86_64.rpm 1545261 SHA256 1444234e08db33237f336817d32f6655c1a2c41b98f7e899919f2bdfca4577f3 SHA512 1dda4998597739977fc607e5da12fcbb1d6843235c911d9b7ea1b4696d293bcb6b4865a605256e13d512741ee46e5dbfc194363261facf3af90105a2656367a2 WHIRLPOOL 0e326c20e8baadba08ece0b37014f727b50feded614a56ce839fcca41df98852c83898fb12fd1672e9d1e4966262a6e8b9fcc651112a9d0a91b7a2fce5983be7
-EBUILD odeskteam-3.12.9.ebuild 1206 SHA256 21a347a099f3603f22f234dbfb050ca5c7d66b6c878df4c0cf2c8b6bafb96e31 SHA512 4234c3a3722079ace09d8099c65ab83d00d9b163637b73b91529471589cfb619c1160cab0632fe85995445f53527c597f1551d4c8d45ae83bad913da8eb0e3ff WHIRLPOOL 0b6e8b9269e0423b4d716d531f89f08790a7361c1491c170ab801088634a712ed1fa428463ab3a4448f7626daeabfa128d8d2c464454bcd7eda27a3e711c99d0
+EBUILD odeskteam-3.12.9.ebuild 1231 SHA256 d34a614f1dfa3e852ff7d4f4335dfa49840a276c5e1a6bd560e028e4d6fce251 SHA512 c705263b21e34ba78cd855eebd8b55d84055faf13628212e2fe2903dd7914a68924c835961013b151f5f874c0ed1cab73fc657f6556c520dd6c297c147c241c4 WHIRLPOOL 842ec1cab967801cc835be4c530a9429dc52ddee10d7043956dee7697f262390645e91e79adaf3d0a9bc20315ae9150667c198ff879b997ccec22d83bc5da968
 EBUILD odeskteam-3.6.1.ebuild 1488 SHA256 d141e102316dabb640f8e9d1d1138d64d64ad715ecbded1fc37fbf425274a4e7 SHA512 f048135cf575ece9a5db5ece5d7616e5f9f03862a06aa1a7be1cdce9ff366630086c39d345abe122011a7c385f1be3edd6f71d549c0c85affe35a778028da92c WHIRLPOOL 60b03d9e070890b1911a405e442bddced739f8969fb6853b8b5a5d0826191c6371ff3f19ef1a58b7962ad9a1c8c75c98c54ace774df1b0e8cb043e0315a0e283
-MISC ChangeLog 2115 SHA256 eaf12f0af4317190f0eca3b0ea000b94a77e58652e0546b44ecb22546359dd26 SHA512 7fb60a23f98eadd3d6f756adf7cb708413c33d955f867d08147a74b8ae790b9b9162cb3d04d071941dbbc28fc7a8a20121ef6c9b56d14129562f9814a1c80a53 WHIRLPOOL a2b4aa5ab4e2d60e67b7543b727daf9b10835adb84cd2e9802f263a206cd95743a4c92c959ab22aaba20c8aec38ab7dac0237ffa959f47a8836a34d8ea7a2422
+MISC ChangeLog 2302 SHA256 a48c7f12f69ba2efc6700e8f74a2768a7385cb70d51ef68e8da071599a88bf56 SHA512 de13840fba9255683fdc0b47e1a12805b75441dec3c6b80c8e38a45525cbe8469d501e9f7ebe89b1dc4b6e61469a16b813633e451a68ec3620f804e0d0bd33e3 WHIRLPOOL 8dd53153602460ee9e1f7399dbcc6c645e5a11454a850db700e82f7b9e4f7d79cde442cd4dcc048a8f2bd5d1a685f2df3461fcad42727306943a410eaecabb1c
 MISC metadata.xml 449 SHA256 634cf9ddffd2f19abccde3541fd0f2a3b69ac641ead61641d1529bb21be5f5df SHA512 03770b73e7553ed1e42c557aa06fbeb4e1d80655b60e7ca4a92d7d42a1f2d62f08dff6d92ec24c61f5e8b2bee4f743ae63b2e053f4cb91896ba9fd69289a012d WHIRLPOOL 8741b84dd5ae88e14c0d161372748d9c6fb70b77adcdf58e120db27306c3516015b036c8845bc1b802e6d48b429f9f247d8996575306b6540c79b9ab154d0668
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRYydwACgkQVxOqA9G7/aAZrwD+JIN2rOD7bcg0hml+P9FIpySF
-svXgE/gae9NDmCUm1vEA/jKaA37AXua6zl/yK23xxRY6byyDDHbwoCY+0kQdeIrr
-=zkzI
+iF4EAREIAAYFAlR16JcACgkQVxOqA9G7/aDwBwD/Ytizaa8jv23oZmxB9L+UmqvK
+5O4BaYg5RnfHMcm8Mb4A/j4mCwSqTY/ebwVAIrK1YhYDqC5NbFSJZpYxWBaX1Tx/
+=B8cH
 -----END PGP SIGNATURE-----

diff --git a/app-office/odeskteam/odeskteam-3.12.9.ebuild b/app-office/odeskteam/odeskteam-3.12.9.ebuild
index 893afa29a1cd502dc31d69a37fb89400a5a3e191..09b7bd510edb350a4e8e50c8d28bfa8cdb856be7 100644 (file)
--- a/app-office/odeskteam/odeskteam-3.12.9.ebuild
+++ b/app-office/odeskteam/odeskteam-3.12.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.1 2014/11/04 12:43:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.2 2014/11/26 14:49:57 titanofold Exp $
 
 EAPI=5
 
@@ -22,6 +22,7 @@ KEYWORDS="~amd64 ~x86"
 S=${WORKDIR}
 
 RDEPEND="
+|| ( dev-qt/qtphonon:4 media-libs/phonon )
 >=dev-libs/glib-2
 app-arch/bzip2
 dev-libs/libxml2
@@ -30,7 +31,6 @@ dev-qt/qtdbus:4
 dev-qt/qtdeclarative:4
 dev-qt/qtgui:4
 dev-qt/qtopengl:4
-dev-qt/qtphonon:4
 dev-qt/qtscript:4
 dev-qt/qtsql:4
 dev-qt/qtsvg:4