dev-libs/nspr: Re-add the minor version to .so

4 files changed, 45 insertions, 18 deletions

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 71b63d4..540b943 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,15 +1,5 @@
 AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036e4b96a3f88b57818d01721ed4f6adca98 SHA256 d8589298735028e9899e767da382523d83331f2c358440beaccf34ca569567be
 AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
-AUX nspr-4.6.1-config.patch 2722 RMD160 75701d5dbdd25a05a3bb43539bfa5f5ea850aabd SHA1 e8deaea05baf51eb6795db4e89ab89162d5d4632 SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842
-AUX nspr-4.6.1-lang.patch 1715 RMD160 8778363b94db0653bbbdd2e2feccd20f3e9cdb05 SHA1 4f2ff103202fe28b7642579df9b3e9484c184157 SHA256 71c199cd35640d079a66f1311260d52532424191cb7d7b96f045f3c8f5d30697
 AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2
-AUX nspr-4.7.1-solaris.patch 516 RMD160 aaa024e1afabfae51a0060db328536e1a624ed3a SHA1 6766a9939830e8277f2342db806235ab2e30ab14 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447
-AUX nspr-4.7.4-solaris.patch 2011 RMD160 08060ba3885a1a659ad5a5505715ced0dd669d5f SHA1 9b0e2021e9dca56f741b505e5aa5ca56da47bbb1 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f
-AUX nspr-4.8-config.patch 1425 RMD160 98ba83ca432addff873b7c199c8d203a4413091d SHA1 bd619972714a464fd58fd3024bdbdb258af20940 SHA256 c43e34499bc1c0f86a69633af1aadf99a2a911fecb77786c8a94b796a6176773
-AUX nspr-4.8-pkgconfig-gentoo-2.patch 4711 RMD160 3709911449facde45d1bebc60e9e1593aa691af5 SHA1 c41c608247aa712f783a1ec8ea2943b79dee44eb SHA256 5cd96bcb47f9678d4aac95d91d975101d31f038b05bd3f5b191a262d733b8943
-AUX nspr-4.8-pkgconfig-gentoo-3.patch 4026 RMD160 59c47896666e9339dd4ddfdaa9d8f8e3e4328419 SHA1 ec1869623dc237227c2f6b2dd2c622ec60fff2de SHA256 59b30402373ba8fac6dc441bb172a09696c402d7d359b3cfda20560903725a07
-AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
-AUX nspr-4.8.3-aix-soname.patch 1164 RMD160 da8fe1e17cade02ab6a4862ef901dd6c1606a1e3 SHA1 7a919bf08fa9d7a68815cdceda9082f5db8be445 SHA256 cec2e8b1cdf9e81f6b36c7981a5cb017fbf18192586c00d3e80ad897917bfcaa
-AUX nspr-4.8.4-darwin-install_name.patch 1102 RMD160 eb565bc36822129e05f2fa45aaa52284333f2aee SHA1 5f7a057a457c3176aa255dfe1503cb23b5f37f09 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab
 AUX pkgconfig.patch 4026 RMD160 147bcc36fe2394a0c5c7cdc531c88cc18eada7c9 SHA1 ae34f19de86ab5fefd3e443864120db3c77bc7dc SHA256 2ea7b2584ee440b8bbd7ad89c7f71b8e1a5b97737e1e9e23c6b0f1055777a033
-EBUILD nspr-9999.ebuild 1840 RMD160 b81eeac98e5ed8c64d6b15138a8a76124af72dc6 SHA1 a5c55a19e3ba5190c799a832ad1a2dc6963395a8 SHA256 e088b038d3aeb129ac3aefbb78b2535c70b885473bf6ef163286af3af6e49488
+EBUILD nspr-9999.ebuild 1881 RMD160 d4caf643b120796e5313cf95a49ab2501d24cba8 SHA1 fdab6e89dc2a06896588f16d7c221464d20edc75 SHA256 04ae0ea4e61fe13bbb590a3315654e5a047a6af66eff4875aebf4be12e87ce00
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
new file mode 100644
index 0000000..a7d5361
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
@@ -0,0 +1,11 @@
+--- mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
++++ mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
+@@ -3893,7 +3893,7 @@
+     PR_MD_CSRCS=linux.c
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
++    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
+     _OPTIMIZE_FLAGS=-O2
+     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
+                                    # combo is not yet good at debugging inlined
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
new file mode 100644
index 0000000..af6dce6
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
@@ -0,0 +1,26 @@
+--- mozilla/nsprpub/pr/src/misc/prtime.c.orig	2007-09-14 19:41:08.000000000 +0200
++++ mozilla/nsprpub/pr/src/misc/prtime.c	2007-09-14 19:42:17.000000000 +0200
+@@ -1536,7 +1536,7 @@
+                 case TT_EET: zone_offset =  2 * 60; break;
+                 case TT_JST: zone_offset =  9 * 60; break;
+                 default:
+-                  PR_ASSERT (0);
++                  return PR_FAILURE;
+                   break;
+                 }
+         }
+@@ -1578,11 +1578,12 @@
+           struct tm localTime;
+           time_t secs;
+
+-          PR_ASSERT(result->tm_month > -1 &&
++          if (!(result->tm_month > -1 &&
+                     result->tm_mday > 0 &&
+                     result->tm_hour > -1 &&
+                     result->tm_min > -1 &&
+-                    result->tm_sec > -1);
++                    result->tm_sec > -1))
++		    return PR_FAILURE;
+
+             /*
+              * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-9999.ebuild b/dev-libs/nspr/nspr-9999.ebuild
index 1bb4723..a4b52c7 100644
--- a/dev-libs/nspr/nspr-9999.ebuild
+++ b/dev-libs/nspr/nspr-9999.ebuild
@@ -52,13 +52,13 @@ src_install () {
 		done
 	fi
 
-	#local n=
-	#MINOR_VERSION=${MIN_PV} # Used for .so version
-	#for file in *$(get_libname); do
-		#n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
-		#mv ${file} ${n} || die "failed to mv files around"
-		#ln -s ${n} ${file} || die "failed to symlink files."
-	#done
+	local n=
+	MINOR_VERSION=$(sed -n -r -e 's|.*NSPR_[0-9]+_([0-9]+)_[0-9]+.*|\1|p' "${S}"/nsprpub/TAG-INFO)
+	for file in *$(get_libname); do
+		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
+		mv ${file} ${n} || die "failed to mv files around"
+		ln -s ${n} ${file} || die "failed to symlink files."
+	done
 
 	# Remove stupid files in /usr/bin
 	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"