From bf46d330d6b3f23d403ec78e9c3bbb17a0615c80 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 6 Jan 2008 23:36:23 +0000
Subject: Re-add the gen ld script funcs

---
 sys-apps/openrc/Manifest           |  8 ++++----
 sys-apps/openrc/openrc-9999.ebuild | 24 ++++++++----------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bdf6c8d..d57c48e 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,7 +1,7 @@
-EBUILD openrc-9999.ebuild 4022 RMD160 39571580312f2fc3164dff03d21301f35e4b5275 SHA1 c635b078fd77923a89f97da9d24146b1da8c726b SHA256 ddda9501da3ae12db4ab5cab5219f6be6329cbc85ac9676bcc7181d016119636
-MD5 e98e3ae48efc7e04804653655b9d800f openrc-9999.ebuild 4022
-RMD160 39571580312f2fc3164dff03d21301f35e4b5275 openrc-9999.ebuild 4022
-SHA256 ddda9501da3ae12db4ab5cab5219f6be6329cbc85ac9676bcc7181d016119636 openrc-9999.ebuild 4022
+EBUILD openrc-9999.ebuild 3884 RMD160 67a7c0e5844baaf58cee71d05e192efec01711fc SHA1 e87ca227327eeeac0303e4fd102253281bcad2d7 SHA256 ef5a70f9bc5035bdec5db675b14c0dde2f8662b14aca64e1684b99663798eefe
+MD5 67757e804fd4caeba7802a0407ab2b5b openrc-9999.ebuild 3884
+RMD160 67a7c0e5844baaf58cee71d05e192efec01711fc openrc-9999.ebuild 3884
+SHA256 ef5a70f9bc5035bdec5db675b14c0dde2f8662b14aca64e1684b99663798eefe openrc-9999.ebuild 3884
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openrc-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-openrc-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-openrc-9999 0
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 58f664f..ca8a31d 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -62,23 +62,7 @@ pkg_setup() {
 	MAKE_ARGS="${MAKE_ARGS} CC=$(tc-getCC)"
 }
 
-# Massage the git repo a little
-if [ "${PV}" = "9999" ]; then
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-
-	# GIT has this rpath for testing, but we need to disable it as it's
-	# a potential security risk
-	#sed -i.bak -e '/LDFLAGS += -Wl,-rpath ./ s/^/#/' src/Makefile
-
-	# Ensure a .depend always exists as it should not be in GIT
-	#[ -e src/.depend ] || touch -r / src/.depend
-}
-fi
-
 src_compile() {
-	#emake ${MAKE_ARGS} depend || die
 	emake ${MAKE_ARGS} || die
 }
 
@@ -93,6 +77,14 @@ src_install() {
 	if use unicode; then
 		sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
 	fi
+
+	# Fix portage bitching about libs and symlinks
+	rm "${D}"/usr/"${LIBDIR}"/libeinfo.so
+	rm "${D}"/usr/"${LIBDIR}"/librc.so
+	ln -s libeinfo.so.1 "${D}"/"${LIBDIR}"/libeinfo.so
+	ln -s librc.so.1 "${D}"/"${LIBDIR}"/librc.so
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
 }
 
 pkg_preinst() {
-- 
cgit v1.2.3-65-gdbad