ebuild patch that uses get_libdir

virtualbox-ose-2.0.2.ebuild.patch (text/plain), 4.20 KB, created by Alessio Cassibba (X-Drum) on 2008-09-21 21:33:50 UTC

--- virtualbox-ose-2.0.2.ebuild	2008-09-18 01:58:33.000000000 +0200
+++ virtualbox-ose-2.0.2.ebuild	2008-09-21 22:48:06.000000000 +0200
@@ -45,6 +45,7 @@
 	sys-apps/hal"
 
 S=${WORKDIR}/${MY_P/-OSE/}
+MY_LIBDIR="$(get_libdir)"
 
 pkg_setup() {
 	# known problems with gcc 4.3 and the recompiler
@@ -88,6 +89,11 @@
 
 	# Disable things unused or splitted into separate ebuilds 
 	cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk
+	if use amd64; then
+		sed -i \
+				-e "s/lib/${MY_LIBDIR}/" LocalConfig.kmk \
+				|| die "LocalConfig.kmk sed failed"
+	fi
 }
 
 src_compile() {
@@ -137,24 +143,30 @@
 	newins "${FILESDIR}/${P}-config" vbox.cfg
 	newins "${FILESDIR}/${PN}-interfaces" interfaces
 
+	if use amd64; then
+		sed -i \
+				-e "s/lib/${MY_LIBDIR}/" \
+				"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+	fi
+
 	# symlink binaries to the shipped wrapper
-	exeinto /usr/lib/${PN}
+	exeinto /usr/${MY_LIBDIR}/${PN}
 	newexe "${FILESDIR}/${P}-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/lib/${PN}/VBox
-	fperms 0750 /usr/lib/${PN}/VBox
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBox
 	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF" || die
-	fowners root:vboxusers /usr/lib/${PN}/VBoxAddIF
-	fperms 0750 /usr/lib/${PN}/VBoxAddIF
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
 
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/lib/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/lib/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxAddIF
-	dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxAddIF
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF
 
 	# install binaries and libraries
-	insinto /usr/lib/${PN}
+	insinto /usr/${MY_LIBDIR}/${PN}
 	doins -r components
 
 	if use sdk; then
@@ -163,42 +175,42 @@
 
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
 		doins $each
-		fowners root:vboxusers /usr/lib/${PN}/${each}
-		fperms 0750 /usr/lib/${PN}/${each}
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/${each}
 	done
 
 	if use amd64; then
 		doins VBoxREM2.rel
-		fowners root:vboxusers /usr/lib/${PN}/VBoxREM2.rel
-		fperms 0750 /usr/lib/${PN}/VBoxREM2.rel
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
 	fi
 
 	if ! use headless; then
 			for each in VBox{SDL,Headless} ; do
 				doins $each
-				fowners root:vboxusers /usr/lib/${PN}/${each}
-				fperms 4750 /usr/lib/${PN}/${each}
-				pax-mark -m "${D}"/usr/lib/${PN}/${each}
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
 			done
 
-			dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL
+			dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxSDL
 
 			if use qt4; then
 				doins VirtualBox
-				fowners root:vboxusers /usr/lib/${PN}/VirtualBox
-				fperms 4750 /usr/lib/${PN}/VirtualBox
-				pax-mark -m "${D}"/usr/lib/${PN}/VirtualBox
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
 
-				dosym /usr/lib/${PN}/VBox /usr/bin/VirtualBox
+				dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VirtualBox
 			fi
 
 			newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
 			domenu "${FILESDIR}"/${PN}.desktop
 	else
 			doins VBoxHeadless
-			fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless
-			fperms 4750 /usr/lib/${PN}/VBoxHeadless
-			pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless
+			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VBoxHeadless
 	fi
 
 	insinto /usr/share/${PN}