| 1 |
commit: 6c0692b5d479bcde775fb759ea2a54df8cf2ae28 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 1 18:32:25 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 1 19:46:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0692b5 |
| 7 |
|
| 8 |
media-libs/libmtp: Add missing || die, DOCS to array, sorting |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
media-libs/libmtp/libmtp-1.1.16.ebuild | 15 ++++++++------- |
| 14 |
media-libs/libmtp/libmtp-9999.ebuild | 15 ++++++++------- |
| 15 |
2 files changed, 16 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild |
| 18 |
index 3dff728f84f..ab1ccf9d3d5 100644 |
| 19 |
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild |
| 20 |
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild |
| 21 |
@@ -2,6 +2,7 @@ |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
+ |
| 26 |
inherit udev user |
| 27 |
|
| 28 |
if [[ ${PV} == 9999* ]]; then |
| 29 |
@@ -12,7 +13,7 @@ else |
| 30 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" |
| 31 |
fi |
| 32 |
|
| 33 |
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" |
| 34 |
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)" |
| 35 |
HOMEPAGE="http://libmtp.sourceforge.net/" |
| 36 |
|
| 37 |
LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? |
| 38 |
@@ -26,7 +27,7 @@ BDEPEND=" |
| 39 |
virtual/pkgconfig |
| 40 |
doc? ( app-doc/doxygen )" |
| 41 |
|
| 42 |
-DOCS="AUTHORS README TODO" |
| 43 |
+DOCS=( AUTHORS README TODO ) |
| 44 |
|
| 45 |
pkg_setup() { |
| 46 |
enewgroup plugdev |
| 47 |
@@ -36,15 +37,15 @@ src_prepare() { |
| 48 |
default |
| 49 |
|
| 50 |
# ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) |
| 51 |
- rm -f ChangeLog |
| 52 |
+ rm ChangeLog || die |
| 53 |
|
| 54 |
if [[ ${PV} == 9999* ]]; then |
| 55 |
local crpthf=config.rpath |
| 56 |
local crpthd=/usr/share/gettext/${crpthf} |
| 57 |
if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then |
| 58 |
- cp "${crpthd}" . |
| 59 |
+ cp "${crpthd}" . || die |
| 60 |
else |
| 61 |
- touch ${crpthf} # This is from upstream autogen.sh |
| 62 |
+ touch ${crpthf} || die # This is from upstream autogen.sh |
| 63 |
fi |
| 64 |
eautoreconf |
| 65 |
fi |
| 66 |
@@ -52,9 +53,9 @@ src_prepare() { |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
local myeconfargs=( |
| 70 |
- $(use_enable static-libs static) |
| 71 |
- $(use_enable doc doxygen) |
| 72 |
$(use_enable crypt mtpz) |
| 73 |
+ $(use_enable doc doxygen) |
| 74 |
+ $(use_enable static-libs static) |
| 75 |
--with-udev="$(get_udevdir)" |
| 76 |
--with-udev-group=plugdev |
| 77 |
--with-udev-mode=0660 |
| 78 |
|
| 79 |
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild |
| 80 |
index 3dff728f84f..ab1ccf9d3d5 100644 |
| 81 |
--- a/media-libs/libmtp/libmtp-9999.ebuild |
| 82 |
+++ b/media-libs/libmtp/libmtp-9999.ebuild |
| 83 |
@@ -2,6 +2,7 @@ |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=7 |
| 87 |
+ |
| 88 |
inherit udev user |
| 89 |
|
| 90 |
if [[ ${PV} == 9999* ]]; then |
| 91 |
@@ -12,7 +13,7 @@ else |
| 92 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" |
| 93 |
fi |
| 94 |
|
| 95 |
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" |
| 96 |
+DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)" |
| 97 |
HOMEPAGE="http://libmtp.sourceforge.net/" |
| 98 |
|
| 99 |
LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? |
| 100 |
@@ -26,7 +27,7 @@ BDEPEND=" |
| 101 |
virtual/pkgconfig |
| 102 |
doc? ( app-doc/doxygen )" |
| 103 |
|
| 104 |
-DOCS="AUTHORS README TODO" |
| 105 |
+DOCS=( AUTHORS README TODO ) |
| 106 |
|
| 107 |
pkg_setup() { |
| 108 |
enewgroup plugdev |
| 109 |
@@ -36,15 +37,15 @@ src_prepare() { |
| 110 |
default |
| 111 |
|
| 112 |
# ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) |
| 113 |
- rm -f ChangeLog |
| 114 |
+ rm ChangeLog || die |
| 115 |
|
| 116 |
if [[ ${PV} == 9999* ]]; then |
| 117 |
local crpthf=config.rpath |
| 118 |
local crpthd=/usr/share/gettext/${crpthf} |
| 119 |
if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then |
| 120 |
- cp "${crpthd}" . |
| 121 |
+ cp "${crpthd}" . || die |
| 122 |
else |
| 123 |
- touch ${crpthf} # This is from upstream autogen.sh |
| 124 |
+ touch ${crpthf} || die # This is from upstream autogen.sh |
| 125 |
fi |
| 126 |
eautoreconf |
| 127 |
fi |
| 128 |
@@ -52,9 +53,9 @@ src_prepare() { |
| 129 |
|
| 130 |
src_configure() { |
| 131 |
local myeconfargs=( |
| 132 |
- $(use_enable static-libs static) |
| 133 |
- $(use_enable doc doxygen) |
| 134 |
$(use_enable crypt mtpz) |
| 135 |
+ $(use_enable doc doxygen) |
| 136 |
+ $(use_enable static-libs static) |
| 137 |
--with-udev="$(get_udevdir)" |
| 138 |
--with-udev-group=plugdev |
| 139 |
--with-udev-mode=0660 |
Archives