Switch to using $(get_libdir) in symlinks, should resolve bug #177916. Added backwards compat symlinks for 2.0.1.

Package-Manager: portage-2.1.2.7

5 files changed, 48 insertions, 32 deletions

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index c738e7b9fae2..0aa72acddec2 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -53,18 +53,18 @@ EBUILD firebird-1.5.3-r1.ebuild 7111 RMD160 20f6ff1747c7b9df8a5b48f5bf56905f1122
 MD5 cbaa96e95b8bece978184bb6ccac03f6 firebird-1.5.3-r1.ebuild 7111
 RMD160 20f6ff1747c7b9df8a5b48f5bf56905f112217d1 firebird-1.5.3-r1.ebuild 7111
 SHA256 52b9b501c866e4e13516107f806cb8638b1d8ddbd50ac3ef2d22040110aa2e59 firebird-1.5.3-r1.ebuild 7111
-EBUILD firebird-1.5.4-r1.ebuild 7589 RMD160 f00a67088f282f3de6572b994d235cce6da3e346 SHA1 693b5ee9eb56d52046127107863a641302ab6038 SHA256 d7774b15c21fbf6819e9fc9aab0065f2e7bf23aa63a80493ee1c82f43aec0913
-MD5 f102df06dcc72ce390f54853756fe99e firebird-1.5.4-r1.ebuild 7589
-RMD160 f00a67088f282f3de6572b994d235cce6da3e346 firebird-1.5.4-r1.ebuild 7589
-SHA256 d7774b15c21fbf6819e9fc9aab0065f2e7bf23aa63a80493ee1c82f43aec0913 firebird-1.5.4-r1.ebuild 7589
+EBUILD firebird-1.5.4-r2.ebuild 7708 RMD160 a17545cb7393938c026005a0c4d5fc13314c98e9 SHA1 b63df1653d94c7551d44ed33eb8eebfa5b157d55 SHA256 9877d86e540e48c856fb689a25620ffd43e2af21077859d73042cd14142aec86
+MD5 b9b9c054de6b91192392741a60419579 firebird-1.5.4-r2.ebuild 7708
+RMD160 a17545cb7393938c026005a0c4d5fc13314c98e9 firebird-1.5.4-r2.ebuild 7708
+SHA256 9877d86e540e48c856fb689a25620ffd43e2af21077859d73042cd14142aec86 firebird-1.5.4-r2.ebuild 7708
 EBUILD firebird-1.5.4.ebuild 7594 RMD160 d53b86cfced596bfc6a4f21036bb9adddd0990a2 SHA1 a971d4246c87e374fcfebcb0fd6201af5e504b6b SHA256 49c64c1167a1b3be82df3b0d5d6f5748330b33726d73efb5a8e36349eeed0056
 MD5 31b9973c747eb38eb734040063b507ed firebird-1.5.4.ebuild 7594
 RMD160 d53b86cfced596bfc6a4f21036bb9adddd0990a2 firebird-1.5.4.ebuild 7594
 SHA256 49c64c1167a1b3be82df3b0d5d6f5748330b33726d73efb5a8e36349eeed0056 firebird-1.5.4.ebuild 7594
-EBUILD firebird-2.0.1.12855.0-r1.ebuild 6505 RMD160 702255d1725d3cd6e092cda881bd986aee315980 SHA1 f0116b5b0bc70b2ff0c8653c651fef616f358d1e SHA256 5a3cc4686cd36798e79448d369fafa6a0e712bc6877c01d1150a7afb32c9bec7
-MD5 902b467b9475d1ab85792dcd4702bbef firebird-2.0.1.12855.0-r1.ebuild 6505
-RMD160 702255d1725d3cd6e092cda881bd986aee315980 firebird-2.0.1.12855.0-r1.ebuild 6505
-SHA256 5a3cc4686cd36798e79448d369fafa6a0e712bc6877c01d1150a7afb32c9bec7 firebird-2.0.1.12855.0-r1.ebuild 6505
+EBUILD firebird-2.0.1.12855.0-r2.ebuild 7198 RMD160 48cfd4ac7cb73668a8b15aca4fbb8c6cde4e550f SHA1 edb186197c7fc77fbc787caff849c5ebfca3df74 SHA256 3809ec1013f0c58530f755e1a6d131ee87c2dd9905b4fd8047fbbbd917b3a51f
+MD5 a0304d57632e64e06972e37e3d984ae6 firebird-2.0.1.12855.0-r2.ebuild 7198
+RMD160 48cfd4ac7cb73668a8b15aca4fbb8c6cde4e550f firebird-2.0.1.12855.0-r2.ebuild 7198
+SHA256 3809ec1013f0c58530f755e1a6d131ee87c2dd9905b4fd8047fbbbd917b3a51f firebird-2.0.1.12855.0-r2.ebuild 7198
 MISC ChangeLog 8944 RMD160 c2b353691a740f63bdf68e7421accde19687ebc3 SHA1 810ce43256c1a76dd13a444e1886a2356e450dc2 SHA256 e14279b5fd424566fd8d781cc28d6ce8c77b11dd34da7f5753ce9d4f6cb8e538
 MD5 4a6e3662a29378d48acbb00a878a6a52 ChangeLog 8944
 RMD160 c2b353691a740f63bdf68e7421accde19687ebc3 ChangeLog 8944
@@ -79,9 +79,9 @@ SHA256 fce6d7adc88cb5cb9a444b74dc328c86dc9f6edfebfad4a9cd9f60eacaad225d files/di
 MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4 1048
 RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4 1048
 SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4 1048
-MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r1 1048
-RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r1 1048
-SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r1 1048
-MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r1 506
-RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r1 506
-SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r1 506
+MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r2 1048
+RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r2 1048
+SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r2 1048
+MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r2 506
+RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r2 506
+SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r2 506
diff --git a/dev-db/firebird/files/digest-firebird-1.5.4-r1 b/dev-db/firebird/files/digest-firebird-1.5.4-r2
index b3e31cc48311..b3e31cc48311 100644
--- a/dev-db/firebird/files/digest-firebird-1.5.4-r1
+++ b/dev-db/firebird/files/digest-firebird-1.5.4-r2
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r1 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r2
index 04a90efef089..04a90efef089 100644
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r1
+++ b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r2
diff --git a/dev-db/firebird/firebird-1.5.4-r1.ebuild b/dev-db/firebird/firebird-1.5.4-r2.ebuild
index c444e56471c1..6a2590adcfbc 100644
--- a/dev-db/firebird/firebird-1.5.4-r1.ebuild
+++ b/dev-db/firebird/firebird-1.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r1.ebuild,v 1.1 2007/05/12 05:52:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r2.ebuild,v 1.1 2007/05/14 02:56:09 wltjr Exp $
 
 inherit flag-o-matic eutils
 
@@ -123,19 +123,21 @@ src_install() {
 	for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done
 	chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so}
 
+	local my_lib=$(get_libdir)
+
 	# create links for back compatibility
-	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
-	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
-	dosym ./libfbclient.so /opt/firebird/lib/libgds.so
-	dosym ./libfbclient.so /opt/firebird/lib/libgds.so.0
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
+	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so
+	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so.0
 
 	# we want relative symlinks...
-	rm /usr/lib/libfbclient.so
-	rm /usr/lib/libfbclient.so.1
-	rm /usr/lib/libfbclient.so.1.5.4
-	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libfbclient.so
-	dosym ../../opt/firebird/lib/libfbclient.so.1 /usr/lib/libfbclient.so.1
-	dosym ../../opt/firebird/lib/libfbclient.so.1.5.4 /usr/lib/libfbclient.so.1.5.4
+	rm /usr/${my_lib}/libfbclient.so
+	rm /usr/${my_lib}/libfbclient.so.1
+	rm /usr/${my_lib}/libfbclient.so.1.5.4
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1.5.4 /usr/${my_lib}/libfbclient.so.1.5.4
 
 	# move and link config files to /etc/firebird so they'll be protected
 	dodir /etc/firebird
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild
index 5775a50fcb4e..8912b3c9adfa 100644
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild
+++ b/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r1.ebuild,v 1.1 2007/05/12 05:52:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r2.ebuild,v 1.1 2007/05/14 02:56:09 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -111,18 +111,32 @@ src_install() {
 	touch "${D}"/var/log/firebird/firebird.log
 	chown firebird:firebird "${D}"/var/log/firebird/firebird.log
 
-	if [ ${ARCH} == "amd64" ] ; then
-		cd "${D}/opt/firebird/"
-		ln -s lib64 lib
-		cd "${S}/gen/firebird"
-	fi
-
 	# create links for split config & log file
 	dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
 	dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
 	dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
 	dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
 
+	local my_lib=$(get_libdir)
+
+	# firebird has a problem with lib64 dir name, bug?
+	if [ ${my_lib} == "lib64" ] ; then
+		dosym ./lib64 /opt/firebird/lib
+	fi
+
+	# create links for backwards compatibility dosym puts link in / :(
+	cd "${D}/opt/firebird/${my_lib}/"
+	ln -s libfbclient.so libgds.so
+	ln -s libfbclient.so libgds.so.0
+	ln -s libfbclient.so libfbclient.so.1
+
+	# create system links for ld
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
+	dosym ../../opt/firebird/${my_lib}/libfbclient.so.2 /usr/${my_lib}/libfbclient.so.2
+
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed"