| 1 |
commit: 9061e0556951f986d3e187873d78bf655f894080 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 1 18:39:51 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 1 19:46:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9061e055 |
| 7 |
|
| 8 |
media-libs/libmtp: Simplify live proceedings |
| 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 | 9 ++++----- |
| 14 |
media-libs/libmtp/libmtp-9999.ebuild | 9 ++++----- |
| 15 |
2 files changed, 8 insertions(+), 10 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 ab1ccf9d3d5..891ca253c66 100644 |
| 19 |
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild |
| 20 |
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild |
| 21 |
@@ -24,6 +24,7 @@ RDEPEND="virtual/libusb:1 |
| 22 |
crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" |
| 23 |
DEPEND="${RDEPEND}" |
| 24 |
BDEPEND=" |
| 25 |
+ >sys-devel/gettext-0.18.3 |
| 26 |
virtual/pkgconfig |
| 27 |
doc? ( app-doc/doxygen )" |
| 28 |
|
| 29 |
@@ -40,12 +41,10 @@ src_prepare() { |
| 30 |
rm ChangeLog || die |
| 31 |
|
| 32 |
if [[ ${PV} == 9999* ]]; then |
| 33 |
- local crpthf=config.rpath |
| 34 |
- local crpthd=/usr/share/gettext/${crpthf} |
| 35 |
- if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then |
| 36 |
- cp "${crpthd}" . || die |
| 37 |
+ if [[ -e /usr/share/gettext/config.rpath ]]; then |
| 38 |
+ cp /usr/share/gettext/config.rpath . || die |
| 39 |
else |
| 40 |
- touch ${crpthf} || die # This is from upstream autogen.sh |
| 41 |
+ touch config.rpath || die # This is from upstream autogen.sh |
| 42 |
fi |
| 43 |
eautoreconf |
| 44 |
fi |
| 45 |
|
| 46 |
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild |
| 47 |
index ab1ccf9d3d5..54647efd4ca 100644 |
| 48 |
--- a/media-libs/libmtp/libmtp-9999.ebuild |
| 49 |
+++ b/media-libs/libmtp/libmtp-9999.ebuild |
| 50 |
@@ -24,6 +24,7 @@ RDEPEND="virtual/libusb:1 |
| 51 |
crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" |
| 52 |
DEPEND="${RDEPEND}" |
| 53 |
BDEPEND=" |
| 54 |
+ >sys-devel/gettext-0.18.3 |
| 55 |
virtual/pkgconfig |
| 56 |
doc? ( app-doc/doxygen )" |
| 57 |
|
| 58 |
@@ -40,12 +41,10 @@ src_prepare() { |
| 59 |
rm ChangeLog || die |
| 60 |
|
| 61 |
if [[ ${PV} == 9999* ]]; then |
| 62 |
- local crpthf=config.rpath |
| 63 |
- local crpthd=/usr/share/gettext/${crpthf} |
| 64 |
- if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then |
| 65 |
- cp "${crpthd}" . || die |
| 66 |
+ if [[ -e crpthd=/usr/share/gettext/config.rpath ]]; then |
| 67 |
+ cp crpthd=/usr/share/gettext/config.rpath . || die |
| 68 |
else |
| 69 |
- touch ${crpthf} || die # This is from upstream autogen.sh |
| 70 |
+ touch config.rpath || die # This is from upstream autogen.sh |
| 71 |
fi |
| 72 |
eautoreconf |
| 73 |
fi |
Archives