Version bump. Drop old.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

3 files changed, 38 insertions, 33 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/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
+}