Version bump fixes bug 525786. Add missing dependencies fixes bug 487916.

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

4 files changed, 40 insertions, 98 deletions

diff --git a/app-office/odeskteam/ChangeLog b/app-office/odeskteam/ChangeLog
index 416c51348c87..319be286019a 100644
--- a/app-office/odeskteam/ChangeLog
+++ b/app-office/odeskteam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2014/02/19 01:41:57 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/ChangeLog,v 1.13 2014/11/04 12:43:07 titanofold Exp $
+
+*odeskteam-3.12.9 (04 Nov 2014)
+
+  04 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  -odeskteam-3.6.1-r1.ebuild, -odeskteam-3.10.5.ebuild,
+  +odeskteam-3.12.9.ebuild:
+  Version bump fixes bug 525786. Add missing dependencies fixes bug 487916.
 
 *odeskteam-3.10.5 (19 Feb 2014)
 
diff --git a/app-office/odeskteam/Manifest b/app-office/odeskteam/Manifest
index f7ee23a1d06c..4f8f0c4ba4f6 100644
--- a/app-office/odeskteam/Manifest
+++ b/app-office/odeskteam/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA256
 
 AUX odeskteam-3.6.1_desktop_file.patch 427 SHA256 297dc192fb9d770a7af08b253ddb33253d6232edef93b8c8d09a6e20db9677bf SHA512 1193306c3a18bfd45fc95d4a49192cfcd4ce34e0a6190afbf9266dcdeb312743d9b9e568c99462e825914a7990e37e64c9483ca4b3ed4a4ebfacb6122bf91d79 WHIRLPOOL f4d336443966c40510e7037fab57016d9084e304f6fd6540713373151dbb1720293622b5dc829f28375d46eed7896d5c278b07e6f64705dc756680aba4a04948
-DIST odeskteam-3.10.5-1fc19.i386.rpm 1579803 SHA256 87d8689660f36384d1703c8164aecf2babfcfad669739ec9ff732b608d36d046 SHA512 32dff3addd42476c7690e33b12da1d455a8c22c63ab210502075a06ff0cf461a87268755cc98a6076232fd1e2c7491b009558c5735ee249bb55fad6e71ba4a50 WHIRLPOOL 502b82fa9cbb81f7c01be7b650a8842f042863b2fa20538b2801f535f7887bb53b5937bbe6dd20f52dea452220e2fc14873d7557ee6addb21ceabd2e007dbb98
-DIST odeskteam-3.10.5-1fc19.x86_64.rpm 1637105 SHA256 9a071e29fa261dda061196dc43417ce5d4b3c23af00c781bf417075bec4ad5e1 SHA512 a962240026422e3be7a6b4311b1bb09bfb46a0dc0bc16b01140b00402b539082deba33423abec27e028f8a7cefb7d829d30ce699fa3c7513da61be9e1b53bc5c WHIRLPOOL 7aac6f0d69bac900485f5a77bc5feae03eebbd8066c413d3048b1dfde09241d943bc09b522466b0cfe591c0a0825d5af9b64e0d3f51f74bb41b4049cce52de45
+DIST odeskteam-3.12.9.i386.rpm 1586118 SHA256 b80895d6b68414ddfe22b0cf584de82835cb5e937969a7db3305b00eac68e0dd SHA512 50fed1333501374d40d5f04acb50141b5123566b47ee0fd4574f7c0501b4e029a67bf08e9d3ee9f24eb5a75b5fab6410dd48fdda6617113057297fa24591ccb4 WHIRLPOOL cd0fab5af33b6d3002d2e433b49102f837d20bccfe2d901f1e9a8a45b20b3cd2de6a7bde8762c3cb1c6329b26597137fa7565efff10d416366d96a56e5470fa9
+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.10.5.ebuild 1198 SHA256 3bbd87c7fcbd4bf4d15045cf9c771cf812ed5eb14c8bcf1d0bb6ac5b0a8a76e9 SHA512 79dfe4b604512ddaabd1b368ebe9ce2548dfede99068caed2ba133f63dcf7df52fe76dd279bb3887bf17398fd66c3d0203bd3ee43700729e708871da949502da WHIRLPOOL 78979c4ba737cbc8bcca88bcbf3430905b15a6399ba886cf0031dd5fb9e07502dfc867a45bb1174da7ce55e5071abbb9543c3d982735c7a3820ec2a2935aeef7
-EBUILD odeskteam-3.6.1-r1.ebuild 1513 SHA256 142289a68919e885696d5a1cb3d61467ea79becf7a79eaac5953eb850e0cb5ea SHA512 319b8738d144faa59344fa2675f1b75c41e798513c443df95c133d995b7862bae0a893f71a3aed9cb83dd4f76bf25f454e3e551fbc78fc6e87bbbfc193311b55 WHIRLPOOL 9c149d3de96c127304d00b8c2efce721ff5f34855565d68321b30ce9155f8c5842604ac087dcd9b57bd4c2c29de9c2d238462bac582b2775a60d7a64e408730b
+EBUILD odeskteam-3.12.9.ebuild 1206 SHA256 21a347a099f3603f22f234dbfb050ca5c7d66b6c878df4c0cf2c8b6bafb96e31 SHA512 4234c3a3722079ace09d8099c65ab83d00d9b163637b73b91529471589cfb619c1160cab0632fe85995445f53527c597f1551d4c8d45ae83bad913da8eb0e3ff WHIRLPOOL 0b6e8b9269e0423b4d716d531f89f08790a7361c1491c170ab801088634a712ed1fa428463ab3a4448f7626daeabfa128d8d2c464454bcd7eda27a3e711c99d0
 EBUILD odeskteam-3.6.1.ebuild 1488 SHA256 d141e102316dabb640f8e9d1d1138d64d64ad715ecbded1fc37fbf425274a4e7 SHA512 f048135cf575ece9a5db5ece5d7616e5f9f03862a06aa1a7be1cdce9ff366630086c39d345abe122011a7c385f1be3edd6f71d549c0c85affe35a778028da92c WHIRLPOOL 60b03d9e070890b1911a405e442bddced739f8969fb6853b8b5a5d0826191c6371ff3f19ef1a58b7962ad9a1c8c75c98c54ace774df1b0e8cb043e0315a0e283
-MISC ChangeLog 1865 SHA256 4b7dc7c1f727e997f117326267e3d559b3cce162c0e8592ca7b2771eccfc6ca8 SHA512 4bc6357d769ed6ebc28b383aa2745e7eab7cd33cd718f0aa93fd70ce209047f336f3e90f4240a0d2985aafd96cbaf2a8824d0f2fe71956afccb49e100e09cd80 WHIRLPOOL bc43157fdb86eb4df07703671a8daf3306d10eb94691afae638a8603bc7a648106f5c09b3c1808adb9cc59cffbe97d83ada8f8bb1e03d6be7349f98d5fe0e9b2
+MISC ChangeLog 2115 SHA256 eaf12f0af4317190f0eca3b0ea000b94a77e58652e0546b44ecb22546359dd26 SHA512 7fb60a23f98eadd3d6f756adf7cb708413c33d955f867d08147a74b8ae790b9b9162cb3d04d071941dbbc28fc7a8a20121ef6c9b56d14129562f9814a1c80a53 WHIRLPOOL a2b4aa5ab4e2d60e67b7543b727daf9b10835adb84cd2e9802f263a206cd95743a4c92c959ab22aaba20c8aec38ab7dac0237ffa959f47a8836a34d8ea7a2422
 MISC metadata.xml 449 SHA256 634cf9ddffd2f19abccde3541fd0f2a3b69ac641ead61641d1529bb21be5f5df SHA512 03770b73e7553ed1e42c557aa06fbeb4e1d80655b60e7ca4a92d7d42a1f2d62f08dff6d92ec24c61f5e8b2bee4f743ae63b2e053f4cb91896ba9fd69289a012d WHIRLPOOL 8741b84dd5ae88e14c0d161372748d9c6fb70b77adcdf58e120db27306c3516015b036c8845bc1b802e6d48b429f9f247d8996575306b6540c79b9ab154d0668
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlMEC+wACgkQVxOqA9G7/aBXUQD9H7KfC+czwjDjfyU1TUT/Wpiw
-f9Wgx6NntX+2YkG5lRIBAJ0DUgbhltHdB5hBESMOrPERpoFAm3M5+ULSgXaYe/pT
-=bJ2L
+iF4EAREIAAYFAlRYydwACgkQVxOqA9G7/aAZrwD+JIN2rOD7bcg0hml+P9FIpySF
+svXgE/gae9NDmCUm1vEA/jKaA37AXua6zl/yK23xxRY6byyDDHbwoCY+0kQdeIrr
+=zkzI
 -----END PGP SIGNATURE-----
diff --git a/app-office/odeskteam/odeskteam-3.10.5.ebuild b/app-office/odeskteam/odeskteam-3.12.9.ebuild
index f3089e6f9a2e..893afa29a1cd 100644
--- a/app-office/odeskteam/odeskteam-3.10.5.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.10.5.ebuild,v 1.1 2014/02/19 01:41:57 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.1 2014/11/04 12:43:07 titanofold Exp $
 
 EAPI=5
 
@@ -11,8 +11,8 @@ QA_PREBUILT="*"
 
 DESCRIPTION="Project collaboration and tracking software for oDesk.com"
 HOMEPAGE="https://www.odesk.com/"
-SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc19.x86_64.rpm )
-		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc19.i386.rpm )
+SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}.x86_64.rpm )
+		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}.i386.rpm )
 "
 
 LICENSE="ODESK"
@@ -21,22 +21,27 @@ KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}
 
-RDEPEND=">=dev-libs/glib-2
-		 app-arch/bzip2
-		 dev-libs/libxml2
-		 dev-qt/qtcore:4[ssl]
-		 dev-qt/qtdbus:4
-		 dev-qt/qtdeclarative:4
-		 dev-qt/qtgui:4
-		 dev-qt/qtopengl:4
-		 dev-qt/qtscript:4
-		 dev-qt/qtsql:4
-		 dev-qt/qtsvg:4
-		 dev-qt/qtxmlpatterns:4
-		 x11-libs/libX11
-		 x11-libs/libXScrnSaver
-		 x11-libs/libXext
-		 x11-libs/libXi
+RDEPEND="
+>=dev-libs/glib-2
+app-arch/bzip2
+dev-libs/libxml2
+dev-qt/qtcore:4[ssl]
+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
+dev-qt/qtxmlpatterns:4
+media-libs/glu
+media-libs/mesa
+sys-libs/glibc
+x11-libs/libX11
+x11-libs/libXScrnSaver
+x11-libs/libXext
+x11-libs/libXi
 "
 
 src_prepare() {
diff --git a/app-office/odeskteam/odeskteam-3.6.1-r1.ebuild b/app-office/odeskteam/odeskteam-3.6.1-r1.ebuild
deleted file mode 100644
index 1d4f37af33e4..000000000000
--- a/app-office/odeskteam/odeskteam-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.6.1-r1.ebuild,v 1.3 2013/10/01 21:13:22 pesa Exp $
-
-EAPI=4
-
-inherit rpm eutils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for oDesk.com"
-HOMEPAGE="https://www.odesk.com/"
-SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc17.x86_64.rpm )
-		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc17.i386.rpm )
-"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND=">=dev-libs/glib-2
-		 app-arch/bzip2
-		 dev-libs/expat
-		 dev-libs/icu
-		 dev-libs/libxml2
-		 dev-libs/openssl:0
-		 dev-qt/qtcore:4[ssl]
-		 dev-qt/qtdbus:4
-		 dev-qt/qtgui:4
-		 media-libs/alsa-lib
-		 media-libs/fontconfig
-		 media-libs/freetype
-		 media-libs/libpng
-		 media-libs/openjpeg:0
-		 media-video/ffmpeg
-		 sys-apps/dbus
-		 sys-apps/util-linux
-		 sys-libs/zlib
-		 virtual/libffi
-		 x11-libs/libICE
-		 x11-libs/libSM
-		 x11-libs/libX11
-		 x11-libs/libXScrnSaver
-		 x11-libs/libXau
-		 x11-libs/libXcursor
-		 x11-libs/libXdmcp
-		 x11-libs/libXext
-		 x11-libs/libXfixes
-		 x11-libs/libXi
-		 x11-libs/libXrandr
-		 x11-libs/libXrender
-		 x11-libs/libxcb
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_desktop_file.patch"
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/odeskteam-qt4
-
-	domenu usr/share/applications/odeskteam.desktop
-
-	doicon usr/share/pixmaps/odeskteam.png
-}