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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 35 insertions, 7 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/Manifest b/sys-fs/libeatmydata/Manifest
index 22bdffdfba14..62479dfc7b1a 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libeatmydata-105-undpkg.patch 379 SHA256 29a159d5a0f11f1a18ae04303103d1a45cf79456272edf06be3ea07de32cba7e SHA512 b6b56e90305937eebe6a043f40c904a1facbf480d9f63a3c59d8bd96150c810bb2cb4aaffafc3d02f4c01179eeec5cce2f5b285d0db6fb7664ea5b2fa64f2ec5 WHIRLPOOL b681b45ce7e7ee3c743327ab4ef85dbe17f845f4b6c55081ac44be74d00bc9718ed12a8035b98828aeb1413ab7a34030d8bb9550e0334edfd357816869a3371b
 DIST libeatmydata-105.tar.gz 419427 SHA256 bdd2d068b6b27cf47cd22aa4c5da43b3d4a05944cfe0ad1b0d843d360ed3a8dd SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4 WHIRLPOOL 52e3e4db47b279d654450cacc76e24d2138f35299d55c81fd8760a1e054450d9d0e21ec3163ddce5116a868e0ea04783c014ca13480f8140e3a422b6480a83e2
 DIST libeatmydata-65.tar.gz 408813 SHA256 8a16c1ff04aeceed1891e2772728359d3368347e1807bed60fc6147d8968d5c1 SHA512 b2e3ed9c67b6ae9b0e5918b114bf0fb6e59dda3bff9b9331a8c280243822d4c77f35e9b08138ea65a74c893cc2bd67677bbf28b03bc61f011b24dd39d171adc2 WHIRLPOOL 51347727497073130ab4ea18d963a8d98c3e950a56c612f0485f205908b1b97f10f6e0afdad2a3d1c448bde2132426fc0a173a6140009a26a3a8db581b13460e
 DIST libeatmydata-82.tar.gz 407977 SHA256 0b675f58069f912727cee5eb75f9ff1a6a8300fe7e3fe4fc6bdd03b7c2c15b29 SHA512 882b2464c26d99ea0b01a2f1171dddb637ac0b3509c18416da4e0199f515ff23c43a7bb5eb641bc3447a2c6be06c261260713565c3e4c4b988995d09f52d623c WHIRLPOOL 5f6decc9e2a8de05379bd16874b2fb8865b52b115686c11cb0d0126b2ace822e0722cf0e2a7810e9f573fb1845dac00db991ecdbef10e98f49a1a5e4a7705153
-EBUILD libeatmydata-105.ebuild 760 SHA256 2aa08a2add291e58a270aef3f3f8fc02507a8fba1685641fc01844018f6150db SHA512 ad7f6fc61ad0979c16f7c6a0b23b167b771e56fe8ee227b85e572f9a6a7bf718c9889857471b80491d0e18951f9788bd7dba45b80fdf2f644312830de0a633b0 WHIRLPOOL 744010b89333a49cd9d60edf1ac2fc378195fb21014e98dc777a99111df991f45912b0f62e86ca612b75c2e2ffa2163a096ce8b7fd133e541e245171d8be90d2
+EBUILD libeatmydata-105-r1.ebuild 842 SHA256 f19f69f053f4c89c959101e6dec5228f93758a8fa54caf92859078d854c79180 SHA512 95833e40a1d258519f79c7395f4157800af4c2eae1df781e92c7b5ac9ae3199c4e6d2e71594d3d6e8b7904b524e67c3885c57ab652241473f105a96c11852764 WHIRLPOOL fe8df8cb0f155d6cea76a75f9bca804697366a5eb944427bd534ca152822b4bbce36a373a743ef6c343c85051bb4f25f0a2432f2e8784bf36ce9625e1f5c0d31
 EBUILD libeatmydata-65.ebuild 766 SHA256 56f0ccad01ff07728b4a020868b557f96f79b6d796a1ef52b4c677ac7849365e SHA512 8e54829832f9e8782431e7aa88e7fb8414db229d1bc5aa20a691f4419a61a708359597a9dda86b5bec0da72aed5ef3dc39ef2cd3dc3f4df61d5bad6a92858dff WHIRLPOOL 01ba515b403894b21b22301105f205025cc9fdd665b9a22c22aa031f37f3f2db03b2d26ecb40c10922eded82f417265d4a6ddfeff0e581311878afc846e04d03
 EBUILD libeatmydata-82-r1.ebuild 753 SHA256 7334894b835fd647dac40374f171c59caaaaff2f6547244e053381fb4330fb2a SHA512 3bb5cc889691c6c8f9193f4e5eebcc6d25c2d318e6620a36fcd5bebec94e9570e7ec4098af3014959ae67ad4c0fc63fc815cbee405f825fd84bc8d3416700a68 WHIRLPOOL 9d4554d4eff294b00af3462f40e37476f329a3decdf5b481226c421b8c97df220a7a85ab05adc1cfc45bc5f603e450349b66f5fa5ed64a1814ce0cc7e17c5e94
 EBUILD libeatmydata-82.ebuild 755 SHA256 5c24170a2dd932f618518f86699dfe58904c37b3317e165528d1d7439a0935a0 SHA512 e6b4f6e792fda93f6426902be9ef7891b18f694671c5ac8f900b2d2a7c6a1d35a1f4fbca858aaa094278315126a7c7406f4aa4fe0276f328b6ce489461482987 WHIRLPOOL 0b621af7da42164bc1085f81c0b92c9f0840025e87987c83c90728c3614260eb0902b7460880e0440d3aaacb32e9d78f5191b18f4328e0ec7cc9ffb38e7a2fb5
-MISC ChangeLog 1012 SHA256 84e16c2e2b77b6cca39a183e910dae918c61e864721c06cf9599e3dabc1443d9 SHA512 b1b1695d63cf593a9c7220c102f3dbd15bfc8b7908641284cb41e926fa5c30d6ebf8a5b8ab54759dbed7f093f5d5acd36e195a9f4b2dbeafa4450ab99bdcffdd WHIRLPOOL 2455a260841d6b536bdc343fa7a68ccb8bbe709aaf98e03e60bbad831c1b960a3e86a2d0b20bc7186296c2dd988e19ecab8ccc14a5dfc162647bbfc1c686e3a9
+MISC ChangeLog 1279 SHA256 3a97b8b00ba58f83a3285eb5688fbe57cbde175d35987f8d5fa9c02aa91ce9a2 SHA512 b16681579c5fccd0920fe4934a33b463f2e4f32fa183f11b859caafe5983bc154ce8724f56d9fc3f291c88d8e815f124c1ecfcba9450bf3089a9ece9e975715a WHIRLPOOL 7f2d167b0e2127d9921aa22bd166722c83ad984ae956542b82e5da0580e320bbc293637fb7a905337635973e5c41ae4084b183f873d382f9360bdf826fb16689
 MISC metadata.xml 418 SHA256 0c6bc6c9ea92b82db94551664b91213845a8e7b6a156d661a6078079aae4eb64 SHA512 a47a87f4e76d5f4891400a3e88500985fe65fd84991e060809dc55c8e5d7d67f0bf1bea84b85c4d9f5720c25a206b49fc05aa8872b13dfc97714785b377df97e WHIRLPOOL 42ce5ee8789ec4a4e9d832e3aacb1bfdf08c59b1b90753885905e4785ae69fc2fcf8332a6d125c6631f7fcc0c005fbd28e5b0d7f14fe1f62e73a882b4616bad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVk48YACgkQcaHudmEf86q7PwCghyBUnxOU6Xm2OwchtM05Min8
-1NkAnROtLwqTwL7Wih2YxZZ9zqzzcHJe
-=rwkq
+iEYEAREIAAYFAlVneSUACgkQcaHudmEf86qOAQCfcgLXv5sxj4OlmOvb0s5dXRnk
+fIgAnioNgm7s45wn+it/xIMq6kGltYV/
+=XO2V
 -----END PGP SIGNATURE-----
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
 }