Raise .so version from 1.0.12 to 1.0.13 and respect LDFLAGS wrt #283048.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 161 insertions, 5 deletions

diff --git a/media-sound/gsm/ChangeLog b/media-sound/gsm/ChangeLog
index d41cc77570a9..e00f21ae182f 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.38 2009/08/28 14:25:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/ChangeLog,v 1.39 2009/09/08 11:51:13 ssuominen Exp $
+
+  08 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> gsm-1.0.13.ebuild,
+  +files/gsm-1.0.13-shared.patch:
+  Raise .so version from 1.0.12 to 1.0.13 and respect LDFLAGS wrt #283048.
 
 *gsm-1.0.13 (28 Aug 2009)
 
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index c48ebc4ec181..0b4aaa7ebd60 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1,9 +1,10 @@
 AUX gsm-1.0.12-64bit.patch 591 RMD160 fe48ec8dce98db335118ae699a2bb8d6d10931bf SHA1 949ec26ccd9aaa9a7f09806c7ae0a71a3724afe3 SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84
 AUX gsm-1.0.12-memcpy.patch 301 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b SHA1 fe6d55433de5775ff7ec2f4e5b8e65b1375b0390 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe
 AUX gsm-1.0.12-shared.patch 3713 RMD160 6d9cd3e0e6eb7354900b990aa6e195cc12e8e733 SHA1 d2e08db4e95fa96661e989b59318e3eca06e01d2 SHA256 30661e6f947e74ce2f1c42452d666e76175e18269490d5adfa695bad3cf4ff47
+AUX gsm-1.0.13-shared.patch 3723 RMD160 ec8970abb71622dbde4c1ee43f16b7a70efc1474 SHA1 827c552d16bca2ef71bb10ef1bdecc0adad5be00 SHA256 806dc90827785625e73048f1aa39b8c182c55a466c07a66be8883469be72c0af
 DIST gsm-1.0.12.tar.gz 62156 RMD160 c780aa1405f5029aaacf96183577c6720691dd31 SHA1 69c22bdda35871d223affdac09115b6abb0932b1 SHA256 dde4e62e4ce35af29a15d26beca2fc0f98c0219553927453425cda01f16e4de4
 DIST gsm-1.0.13.tar.gz 65318 RMD160 e44f70d481328038b3b16a25cc99b7855113db61 SHA1 668b0a180039a50d379b3d5a22e78da4b1d90afc SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad
 EBUILD gsm-1.0.12-r1.ebuild 1558 RMD160 dce46ce69a35f0497283c9c8c8eb4329a2f30646 SHA1 41ef3f162c2b9a7ac1e4232486e2bc84649693c3 SHA256 4d45e1c64766bdbfbac2ba26dc9f9d96c82a78323c3a5fe62889dce397d87c01
-EBUILD gsm-1.0.13.ebuild 1587 RMD160 bfa2a6112e62981e19cdfed7f3d83c1a4d2f8136 SHA1 caa1aa55054e3111ab1bfd8770233b17653b205b SHA256 3eb63ebce9913e2d9be721e1b9c1295e49942d04f0c6c5f66542a376f029ab99
-MISC ChangeLog 4289 RMD160 54cff968642a6c363ee480481dd9d4ebcb386992 SHA1 662b6ddc283604fddfff17102c4f3ddb0395dbb1 SHA256 72f36e45b0a06553ce42e13aa7bc26c363bbeaada6e1fd2f9c666725f8c8bcd1
+EBUILD gsm-1.0.13.ebuild 1579 RMD160 aff2ad71db1c2dab4463126978ba95a91ad5ffd9 SHA1 bb918bf9b9fe49904e1d467834d0c844e72122e6 SHA256 17f738f28393e9e5cc4eb11e0b34afddde70e03d08edcfbad9bb58eb15f2d569
+MISC ChangeLog 4472 RMD160 4836cb3cb20d70df4b4784546498ef685d169dca SHA1 7a64d8f800abec9b82ebbeb88327352a3f4d21ed SHA256 0ce28134c520912692fa31f028aac90e341a5631fe9854677545eadae061452a
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
new file mode 100644
index 000000000000..fc99e2c30437
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -0,0 +1,151 @@
+diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
+--- gsm-1.0-pl13.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
++++ gsm-1.0-pl13/Makefile	2009-09-08 14:50:02.000000000 +0300
+@@ -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) $(LFLAGS) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
++		ln -fs libgsm.so.1.0.13 lib/libgsm.so.1
++		ln -fs libgsm.so.1.0.13 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.13	\
++			$(LIB)libgsm.so.1			\
++			$(TOAST) $(TCAT) $(UNTOAST)		\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+ 
diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild
index e4cf6e23c039..afb947fe4eba 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.1 2009/08/28 14:25:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.2 2009/09/08 11:51:13 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -17,7 +17,7 @@ IUSE=""
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.12-shared.patch \
+	epatch "${FILESDIR}"/${P}-shared.patch \
 		"${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
 		"${FILESDIR}"/${PN}-1.0.12-64bit.patch
 }