Version bump. Drop old.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 41 insertions, 46 deletions

diff --git a/app-arch/cabextract/ChangeLog b/app-arch/cabextract/ChangeLog
index 2da6c89b5672..b78f668c462f 100644
--- a/app-arch/cabextract/ChangeLog
+++ b/app-arch/cabextract/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/cabextract
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.64 2010/09/28 20:33:31 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/ChangeLog,v 1.65 2011/05/16 10:06:51 pva Exp $
+
+*cabextract-1.4 (16 May 2011)
+
+  16 May 2011; Peter Volkov <pva@gentoo.org> -cabextract-1.2-r1.ebuild,
+  +cabextract-1.4.ebuild:
+  Version bump. Drop old.
 
   28 Sep 2010; Mike Frysinger <vapier@gentoo.org> cabextract-1.3.ebuild:
   Fix building for systems with crappy fnmatch and/or cross-compiling.
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 97357bc93032..e3a368851500 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST cabextract-1.2.tar.gz 194006 RMD160 55292e287047b14945e69b0be8ab9ff1d4902f71 SHA1 871b3db4bc2629eb5726659c147aecea1af6a6d0 SHA256 ae9c860a74fcea109887b4cf5de8fce575ac14737571520b14b84816f17125eb
 DIST cabextract-1.3.tar.gz 217633 RMD160 a02fc161719d57cbee934f0a12ed5441ec7ddc27 SHA1 112469b9e58497a5cfa2ecb3d9eeb9d3a4151c9f SHA256 d464383a35b48d54a3990c02f89acbfc677e655ef46194eae64fb8f433c3c001
-EBUILD cabextract-1.2-r1.ebuild 894 RMD160 cc81640f05ab142323a5e04cc2b40fdaa97a26e1 SHA1 e393770115f347d6e0229d43196a6fc09898f832 SHA256 35d03372bbcd7658e4d4afb51e8d2f8a451f277d3c4d7a68b236d1fe2e62a316
+DIST cabextract-1.4.tar.gz 222490 RMD160 da175f0dab84150cf0c36ac4870002b07e4774d4 SHA1 b1d5dd668d2dbe95b47aad6e92c0b7183ced70f1 SHA256 f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e
 EBUILD cabextract-1.3.ebuild 1056 RMD160 d6dc9e46d292ddb13b466e5bdc5eba60a7e0be5e SHA1 2381350273a8099930f9d8645d2bb79af1800782 SHA256 916737640ae005b181f2befccfdd4a166a8e9ca793214a8de60715401aa61f19
-MISC ChangeLog 8766 RMD160 d02bea5cfca1dbcf78bdba30dbea0e182ae13d27 SHA1 0be8bb84eb764f1e7ea5c7abf9ec30c14764f31c SHA256 c604aee727efead459ad07619859637ab1767438310e6c4cda6ab2562fdf558f
+EBUILD cabextract-1.4.ebuild 1046 RMD160 4dfe4831841d5d92a28117585db4547cb86cf1c0 SHA1 afd335173ad52109317282903de4bd4f98f6aca1 SHA256 f025b55d9664ae977f0e29c0b9d1590ba28873030f3297fb88d9362568da5425
+MISC ChangeLog 8919 RMD160 797c3e610f29d0503338343351011f7031e61812 SHA1 b554ce2a5058b5f2e67d0c3395b45860185b0372 SHA256 0b479af562761de3db9fc2f3335487dbebbdcecb2c638f536e42ce1adf59a75c
 MISC metadata.xml 388 RMD160 4c46f3dc442865e942e22519fa4494dac62e9694 SHA1 a356ebe1c2b65717dd8c8bde042c46b76d8c34b0 SHA256 bd36996a91c4decd278de7016c374730e9e7a7b3b58e01fe7ebac2a049cab5a7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAkyiUQUACgkQTwhj9JtAlp60tgEAqDzfxhlaaqCYKvl8ChHjCDGb
-hizX5sHUeTbwQYNqergBALQfAEfdw0ZXDFcAl69wtF6E/ruqUAHLLN1O/NODI++5
-=MY6I
------END PGP SIGNATURE-----
diff --git a/app-arch/cabextract/cabextract-1.2-r1.ebuild b/app-arch/cabextract/cabextract-1.2-r1.ebuild
deleted file mode 100644
index 53abf7664faa..000000000000
--- a/app-arch/cabextract/cabextract-1.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.2-r1.ebuild,v 1.8 2009/10/12 09:53:01 pva Exp $
-
-inherit autotools
-
-DESCRIPTION="Extracts files from Microsoft .cab files"
-HOMEPAGE="http://www.cabextract.org.uk/"
-SRC_URI="http://www.kyz.uklinux.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf # fixes bug #271592
-}
-
-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
new file mode 100644
index 000000000000..6141fc1e1eba
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 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.1 2011/05/16 10:06:51 pva Exp $
+
+EAPI="4"
+
+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
+	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}
+	fi
+}