From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 29 Jun 2020 11:38:31 +0100
Subject: gentoo resync : 29.06.2020

---
 media-sound/gsm/Manifest                      |  4 ++--
 media-sound/gsm/files/gsm-1.0.13-shared.patch | 30 +++++++++++++++++----------
 media-sound/gsm/gsm-1.0.13-r1.ebuild          |  4 ++--
 3 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'media-sound/gsm')

diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 520a28bea469..b3884faac2ba 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1,6 +1,6 @@
 AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e27cc0bb39b7ce0df361840304ee06d3d321ee39209e3dc7bb6424d64490b3174c5d24b3cd1cbe1ccde2787d SHA512 33b559da974d89487f41e24fe9fee4ac4df6383e27835f710f50deaca76c5077fc24b20fe4d306f1b8c2ca6f3e9cf99c5934796e3795354dee63061e305d4c72
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
-AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
+AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1553 BLAKE2B 6b343d4018055057fe85e0a617b7c01e224c2bda2b6879aad77f79578616ba50a6bf979c4b5bc24ebb25df7f9802a0fc1103bffe0d2db605a6d26b5d5ddd0efa SHA512 6dea985eb488d035971ca83f34c580f6f202740b8c46edec81f621e974fbad595c1b98bc3db170790c2d62f1083300e314d626b5a506958e9dd3db5bc678f2cd
+EBUILD gsm-1.0.13-r1.ebuild 1603 BLAKE2B c4c95c893e2273ca95b61446b7d0d71d6bd10b036bc26e807866c21c5e649a4bcc007de257fff245dc4f9175235717d701e545cc28cd76456bf1b86751051322 SHA512 572d3b59a980fd1bfb2994493876d11ec7ada6599d45750dba12f077e936790c8b5aa49d9bd362875b455e409c03c4f8e523018daadbd360ac036a0335fda77d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
index fc99e2c30437..ba178092c2f0 100644
--- a/media-sound/gsm/files/gsm-1.0.13-shared.patch
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -1,16 +1,24 @@
-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 @@
+--- a/Makefile
++++ b/Makefile
+@@ -96,16 +96,14 @@
  #  Other tools
  
  SHELL		= /bin/sh
 -LN		= ln
 +LN		= ln -s
  BASENAME 	= basename
- AR		= ar
+-AR		= ar
  ARFLAGS		= cr
-@@ -140,6 +140,7 @@
+ RMFLAGS		=
+ FIND		= find
+ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+ # RANLIB 	= true
+-RANLIB	 	= ranlib
+ 
+ #
+ #    You shouldn't have to configure below this line if you're porting.
+@@ -140,6 +138,7 @@
  # Targets
  
  LIBGSM	= $(LIB)/libgsm.a
@@ -18,7 +26,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
-@@ -203,24 +204,43 @@
+@@ -203,24 +202,43 @@
  
  # Object files
  
@@ -80,7 +88,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  TOAST_OBJECTS =	$(SRC)/toast.o 		\
  		$(SRC)/toast_lin.o	\
-@@ -228,7 +248,7 @@
+@@ -228,7 +246,7 @@
  		$(SRC)/toast_alaw.o	\
  		$(SRC)/toast_audio.o
  
@@ -89,7 +97,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  # Manuals
  
-@@ -277,9 +297,12 @@
+@@ -277,9 +295,12 @@
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
@@ -103,7 +111,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +322,29 @@
+@@ -299,24 +320,29 @@
  
  # The basic API: libgsm
  
@@ -138,7 +146,7 @@ diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
  
  
  # The local bin and lib directories
-@@ -426,7 +454,9 @@
+@@ -426,7 +452,9 @@
  
  clean:	semi-clean
  		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 676c7daf803c..7f0c2275a725 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -38,14 +38,14 @@ src_configure() {
 
 multilib_src_compile() {
 	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
-		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
 }
 
 multilib_src_install() {
 	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
 
 	emake -j1 INSTALL_ROOT="${ED}"/usr \
-		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
 		GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
 		GSM_INSTALL_INC="${ED}"/usr/include/gsm \
 		GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
-- 
cgit v1.2.3