Use system libgsm instead copy included in the tarball (#252886).

Remove forced -g from (C|LD)FLAGS.
(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 96 insertions, 2 deletions

diff --git a/app-mobilephone/vmoconv/ChangeLog b/app-mobilephone/vmoconv/ChangeLog
index 8680e573cb68..d2c5f829d5e8 100644
--- a/app-mobilephone/vmoconv/ChangeLog
+++ b/app-mobilephone/vmoconv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/vmoconv
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.6 2008/10/05 22:44:34 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/vmoconv/ChangeLog,v 1.7 2009/03/03 19:37:50 mrness Exp $
+
+*vmoconv-1.0-r1 (03 Mar 2009)
+
+  03 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/vmoconv-1.0-external-libgsm.patch, +files/vmoconv-1.0-flags.patch,
+  +vmoconv-1.0-r1.ebuild:
+  Use system libgsm instead copy included in the tarball (#252886). Remove
+  forced -g from (C|LD)FLAGS.
 
   05 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
   files/vmoconv-1.0-glibc28.patch:
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch
new file mode 100644
index 000000000000..8ab3670aa098
--- /dev/null
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-external-libgsm.patch
@@ -0,0 +1,36 @@
+diff -Nru vmoconv-1.0.orig/src/Makefile.am vmoconv-1.0/src/Makefile.am
+--- vmoconv-1.0.orig/src/Makefile.am	2003-02-17 21:39:18.000000000 +0000
++++ vmoconv-1.0/src/Makefile.am	2009-03-03 21:24:12.000000000 +0000
+@@ -1,32 +1,6 @@
+ 
+-noinst_LTLIBRARIES =		libgsm.la
+-
+ INCLUDES =			-I.
+ 
+-libgsm_la_SOURCES =		add.c            \
+-				code.c           \
+-				debug.c          \
+-				decode.c         \
+-				long_term.c      \
+-				lpc.c            \
+-				preprocess.c     \
+-				rpe.c            \
+-				gsm_destroy.c    \
+-				gsm_decode.c     \
+-				gsm_encode.c     \
+-				gsm_explode.c    \
+-				gsm_implode.c    \
+-				gsm_create.c     \
+-				gsm_print.c      \
+-				gsm_option.c     \
+-				short_term.c     \
+-				table.c		\
+-				proto.h		\
+-				unproto.h	\
+-				config.h	\
+-				private.h	\
+-				gsm.h
+-
+ vmo2wav_LDADD =			-lgsm
+ 
+ vmo2wav_SOURCES =		vmo2wav.c
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
new file mode 100644
index 000000000000..031b6eefaaca
--- /dev/null
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
@@ -0,0 +1,17 @@
+diff -Nru vmoconv-1.0.orig/configure.in vmoconv-1.0/configure.in
+--- vmoconv-1.0.orig/configure.in	2004-09-26 15:17:48.000000000 +0000
++++ vmoconv-1.0/configure.in	2009-03-03 21:32:40.000000000 +0000
+@@ -26,10 +26,10 @@
+     [printf(__func__)],,
+     [AC_DEFINE(__func__, "", [non-C99 fake support for __func__])])
+ 
+-dnl Turn on debugging and all warnings when using gcc
++dnl Turn on all warnings when using gcc
+ if test "$ac_cv_prog_gcc" = "yes"; then
+-	CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes"
+-	LDFLAGS="$LDFLAGS -g -Wall"
++	CFLAGS="$CFLAGS -Wall -Wmissing-declarations -Wmissing-prototypes"
++	LDFLAGS="$LDFLAGS -Wall"
+ fi
+        
+ AC_SUBST(CFLAGS)
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
new file mode 100644
index 000000000000..1d05cf569543
--- /dev/null
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 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.1 2009/03/03 19:37:50 mrness Exp $
+
+inherit eutils autotools
+
+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=""
+
+DEPEND="media-sound/gsm"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-glibc28.patch"
+	epatch "${FILESDIR}/${P}-flags.patch"
+	epatch "${FILESDIR}/${P}-external-libgsm.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}