Fixup gunzip/zcat hardlinks of gzip becoming copies. Add perl to DEPEND and

RDEPEND, as its needed during build, and afterwards for klcc wrapper. Add
pkg_postinst() override for linux-mod eclass, as we do not install modules.

Package-Manager: portage-2.0.51.19

3 files changed, 37 insertions, 11 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 5af906c9ea83..7aaf1ca50491 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.4 2005/03/10 09:46:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.5 2005/03/11 01:29:30 azarah Exp $
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org> klibc-1.0.3.ebuild:
+  Fixup gunzip/zcat hardlinks of gzip becoming copies. Add perl to DEPEND and
+  RDEPEND, as its needed during build, and afterwards for klcc wrapper. Add
+  pkg_postinst() override for linux-mod eclass, as we do not install modules.
 
   10 Mar 2005; Martin Schlemmer <azarah@gentoo.org> files/klibc.m4:
   Update m4 macro.
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 914139c4fe8f..80c76fd87470 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 MD5 300321e4e9125b68cfc58017ec3949fd klibc-1.0.ebuild 3289
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
-MD5 2dd57ca4be1fa487856c504ce7165c73 ChangeLog 835
-MD5 292806d5dfb2b2ce5f1af2287657fba8 klibc-1.0.3.ebuild 3170
+MD5 e577d30291ae2c7bf2efc14ddc0edfab ChangeLog 1140
+MD5 8cb74e7f2cdc3c49941b7d708aa7c34e klibc-1.0.3.ebuild 3584
 MD5 d995810231e49d3aee9101cebc8a6a17 files/digest-klibc-1.0 62
 MD5 dfa828b111983dc4ccc9a21dee070b39 files/klibc.m4 3630
 MD5 e70edb40913b7ad07638a7202f773b6f files/klibc-1.0-makeklcc-empty-args.patch 807
@@ -12,7 +12,7 @@ MD5 626ed5b2981bf97e3b37743bb3b4cc08 files/digest-klibc-1.0.3 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCMBhL1ZcsMnZjRyIRAshBAKCGLsQz7y9dpNQt81RhVhWT9du3CwCffZyM
-1n6xE376IE/x1aziHaN+JsM=
-=FzkM
+iD8DBQFCMPU61ZcsMnZjRyIRAifvAJ4l/ttDLqejTLxhlFPDC6LEJZLM/ACZAT2V
+cWva14ffp1TVBTKRj0tFt60=
+=fRQQ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/klibc-1.0.3.ebuild b/dev-libs/klibc/klibc-1.0.3.ebuild
index be6573f0b2a4..ceec0a026ddb 100644
--- a/dev-libs/klibc/klibc-1.0.3.ebuild
+++ b/dev-libs/klibc/klibc-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.0.3.ebuild,v 1.1 2005/03/10 08:49:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.0.3.ebuild,v 1.2 2005/03/11 01:29:30 azarah Exp $
 
 inherit eutils linux-mod
 
@@ -21,7 +21,9 @@ KEYWORDS="~x86"
 IUSE=""
 RESTRICT="nostrip"
 
-DEPEND="virtual/linux-sources"
+DEPEND="dev-lang/perl
+	virtual/linux-sources"
+RDEPEND="dev-lang/perl"
 
 if [[ ${CTARGET} != ${CHOST} ]] ; then
 	SLOT="${CTARGET}"
@@ -50,6 +52,11 @@ guess_arch() {
 	return 1
 }
 
+pkg_setup() {
+	# Make sure kernel sources are OK
+	# (Override for linux-mod eclass)
+	check_kernel_built
+}
 
 src_unpack() {
 	unpack ${A}
@@ -66,9 +73,6 @@ src_unpack() {
 		die "Could not guess klibc's ARCH from your CTARGET!"
 	fi
 
-	# Make sure kernel sources are ok
-	check_kernel_built
-
 	kernel_arch=$(readlink "${KV_DIR}/include/asm" | sed -e 's:asm-::')
 	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
 		echo
@@ -95,15 +99,27 @@ src_compile() {
 }
 
 src_install() {
+	local klibc_prefix
+
 	if is_cross ; then
 		make INSTALLROOT=${D} \
 			ARCH=$(guess_arch) \
 			CROSS="${CTARGET}-" \
 			install || die "Install failed!"
+
+		klibc_prefix=$("${S}/${CTARGET}-klcc" -print-klibc-bindir)
 	else
 		env -u ARCH \
 		make INSTALLROOT=${D} install || die "Install failed!"
 
+		klibc_prefix=$("${S}/klcc" -print-klibc-bindir)
+	fi
+
+	# Hardlinks becoming copies
+	dosym gzip "${klibc_prefix}/gunzip"
+	dosym gzip "${klibc_prefix}/zcat"
+
+	if ! is_cross ; then
 		insinto /usr/share/aclocal
 		doins ${FILESDIR}/klibc.m4
 
@@ -116,3 +132,8 @@ src_install() {
 		docinto kinit; dodoc ${S}/kinit/README
 	fi
 }
+
+pkg_postinst() {
+	# Override for linux-mod eclass
+	return 0
+}