alpha/amd64/arm/hppa/ia64/ppc/ppc64/sparc/x86 stable as only modification to 1.0.12 is license clarification.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 7 insertions, 203 deletions

diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index e00f21ae182f..7369c91001d9 100644
--- a/media-sound/gsm/ChangeLog
+++ b/media-sound/gsm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gsm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.39 2009/09/08 11:51:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.40 2009/09/08 12:00:56 ssuominen Exp $
+
+  08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> gsm-1.0.13.ebuild:
+  alpha/amd64/arm/hppa/ia64/ppc/ppc64/sparc/x86 stable as only modification
+  to 1.0.12 is license clarification.
 
   08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> gsm-1.0.13.ebuild,
   +files/gsm-1.0.13-shared.patch:
diff --git a/media-sound/gsm/files/gsm-1.0.12-shared.patch b/media-sound/gsm/files/gsm-1.0.12-shared.patch
deleted file mode 100644
index 49e56c23055a..000000000000
--- a/media-sound/gsm/files/gsm-1.0.12-shared.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -ur gsm-1.0-pl12.orig/Makefile gsm-1.0-pl12/Makefile
---- gsm-1.0-pl12.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
-+++ gsm-1.0-pl12/Makefile	2007-12-15 18:47:22.000000000 +0200
-@@ -96,7 +96,7 @@
- #  Other tools
- 
- SHELL		= /bin/sh
--LN		= ln
-+LN		= ln -s
- BASENAME 	= basename
- AR		= ar
- ARFLAGS		= cr
-@@ -140,6 +140,7 @@
- # Targets
- 
- LIBGSM	= $(LIB)/libgsm.a
-+LIBGSMSO= $(LIB)/libgsm.so
- 
- TOAST	= $(BIN)/toast
- UNTOAST	= $(BIN)/untoast
-@@ -203,24 +204,43 @@
- 
- # Object files
- 
--GSM_OBJECTS =	$(SRC)/add.o		\
--		$(SRC)/code.o		\
--		$(SRC)/debug.o		\
--		$(SRC)/decode.o		\
--		$(SRC)/long_term.o	\
--		$(SRC)/lpc.o		\
--		$(SRC)/preprocess.o	\
--		$(SRC)/rpe.o		\
--		$(SRC)/gsm_destroy.o	\
--		$(SRC)/gsm_decode.o	\
--		$(SRC)/gsm_encode.o	\
--		$(SRC)/gsm_explode.o	\
--		$(SRC)/gsm_implode.o	\
--		$(SRC)/gsm_create.o	\
--		$(SRC)/gsm_print.o	\
--		$(SRC)/gsm_option.o	\
--		$(SRC)/short_term.o	\
--		$(SRC)/table.o
-+STATIC_GSM_OBJECTS =	$(SRC)/add.o		\
-+			$(SRC)/code.o		\
-+			$(SRC)/debug.o		\
-+			$(SRC)/decode.o		\
-+			$(SRC)/long_term.o	\
-+			$(SRC)/lpc.o		\
-+			$(SRC)/preprocess.o	\
-+			$(SRC)/rpe.o		\
-+			$(SRC)/gsm_destroy.o	\
-+			$(SRC)/gsm_decode.o	\
-+			$(SRC)/gsm_encode.o	\
-+			$(SRC)/gsm_explode.o	\
-+			$(SRC)/gsm_implode.o	\
-+			$(SRC)/gsm_create.o	\
-+			$(SRC)/gsm_print.o	\
-+			$(SRC)/gsm_option.o	\
-+			$(SRC)/short_term.o	\
-+			$(SRC)/table.o
-+
-+SHARED_GSM_OBJECTS =	$(SRC)/add.lo		\
-+			$(SRC)/code.lo		\
-+			$(SRC)/debug.lo		\
-+			$(SRC)/decode.lo	\
-+			$(SRC)/long_term.lo	\
-+			$(SRC)/lpc.lo		\
-+			$(SRC)/preprocess.lo	\
-+			$(SRC)/rpe.lo		\
-+			$(SRC)/gsm_destroy.lo	\
-+			$(SRC)/gsm_decode.lo	\
-+			$(SRC)/gsm_encode.lo	\
-+			$(SRC)/gsm_explode.lo	\
-+			$(SRC)/gsm_implode.lo	\
-+			$(SRC)/gsm_create.lo	\
-+			$(SRC)/gsm_print.lo	\
-+			$(SRC)/gsm_option.lo	\
-+			$(SRC)/short_term.lo	\
-+			$(SRC)/table.lo
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\
-@@ -228,7 +248,7 @@
- 		$(SRC)/toast_alaw.o	\
- 		$(SRC)/toast_audio.o
- 
--OBJECTS =	 $(GSM_OBJECTS) $(TOAST_OBJECTS)
-+OBJECTS =	$(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS)
- 
- # Manuals
- 
-@@ -277,9 +297,12 @@
- 		$(CC) $(CFLAGS) $?
- 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
- 
-+%.lo: %.c
-+		$(CC) $(CFLAGS) -fPIC -c $< -o $@
-+
- # Target rules
- 
--all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:		$(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
- 		@-echo $(ROOT): Done.
- 
- tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +322,29 @@
- 
- # The basic API: libgsm
- 
--$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
-+$(LIBGSMSO):	$(LIB) $(SHARED_GSM_OBJECTS)
-+		$(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
-+		ln -fs libgsm.so.1.0.12 lib/libgsm.so.1
-+		ln -fs libgsm.so.1.0.12 lib/libgsm.so
-+
-+$(LIBGSM):	$(LIB) $(STATIC_GSM_OBJECTS)
- 		-rm $(RMFLAGS) $(LIBGSM)
--		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
-+		$(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS)
- 		$(RANLIB) $(LIBGSM)
- 
- 
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
- 
- $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
--		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
- 
- $(UNTOAST):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(UNTOAST)
--		$(LN) $(TOAST) $(UNTOAST)
-+		$(LN) toast $(UNTOAST)
- 
- $(TCAT):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(TCAT)
--		$(LN) $(TOAST) $(TCAT)
-+		$(LN) toast $(TCAT)
- 
- 
- # The local bin and lib directories
-@@ -426,7 +454,9 @@
- 
- clean:	semi-clean
- 		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
--			$(TOAST) $(TCAT) $(UNTOAST)	\
-+			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.12	\
-+			$(LIB)libgsm.so.1			\
-+			$(TOAST) $(TCAT) $(UNTOAST)		\
- 			$(ROOT)/gsm-1.0.tar.Z
- 
- 
diff --git a/media-sound/gsm/gsm-1.0.12-r1.ebuild b/media-sound/gsm/gsm-1.0.12-r1.ebuild
deleted file mode 100644
index f12241578e40..000000000000
--- a/media-sound/gsm/gsm-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.12-r1.ebuild,v 1.15 2009/05/10 17:46:23 ssuominen Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-DESCRIPTION="Lossy speech compression library and tool."
-HOMEPAGE="http://kbs.cs.tu-berlin.de/~jutta/toast.html"
-SRC_URI="http://www.cs.tu-berlin.de/~jutta/${PN}/${P}.tar.gz"
-
-LICENSE="gsm"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-memcpy.patch \
-		"${FILESDIR}"/${P}-64bit.patch
-}
-
-src_compile() {
-	# From upstream Makefile. Define this if your host multiplies
-	# floats faster than integers, e.g. on a SPARCstation.
-	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
-
-	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
-		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
-
-	emake -j1 INSTALL_ROOT="${D}"/usr \
-		GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
-		GSM_INSTALL_INC="${D}"/usr/include/gsm \
-		GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
-		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
-		install || die "emake install failed."
-
-	dolib lib/libgsm.so*
-
-	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
-
-	dodoc ChangeLog* MACHINES MANIFEST README
-}
diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild
index afb947fe4eba..0d85ce36d7d8 100644
--- a/media-sound/gsm/gsm-1.0.13.ebuild
+++ b/media-sound/gsm/gsm-1.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.2 2009/09/08 11:51:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.3 2009/09/08 12:00:56 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.tu-berlin.de/~jutta/${PN}/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"