Version bump, which fixes security bugs #538152 and #540626. Bump EAPI. Rename extra-tools useflag to extras (bug #411643). Remove old.

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

6 files changed, 80 insertions, 60 deletions

diff --git a/app-arch/cabextract/ChangeLog b/app-arch/cabextract/ChangeLog
index e78b58616f3d..5395b6c6379b 100644
--- a/app-arch/cabextract/ChangeLog
+++ b/app-arch/cabextract/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/cabextract
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.76 2015/03/03 05:39:32 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.77 2015/03/29 11:22:52 yngwin Exp $
+
+*cabextract-1.6 (29 Mar 2015)
+
+  29 Mar 2015; Ben de Groot <yngwin@gentoo.org> +cabextract-1.6.ebuild,
+  -cabextract-1.3.ebuild, cabextract-1.4.ebuild, metadata.xml:
+  Version bump, which fixes security bugs #538152 and #540626. Bump EAPI. Rename
+  extra-tools useflag to extras (bug #411643). Remove old.
 
   02 Mar 2015; Yixun Lan <dlan@gentoo.org> cabextract-1.4.ebuild:
   add arm64 support, tested on A53 board
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 3273e9c3120a..ddee42ed8616 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cabextract-1.3.tar.gz 217633 SHA256 d464383a35b48d54a3990c02f89acbfc677e655ef46194eae64fb8f433c3c001 SHA512 2b4d09e31ead2ad7e8a5bcb4c32b94382cf3bdb30a76309225095d311758244e71b171d663dfbf8dd1e98a3798d2d1bf5b1b4c0270d340093d774902a9b29be8 WHIRLPOOL ed4e40c91c79dfe498cc47f811311a5700b926d27dffe8b949f78c5931b73dce51bc6064eabe0d7eca9909d6c8fc9def94a02482c1ea6de6df7b3255d77ee837
 DIST cabextract-1.4.tar.gz 222490 SHA256 f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e SHA512 013c55efd8847bbc42432cde1bc4f6232f5b627ef8d7fadbf5793e47e3e06b5c1d428846cb38921d6c758fd508abfcc68aac3214762b9d4bfcb7277bd8bbbb94 WHIRLPOOL fd1e8e7b9dfa6c8e8e920371a44f2b641d2fc1a8429f2924fdd12cca583f71e8e6d972b251e2315359ae0c469b0127993dfe2840a65265be134e3f4dbc6f8cd2
-EBUILD cabextract-1.3.ebuild 1056 SHA256 916737640ae005b181f2befccfdd4a166a8e9ca793214a8de60715401aa61f19 SHA512 8ce6648b126b6100ea70d76374cbaa50949eda473f632d5cbdb79c98c227f8d749b962d70c31eda19cc5c98a395cafef1395045576bc1008df4515d149983596 WHIRLPOOL a1a5a4fed2efade2040ceee291bd5e1be847b2fb0f445b84ccfa152e51bb03a9407066e219c4b6b586a50418c99933d9012e585ccfa52f93978054b65b65ef72
-EBUILD cabextract-1.4.ebuild 1247 SHA256 57e6c09052bf3cc6f1725f28eb049d555427adc45a29e3f09d4760c92dad4582 SHA512 d8b19f8642faba8a8af3e0efcc8e1e92aae6588769d4918ae38697b0c94e3d026b3a93c1e28201d32c24903eb0988ac17c5190dc2a2bc4ade5ad6f301748d1b6 WHIRLPOOL ae99e9de963166c833b467bb66bce1196c7e7edd498b4ef8d1652dabaf6aaf1fa9856aa0050ff37ef21b78aa49af8c9e2604f7ed8b638bf194ac549020c88f06
-MISC ChangeLog 10112 SHA256 bbd2f3625434fe233e78bc1cfe23d0ee4e2bfebb85a2c8bfac5007333bdd5a83 SHA512 022e737c228a4419205cc514f0b9c5ce474b3cb2ce375a4d0e706a0b970881ce36023f67eeb330cd156eb0318f2cc7eb4bee6ab38837646c0dd2b07fdb7a5778 WHIRLPOOL e05d61c184547e78ae1c466a5ba8c30804ffb60b42646f78eadad94f3f7d1b451374c0cef33299c78c753508ddb4f4b4f9ffc8e546636148f5c8bfd1e7d23623
-MISC metadata.xml 388 SHA256 bd36996a91c4decd278de7016c374730e9e7a7b3b58e01fe7ebac2a049cab5a7 SHA512 690c23f32bb06d0881f560ca0056e17fcd42331427855477aa2644ed5437e661d21d8a3e726a56ef3f0858f02f1a13a633839c677b652397904e3da422e64bd8 WHIRLPOOL 2cf5cd7648c131442c15c16e810a8e7b6352d81e0ab55582fd118275721dc9d48197e5be822d42f40a324cf9f46596bc8ef7436bce30a594088fd1b6762e1513
+DIST cabextract-1.6.tar.gz 241731 SHA256 cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8 WHIRLPOOL 5816e3f6ee3a3caad574bbc3d8aeff55bb99383a4ce80a40332d59696a1d4fbaba6823e9a77023e7cbbc257a0693a35f7817d7ff20383b30898de5d4e50eb1f2
+EBUILD cabextract-1.4.ebuild 1243 SHA256 9c5d60ee73eb98ad7f93f6febc6d291c9fcf9fa014f5af8d3d072cf3aadf25eb SHA512 76f5ff810344fc5da219dc7d52f39c37830d8271644694635438e97569a034ec28b5fa881b5853839d3de2a107a865fc59c132782a2159ff24589a62c16d2a56 WHIRLPOOL 97b0299ca436ac8b72c3f241f673e57fefe7de4923b1086654b9ea1069501ae9bece7196e16797b01e52581f352a66c29375837e14cb521db68365c1591c5c31
+EBUILD cabextract-1.6.ebuild 1265 SHA256 6c3aa58f0680f6f39ae1fa28d685051b9a415be2cc935afc4c60414303557773 SHA512 770b77361a2de38f03f3ac80231b4b1cdb42f8ef331ab6156c2ef7591c37d462dbc51f89de6fb9abf0bc5c09e59c0114b83800e2796d1f2aa293505690392365 WHIRLPOOL c5fc1c6e860771056643630f74a7e77c5ff599e7f12b0ce18630e75e48e7071a51c358520c06bdeb5f29e3a8c22b325031bf5574ce7df7024cf9864181106121
+MISC ChangeLog 10421 SHA256 d7bf81706b39d84bf47448c76cea8a29d42331bddecb2488fa89b650f3faaa1f SHA512 41e8b6e32ac1b09b6866b1801e76e47e6f19ba36940808882654cb3f32885b54f8dd0937f380d54a6fcccab727e201ece5995a071254a861ad2c0981277b2e24 WHIRLPOOL dd80296df3057eaae847a624f61f8b54ee2dd7d8c3732261d4d63696c2e32bf5c2780f527332d60feb856fb182912a6c9d64b3fe0b620435ef1c2c5f60ba4838
+MISC metadata.xml 413 SHA256 29b0688a821cac92c34eb4e423e9e435923481d9c9107fa91c6241d9ead8da79 SHA512 37f91291d72358ca6c89d37dc9dab96c4a13c2dadc6a8448e9aa95c64e185ae473b4ab532bfb50fd062fd4121f6c6380b3a54e19eb61eb874cf39c78976d60fb WHIRLPOOL 3273733808d9be8196c279d6a79b9c067d7f5dafadde0c45cdc89477e6097c6b9d3a8bded7492fb80d61a55fcd3aaa65859ebf6dfe5db14aa558fca18aa28a55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9Ng5AAoJEJIMDbyqvv1VM0MP/1/YTlBrVsfOcK8Y1iYZfpef
-aH5gVIE/AyVpYRIU9G5gWXqLGA1RqYXopoHBLZmpLUuG3UxpyOsLT01RXlfMa0OV
-tO0FVStDqAMP51f+lnquz+YeT8ZDuW8VLmM/k+7k9FV+qMhGFc+tlvRm751Y+LJc
-u73Xb5z39LskQLX3Fc7j/X6LpnjGywR4iPlJDm3VXPQkzInqMmROqwEUc6OTduDP
-9rPDqv+WQiPmZPFHcZEyTp1whzadwYc5unsolD+9v2fKC3izaVW3TYLOiW+aXf6P
-wGxa5InzJCoiuyt+TrbJUsU3wRScTOamgta/f/3oO17Nvgr+Fs7jUTiDfz0jVaDM
-MYTO23yTvbWJveyCKIotanrgzf2c17TBUeeY6YclGeNAd2JpBszPuMSrNXQ4dRPl
-u0MvLdoWDrlTRUiZ31KDPLtBj9VjctT9S69QVzOXyS8BN/EOVkpxUGKLRdoCjpqm
-aP0kZUv+qm1yUjv/r4/7tD/7pZ96XWzViRcdNUNz+fdwdTwcBr/EVJGGM2T0iYj3
-g5eGs/rETr+zGuGFirmPyz88IDOzCnIxBkoV809pRbS2Fp2i9lvQ4EZ7D4E0IE05
-V5BdzNMAKfbro3AQB+PRHmQDzPbPXjZXmv/aYgPTIYLSzf9xjuVio9f0acD8kSNY
-4HATYC6r2Sf3hZc0psdp
-=UJQX
+iQJ8BAEBCABmBQJVF+CSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOHHcP/R4gf2yjWR+tyElO1G5MgtcJ
+n6pvsoYhqjkYgLOD2oQI6Nrqt7sSeymfjwQmeQhY0zIQCHcfgR9oWBGyfQNlWaN8
+FAOb0qcPb3EilwNLUvJG50Xi53h/ph9W7KoFQzjSbq8TPtpigYoc1JfTwCrd/5RH
+vUUA2h9cY6Wi02oUxw5vvMiHkbp2GkE27fw/Z+jUTDbma11zF9pOKFeQAt9JPQVt
+5hZmc3Pehs3ksCNvRiYAllZ6LSmxViYRUmmvnSn3ibAjG6KF8W3iAmnEkPQgUrLg
+OFo/0yeYeZpfvoPn9/Us8A6Ca0TDdQXeENy3RXiynNDx1B9MZRNHkrLeqQVXB5kD
+k60OIgq9DIWNABsSjvtY83yM+sdjUkHkgoOZi6LIV2VTfo0XeHtIMZtyYmjGPLTL
+R70FR5Whcw37/rtt1h6eJL3LA+P4/ThsVE91kQHH0ROgZHoP7pGEdLl2nxv7U4s+
+YypviXgOdoLnnUvVIAEJuuyszOrpx2/YMaUDMPE+WKyMIaW++FMDlydUCFPHXw5R
+NcdkW9qmv1KSBExVBPS+K43zOWwEa6/PE4gMx2x9nOa07KTAuyrvl46qrbQv1ZVt
+/MxWQmxd8O8N71nxBF8JaBjQOJr22ZcIAAlqCBLqCyPhkb4OXQxH4qab7JhxeBVN
+X2rd0CGLsJn2tg/pJ0qs
+=qymI
 -----END PGP SIGNATURE-----
diff --git a/app-arch/cabextract/cabextract-1.3.ebuild b/app-arch/cabextract/cabextract-1.3.ebuild
deleted file mode 100644
index 760243b6d379..000000000000
--- a/app-arch/cabextract/cabextract-1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.3.ebuild,v 1.7 2010/09/28 20:33:31 vapier Exp $
-
-DESCRIPTION="Extracts files from Microsoft .cab files"
-HOMEPAGE="http://www.cabextract.org.uk/"
-SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="extra-tools"
-
-RDEPEND="extra-tools? ( dev-lang/perl )"
-
-# the code attempts to set up a fnmatch replacement, but then fails to code
-# it properly leading to undefined references to rpl_fnmatch().  This may be
-# removed in the future if building still works by setting "yes" to "no".
-export ac_cv_func_fnmatch_works=yes
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
-	dohtml doc/wince_cab_format.html
-	if use extra-tools; then
-		dobin src/{wince_info,wince_rename,cabinfo} || die
-	fi
-}
diff --git a/app-arch/cabextract/cabextract-1.4.ebuild b/app-arch/cabextract/cabextract-1.4.ebuild
index 2d88aa85bc94..a530beccf419 100644
--- a/app-arch/cabextract/cabextract-1.4.ebuild
+++ b/app-arch/cabextract/cabextract-1.4.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.4.ebuild,v 1.12 2015/03/03 05:39:32 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.4.ebuild,v 1.13 2015/03/29 11:22:52 yngwin Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit toolchain-funcs
 
-DESCRIPTION="Extracts files from Microsoft .cab files"
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
 HOMEPAGE="http://www.cabextract.org.uk/"
 SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="extra-tools"
+IUSE="extras"
 
-RDEPEND="extra-tools? ( dev-lang/perl )"
+RDEPEND="extras? ( dev-lang/perl )"
 
 # the code attempts to set up a fnmatch replacement, but then fails to code
 # it properly leading to undefined references to rpl_fnmatch().  This may be
@@ -30,7 +30,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
 	dohtml doc/wince_cab_format.html
-	if use extra-tools; then
+	if use extras; then
 		dobin src/{wince_info,wince_rename,cabinfo}
 	fi
 }
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
new file mode 100644
index 000000000000..395fb8478393
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.6.ebuild,v 1.1 2015/03/29 11:22:52 yngwin Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="http://www.cabextract.org.uk/"
+SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
+	~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux
+	~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+	~x86-solaris"
+IUSE="extras"
+
+RDEPEND="extras? ( dev-lang/perl )"
+
+# the code attempts to set up a fnmatch replacement, but then fails to code
+# it properly leading to undefined references to rpl_fnmatch().  This may be
+# removed in the future if building still works by setting "yes" to "no".
+export ac_cv_func_fnmatch_works=yes
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
+	dohtml doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}
diff --git a/app-arch/cabextract/metadata.xml b/app-arch/cabextract/metadata.xml
index 1acfbec9e034..78a6f5f7ea4a 100644
--- a/app-arch/cabextract/metadata.xml
+++ b/app-arch/cabextract/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
-<use>
-	<flag name="extra-tools">Install experimental tools: wince_info and
-	wince_rename for examining and processing Windows CE installation cabinet
-	header files; cabinfo for examining the structure of a cab file.</flag>
-</use>
+  <herd>fonts</herd>
+  <use>
+    <flag name="extras">Install experimental extra tools: wince_info and
+      wince_rename for examining and processing Windows CE installation cabinet
+      header files; cabinfo for examining the structure of a cab file.
+    </flag>
+  </use>
 </pkgmetadata>