Version bump.

Package-Manager: portage-2.1.3.6

8 files changed, 90 insertions, 58 deletions

diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index 989a3be8e736..56daba680bce 100644
--- a/media-sound/gsm/ChangeLog
+++ b/media-sound/gsm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/gsm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.15 2007/03/09 03:17:53 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.16 2007/08/19 09:34:29 drac Exp $
+
+*gsm-1.0.12 (19 Aug 2007)
+
+  19 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gsm-1.0.12-64bit.patch, +files/gsm-1.0.12-memcpy.patch,
+  +gsm-1.0.12.ebuild:
+  Version bump.
 
 *gsm-1.0.10-r1 (09 Mar 2007)
 
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 66a51fa4ddd8..2edc62d620f2 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1,20 +1,25 @@
-AUX gsm-1.0.10-amd64.diff 591 RMD160 f7837a5032e2fce7ac58cb810fe52cb8f468198c SHA1 8304791717bf58f63a386ebb6b6e626a7899c334 SHA256 88fbe05ffe7a3aacb3f25bd6d0218067edeaf402f4ecbd0c6bcbd751303eae7c
-MD5 cf99fa6ecbaddb1c554a36ba9ca4169f files/gsm-1.0.10-amd64.diff 591
-RMD160 f7837a5032e2fce7ac58cb810fe52cb8f468198c files/gsm-1.0.10-amd64.diff 591
-SHA256 88fbe05ffe7a3aacb3f25bd6d0218067edeaf402f4ecbd0c6bcbd751303eae7c files/gsm-1.0.10-amd64.diff 591
+AUX gsm-1.0.12-64bit.patch 591 RMD160 fe48ec8dce98db335118ae699a2bb8d6d10931bf SHA1 949ec26ccd9aaa9a7f09806c7ae0a71a3724afe3 SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84
+MD5 6c285ee164e874dead3bc86399444134 files/gsm-1.0.12-64bit.patch 591
+RMD160 fe48ec8dce98db335118ae699a2bb8d6d10931bf files/gsm-1.0.12-64bit.patch 591
+SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84 files/gsm-1.0.12-64bit.patch 591
+AUX gsm-1.0.12-memcpy.patch 301 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b SHA1 fe6d55433de5775ff7ec2f4e5b8e65b1375b0390 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe
+MD5 7c45a8bbbc2031c74c67c34bcf037c56 files/gsm-1.0.12-memcpy.patch 301
+RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b files/gsm-1.0.12-memcpy.patch 301
+SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe files/gsm-1.0.12-memcpy.patch 301
 DIST gsm-1.0.10.tar.gz 65928 RMD160 334f93ab232c0b5c1b3090ffa551af0ee0455ed0 SHA1 ee47a81f4137bf3ce933dc610cb2293055ce9c02 SHA256 ddab700db455e13bcf9bc0592b320e61c6a7c692fb3cef7881b14b2df1a39069
-EBUILD gsm-1.0.10-r1.ebuild 1097 RMD160 209a4815276aebb4d3b49d04e976a4bcf57bc7b3 SHA1 7583530777d791e96a681dd0ef67c18f2b39bcb7 SHA256 e24ccf1452cb73a9daffb62c4a1da0b1d9bea2844264860309012b40f53f6469
-MD5 47ae37f7558d44dee646c93a6e223957 gsm-1.0.10-r1.ebuild 1097
-RMD160 209a4815276aebb4d3b49d04e976a4bcf57bc7b3 gsm-1.0.10-r1.ebuild 1097
-SHA256 e24ccf1452cb73a9daffb62c4a1da0b1d9bea2844264860309012b40f53f6469 gsm-1.0.10-r1.ebuild 1097
+DIST gsm-1.0.12.tar.gz 62156 RMD160 c780aa1405f5029aaacf96183577c6720691dd31 SHA1 69c22bdda35871d223affdac09115b6abb0932b1 SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4
 EBUILD gsm-1.0.10.ebuild 1089 RMD160 a88be377feb51d4132f767ef9678dbbc095fb58e SHA1 973ce6cfb002aebf3e875ffa01a69bd8a99810c8 SHA256 7f010ff317c1409449982731f79761062c2108c2e9fb0d68dd913be7689342dd
 MD5 cfe69a54bb9e6f6aba1340ef78b329da gsm-1.0.10.ebuild 1089
 RMD160 a88be377feb51d4132f767ef9678dbbc095fb58e gsm-1.0.10.ebuild 1089
 SHA256 7f010ff317c1409449982731f79761062c2108c2e9fb0d68dd913be7689342dd gsm-1.0.10.ebuild 1089
-MISC ChangeLog 1512 RMD160 e90f2cfa18f7294a6e1dff081fb0fe2d6ef43ce4 SHA1 3fce2fc1db711935228e97c22eb9d73585a23015 SHA256 3e43f0869a7e3e2f43c98d4d0d721584b8f0f0da3ecd26cdb74d0170e84be82e
-MD5 dbdba827f3055fba6942446064a55d86 ChangeLog 1512
-RMD160 e90f2cfa18f7294a6e1dff081fb0fe2d6ef43ce4 ChangeLog 1512
-SHA256 3e43f0869a7e3e2f43c98d4d0d721584b8f0f0da3ecd26cdb74d0170e84be82e ChangeLog 1512
+EBUILD gsm-1.0.12.ebuild 1386 RMD160 d54e2540acdfe09ffac25f91acfa02e59d58ea14 SHA1 c2f5f5baaa6f230ae0101c7267571caa13afbb3e SHA256 39ef377792163fdccd96a2652ababd2c5908e2271fd43b039fafdf7d4f24a5e1
+MD5 86d2bc6900efff63c50c330a3bcb12fd gsm-1.0.12.ebuild 1386
+RMD160 d54e2540acdfe09ffac25f91acfa02e59d58ea14 gsm-1.0.12.ebuild 1386
+SHA256 39ef377792163fdccd96a2652ababd2c5908e2271fd43b039fafdf7d4f24a5e1 gsm-1.0.12.ebuild 1386
+MISC ChangeLog 1689 RMD160 1174f7811a076a4d2e67fd3cfc588d92cefce5eb SHA1 5032784eea245051cd5164ce751bfda4df8f0cce SHA256 c693e5ff7b0d55c0a95ee708325d3a84ed0eaa4750c5b7bcbd04f6779b52d51b
+MD5 a9238dabe7f2903e30efe102414ce342 ChangeLog 1689
+RMD160 1174f7811a076a4d2e67fd3cfc588d92cefce5eb ChangeLog 1689
+SHA256 c693e5ff7b0d55c0a95ee708325d3a84ed0eaa4750c5b7bcbd04f6779b52d51b ChangeLog 1689
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,6 +27,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 a7837c9a31f6bbec1ad17fa27128323c files/digest-gsm-1.0.10 229
 RMD160 8485b05b98a997cca07b21757a6071a946b6a05b files/digest-gsm-1.0.10 229
 SHA256 cbaeb440c12022698c5e8af654fdd2e169773a6e2798968aea5e282c463323a4 files/digest-gsm-1.0.10 229
-MD5 a7837c9a31f6bbec1ad17fa27128323c files/digest-gsm-1.0.10-r1 229
-RMD160 8485b05b98a997cca07b21757a6071a946b6a05b files/digest-gsm-1.0.10-r1 229
-SHA256 cbaeb440c12022698c5e8af654fdd2e169773a6e2798968aea5e282c463323a4 files/digest-gsm-1.0.10-r1 229
+MD5 dbddf10519655c9ee40154de0b62e135 files/digest-gsm-1.0.12 229
+RMD160 532faaafe993d064df4cb474efe2627f99ff7428 files/digest-gsm-1.0.12 229
+SHA256 7715ee47e9290995b3bb7ce008e6b57d0dac84be9b87724ab8f8bbd274b0a328 files/digest-gsm-1.0.12 229
diff --git a/media-sound/gsm/files/digest-gsm-1.0.10-r1 b/media-sound/gsm/files/digest-gsm-1.0.10-r1
deleted file mode 100644
index b9697fed4567..000000000000
--- a/media-sound/gsm/files/digest-gsm-1.0.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b148480f82e96d274248e13880ec873 gsm-1.0.10.tar.gz 65928
-RMD160 334f93ab232c0b5c1b3090ffa551af0ee0455ed0 gsm-1.0.10.tar.gz 65928
-SHA256 ddab700db455e13bcf9bc0592b320e61c6a7c692fb3cef7881b14b2df1a39069 gsm-1.0.10.tar.gz 65928
diff --git a/media-sound/gsm/files/digest-gsm-1.0.12 b/media-sound/gsm/files/digest-gsm-1.0.12
new file mode 100644
index 000000000000..7cae8d182ed8
--- /dev/null
+++ b/media-sound/gsm/files/digest-gsm-1.0.12
@@ -0,0 +1,3 @@
+MD5 8909828c601e82e842e6a0ceade60a4e gsm-1.0.12.tar.gz 62156
+RMD160 c780aa1405f5029aaacf96183577c6720691dd31 gsm-1.0.12.tar.gz 62156
+SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4 gsm-1.0.12.tar.gz 62156
diff --git a/media-sound/gsm/files/gsm-1.0.10-amd64.diff b/media-sound/gsm/files/gsm-1.0.12-64bit.patch
index 6b96d57ba8e1..bc28c5099c57 100644
--- a/media-sound/gsm/files/gsm-1.0.10-amd64.diff
+++ b/media-sound/gsm/files/gsm-1.0.12-64bit.patch
@@ -1,6 +1,6 @@
-diff -ur gsm-1.0-pl10-orig/inc/private.h gsm-1.0-pl10/inc/private.h
---- gsm-1.0-pl10-orig/inc/private.h	2005-03-25 00:35:41.000000000 +0100
-+++ gsm-1.0-pl10/inc/private.h	2005-03-25 00:36:05.000000000 +0100
+diff -ur gsm-1.0-pl12.orig/inc/private.h gsm-1.0-pl12/inc/private.h
+--- gsm-1.0-pl12.orig/inc/private.h	2006-04-26 22:17:01.000000000 +0300
++++ gsm-1.0-pl12/inc/private.h	2007-08-19 12:23:02.000000000 +0300
 @@ -10,10 +10,10 @@
  #define	PRIVATE_H
  
diff --git a/media-sound/gsm/files/gsm-1.0.12-memcpy.patch b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch
new file mode 100644
index 000000000000..fc3c1ce232d9
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch
@@ -0,0 +1,11 @@
+diff -ur gsm-1.0-pl12.orig/src/code.c gsm-1.0-pl12/src/code.c
+--- gsm-1.0-pl12.orig/src/code.c	2006-04-26 22:16:50.000000000 +0300
++++ gsm-1.0-pl12/src/code.c	2007-08-19 12:18:01.000000000 +0300
+@@ -8,6 +8,7 @@
+ 
+ #include	"config.h"
+ 
++#include <string.h>
+ 
+ #ifdef	HAS_STDLIB_H
+ #include	<stdlib.h>
diff --git a/media-sound/gsm/gsm-1.0.10-r1.ebuild b/media-sound/gsm/gsm-1.0.10-r1.ebuild
deleted file mode 100644
index 6b1a61c341e9..000000000000
--- a/media-sound/gsm/gsm-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.10-r1.ebuild,v 1.1 2007/03/09 03:17:53 beandog Exp $
-
-IUSE=""
-
-inherit eutils versionator toolchain-funcs
-
-S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-pl' )"
-DESCRIPTION="Lossy speech compression library and tool."
-HOMEPAGE="http://kbs.cs.tu-berlin.de/~jutta/toast.html"
-SRC_URI="ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/${P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="OSI-Approved"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-amd64.diff
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" WAV49="-DWAV49" CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/lib /usr/include /usr/share/man/man{1,3}
-	make INSTALL_ROOT="${D}/usr" \
-		GSM_INSTALL_INC="${D}/usr/include" \
-		GSM_INSTALL_MAN="${D}/usr/share/man/man3" \
-		TOAST_INSTALL_MAN="${D}/usr/share/man/man1" \
-		install || die
-
-	dodoc ChangeLog* MACHINES MANIFEST README
-}
diff --git a/media-sound/gsm/gsm-1.0.12.ebuild b/media-sound/gsm/gsm-1.0.12.ebuild
new file mode 100644
index 000000000000..ccfc86c79bc9
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/08/19 09:34:29 drac Exp $
+
+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="OSI-Approved"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${PN}-"$(replace_version_separator 2 '-pl' )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-memcpy.patch
+	epatch "${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 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
+		CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib /usr/include /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_INSTALL_MAN="${D}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
+		install || die "emake install failed."
+
+	dodoc ChangeLog* MACHINES MANIFEST README
+}