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

Remove forced -g from (C|LD)FLAGS.
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 104 insertions, 7 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/Manifest b/app-mobilephone/vmoconv/Manifest
index d62830161fd0..93aa5663f206 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vmoconv-1.0-external-libgsm.patch 863 RMD160 7f40f3b672faddd285477e9d9e4a76273d89c637 SHA1 d99f005e2347e70cde130bf65b48ea9b94a3bd8b SHA256 9e815f6b1da3956ba9e42c13d8336dbb827c50eb8cdcac731ea74cc0b447c210
+AUX vmoconv-1.0-flags.patch 683 RMD160 f482745c9a2d664fdbddee9bcbd4f8f1e8f82b4d SHA1 bb2eb8688b7fbccd0b184fbfbf8b866bae008b11 SHA256 7e9cc3832f4d81c2f55cd1faf69670c000d25caa37a572cc06ff8ace06011fe5
 AUX vmoconv-1.0-glibc28.patch 876 RMD160 674e6104b25277c0ed4c4f82ac3020666aa97e64 SHA1 f9bf5c77d3df9d36a502ef63b58c5f70fe6684ed SHA256 432bd2b4796d12c9a100029a70729e7b4c3defe7d2d69a7c0072ba3c1ce95e8e
 DIST vmoconv-1.0.tar.gz 315028 RMD160 f138b120d975fef9dcf474164f8bc26655372bf5 SHA1 f542f4eed35b5f1412b78ba0b068a8ea448843cf SHA256 1a20cab89f4f7f30bf5d14243b944921420b482e1f7c0d5dd1c4ad9df9e37528
+EBUILD vmoconv-1.0-r1.ebuild 818 RMD160 1e68b3c60d4ee4e1e650cbaabb1d3c4c0071778f SHA1 1d24274844345b78bc2d51144050ab8fd05f2d67 SHA256 e8d53c6d74a5b2bcd3421d5440d68180c334fab2ac324bd4c1b2735b36c98ebc
 EBUILD vmoconv-1.0.ebuild 883 RMD160 565f28c4724492809e0bef4236cc50ddf14aca6e SHA1 cd147e016a2637c3cd9977e30260c7175d290781 SHA256 a3341ee72db4fb2cd0bf95dbc59dac2df92700c934c7ba25fe8bb07600df24dd
-MISC ChangeLog 1210 RMD160 ef8db7a0ff287d1ff6b77163807c59773163304a SHA1 b39ae08f1a155d748c97dd9de5626afba22f9129 SHA256 cf2ab90506ad4af35190652fbdb85fbd0f0d65bd4f21007fdf792151bddee8e8
+MISC ChangeLog 1494 RMD160 dcf693d89f9682baf6cb109fd599fe714d3a772a SHA1 6375992379659bb1099da13129e08f761ec8e108 SHA256 1d176bad7e6f1c251ab7a2abfee29aedd57386db9b6d76434cd5447b3ffcf29d
 MISC metadata.xml 295 RMD160 73a03bb5657a36237e9b64b11ab2a3cac0a39f76 SHA1 430494619a2e26d6003599b416f81b0b22f5eaee SHA256 268235925e3d95b8383d1986c212038b47fde6a3212fad0d04245b1b5472d51c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkjpQ1cACgkQAiZjviIA2Xi2ewCg5cJSeJyXA81HYgvNTxluKeqX
-ZO8AoIRBbPQ93sGa/tj6E3GZMNRoCgzd
-=faoq
+iEYEARECAAYFAkmtozgACgkQts85UDFmaOVkOwCeMxRBdfitTS0Wpw1WDO6jkLG+
+vigAn34u0qrWQRzguLvEI/P+rftmdc8g
+=Ihln
 -----END PGP SIGNATURE-----
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
+}