Add patch by Diego Pettenò to tweak versioning styles on Gentoo/FreeBSD hosts #109105.

Package-Manager: portage-2.0.53_rc5

4 files changed, 54 insertions, 8 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 8bc73567637e..baac4954cab6 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.89 2005/10/13 13:41:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.90 2005/10/16 03:32:12 vapier Exp $
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch,
+  libtool-1.5.20.ebuild:
+  Add patch by Diego Pettenò to tweak versioning styles on Gentoo/FreeBSD
+  hosts #109105.
 
   13 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> libtool-1.5.20.ebuild:
   Stable on sparc wrt #108846
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 93c2044fe223..7bcea5c211ad 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e0a504728deb8189779576d61cb0db95 ChangeLog 15354
+MD5 ab9cc0ad9d5b35ed2899f3ea429cda46 ChangeLog 15584
 MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
 MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
 MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
@@ -22,6 +22,7 @@ MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.p
 MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
 MD5 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
 MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
+MD5 ed908a69f44e42aa9dce9ffde8bbb41d files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185
 MD5 eea7fbac7b23154feebdfb9ad0951569 files/1.5.6/libtool-1.5-filter-host-tags.patch 1426
 MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
 MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
@@ -33,12 +34,12 @@ MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
 MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
 MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
-MD5 77d96a962460cd1aa2b82f9a7292d684 libtool-1.5.20.ebuild 5049
+MD5 675666703bed2078be31605d129d51b9 libtool-1.5.20.ebuild 5129
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDTmQsKRy60XGEcJIRAo0HAJ0Qajq7/iMy+v8LS4zD1DURsKF4xQCfbLn8
-106pN70rRT6XccHMDCvVHBM=
-=FRex
+iD8DBQFDUcpGgIKl8Uu19MoRAiOEAJ9reOWnHThMCVNFvtJyV/C3Om0NtQCfRUZv
+2y0gd101LnB7WcAY3QVYC78=
+=Hq1w
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch
new file mode 100644
index 000000000000..cc9d8b82d61c
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch
@@ -0,0 +1,38 @@
+Force linux-style versioning when generating shared libraries on 
+Gentoo/FreeBSD hosts only.
+
+Patch by Diego Pettenò
+
+http://bugs.gentoo.org/109105
+
+--- libtool-1.5.20/libtool.m4
++++ libtool-1.5.20/libtool.m4
+@@ -1375,7 +1375,14 @@ freebsd* | dragonfly*)
+     *) objformat=elf ;;
+     esac
+   fi
+-  version_type=freebsd-$objformat
++  # Handle Gentoo/FreeBSD as it was Linux
++  case $host_vendor in
++    gentoo)
++      version_type=linux ;;
++    *)
++      version_type=freebsd-$objformat ;;
++  esac
++
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -1386,6 +1392,12 @@ freebsd* | dragonfly*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
++    linux)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++      soname_spec='${libname}${release}${shared_ext}$major'
++      need_lib_prefix=no
++      need_version=no
++      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
diff --git a/sys-devel/libtool/libtool-1.5.20.ebuild b/sys-devel/libtool/libtool-1.5.20.ebuild
index d5cd12dcec25..eea6d182253f 100644
--- a/sys-devel/libtool/libtool-1.5.20.ebuild
+++ b/sys-devel/libtool/libtool-1.5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20.ebuild,v 1.6 2005/10/13 13:41:34 gustavoz Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20.ebuild,v 1.7 2005/10/16 03:32:12 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils
 
@@ -73,6 +73,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/1.5.6/${PN}-1.5.6-ltmain-SED.patch
 	epatch "${FILESDIR}"/1.4.3/${PN}-1.4.2-expsym-linux.patch
 	epatch "${FILESDIR}"/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
+	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
 
 	# Gentoo Patches
 	# Do not create bogus entries in $dependency_libs or $libdir