From 73f2e8511b534eb6eb2227371c6a422abf34411e Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sat, 5 Jan 2008 21:10:04 +0000
Subject: Work with the new git.

---
 sys-apps/openrc/Manifest           |  8 ++++----
 sys-apps/openrc/openrc-9999.ebuild | 19 ++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index f896b92..bdf6c8d 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,7 +1,7 @@
-EBUILD openrc-9999.ebuild 4291 RMD160 f9335e40a47a11268b79ef60ff3628ace2526291 SHA1 dd462a756609d4feae7f856b78e0424c6c62145c SHA256 fd457fba753b0dacf95ea8b5600152c6724514f96aba813deb2ae0b4b7a6f3da
-MD5 1a4f0ead5ec1b8d443db87af52e50783 openrc-9999.ebuild 4291
-RMD160 f9335e40a47a11268b79ef60ff3628ace2526291 openrc-9999.ebuild 4291
-SHA256 fd457fba753b0dacf95ea8b5600152c6724514f96aba813deb2ae0b4b7a6f3da openrc-9999.ebuild 4291
+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
 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 99011a8..58f664f 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -31,7 +31,7 @@ pkg_setup() {
 	LIBDIR="lib"
 	[ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
 	
-	MAKE_ARGS="${MAKE_ARGS} LIB=${LIBDIR}"
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
 
 	local brand="Unknown"
 	if use kernel_linux; then
@@ -53,9 +53,9 @@ pkg_setup() {
 	fi
 	if use static && ! use pam; then
 		if use elibc_glibc; then
-			MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-Wl,-Bstatic"
+			MAKE_ARGS="${MAKE_ARG} PROGLDFLAGS=-Wl,-Bstatic"
 		else
-			MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-static"
+			MAKE_ARGS="${MAKE_ARGS} PROGLDFLAGS=-static"
 		fi
 	fi
 
@@ -70,28 +70,21 @@ src_unpack() {
 
 	# 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
+	#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
+	#[ -e src/.depend ] || touch -r / src/.depend
 }
 fi
 
 src_compile() {
-	emake ${MAKE_ARGS} depend || die
+	#emake ${MAKE_ARGS} depend || die
 	emake ${MAKE_ARGS} || die
 }
 
 src_install() {
 	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
 
-	# Fix portage bitching about libs and symlinks
-	rm "${D}"/usr/"${LIBDIR}"/libeinfo.so "${D}"/usr/"${LIBDIR}"/librc.so
-	ln -s libeinfo.so.1 "${D}"/"${LIBDIR}"/libeinfo.so
-	gen_usr_ldscript libeinfo.so
-	ln -s librc.so.1 "${D}"/"${LIBDIR}"/librc.so
-	gen_usr_ldscript librc.so
-
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
 	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-- 
cgit v1.2.3-65-gdbad