Fix wrapper script to not to rely on debian-specifix way to detect libexec..

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

3 files changed, 29 insertions, 2 deletions

diff --git a/sys-fs/libeatmydata/ChangeLog b/sys-fs/libeatmydata/ChangeLog
index 8d624dfa84f8..453c3ffd069f 100644
--- a/sys-fs/libeatmydata/ChangeLog
+++ b/sys-fs/libeatmydata/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/libeatmydata
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/ChangeLog,v 1.4 2015/05/26 21:21:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/ChangeLog,v 1.5 2015/05/28 20:22:55 slyfox Exp $
+
+*libeatmydata-105-r1 (28 May 2015)
+
+  28 May 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/libeatmydata-105-undpkg.patch, +libeatmydata-105-r1.ebuild,
+  -libeatmydata-105.ebuild:
+  Fix wrapper script to not to rely on debian-specifix way to detect libexec..
 
 *libeatmydata-105 (26 May 2015)
 
diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
new file mode 100644
index 000000000000..3ffd698c7ddd
--- /dev/null
+++ b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
@@ -0,0 +1,14 @@
+Don't rely on debian's way to multilib/multiarch.
+
+https://bugs.gentoo.org/550344
+diff --git a/eatmydata.in b/eatmydata.in
+index 40468db..aa143f0 100644
+--- a/eatmydata.in
++++ b/eatmydata.in
+@@ -17,5 +17,4 @@
+ 
+-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
++shlib="@libexecdir@/eatmydata.sh"
+ 
+-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
+ if [ -f "$shlib" ]; then
diff --git a/sys-fs/libeatmydata/libeatmydata-105.ebuild b/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild
index 2a85b0b5d51d..8a7f03d2a560 100644
--- a/sys-fs/libeatmydata/libeatmydata-105.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/libeatmydata-105.ebuild,v 1.1 2015/05/26 21:21:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild,v 1.1 2015/05/28 20:22:55 slyfox Exp $
 
 EAPI=5
 inherit autotools-multilib eutils
@@ -22,6 +22,12 @@ RESTRICT=test
 DEPEND="sys-apps/sed"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-105-undpkg.patch
+)
+
 multilib_src_install_all() {
+	prune_libtool_files --all
+
 	dodoc AUTHORS README
 }