From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6CBE8138334 for ; Thu, 1 Nov 2018 19:47:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B046E08F0; Thu, 1 Nov 2018 19:47:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 322F2E08F0 for ; Thu, 1 Nov 2018 19:47:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41D69335C5A for ; Thu, 1 Nov 2018 19:47:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72D71452 for ; Thu, 1 Nov 2018 19:46:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1541101605.9061e0556951f986d3e187873d78bf655f894080.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmtp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libmtp/libmtp-1.1.16.ebuild media-libs/libmtp/libmtp-9999.ebuild X-VCS-Directories: media-libs/libmtp/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9061e0556951f986d3e187873d78bf655f894080 X-VCS-Branch: master Date: Thu, 1 Nov 2018 19:46:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3281beb5-d82c-45e2-9b56-8afeb1e2432d X-Archives-Hash: ba7fe57e9dfc64de28ebe87c79a7ced8 commit: 9061e0556951f986d3e187873d78bf655f894080 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 1 18:39:51 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 1 19:46:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9061e055 media-libs/libmtp: Simplify live proceedings Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/libmtp/libmtp-1.1.16.ebuild | 9 ++++----- media-libs/libmtp/libmtp-9999.ebuild | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild index ab1ccf9d3d5..891ca253c66 100644 --- a/media-libs/libmtp/libmtp-1.1.16.ebuild +++ b/media-libs/libmtp/libmtp-1.1.16.ebuild @@ -24,6 +24,7 @@ RDEPEND="virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" DEPEND="${RDEPEND}" BDEPEND=" + >sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen )" @@ -40,12 +41,10 @@ src_prepare() { rm ChangeLog || die if [[ ${PV} == 9999* ]]; then - local crpthf=config.rpath - local crpthd=/usr/share/gettext/${crpthf} - if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then - cp "${crpthd}" . || die + if [[ -e /usr/share/gettext/config.rpath ]]; then + cp /usr/share/gettext/config.rpath . || die else - touch ${crpthf} || die # This is from upstream autogen.sh + touch config.rpath || die # This is from upstream autogen.sh fi eautoreconf fi diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild index ab1ccf9d3d5..54647efd4ca 100644 --- a/media-libs/libmtp/libmtp-9999.ebuild +++ b/media-libs/libmtp/libmtp-9999.ebuild @@ -24,6 +24,7 @@ RDEPEND="virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" DEPEND="${RDEPEND}" BDEPEND=" + >sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen )" @@ -40,12 +41,10 @@ src_prepare() { rm ChangeLog || die if [[ ${PV} == 9999* ]]; then - local crpthf=config.rpath - local crpthd=/usr/share/gettext/${crpthf} - if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then - cp "${crpthd}" . || die + if [[ -e crpthd=/usr/share/gettext/config.rpath ]]; then + cp crpthd=/usr/share/gettext/config.rpath . || die else - touch ${crpthf} || die # This is from upstream autogen.sh + touch config.rpath || die # This is from upstream autogen.sh fi eautoreconf fi