[gentoo-commits] repo/gentoo:master commit in: app-office/upwork/files/, app-office/upwork/

[Aaron Swenson]

commit:     5235b6544913b2c36dbbe94e0ad7deaca3014e78
Author:     Ștefan Talpalaru <stefantalpalaru <AT> yahoo <DOT> com>
AuthorDate: Tue Sep 25 13:20:52 2018 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 11:04:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5235b654

app-office/upwork: version bump to 5.1.0.562

The old versions have been removed because they are no longer useful.

Closes: https://bugs.gentoo.org/656374
Closes: https://github.com/gentoo/gentoo/pull/9972
Authored-by: Ștefan Talpalaru <stefantalpalaru <AT> yahoo.com>
Signed-off-by: Ștefan Talpalaru <stefantalpalaru <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/9972
Signed-off-by: Aaron Swenson <titanofold <AT> gentoo.org>

 app-office/upwork/Manifest                         |  6 +--
 app-office/upwork/files/upwork-desktop-r1.patch    | 14 ++++++
 app-office/upwork/files/upwork-desktop.patch       | 13 ------
 app-office/upwork/metadata.xml                     |  4 +-
 app-office/upwork/upwork-4.1.134.ebuild            | 51 ----------------------
 ...work-4.2.153.ebuild => upwork-5.1.0.562.ebuild} | 20 ++++-----
 6 files changed, 28 insertions(+), 80 deletions(-)

diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 3006ee133e7..f5af6418ba2 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,4 +1,2 @@
-DIST upwork-4.1.134_i386.rpm 34420908 BLAKE2B a1a3e76e44faa26852f67bf65d2040a2e53056f54dca7075dd6126f657837f0ad640ce804995ca5c78f385c92b92cc8df81d895c51781bbad1bdde1209ae8e0b SHA512 68190c4aa26df36857311b5944d2cdc15930ff248d8a4c841785451c1a48bb15ad1bf7bdd586d109994de70cef493a98a198b68bd785df2e8b88e45b85a25f23
-DIST upwork-4.1.134_x86_64.rpm 34025281 BLAKE2B 659eec23d72c838c7725a88efb773825395c520814665bd592903a9e764ebe4723cf4548ce4fe4c6b2109fef2018694a9ad620fee620a4f81808353ddb5582c4 SHA512 65ef2e6552e34b50f24102c6227267a07881955bdf6b41571374167f844e07a0be6ee752c9fe3ff2b4280b58895ddeda86d0ba4aaa229bc12ff378ac5b6f730a
-DIST upwork-4.2.153_i386.rpm 45812396 BLAKE2B 1f71ae1e984fa8ce29a37674aae7491aa42fb821ea3dd71c3947ebb7db76da51b3b7567301ab6952d47a873c242c52abe6cd976ff324287104b8ff58eba10a16 SHA512 8117e98dc72b64e094bc73c249d040c96cd04e974182db575dfdcd40bd93e09ecda9f0619953b41b71cb0d6f286cd355df41ae68be3787aa7b507195a15104d3
-DIST upwork-4.2.153_x86_64.rpm 44008199 BLAKE2B 95ee207f66e4a9c6a82c6a98f90b26254e10fb01a858817f206a5fbc114ac551568010cb3f88bab9dae744b62c3e56ef91996e6d49dbc163652d0f5ead6818bd SHA512 4defc588a32462d825da0e95847bf6739b6f66d3095016dd9d3b7e502a470f086c13edfe36f6511f2961e91ec8b96a0e4eac4682409e0761a3d6abbb3db172d4
+DIST upwork-5.1.0.562_i386.rpm 51520094 BLAKE2B 00ae85aa45cd4c39d7c3dc89db9f490741ffb1b291df4c1cebbf2f4d0510bbe38696f65b2022a1b7881f93a3f882f9fd0947a4cbd186debf81255275ab60ce75 SHA512 37b93e61c69f2ec0c350e968fa9e0fd88ef5d9de252f24f1187574625a763a3b3e2ffeeded01bb415006d3b3426b29385d2b31c28a11044e46df0c21c6f334e0
+DIST upwork-5.1.0.562_x86_64.rpm 50518342 BLAKE2B cbb35b6cbf45393b6b6b9c91923f502fba9eb9edd9674b455ba3bbe3ac99c9d54fb35b0c6e13013728e1f2358c8bc9a8f2fc07faa30577df4ddac4c1d639145d SHA512 2f21e0a0756d669512260237bfd28c1cdb8bdb53846411340f574ef6c9c04ba8c8abd36e1197547eb7339cc17aa51dd1d2ccbfdd3fc66eacc7e3c83125391c38

diff --git a/app-office/upwork/files/upwork-desktop-r1.patch b/app-office/upwork/files/upwork-desktop-r1.patch
new file mode 100644
index 00000000000..cffc1bb92e9
--- /dev/null
+++ b/app-office/upwork/files/upwork-desktop-r1.patch
@@ -0,0 +1,14 @@
+diff -ur a/usr/share/applications/upwork.desktop b/usr/share/applications/upwork.desktop
+--- a/usr/share/applications/upwork.desktop	2018-07-04 16:38:55.000000000 +0200
++++ b/usr/share/applications/upwork.desktop	2018-09-25 15:06:27.021679329 +0200
+@@ -2,8 +2,8 @@
+ Encoding=UTF-8
+ Name=Upwork
+ Exec=upwork
+-Icon=upwork.png
++Icon=upwork
+ Terminal=false
+ Type=Application
+-Categories=GTK;Network;Project Management
++Categories=GTK;Network;X-Project Management
+ StartupNotify=false

diff --git a/app-office/upwork/files/upwork-desktop.patch b/app-office/upwork/files/upwork-desktop.patch
deleted file mode 100644
index a7b76f815b0..00000000000
--- a/app-office/upwork/files/upwork-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/share/applications/upwork.desktop	2015-05-15 10:58:10.166313615 -0400
-+++ b/usr/share/applications/upwork.desktop	2015-05-15 10:58:29.929383130 -0400
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- Name=Upwork
- Exec=upwork
--Icon=upwork.png
-+Icon=upwork
- Terminal=false
- Type=Application
--Categories=Development;Project Management;GTK
-+Categories=Development;X-Project Management;GTK;
- StartupNotify=true

diff --git a/app-office/upwork/metadata.xml b/app-office/upwork/metadata.xml
index 6df5fcb9e08..33ffa3148d1 100644
--- a/app-office/upwork/metadata.xml
+++ b/app-office/upwork/metadata.xml
@@ -7,10 +7,10 @@
     </maintainer>
     <maintainer type="person">
         <email>stefantalpalaru@×××××.com</email>
-        <name>Stefan Talpalaru</name>
+        <name>Ștefan Talpalaru</name>
     </maintainer>
     <longdescription lang="en">
-        upwork's desktop application enabling visibility, connectivity,
+        Upwork's desktop application enabling visibility, connectivity,
         collaboration and guaranteed payment for guaranteed work.
     </longdescription>
 </pkgmetadata>

diff --git a/app-office/upwork/upwork-4.1.134.ebuild b/app-office/upwork/upwork-4.1.134.ebuild
deleted file mode 100644
index 2827201a56b..00000000000
--- a/app-office/upwork/upwork-4.1.134.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm eutils pax-utils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( http://updates.team.odesk.com/binaries/v4_1_314_0_0bo6g5kfbj07y2x4/upwork_i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND="
-	dev-libs/libgcrypt:11
-	gnome-base/gconf
-	media-libs/alsa-lib
-	sys-libs/libcap
-	virtual/udev
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-desktop.patch"
-}
-
-src_install() {
-	# Wrapper to the real executable
-	dobin usr/bin/upwork
-
-	insinto /usr/share
-	pax-mark m usr/share/upwork/upwork
-	doins -r usr/share/upwork
-	dosym /usr/lib/libudev.so /usr/share/upwork/libudev.so.0
-
-	# Make this executable because it's the real executable
-	fperms 0755 /usr/share/upwork/upwork
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/pixmaps/upwork.png
-}

diff --git a/app-office/upwork/upwork-4.2.153.ebuild b/app-office/upwork/upwork-5.1.0.562.ebuild
similarity index 61%
rename from app-office/upwork/upwork-4.2.153.ebuild
rename to app-office/upwork/upwork-5.1.0.562.ebuild
index cdc73b3508d..27e39f4e7bc 100644
--- a/app-office/upwork/upwork-4.2.153.ebuild
+++ b/app-office/upwork/upwork-5.1.0.562.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,36 +11,36 @@ QA_PREBUILT="*"
 DESCRIPTION="Project collaboration and tracking software for upwork.com"
 HOMEPAGE="https://www.upwork.com/"
 SRC_URI="
-	amd64? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( https://updates-desktopapp.upwork.com/binaries/v4_2_153_0_tkzkho5lhz15j08q/upwork_i386.rpm -> ${P}_i386.rpm )
+	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_1_0_562_f3wgs5ljinabm69t/upwork-5.1.0.562-1fc24.i386.rpm -> ${P}_i386.rpm )
 "
 LICENSE="ODESK"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 S=${WORKDIR}
+PATCHES=( "${FILESDIR}/${PN}-desktop-r1.patch" )
 
 DEPEND="dev-util/patchelf"
 RDEPEND="
-	dev-libs/libgcrypt:11
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
 	gnome-base/gconf
 	media-libs/alsa-lib
-	net-print/cups
+	media-libs/freetype
+	sys-apps/dbus
 	sys-libs/libcap
-	x11-libs/gtk+:2
+	x11-libs/gtk+:2[cups]
 	x11-libs/gtkglext
 "
 
-PATCHES=( "${FILESDIR}/${PN}-desktop.patch" )
-
 src_install() {
 	pax-mark m usr/share/upwork/upwork
 
 	dobin usr/bin/upwork
 
 	patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
-	dolib usr/share/upwork/libcef.so
-	rm usr/share/upwork/libcef.so
 
 	insinto /usr/share
 	doins -r usr/share/upwork