Version bump. Removed old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 58 insertions, 43 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index fc69b24416ad..0954c30a0969 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.274 2014/04/28 17:45:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.275 2014/06/13 16:18:28 polynomial-c Exp $
+
+*file-5.19 (13 Jun 2014)
+
+  13 Jun 2014; Lars Wendler <polynomial-c@gentoo.org> -file-5.18.ebuild,
+  +file-5.19.ebuild:
+  Version bump. Removed old.
 
   28 Apr 2014; Michał Górny <mgorny@gentoo.org> file-5.18-r1.ebuild,
   file-9999.ebuild:
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 12a93906ce50..eb4589acea61 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,28 +3,27 @@ Hash: SHA256
 
 DIST file-5.17.tar.gz 709991 SHA256 3feb97141b387b64da30aee485852925312c0e74219380a5ed451f14a90c83ca SHA512 6c85d1719221f5dcf8620442901d17de1c32458ffedbdcd43beedf7d8b2553fe4bf85deeabda65abcbdc9e5cbfefafe26ecd982749c57e393955f51009ef2a88 WHIRLPOOL dff671934aed89308278a1158f0e70eb6dc73ab4852ecf206ca3164251a3d0a7e692b3d6acad98d9c49ae2154b8be15d3704c8eb3d255d79f951c808f97d8253
 DIST file-5.18.tar.gz 715461 SHA256 6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07 SHA512 eba4dd91053a28494e8a4d436b338ccfa44494dcd6c9031f7bb9c8b372d8cfacf702e0325e34b8498454be21b28dad78f0f63af5ad50b181b1962e0ec779c7b5 WHIRLPOOL a22b84978ddb383a680f5fd65b80027ebf11e92fe531aa87aed0fe1b84f27c57d5dc76cd5e6d59a27cc728e6c83384293fb87508696d49bd3a5ca9b27e903c03
+DIST file-5.19.tar.gz 719158 SHA256 9484b3bbda1acc7b13a4f71031a85ce10c77bd0ffec7226741a219ef587e3a7c SHA512 f897454f731b013634f38c02c927d7fb5d0660d5b1a81b7bf614da244558dd64ae44ab35ffc6a5e634a7f670ee287c0e87c70e44266c3123e0d1b73fa303c6ed WHIRLPOOL 8ae346b023e44f5d573c1cf94102aa7eb5f685f1319e248b141bc6dd8668ec983c9d0a0791bd50d9bde031b336ded6ae273bb612d05f738441e29343dfe74477
 EBUILD file-5.17.ebuild 2389 SHA256 8266cdbc474c193557a995a490c846906354899c61668de8c776ee281c3ee877 SHA512 eda9b4ab991c578d3e76b3de7e6548867b2f5eca8b03d47e50d52c743ce207d1faa1585a20f87493d79cc46bf01ff618c2d626c839f529f2480ada55c4a6e72a WHIRLPOOL b2cde97f752155db3d63d203a205c359b7b5c4f9ee5eda2584bc11b532c280d23c11fcb82f55dc7678b00d0af640492e06dac8e934125c270362b5910d8a3a29
 EBUILD file-5.18-r1.ebuild 2780 SHA256 bdae7aad72767cf77dd8fc31a3e6fa0a4d022f936a8b8a7c8b9be084d94d30c0 SHA512 913cce3e99a65809ee490a7aa64f4e488513c7bb2ed9496d623ad83267a7ad837b8cb5d3432cc08cf741be885efb7770d669fea6ff9c4847b6ae1cc0c3b96ab9 WHIRLPOOL c514904c239bf851800b915eaeb246ad3621a90e0733c2f8581b1928cfa88f8f8baf3c6f76d0aa37883560d00e13e824350f0ab41a566d710b6fe12482b84e1f
-EBUILD file-5.18.ebuild 2402 SHA256 add8553bb26ff1bdca1de5be1920a22d5b646e2538a32ca24d256de2c8992e49 SHA512 360937770c7fa39fc7c2744be220688b092cadf7ffd968427c6f5d21526a40c0003b8faaeb2860a309ebdbf4b555944c83861f2687a68933fca6231876d2f016 WHIRLPOOL 8e4f8de76981c085911a613492704bdcea797c39d8694673d431f43e5d065d1847cce1654703b5d5abf0fc17e74b27be6417bf5f1a0a7b3106f02693d9ae29f5
+EBUILD file-5.19.ebuild 2783 SHA256 179c5f8959710b8f8fc13eaa7a69931012d222af50ad42e3a6d7157f9ad702d2 SHA512 1b8026b8771be3b77e4383d3c7a33cc1b49d9ef27064a4c589730ac4cde08c482f97cf881802176e4fe8d7edb06bc117434697ef8c2e45da95c3fa4be6ddbca4 WHIRLPOOL 2f2fdc71734ab3645bb645b3864779106d2a7687fc16a85497bf61d1c31d4354f7b59f7997393e60f041957b91452d71a26f7d9b556accc07013e38da4afb54d
 EBUILD file-9999.ebuild 2629 SHA256 3930cbda090be96156fe7802866dca7970293f1544f173e2f23769058b351c8c SHA512 9c94eb5cdc21c3bf4744b6cd00beb7a1022ca921db0233b54f0e49c36a923b7380828e052c1c279f0a3cf1bed286a50f24ed1b5ef11c9f5f18a450d2bbfc0ed5 WHIRLPOOL b62d9d0c60d99f488a76642b685d1e9f4a64bdec943ca7db819df46e0db05c6d02b8a55bf3d261fadab7880bbc25cce0e47afe940c738cd640272d8f9306d060
-MISC ChangeLog 33347 SHA256 49a342ce421a753647a8b4b4d399593d787bbfbdafa4695ecca1fa3af3a7b3a1 SHA512 00b8bd19741999ef1406c0d75f50118dd16cd2f0cefa7086e4ab1ff83ee38b3caf2dfa68f3ce9dc425d88d02ae12e27ed75cf8b82d62a35af7af912bfe27035e WHIRLPOOL f19ad178d4a4629b641c2e366a2620cba73cb789caed4ad078c134a60cb3a49ccc688203c5061a92ddf3519ee2b6c7cccdc541b70edfd99ae1f6f3d8773287f7
+MISC ChangeLog 33503 SHA256 8d4964d8c6d0e044ec4214516d4423c254c47b7df69bc3e2f451e9c1e784ac5b SHA512 9675bbde71d8136daef9833b24ed85e2b3b6a2e132a78e66e53ee0a27cb3c0c40b55271885d46a0533d5d915c940ff66d13e55cbedd61792e594982ac3325347 WHIRLPOOL 381d0fb0d08d75f4575ceae3c52eee67059a9af29ec88cf8f00bdd7ee3bc067169d604e9ed24ed643b2cff859f44d33087fc4d09487a81196a7e3fe38a788c92
 MISC metadata.xml 227 SHA256 ecd74a3d9a250a8c5c597b45fd334ab26335074b687bc12f5a6fea32ef9f0690 SHA512 bf2e56b14ac89961c21f5eba6bf90e4f21fd001b88963bcf4c21d0ec63f7b860611bd8883b8760c2bc81dde2a9669456123033ca54337441016379f80e6029cf WHIRLPOOL 22c14f95d7a544f0c11e11136811724ebe69dc0c607073307a28446b1ebeb4ab8838180947a4f496f41648522e34b5dab71680c330a0085b774dbc9ea23ff647
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTXpOkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOFAP/1dm3QhOh4Oq+JEMzpDs6kz8
-m2hm9CiOS9FyOkd6/5J8fvgIJGgFvKC6J77yd4+STFmbuDB1ky5Cf4cKpO/GELS8
-ZySCB1CZTGRKnZu9DdB3NQZN7Zzw0jB2H4KgMm8hEVBYFVcKklX5vYjDSZLDCc9A
-W7kCWUsk90GEmPVcGZZZvIqfu7oScBsHq/4wk1JGuQnxogwlMOo5EqDu1lkCaobZ
-1Oj4/LU3Yjv65wpNs0/cS2Ah3sd43R7qrrZ6A+v3EOKt5eBHImU1saM/kiDwoxnN
-6f5L0oB56oQAijSsLDRiveKiYj2p+ImaLkj91zAbg9/U4cLkorr4klt7oYUdIPEk
-N7i8IUYZ05BSWgTILPCIbZxuk+NFPcDUbVqeb2yPG00SPunpi3jQsCSCD/1fDC9u
-z9/SdYA4tbv6zIH4hB3EDcx4K2oHdxIK5mH6k4SaZrSION6WO27zMFtYOszLOyLM
-K6jzY4RPdGOUoneRpcLaS1bwEq63IXWbFiTL0w9mjtD+OUXPimE2kuywlaDraJfH
-7q2HtlFWnNFuKquGnzg3pirp61Vlobs0dESDyyqmgCct73enWXL6Lt5NZClreGf4
-nrrHa9wGfMS3kOd+03e5aR3CS54lmZwD/liYHjoSVhmD7CvnF060gYaM5bJ2nbye
-975Z/Wl0Su6yC8KT88U7
-=A2VP
+iQIcBAEBCAAGBQJTmyRVAAoJEPiazRVxLXTFNrIP/2m5ohzQlrezIisfA0RkJ7Ng
+BnHS5UNjfPyLYUYvPxvWRrZqh+RA+qZM1x5ma0a2wwh8Sf1o4/QSCjIlU3E7wJ7O
+Aj/A6Sdd/w5XiZ7IX8YkZpgMqjk0aC28TAyYhFlmuHjvmXxNYuZ3+OmWrZfGmacl
+cXMocHw+n4QnATISvPrJveHetNDGRyD+rErDtOEP0+mvWQOpPH9D1RQQW/5eYolC
+of6FTK6YNdu/5xJsu44PPRfCmpaqjxh25QKI31nKm9U1rgxmAHgs/EnA6b4CDwki
+sdVbvFa4TBUWTx9N93Glpe+xffQ5ILH7TyZBOlX/eLTsRZeIxFAVBbgoiplhmUsZ
++7KO4Y9qZ8uJRL6q24Hi5kZCotP/lYAhaJbnuPhzKpyvAiMXYSi2RqctbyqWEgmd
+s+w9N6ajFEWJMxtblKg682PEYJaj+bS/97g9aqp6PpAunwM0udpEh+TqAwJwfFIZ
+GDV1jXiO36nakUHjv/c5JaUjrIRjsuVWp7vY8vK5zPNpwSac9fz3tfc56ZY9Q8vV
+44K2QD6WeX1/DGLPu12Yk0AUP/VkS8ogr/7kUnd0wtctu366uni7WcCV0lQZEhaj
+QVYzM+4VZA3bMoOpxFk/RfV5Ku1ivR7dSJlBG+k7leumdeaRzS6BMV6uJ86tMEID
+jMBpc6122b42NdrTtlXw
+=kJbP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.18.ebuild b/sys-apps/file/file-5.19.ebuild
index 725baa9b3ae3..d202a4ca5de2 100644
--- a/sys-apps/file/file-5.18.ebuild
+++ b/sys-apps/file/file-5.19.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.18.ebuild,v 1.1 2014/03/26 16:10:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.19.ebuild,v 1.1 2014/06/13 16:18:28 polynomial-c Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool toolchain-funcs
+inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/glensc/file.git"
@@ -25,7 +25,9 @@ SLOT="0"
 IUSE="python static-libs zlib"
 
 DEPEND="python? ( ${PYTHON_DEPS} )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
 RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )"
 
@@ -37,17 +39,12 @@ src_prepare() {
 	mv python/README{,.python}
 }
 
-wd() { echo "${WORKDIR}"/build-${CHOST}; }
-
-do_configure() {
-	ECONF_SOURCE=${S}
-
-	mkdir "$(wd)"
-	pushd "$(wd)" >/dev/null
-
-	econf "$@"
-
-	popd >/dev/null
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	ac_cv_header_zlib_h=$(usex zlib) \
+	ac_cv_lib_z_gzopen=$(usex zlib)
+	econf \
+		$(use_enable static-libs static)
 }
 
 src_configure() {
@@ -55,7 +52,10 @@ src_configure() {
 	# because people often don't keep matching host/target
 	# file versions #362941
 	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build
+		cd "${WORKDIR}"/build
 		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE=${S} \
 		ac_cv_header_zlib_h=no \
 		ac_cv_lib_z_gzopen=no \
 		CHOST=${CBUILD} \
@@ -65,29 +65,39 @@ src_configure() {
 		LDFLAGS="${BUILD_LDFLAGS} -static" \
 		CC=${BUILD_CC} \
 		CXX=${BUILD_CXX} \
-		do_configure --disable-shared
+		econf --disable-shared
 	fi
 
-	export ac_cv_header_zlib_h=$(usex zlib) ac_cv_lib_z_gzopen=$(usex zlib)
-	do_configure $(use_enable static-libs static)
+	multilib-minimal_src_configure
 }
 
-do_make() {
-	emake -C "$(wd)" "$@"
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake -C src libmagic.la
+	fi
 }
 
 src_compile() {
 	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		CHOST=${CBUILD} do_make -C src file
-		PATH=$(CHOST=${CBUILD} wd)/src:${PATH}
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
 	fi
-	do_make
+	multilib-minimal_src_compile
 
 	use python && cd python && distutils-r1_src_compile
 }
 
-src_install() {
-	do_make DESTDIR="${D}" install
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
 	dodoc ChangeLog MAINT README
 
 	use python && cd python && distutils-r1_src_install