Fix bug 467588. EAPI bump. Remove old.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 42618354)

3 files changed, 11 insertions, 44 deletions

diff --git a/app-mobilephone/vmoconv/ChangeLog b/app-mobilephone/vmoconv/ChangeLog
index caba77029073..40970ad3fc8a 100644
--- a/app-mobilephone/vmoconv/ChangeLog
+++ b/app-mobilephone/vmoconv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/vmoconv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.10 2011/12/21 08:37:52 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.11 2013/08/21 19:20:24 creffett Exp $
+
+  21 Aug 2013; Chris Reffett <creffett@gentoo.org> -vmoconv-1.0.ebuild,
+  vmoconv-1.0-r1.ebuild:
+  Fix bug 467588. EAPI bump. Remove old.
 
   21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> vmoconv-1.0-r1.ebuild:
   x86 stable wrt bug #393971
@@ -47,4 +51,3 @@
   08 Jan 2005; Andrej Kacian <ticho@gentoo.org> +metadata.xml,
   +vmoconv-1.0.ebuild:
   Initial import.
-
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
index 03b97f41d43d..8fd5cbdd99c4 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild,v 1.4 2011/12/21 08:37:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild,v 1.5 2013/08/21 19:20:23 creffett Exp $
+EAPI=5
 
 inherit eutils autotools
 
@@ -16,14 +17,11 @@ IUSE=""
 DEPEND="media-sound/gsm"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-glibc28.patch"
 	epatch "${FILESDIR}/${P}-flags.patch"
 	epatch "${FILESDIR}/${P}-external-libgsm.patch"
-
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
 	eautoreconf
 }
 
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0.ebuild
deleted file mode 100644
index b82178729c9d..000000000000
--- a/app-mobilephone/vmoconv/vmoconv-1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/vmoconv-1.0.ebuild,v 1.6 2008/06/20 23:05:36 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav."
-HOMEPAGE="http://triq.net/obex/"
-SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-glibc28.patch"
-}
-
-src_compile() {
-	econf || die "configure failed"
-	# ugly workaround, otherwise make tries to build binaries before
-	# necessary .la file is built
-	cd src && make libgsm.la || die "make libgsm failed"
-	cd ..
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}