From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-875900-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4CD3E59CB1
	for <garchives@archives.gentoo.org>; Mon, 11 Apr 2016 20:21:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 318D421C00F;
	Mon, 11 Apr 2016 20:21:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AC25721C00F
	for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2016 20:21:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C24403409A4
	for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2016 20:21:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 8971F852
	for <gentoo-commits@lists.gentoo.org>; Mon, 11 Apr 2016 20:21:13 +0000 (UTC)
From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" <monsieurp@gentoo.org>
Message-ID: <1460405098.02a152fe8132adfe63b85b69c29532cbc9338e28.monsieurp@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/qtox/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-im/qtox/qtox-9999.ebuild
X-VCS-Directories: net-im/qtox/
X-VCS-Committer: monsieurp
X-VCS-Committer-Name: Patrice Clement
X-VCS-Revision: 02a152fe8132adfe63b85b69c29532cbc9338e28
X-VCS-Branch: master
Date: Mon, 11 Apr 2016 20:21:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3be2b8ba-496e-40c6-948b-eca4aa220fe7
X-Archives-Hash: cd1f9abc63eb0ac30cf5b8dba887ba8e

commit:     02a152fe8132adfe63b85b69c29532cbc9338e28
Author:     Zetok Zalbavar <zetok <AT> openmailbox <DOT> org>
AuthorDate: Mon Apr 11 15:33:48 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 20:04:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a152fe

net-im/qtox: update -9999 ebuild to use newest upstream changes

Now upstream installs binary and icons, and it doesn't need to be
handled by ebuild.

Upstream PR: https://github.com/tux3/qTox/pull/3101
Closes: https://github.com/gentoo/gentoo/pull/1235

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-im/qtox/qtox-9999.ebuild | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index cdbfc5b..45bf9a5 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -66,18 +66,8 @@ src_configure() {
 	# filter_audio is disabled since it's not available in Gentoo, and
 	# support for it in qTox at the present is ~broken anyway
 	eqmake5 \
+			PREFIX="${D}/usr" \
 			DISABLE_FILTER_AUDIO=YES \
 			${NO_GTK_SUPPORT} \
 			${NO_X_SUPPORT}
 }
-
-src_install() {
-	dobin "${S}/qtox"
-	# install all png icons
-	local ICONS=(16 22 24 32 36 48 64 72 96 128 192 256 512)
-	for i in "${ICONS[@]}"; do
-		newicon -s "${i}" "${S}/img/icons/qtox-${i}x${i}.png" "qtox.png"
-	done
-	doicon -s scalable "${S}/img/icons/qtox.svg"
-	domenu "${S}/qTox.desktop"
-}