Drop unneeded die calls for EAPI-4, remove some unneeded code for unsupported targets

Package-Manager: portage-2.2.0_alpha49-r1/cvs/Linux x86_64

3 files changed, 18 insertions, 20 deletions

diff --git a/net-libs/nativebiginteger/ChangeLog b/net-libs/nativebiginteger/ChangeLog
index a27079e4dcfb..bee55fd1ae59 100644
--- a/net-libs/nativebiginteger/ChangeLog
+++ b/net-libs/nativebiginteger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/nativebiginteger
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/ChangeLog,v 1.7 2011/07/31 18:20:59 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/ChangeLog,v 1.8 2011/08/03 17:49:53 tommy Exp $
+
+  03 Aug 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  nativebiginteger-0.8.7.ebuild:
+  Drop unneeded die calls for EAPI-4, remove some unneeded code for unsupported
+  targets
 
 *nativebiginteger-0.8.7 (31 Jul 2011)
 
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
index d18e59df57f4..98fb1c9729e2 100644
--- a/net-libs/nativebiginteger/Manifest
+++ b/net-libs/nativebiginteger/Manifest
@@ -12,15 +12,15 @@ DIST i2psource_0.8.7.tar.bz2 18473515 RMD160 545e72fab13d6f6ca660b5b74d86648a916
 DIST nativebiginteger-0.6.4.tar.bz2 10248 RMD160 a7ac7832371c74a1e9592a9abd1b6d5ef40a360a SHA1 37b433b3a7a2cf818a7ca3713548153f63da3817 SHA256 ef36fb57c1d885164f00b3e5d239c22349a530fa20df652efc5cb1f1ccea2c32
 EBUILD nativebiginteger-0.6.4-r3.ebuild 867 RMD160 5c87ea56c8e81302121c057f5e72c65cc68eb8bb SHA1 f1df5a12ee59b2a3ccda03f3b27b6976f6275623 SHA256 30f2a7e27ede87d44acd82675f6b3c9469d227619f5c2c354910a684937ee18b
 EBUILD nativebiginteger-0.6.4.ebuild 786 RMD160 a4034c175976d8c3ccd0c1f3b87fcf5dca06fa14 SHA1 7e479d833c9c045f72350c502c8e7ec6ebde269d SHA256 6739e7cc8119bcd19d0272b6a89cbc86df39aa3e105d685f08c81e665b71c2ed
-EBUILD nativebiginteger-0.8.7.ebuild 2116 RMD160 144ace63c4c3b7ae13594d01d741b364f7db0592 SHA1 c182a250d93638794673cbbfcc62b074d3818ca1 SHA256 a9c35e979430e91fa67d10729384151ccc375daf3b63d54018f388b65d119271
-MISC ChangeLog 1917 RMD160 1a9ae7d8cdebf1611ec292feea557f13155dc256 SHA1 201f7bd647dec41d1663d91f98330dced3c97568 SHA256 6a93a660f452718f3dd657254610a4ccb652305b64dd13ba8971ddba107109b7
+EBUILD nativebiginteger-0.8.7.ebuild 1897 RMD160 f78193bd87211011bbabb53dd84c2efb31ea80c2 SHA1 b44dcbc33885dad41c5357f7d11b208db9414f9f SHA256 9c369d24f828430037234486bbf59d9cd22bec53b2c3ef5e88c900bd5d8f505a
+MISC ChangeLog 2100 RMD160 f626b6c5dacd0d4176039b034bd9181007578203 SHA1 c65363979eef09c8db0c2d68c321dde97cbdcf24 SHA256 091330953d1212bbec2436a8ab3ecec94e1ab2502b9edf53f10e0aaec4e7e763
 MISC metadata.xml 265 RMD160 8391b845c1dc290dbfc6d8391aed1e0537e14725 SHA1 98eb1209de8c64009ada779e9c4b57f0b8273c41 SHA256 02b8c461c4f564f9a88d09d6e5d6cb1018b06173aa6b0fb4f188664b00f057fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk41nRcACgkQG7kqcTWJkGexVAP+POXCmXaWtRNMwH3ldY7eQkUS
-b7MOc6UafssFk15o/5kUrzTFFZmL5XLUKis4pNo+2JUW+MbTFcq9Pw71TA/1rD6E
-PSwyrPfn7Erlr7z4Hz39UitBG6Zkx2i6VWA/iZoaT+tc/7uVKnPSnVOxogzRxDOH
-o5ematyj6wRHtGmYyLc=
-=vj07
+iJwEAQECAAYFAk45ikwACgkQG7kqcTWJkGfMDgQAqeOsjEwaO6xPLqu9nmA/fdel
+TAmQft08yLH7InzOgQ30iU9Qt8PLrUr4EgR1E9IXyVqOG14ShhlDpsfb6J8AGVZL
+tYRIo1B0wGdLpScEyB3w2aGdtYd8agv00fgxIhEqr9vR8xntHxe3d7ozb2jKwD/v
+yayfBMvHX6toYsFLTQU=
+=tbnb
 -----END PGP SIGNATURE-----
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
index 4e05cf43f626..421019ab2e6a 100644
--- a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
+++ b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild,v 1.1 2011/07/31 18:20:59 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild,v 1.2 2011/08/03 17:49:53 tommy Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://mirror.i2p2.de/i2psource_${PV}.tar.bz2"
 
 LICENSE="|| ( public-domain BSD MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ia64"
 
 IUSE="test"
 
@@ -56,20 +56,13 @@ src_test() {
 src_install() {
 	local os arch
 
-	dolib c/jbigi/jbigi/src/libjbigi.so || die
-	( use amd64 || use x86 ) && dolib c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so || die
+	dolib c/jbigi/jbigi/src/libjbigi.so
+	( use amd64 || use x86 ) && dolib c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so
 
 	## The following is needed for compatibility with earlier versions of NativeBigInteger ##
 
-	# os list found by: grep 'jbigi-' core/java/src/net/i2p/util/NativeBigInteger.java
-	case ${CHOST} in
-		*-fbsd) os=freebsd ;;
-		*-darwin) os=osx ;;
-		*-mingw*|*-cygwin) os=windows ;;
-		*) os=linux ;;
-	esac
 	# arch list found by "none" + grep 'JBIGI_OPTIMIZATION_.*=' core/java/src/net/i2p/util/NativeBigInteger.java
 	for arch in none arm k6 k62 k63 athlon x86_64 x86_64_32 pentium pentiummmx pentium2 pentium3 pentium4 ppc ; do
-		dosym libjbigi.so /usr/$(get_libdir)/libjbigi-$os-$arch.so || die
+		dosym libjbigi.so /usr/$(get_libdir)/libjbigi-linux-$arch.so
 	done
 }