Remove rediculous Darwin handling

Package-Manager: portage-2.1.2.2

3 files changed, 18 insertions, 29 deletions

diff --git a/sys-libs/com_err/ChangeLog b/sys-libs/com_err/ChangeLog
index 2a04f18f99af..124ac46a0218 100644
--- a/sys-libs/com_err/ChangeLog
+++ b/sys-libs/com_err/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/com_err
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.26 2006/11/11 09:18:55 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.27 2007/05/01 17:15:15 grobian Exp $
+
+  01 May 2007; Fabian Groffen <grobian@gentoo.org> com_err-1.39.ebuild:
+  Remove rediculous Darwin handling
 
   11 Nov 2006; Mike Frysinger <vapier@gentoo.org>
   +files/com_err-1.38-locale.patch, com_err-1.39.ebuild:
diff --git a/sys-libs/com_err/Manifest b/sys-libs/com_err/Manifest
index cd41338fdfda..95af5b2e8607 100644
--- a/sys-libs/com_err/Manifest
+++ b/sys-libs/com_err/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX com_err-1.38-locale.patch 550 RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 SHA1 15a2d3759f6309a188d82b21282ca50f738ebc27 SHA256 49909ebdaa316687c97c8b78d7485f0868167021f4c07f3d25fd984be2b0c600
 MD5 1a4c6e9e6476e4ed8c419a0a98e1a97c files/com_err-1.38-locale.patch 550
 RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 files/com_err-1.38-locale.patch 550
@@ -14,14 +11,14 @@ MD5 29853daadd9ea0d27abcc57e46d48e25 files/com_err-1.39-parse-types.patch 1117
 RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/com_err-1.39-parse-types.patch 1117
 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/com_err-1.39-parse-types.patch 1117
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-EBUILD com_err-1.39.ebuild 2214 RMD160 9a64f56fb32d24882bab30d66b7ce970bab5e3b6 SHA1 2261929a57af935a862c94f592e93b9d7b7f7f24 SHA256 911612f28a6f6433192489f0b5a0c74c24a5013a1f6f5dfafbb19ee04fd9438e
-MD5 434aae4a549748c4211b97f73efd64eb com_err-1.39.ebuild 2214
-RMD160 9a64f56fb32d24882bab30d66b7ce970bab5e3b6 com_err-1.39.ebuild 2214
-SHA256 911612f28a6f6433192489f0b5a0c74c24a5013a1f6f5dfafbb19ee04fd9438e com_err-1.39.ebuild 2214
-MISC ChangeLog 3342 RMD160 0683bd847fe691f9bb35cb47619b48e07ffa690a SHA1 303cebaa77b34b72decc33b5bb1c240b8c1051a0 SHA256 4153fda407aad30d2b1cdea5250bd8f68c31425aa836f75f3dbfbd866d42574f
-MD5 a88e7be19349683dfd29d2555175edda ChangeLog 3342
-RMD160 0683bd847fe691f9bb35cb47619b48e07ffa690a ChangeLog 3342
-SHA256 4153fda407aad30d2b1cdea5250bd8f68c31425aa836f75f3dbfbd866d42574f ChangeLog 3342
+EBUILD com_err-1.39.ebuild 2094 RMD160 3f76ade49a8c7d1b9cdc3867c453994a2887554b SHA1 3ee18a5df3f83730ec0b1ae1675965a5a7abee31 SHA256 4ef302f6a4898e2d4bb7bc1ee138763f4946558f34f07639db182ac31c682263
+MD5 5f9e0f0345b5985fd1c889867f9c42a5 com_err-1.39.ebuild 2094
+RMD160 3f76ade49a8c7d1b9cdc3867c453994a2887554b com_err-1.39.ebuild 2094
+SHA256 4ef302f6a4898e2d4bb7bc1ee138763f4946558f34f07639db182ac31c682263 com_err-1.39.ebuild 2094
+MISC ChangeLog 3452 RMD160 46cc7997048cbf328d6459b6897e8f758cb59b16 SHA1 675712888b4c054cf71863d747c07ce763649fda SHA256 58844c164450fe4002f8ced3fe6b3b094c4380352c1abdbf9b6e796344c454a5
+MD5 94005c3feb45d475a5152b5b25757f98 ChangeLog 3452
+RMD160 46cc7997048cbf328d6459b6897e8f758cb59b16 ChangeLog 3452
+SHA256 58844c164450fe4002f8ced3fe6b3b094c4380352c1abdbf9b6e796344c454a5 ChangeLog 3452
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -29,10 +26,3 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 fc00317ae73d9c2807fd61dff454474c files/digest-com_err-1.39 247
 RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-com_err-1.39 247
 SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-com_err-1.39 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVZWIamhnQswr0vIRApTgAJ9yr7iXOc0KXEJwyjJoxZ0kMz98EACfTc3X
-2CAnnrOQHP9BTmIMEpFaD9U=
-=8ALa
------END PGP SIGNATURE-----
diff --git a/sys-libs/com_err/com_err-1.39.ebuild b/sys-libs/com_err/com_err-1.39.ebuild
index c2208b14467d..05cd5706b48c 100644
--- a/sys-libs/com_err/com_err-1.39.ebuild
+++ b/sys-libs/com_err/com_err-1.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.39.ebuild,v 1.5 2006/11/11 09:18:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.39.ebuild,v 1.6 2007/05/01 17:15:15 grobian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -61,13 +61,9 @@ src_install() {
 	dosym et/com_err.h /usr/include/com_err.h
 
 	dolib.a lib/libcom_err.a || die "dolib.a"
-	if [[ ${USERLAND} == "Darwin" ]] ; then
-		dosym /usr/$(get_libdir)/libcom_err.*.dylib /usr/$(get_libdir)/libcom_err.dylib || die
-	else
-		dodir /$(get_libdir)
-		mv "${D}"/usr/$(get_libdir)/*$(get_libname)* "${D}"/$(get_libdir)/ || die "move .so"
-		gen_usr_ldscript libcom_err.so
-	fi
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*$(get_libname)* "${D}"/$(get_libdir)/ || die "move $(get_libname)"
+	gen_usr_ldscript libcom_err$(get_libname)
 }
 
 pkg_postinst() {