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 DDEFA138334 for ; Thu, 1 Nov 2018 19:47:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0676E08F5; Thu, 1 Nov 2018 19:47:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AEBF8E08F5 for ; Thu, 1 Nov 2018 19:47:03 +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 5DED1335C7F 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 5EAAF44A 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: <1541101600.6c0692b5d479bcde775fb759ea2a54df8cf2ae28.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: 6c0692b5d479bcde775fb759ea2a54df8cf2ae28 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: 74f06198-c61e-4d84-9b17-f77297de3e37 X-Archives-Hash: 72edc8195daf142a9777bd1febac41a6 commit: 6c0692b5d479bcde775fb759ea2a54df8cf2ae28 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 1 18:32:25 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 1 19:46:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0692b5 media-libs/libmtp: Add missing || die, DOCS to array, sorting 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 | 15 ++++++++------- media-libs/libmtp/libmtp-9999.ebuild | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild index 3dff728f84f..ab1ccf9d3d5 100644 --- a/media-libs/libmtp/libmtp-1.1.16.ebuild +++ b/media-libs/libmtp/libmtp-1.1.16.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit udev user if [[ ${PV} == 9999* ]]; then @@ -12,7 +13,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" fi -DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" +DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)" HOMEPAGE="http://libmtp.sourceforge.net/" LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? @@ -26,7 +27,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen )" -DOCS="AUTHORS README TODO" +DOCS=( AUTHORS README TODO ) pkg_setup() { enewgroup plugdev @@ -36,15 +37,15 @@ src_prepare() { default # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) - rm -f ChangeLog + 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}" . + cp "${crpthd}" . || die else - touch ${crpthf} # This is from upstream autogen.sh + touch ${crpthf} || die # This is from upstream autogen.sh fi eautoreconf fi @@ -52,9 +53,9 @@ src_prepare() { src_configure() { local myeconfargs=( - $(use_enable static-libs static) - $(use_enable doc doxygen) $(use_enable crypt mtpz) + $(use_enable doc doxygen) + $(use_enable static-libs static) --with-udev="$(get_udevdir)" --with-udev-group=plugdev --with-udev-mode=0660 diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild index 3dff728f84f..ab1ccf9d3d5 100644 --- a/media-libs/libmtp/libmtp-9999.ebuild +++ b/media-libs/libmtp/libmtp-9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit udev user if [[ ${PV} == 9999* ]]; then @@ -12,7 +13,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" fi -DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" +DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)" HOMEPAGE="http://libmtp.sourceforge.net/" LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? @@ -26,7 +27,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen )" -DOCS="AUTHORS README TODO" +DOCS=( AUTHORS README TODO ) pkg_setup() { enewgroup plugdev @@ -36,15 +37,15 @@ src_prepare() { default # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) - rm -f ChangeLog + 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}" . + cp "${crpthd}" . || die else - touch ${crpthf} # This is from upstream autogen.sh + touch ${crpthf} || die # This is from upstream autogen.sh fi eautoreconf fi @@ -52,9 +53,9 @@ src_prepare() { src_configure() { local myeconfargs=( - $(use_enable static-libs static) - $(use_enable doc doxygen) $(use_enable crypt mtpz) + $(use_enable doc doxygen) + $(use_enable static-libs static) --with-udev="$(get_udevdir)" --with-udev-group=plugdev --with-udev-mode=0660