Use a linker script rather than symlink and use emake in src_install.

Package-Manager: portage-2.2_pre2

4 files changed, 22 insertions, 16 deletions

diff --git a/sys-libs/com_err/Manifest b/sys-libs/com_err/Manifest
index de9255732070..788d58aea0d4 100644
--- a/sys-libs/com_err/Manifest
+++ b/sys-libs/com_err/Manifest
@@ -12,13 +12,13 @@ EBUILD com_err-1.40.3.ebuild 2059 RMD160 361a4637eaded9230763aa2cb62d06ec4901e7b
 EBUILD com_err-1.40.4.ebuild 2018 RMD160 0a8dcad933cfef36922246300dd7cbbeeda50c3a SHA1 c08c32801a93f7e3460cfd599c081194753ebb56 SHA256 a532c4251c60dc975fe0475fb6e6c02be20a533204986544b47e040801df97a8
 EBUILD com_err-1.40.5.ebuild 2025 RMD160 e14734b913e62fd59aeca1623542c342e92a9adb SHA1 98b1335e1a45d6e1548b375e72c7934a8211486f SHA256 2001c4bc1640b9440b949fae6a7577849f35449e88a55a4e89eef1a303f476a0
 EBUILD com_err-1.40.6.ebuild 2025 RMD160 7f39012233f331f4a469679f366e55c4c66917b9 SHA1 7e266f8887cc01d13c4eb142a587879bc007f652 SHA256 4cf045a9f3ce160b201a453e4233b247f605145881bdc5ddd67f321b5a7309c8
-EBUILD com_err-1.40.8.ebuild 2025 RMD160 e80909e46575579126f4adb89e16c8d84e3ce0ec SHA1 5efac2d7c06769c0116c5d28b0273091e32966fa SHA256 0bfde35994644e38678ac2303766a4f3976f6d5e8a80e52e05d5ef00c83a219a
-MISC ChangeLog 6637 RMD160 2cfec5a1a0e0667fb367bc9fee9c9222115f5329 SHA1 3bd03c20ce86b243f07e2b4e8bedb69caa68ab39 SHA256 9683dc12f1f6037e65489db4593efe027fb43bf7a370be1817ab205020630767
+EBUILD com_err-1.40.8.ebuild 2026 RMD160 dfbed579f704d7e638c10169c14f50183160b7d7 SHA1 e0bf2ff679a9e02b6d5f16fcdb3955fa7a3d7813 SHA256 dd8838d7bc9aadd308a15fb8245e26b97e6a09434ab98c4b833773525482dec7
+MISC ChangeLog 6739 RMD160 70dec8662ecbb3e00ec17cc6662c83f569720317 SHA1 88d9a967450994dc381633fcae78dea390268085 SHA256 2326c355f70b13da29bccccd3797f3e3e06a043d95e973371b55fb9f4ff841eb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH2dbXj9hvisErhMIRArd6AJ427aDCVtxa1/DfPxrgCDy7iAedVwCggQlL
-qizsn4gfWke5Dkkuo/er1uc=
-=robY
+iD8DBQFH3NZbj9hvisErhMIRApU/AKCpadTszsl83xHLm+PCBsSQkHBNGQCcCrkb
+VFZQZGnkzHE5oc/AnYMf8jg=
+=/dBD
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index a23e92932d1a..61371e70f86d 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.52 2008/03/14 01:40:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.53 2008/03/16 08:10:21 vapier Exp $
+
+  16 Mar 2008; Mike Frysinger <vapier@gentoo.org> ss-1.40.8.ebuild:
+  Use a linker script rather than symlink and use emake in src_install.
 
 *ss-1.40.8 (14 Mar 2008)
 
diff --git a/sys-libs/ss/Manifest b/sys-libs/ss/Manifest
index 63d7398e0148..b685aafcd24f 100644
--- a/sys-libs/ss/Manifest
+++ b/sys-libs/ss/Manifest
@@ -13,13 +13,13 @@ EBUILD ss-1.40.3.ebuild 1843 RMD160 41d254fa0e508c3540219428c20949e7df95b4ad SHA
 EBUILD ss-1.40.4.ebuild 1848 RMD160 a4e7b76beb9cb284b4ad7d1f88f4aeb846232b3d SHA1 8d6fdee774d31e9c04561c759ad778185d3b874b SHA256 e56d5477e88f7a18db8b405927872304edb19fe9466eb2305f4ced76d22a48a1
 EBUILD ss-1.40.5.ebuild 1800 RMD160 b9406f137b5cf95467f4bf2ea874c792f4cccdb2 SHA1 08820be49eba924d8b52631e1a1e32010a17c8d1 SHA256 0ecf00a4916c171e6f2c2b6bd254cfd5fc9258ad415c7f25307a2c68ec45d359
 EBUILD ss-1.40.6.ebuild 1800 RMD160 99b89a221022de2f5a14de7987ccab33a96bfc27 SHA1 b6b17e2aaaabc6bdb0ef0ba89a87e80bafe48aaf SHA256 e01ec89f7d3af9e151fa31be03db6847ba3afd0d78984dd7f767c3f94bc79c44
-EBUILD ss-1.40.8.ebuild 1800 RMD160 c2da2adf21064370044806071d84d5364d717b49 SHA1 5aa469a4221aa2095619b4e1c97acb8c6a3468af SHA256 185db7e46b6a9b7fa0717cd2eefae2499c932363024fb1e6eb3bac27b6f845c9
-MISC ChangeLog 6023 RMD160 43b924863bc830b1a59a91a2d459c38975c17d09 SHA1 4cb006691c70319e15d9884676c94860472edb79 SHA256 613425aba4db896c079468f76ecbd6ea8526df76df95d411ac3e604a7ad61622
+EBUILD ss-1.40.8.ebuild 2015 RMD160 afa7e4c9d7e20a2270b95406b80743ee4204dc8a SHA1 87a3129dd1dd79839a28735f18490c87c9208701 SHA256 922ee43d0c98b0fcf35e58bb51b93edc5eccbb94b5413650c6fdfad3cc4a3db7
+MISC ChangeLog 6164 RMD160 31e86970a3ad54a4a9ac2531cfd17d8c75808e28 SHA1 fdb2fab85807fbf9e61428fc20c0b1aebc26e643 SHA256 0f7716d2215df918286de31d4844e7259059d2afb942374425d1482182729123
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH2dfNj9hvisErhMIRAkMdAJ9dMRZ/bckwgQGLqWqo98I/v2qDVwCeOwwa
-t6Og72NsmT+RrgZL369xm5s=
-=bx4i
+iD8DBQFH3NY5j9hvisErhMIRAlPBAKDTidz7i0kFOzekci3zF4TRcCCz2wCfer7C
+D9fcK3l4LXLbW+/DXgZvENw=
+=vi8h
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ss/ss-1.40.8.ebuild b/sys-libs/ss/ss-1.40.8.ebuild
index 2eec6e54c99f..0a5c35529eb6 100644
--- a/sys-libs/ss/ss-1.40.8.ebuild
+++ b/sys-libs/ss/ss-1.40.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.8.ebuild,v 1.1 2008/03/14 01:40:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.8.ebuild,v 1.2 2008/03/16 08:10:21 vapier Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="Subsystem command parsing library"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -29,6 +29,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+
+	# since we've split out com_err/ss into their own ebuilds, we
+	# need to fake out the local files.  let the toolchain find them.
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.a )" > lib/libcom_err.a
+	echo "GROUP ( /usr/$(get_libdir)/libcom_err.so )" > lib/libcom_err.so
 }
 
 src_compile() {
@@ -52,8 +57,6 @@ src_compile() {
 
 src_test() {
 	env_setup
-
-	ln -s $(${CC} -print-file-name=libcom_err.so) lib/libcom_err.so
 	emake -j1 -C lib/ss check || die "make check failed"
 }
 
@@ -61,7 +64,7 @@ src_install() {
 	env_setup
 
 	dodir /usr/share/man/man1
-	make -C lib/ss DESTDIR="${D}" install || die
+	emake -C lib/ss DESTDIR="${D}" install || die
 
 	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
 	# and install linker scripts to /usr/lib/.