Fix bug 467588. EAPI bump. Remove old.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 25 insertions, 47 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/Manifest b/app-mobilephone/vmoconv/Manifest
index b32139de0318..fdaf109d20ea 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX vmoconv-1.0-external-libgsm.patch 863 SHA256 9e815f6b1da3956ba9e42c13d8336dbb827c50eb8cdcac731ea74cc0b447c210 SHA512 d02dc343c59ef15d21b08478d3e9f6393f95c59ecf340afb09945d4897481e9c859f83752b6d79e1ae03563b9d9deb129a0a1db5e0acd69ed1a815b5be408058 WHIRLPOOL 0aab2340b189d22651bd1c515900ee1ae88421fa17108bd638f69fdea38a73b65d4b978b0b0500f47ddc0eba52c54f5caf2ceba906bcc4862e9cd4db10420948
 AUX vmoconv-1.0-flags.patch 683 SHA256 7e9cc3832f4d81c2f55cd1faf69670c000d25caa37a572cc06ff8ace06011fe5 SHA512 431e10787bed24cc775a43f44c60a64610f03c25956efb8892d7117476e01261ae06c644a1ac9ada6f9dc94ad5a38745beb8fb2dbe3dfe8546ecfa51902f0770 WHIRLPOOL e0cd70c4558f2b4016b3355b2aa63296375135269c80cf295ab82ec0c8a4f1660c151864f380f6e566fb3bd66ad9c57bbbb80776fbe434fc11690bab44741411
 AUX vmoconv-1.0-glibc28.patch 876 SHA256 432bd2b4796d12c9a100029a70729e7b4c3defe7d2d69a7c0072ba3c1ce95e8e SHA512 14477a9c13fabae162dfe8fc4b701019fb52e387198c70542275b1e9562a683532f8b88a96a9b8c7d9aea8e5f27224baa27046a04ce164adcd2d260f0a22e011 WHIRLPOOL df0fe2c8dfa385eb56600055f1459506f0642144cf0039552de7f81a7c974ff50fdb0a4b9513536116ee9f718ef5ef18bcebcaca2b3d09bcac5ba4b50c8872d1
 DIST vmoconv-1.0.tar.gz 315028 SHA256 1a20cab89f4f7f30bf5d14243b944921420b482e1f7c0d5dd1c4ad9df9e37528 SHA512 c4bd65f2c034317e43736198eaea6a3cfbbc6be015dc1ac5efa51633c2779bf5af87ea037084173b377a7521538e4a235f264b5f09fedcdaf7f4a815289a7ec2 WHIRLPOOL 1afe830d72e150741e5a9cce954a0618a86a192329bf6ead5eae44579397e48caea9542239ca874c27c7d022f6b99385e5e3ea0a88d8b7f14945d0f405beaff2
-EBUILD vmoconv-1.0-r1.ebuild 825 SHA256 6c5faa6cf15c1bf8ab97ff91d7e745c15c9505bff4c8ed7ad57268cece566264 SHA512 00189c40e304af97a496f0c5f81b89d31ddfef712a33b9829eb6457d024528d1aa5d358b9fb39c8a99ce5446587b306d88de4a811db231bb695299e3afaa1e1c WHIRLPOOL 9fbb5cbd44c63b943c59a9b42385926b06ed2e6c7224423631755a516c5c6819ffbd3c320b8472a9295a290038f41f64c74ba1b882f65216dbb8a443006558fd
-EBUILD vmoconv-1.0.ebuild 883 SHA256 a3341ee72db4fb2cd0bf95dbc59dac2df92700c934c7ba25fe8bb07600df24dd SHA512 7fd462f8153ea6b7cf635213008aff72862ed0c54d1698d389dc4b36dea2820a8f08039a8ceb5cb27704865473219e149f5f17b8f34fcc59bb602553bcbe02c0 WHIRLPOOL 6e1f5cfa8e07d964decf4398d4d1ede01b06c830883926dadac65ddd1bdfdbcad0d8edae6c6be313e2154457383b5b95fdbc96fad116afd2b49a08a086a2b35d
-MISC ChangeLog 1819 SHA256 ff42519312242a88dd8bc4baaec01bacae5883679fb3683d35389b831fb4f280 SHA512 e887c13a8c4ea5d246981784775c6e42b3e484efa2040a5142f47e04dc05746ea25199167504f3a2cce819117ff6603e714c21dc7de36facada9d9913d181a2b WHIRLPOOL e913bf3a68e72d7c3bb6cae2b8c2f564b8d4b84b3764b46755a1e47e89a09a06004fe103db3ade6c29034d95470e02b43a379611e7fab8e2361f2d38125c5e7c
+EBUILD vmoconv-1.0-r1.ebuild 874 SHA256 cfef30b5e07cea43a773fd9f9562a811d223eac6dade217e336c73d68a3c8163 SHA512 06a7c5af03167db708f67b5a2abc7d072e99f0ed47efb7e1d0c0fb9e1279d233ffe1b14c98bc15e7a5e23150b3d143631e5795c1654158239b555e2e84ff71fd WHIRLPOOL ba32c3315416ae797493c660a134d74b87412b8b61b324434ed39679d46d1c458ef2966456173d31fd68345b27f5f01536d551db6ee257e11bc0acf93d439561
+MISC ChangeLog 1955 SHA256 d283d690affa04a4d763debcb06e6b551cdfc9e4ecb2e1ef0f3961dffc884bd1 SHA512 cfdb6b2b300b57c638fc20e1e7f10ad773016beddcc751aeea7608b9b4a6f5a6ac45dd72a12858f48cb7290e6059a2cd91ddbaf733e4f3c0151277fe6a037050 WHIRLPOOL 5d6bcb94c004aea3f1198fd6749f8424416565f99f39136c9c3339023966251a8a2b1fae29500ab89b8c23f9e8b9c528d92f306b11833e53320852fc33e7e346
 MISC metadata.xml 295 SHA256 268235925e3d95b8383d1986c212038b47fde6a3212fad0d04245b1b5472d51c SHA512 4ef532cf5415cfd53b1b6827c973250f02a23dd0e86d168fca8491e64deb4df3f3f9a77f4827823d92fba0098a675cb5bb42d0dff0730e3cc5b03c3021cdff53 WHIRLPOOL afbaa575f70790bfb9a6df82b1fd0dd75bc60d52e537fdd301d0790d4bb6884397dbdf4e771d4966b65eaf96649d221a61bb53252eab972683e808daf2b55c74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iKYEAREIAGYFAlIVEvNfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1SWwwCfaOiqg/BTkb6CTZuQmWs2vYKE
+kakAn0Js9J5lSBhZkK4qwB6Rg/DMwgpU
+=qiy/
+-----END PGP SIGNATURE-----
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
-}