media-libs/libmtp: Simplify live proceedings

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
index ab1ccf9d3d55457ae1b4c22834b4df1a9ede63a7..891ca253c66e069e00dfbe6afaae9ba0ae90a763 100644 (file)
--- 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 ab1ccf9d3d55457ae1b4c22834b4df1a9ede63a7..54647efd4ca9508d82d55aff6d666c608128ef37 100644 (file)
--- 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