added prefix support (bug #498212)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 18 insertions, 28 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index ce22a56cbde0..a9a453d539ed 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.111 2014/01/17 06:18:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.112 2014/01/17 15:56:33 ottxor Exp $
+
+  17 Jan 2014; Christoph Junghans <ottxor@gentoo.org>
+  e2fsprogs-libs-1.42.9.ebuild:
+  added prefix support (bug #498212)
 
   17 Jan 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.42.7.ebuild:
   Mark m68k stable.
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 337e4ad3574e..f3b9a475ffc1 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -9,23 +9,17 @@ DIST e2fsprogs-libs-1.42.9.tar.gz 574130 SHA256 87778c5816bfab40cd5b1c64725b4f4c
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1375 SHA256 1d0cb56ff0730d1e7ad90825df12610c3d869b6b830e5c85401b005b8b61432c SHA512 057f80553e38cd72a81621f8691fd8fd59f26542ad1205c7896992537e86fce584bfc309110bb2267ffe5109ddca07d248fa34b0c05cf0eca41602eab9aaf8a6 WHIRLPOOL f9373e687b343912c5442488fb90a95dfcb322232cc15a6b39ce8bda09e1c592a1d98ec141356c841f695b14dc75e2e5829c8d31f4776f2540edbdad36324150
 EBUILD e2fsprogs-libs-1.42.7.ebuild 1735 SHA256 4619887019c4ce8be52f3777202bb7d0fd848f724a01b438f02618e4721426bb SHA512 4f8db6fafe6097c661bb38729e6477a0d4520af920962c79141c38c8fd75c98c0ab625c49510f1db202237eee7641a0687da2d2e18032d680a20931ed7cd32d1 WHIRLPOOL 74c1ee4603a94184b31c5b75315a0833925b86988ec4bb962c29e0ecbebd5ed66717116b277ed8f416aac6cb8e656fd32016e73f7d61c24162a7900987b01c81
 EBUILD e2fsprogs-libs-1.42.8.ebuild 1964 SHA256 74c50a46bc0eb0971440b702e2e73b5575faf23b9aa9cb524e09998924c95144 SHA512 d811db9d08cd0203219b4498e4406f9eb32517b1de0cd56a59b78d528b7b8c2b36119a9ad849a628746d17fe17cdd28e23349b58874cd8328f2521498fa048f6 WHIRLPOOL 819044fa10b9e2acaf55022b03a06f04e2ca7e7413cdd7a69a9b846ab25bedff231c4ce47b94374dbe28fe2f4599896559fe693aeb883326466e3f7d87f5b701
-EBUILD e2fsprogs-libs-1.42.9.ebuild 1995 SHA256 27ac3672fd9362d7c7c90a1e3a9226ff0caa9b20275335d57c304d85858055b4 SHA512 b40d815dab777e5671eafd87af05e9a49fd6609e283ceef713de76f904baf34c4228d9770c7f4bad85e3f9d6c62c9133bd96e806181c508a976553b5688894f3 WHIRLPOOL 162ebcfc7ab868bed81d58550a48305d56779ce6cfe806e59046eae0d1a7ca559a4588ac90b8365881af73d29926d45678e8ac6312de2e1a7ebe7022cd8a0e8a
-MISC ChangeLog 15711 SHA256 e716aa2041083a109b0fb6345402c2669b380f0a0b0187d4613ed72ce6cb288f SHA512 58ac1883a5a5ea5830b070992eac47fc8e0e0d378b452a617d532f44b243e3de6ddb396292007c3a5ec2430d3056b48a32137fe93921820468e81347b6b97491 WHIRLPOOL a5012c3fa3025b44f536ed726acd1e746a6e2abc6a39a97423b6a8ac531667d1da233d341e43a4cdb7225a1f2c4f92bb36e5ad9462a4d9214665edebf2c2a8be
+EBUILD e2fsprogs-libs-1.42.9.ebuild 1824 SHA256 5d94a30399057cd57154bfb0a9606d7377a0e30c39298a4701f8a517cfce0564 SHA512 97a8de6e4bdab01535957119c4fa5aeb465014b8f4eaa1ac1ff9e2e939ef370d12eece3d7c93486948b45ed276e3926cca19a32ab1d3441857e2e95c2ec4f9ef WHIRLPOOL b129aa244a39e0da46d86b69c17efdf88ec9bfa1893634768bf536b608f5af3526841d543159d26881c17933a7e739fbfbf0ce499ddfb7f89e84331be1484265
+MISC ChangeLog 15835 SHA256 dfe8bbb826a225518ad02a20e418305e42e27b72e1f34dfbfd8acdd8206378ce SHA512 e9edb46b78df383343e0c104cb7906915bdce8787a2a53f7598b77819e0eacc9718f7a871c957e638fc56161c2747d0fda7b82b451f3a947cc101a46787b09b5 WHIRLPOOL 06c1248870204088a7d031ac66c8941d21ebe7d34795197a43fb09f2178ff0bd1fa7c79565949046006c4deb1a31429c44c4c7232eefba90824720fe2a3c2184
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2MtGAAoJEPGu1DbS6WIAmrUP/j0OXxHVqG17kyT+eDwB9Jgg
-6hnH3UW1ggKK6grSN9NkXdkeOe+oZvyNc40Gz3hzfcdqnGTL6PR1sdL64W9ztAY9
-7YuKahk03+mVDubZq8giyuZX72m0iC7YpvvexCbh0S6jpEa8/w6lY9wyscrIzM6f
-uFDaGf48Cb5/LW+WpFCI+uc1EozIsdsFrY09aB8gSjdmj9jLzHXwYTAly5YueSY5
-eefFd5d5+4Lls9QjD8sx8fjmt+XbpVyJ3vufC3zm1vxc0gBVqza3vQsfpK+Va5jA
-Torz/8lwgny9eE3MMv6hcSNLr38FTLYFpDKQWREY/XkWrVbVk/XHqXuReins7Zsg
-w5vFaCfTw91MjDgLgCbUYHX+O7LPNXo0IfQpGanmmwubUlTP7TqJ1/hS35ZTLaoZ
-pDWq3y7PkixnCHjZoMmrnvK7SMNuxG57AGnpsP1lbkMebf1gv2VBR5hKNeTFY+R7
-wQwf5EyiMApU78+8TwNijvqZUHpS5x+IwIb1l1lBOtpLMVXv+Uw04ZeKKT6jPihm
-cGVIdssE9XspRi899ZfVA7XddiytqMGyssdcEYPlA9fmsaOUvfiy175jW4LMxt+Z
-zXtfNG/hiu/krW0AaK092rpyWN7thQd8lHqSIfHZdXiMsuHRo7LNJ8drCe45hil3
-m4/Vx1AroNaquaDTVTmx
-=b+D3
+iQEcBAEBCAAGBQJS2VK3AAoJEOeBhlrCAAWGd8UH/jlyQPs0AZNMoC51Ab5WR/Rj
+Xbo60fQP6cFpHP4s4y+vZhQw48A1RWwhCKUrUvpqTKeykoQioVMmmj6O0FfnXty1
+CA+Kjdl9kFoKDKRa3VcPI+I9txRU6dsJekv5AijZgH1IpQGY59AIw66fKEB1uUIw
+i3HwPiNKKgHuaHMj8vnwbj3R3PKMZS5Ji5wGJwbFBYsyahRdvq2KpNYSWv+gcAJe
+5UdMxdrmLjS9cy4/ToBf8oPiYvVeWgD4fLOF+L2WJL/XJRHm27OQh880xb4SOq5j
+35Q1ujgsHnOZLMO5FCGE3F6Uc81XvK6uUvIF9XsjK8C4SZ5Q2b6b8X8H9Qp3yQ0=
+=k7bD
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
index 6599d8c041dd..bf2a09c29bcf 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.1 2013/12/31 19:07:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.2 2014/01/17 15:56:33 ottxor Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
@@ -38,14 +38,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=bsd;;
-		*)         libtype=elf;;
-	esac
-
 	# we use blkid/uuid from util-linux now
 	ac_cv_lib_uuid_uuid_generate=yes \
 	ac_cv_lib_blkid_blkid_get_cache=yes \
@@ -54,7 +46,7 @@ multilib_src_configure() {
 	econf \
 		--disable-lib{blkid,uuid} \
 		--disable-quota \
-		--enable-${libtype}-shlibs \
+		$(tc-is-static-only || echo --enable-elf-shlibs) \
 		$(tc-has-tls || echo --disable-tls) \
 		$(use_enable nls)
 }