Ensure libYap.so is generated with a defined SONAME

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 129 insertions, 4 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index b124cdbda836..34dcf9a0a139 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.46 2010/10/30 03:52:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.47 2010/10/30 08:34:24 keri Exp $
+
+  30 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild,
+  +files/yap-6.2.0-lib-soname.patch:
+  Ensure libYap.so is generated with a defined SONAME
 
   30 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild,
   +files/yap-6.2.0-ld-library-path.patch:
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 9c4700f3c1ce..e5ba9528a8cb 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -40,6 +40,7 @@ AUX yap-6.2.0-chr-sublist.patch 1343 RMD160 f6f01ed7a4ca0cd065445c80234ce51274f0
 AUX yap-6.2.0-have-config.patch 1701 RMD160 6e7b1f498a1c78e852bb6c23963dc1b1db9ab0a7 SHA1 269e76dd89caaf58cb1e19dfb0c84078347d81c6 SHA256 09bb71de1696686bdf08e95b36b50099ae7a87d57deb5c7a97d836bb7c16de7b
 AUX yap-6.2.0-ld-library-path.patch 6191 RMD160 61ea0f065c038cbd975e162764fcf418d998164f SHA1 6263c6225cf29afc474679af3fe7578acabcb3be SHA256 387c864d70393357201fe25084cf004f4439ae51d40c1792774d7bf4fa1b823f
 AUX yap-6.2.0-ldflags.patch 12983 RMD160 8e69d09a90fb82cb6ee01ebb227ceb1f40182841 SHA1 dd5169cf6396f511c058ae4aa8bc71fd16ed4761 SHA256 c0186dd2709a917cba30263eda6032ecd6c46bb5508e88974ed15e11336e69a8
+AUX yap-6.2.0-lib-soname.patch 5647 RMD160 5aba5aca5cabd0f082ed295f22d3c7ea51892fa4 SHA1 44010c5070cd2d1c3d21e21f226585e1dd74ab13 SHA256 965d89a5b7f37283452fc683e4a249bd7b1b0f995d764d04933f188e6cc0be10
 AUX yap-6.2.0-parallel-make.patch 1714 RMD160 5553cfa89f526ba4e9aa9d5dbf98efb529e0f5d2 SHA1 86c921f909533331485ea56e2020604f5ff0bd66 SHA256 88604835c33eef955a9ea26e223a09bfc05fd2dc52eb29155dbf40ac385968fa
 AUX yap-6.2.0-yapsharedir.patch 512 RMD160 a62a5e09c5e124e6c04857918aba810ec32d9c1c SHA1 cbc9ecfbc61d9fccb459f8fa334492b02ab9e6ca SHA256 84365ed0540714abbc77f872195f3f7287ba912350debe322be556914a75e754
 DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9
@@ -58,7 +59,7 @@ EBUILD yap-6.0.4.ebuild 2282 RMD160 35eb1455778246bca7ded06d51768ca3fa654855 SHA
 EBUILD yap-6.0.5-r1.ebuild 2331 RMD160 48b9cda0634b56e4cbf3f9d3f467d5ed06b7c3d1 SHA1 b7cad92f8540ab827240e5c127cac28298876042 SHA256 1eab4cd6e5273a8ffce60bf816840d85df163719cb29a45d472cded395260e2c
 EBUILD yap-6.0.5.ebuild 2287 RMD160 f4ce34ff3ab33544df90e6d68dc892f0e477b0ee SHA1 cf74f88eda55b569c4d5bc7a5746572013b5cd3d SHA256 bb70ba1c75a56ae607f7d17a108db0c70b79b6bc9245a984228a52812af6c01d
 EBUILD yap-6.0.6.ebuild 2416 RMD160 22ea3b1c433dfd6f30ad1a3531cf82d0f9e68821 SHA1 2550d92d5403e5ad22cce00b66bb38baec0df9c8 SHA256 8a4917829e7f79113bd713828e97e3ee708f0d46e0b95de7031558fbf179dfb8
-EBUILD yap-6.2.0-r1.ebuild 2739 RMD160 43cd8f9146403d912020db0ce2c993b7d92130f8 SHA1 ca928938362614385eb1412b23f9da870097f5b0 SHA256 3e5da6ba4cf423f6f022ac3effcfbf6392c96e4152d4c8531eda87267a641670
+EBUILD yap-6.2.0-r1.ebuild 2783 RMD160 fe4845183677192715a0c86170fa717fd4cd8c9f SHA1 52cc1af5bf2d954eb29eb1ad698e0c862d514ded SHA256 67f0309beadcff935ddb51a6824e70d5887676743e9b42b44d6810fdc4564831
 EBUILD yap-6.2.0.ebuild 2388 RMD160 17b05053b60ebd8214887455bc4a29e9a0c9416c SHA1 ce6158e2c7d85891bbfb4ee7533fc61448ae8952 SHA256 c6d6bf3cc79b7a0572d89988b39827d4c25e5e1edb00b952d3a2dd2870f654a7
-MISC ChangeLog 8710 RMD160 d7b6706cfe026a29e320595c371b8d5f4e26f47c SHA1 46c04b0dd428f27946e9e03bb8170e0602acf053 SHA256 2214f6a5cd53555098253387f5be61365b7d3986af56f974c7b9fb94b2accfe2
+MISC ChangeLog 8856 RMD160 201923dfd369663e31e7d9d9e3468203d5399722 SHA1 cef99b3dd53818e56b860d45c60b4bbdd81c5cd9 SHA256 a85e3610baca000e813405bd079efcb7f040e550a06d8b9471ce94262e7fa33b
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.2.0-lib-soname.patch b/dev-lang/yap/files/yap-6.2.0-lib-soname.patch
new file mode 100644
index 000000000000..c8d42198b976
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-lib-soname.patch
@@ -0,0 +1,119 @@
+diff -ur yap-6.orig/Makefile.in yap-6/Makefile.in
+--- yap-6.orig/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/Makefile.in	2010-10-30 21:27:55.000000000 +1300
+@@ -96,6 +96,7 @@
+ TEXI2HTML=texi2html
+ TEXI2PDF=texi2pdf
+ YAPLIB=@YAPLIB@
++SONAMEFLAG=@SONAMEFLAG@
+ 
+ #4.1VPATH=@srcdir@:@srcdir@/OPTYap
+ CWD=$(PWD)
+@@ -531,7 +532,7 @@
+ 	$(RANLIB) libYap.a
+ 
+ @DYNYAPLIB@: $(LIB_OBJECTS)
+-	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
++	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG)
+ 
+ install: install_bin install_data
+ 
+diff -ur yap-6.orig/configure.in yap-6/configure.in
+--- yap-6.orig/configure.in	2010-10-30 21:28:41.000000000 +1300
++++ yap-6/configure.in	2010-10-30 21:27:06.000000000 +1300
+@@ -915,6 +915,7 @@
+           fi

+ 	  LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+           DYNYAPLIB=libYap."$SO"

++	  SONAMEFLAG="-Wl,-soname=$DYNYAPLIB"

+         fi

+         if test "$have_nsl" = yes

+ 	 then

+@@ -944,6 +945,7 @@
+ 	INSTALL_DLLS=""

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -983,6 +985,7 @@
+ 	fi

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -996,6 +999,7 @@
+ 	#INSTALL_DLLS=""

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -1014,6 +1018,7 @@
+         fi

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -1028,6 +1033,7 @@
+ 	INSTALL_DLLS=""

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -1066,6 +1072,7 @@
+         fi

+         CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"

+         PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"

+ 	;;

+@@ -1089,6 +1096,7 @@
+         fi

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -1105,6 +1113,7 @@
+ 	INSTALL_DLLS=""

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"

+         if test "$dynamic_loading" = "yes"

+         then 

+            YAPLIB_LD="\$(CC)"

+@@ -1123,6 +1132,7 @@
+         # and -fomit-frame-point -DBP_FREE

+ 	YAPLIB="yap.dll"

+ 	DYNYAPLIB="yap.dll"

++	SONAMEFLAG=""

+ 	SHLIB_CFLAGS="$CFLAGS"

+ 	SHLIB_CXXFLAGS="$CXXFLAGS"

+         if test "$target_win64" = no

+@@ -1163,6 +1173,7 @@
+         fi

+ 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

+         DYNYAPLIB=libYap."$SO"

++	SONAMEFLAG=""

+         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

+         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

+         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

+@@ -1469,6 +1480,7 @@
+ AC_SUBST(YAPLIB)

+ AC_SUBST(DYNYAPLIB)

+ AC_SUBST(LDFLAGS)

++AC_SUBST(SONAMEFLAG)

+ dnl install_info

+ AC_SUBST(INSTALL_INFO)

+ dnl let YAP_EXTRAS fall through configure, from the env into Makefile

diff --git a/dev-lang/yap/yap-6.2.0-r1.ebuild b/dev-lang/yap/yap-6.2.0-r1.ebuild
index 3d1665a3b95b..f6e492f497dc 100644
--- a/dev-lang/yap/yap-6.2.0-r1.ebuild
+++ b/dev-lang/yap/yap-6.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.4 2010/10/30 03:52:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.5 2010/10/30 08:34:24 keri Exp $
 
 inherit autotools eutils flag-o-matic java-pkg-opt-2
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-yapsharedir.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-ld-library-path.patch
+	epatch "${FILESDIR}"/${P}-lib-soname.patch
 	epatch "${FILESDIR}"/${P}-have-config.patch
 	epatch "${FILESDIR}"/${P}-chr-sublist.patch