dev-util/adobe-air-sdk-bin: Fixed arch logic.

svn path=/sunrise/; revision=10398

diff --git a/dev-util/adobe-air-sdk-bin/ChangeLog b/dev-util/adobe-air-sdk-bin/ChangeLog
index 5412077f66b45fb34af7d02c3c751d497e73563e..f7905a5438537ca65d489c0b7b80e5ddd1ce6eb6 100644 (file)
--- a/dev-util/adobe-air-sdk-bin/ChangeLog
+++ b/dev-util/adobe-air-sdk-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Apr 2010; Piotr Szymaniak <lazy_bum@o2.pl>
+  adobe-air-sdk-bin-1.5.3.ebuild:
+  Fixed arch logic.
+
   31 Mar 2010; Piotr Szymaniak <lazy_bum@o2.pl>
   adobe-air-sdk-bin-1.5.3.ebuild:
   Updated for x86 support.

diff --git a/dev-util/adobe-air-sdk-bin/Manifest b/dev-util/adobe-air-sdk-bin/Manifest
index e801cec7d53bbdc2d1f476152d9bf6d86831bb10..aae7709dfe4149556d90f07823db526cfaea908b 100644 (file)
--- a/dev-util/adobe-air-sdk-bin/Manifest
+++ b/dev-util/adobe-air-sdk-bin/Manifest
@@ -2,6 +2,6 @@ AUX adobe-air-sdk-bin.xml 733 RMD160 6eefe40d9609e229db418652036219e0f0f5d4b1 SH
 AUX airstart 545 RMD160 96b54f5fdc8ac2cc0814c5691847a0685a9a6205 SHA1 46b91c7c85f53c3e8c9b54914877241539997731 SHA256 668155a4751e99686c08823cea1d4b1c640f2d5adf80ffbd886322675ec61f2c
 AUX airstart.desktop 367 RMD160 120565cdbba01cb89c6f5d1433703f04bdd1d38d SHA1 70161b83e7e2e90005fdd947f1c020c5dcaa3686 SHA256 0b1670898b8dc5c295df88e5c84b486b5ad4ca3da99d8d918b39ce3418d331ed
 DIST AdobeAIRSDK-1.5.3.tbz2 19700568 RMD160 14d5b296c3cc87c1aa1149f30a4f9df39c1f10ab SHA1 0232a4ecf327fc8bcdfdf7fa14f5d81bddc6112c SHA256 aa33f9b38b57138d28403d5abf0654071bd972999cf8308ddec45b5866a81c8b
-EBUILD adobe-air-sdk-bin-1.5.3.ebuild 2086 RMD160 eedd32a4c8a0a0528320e31f43ae954feb209946 SHA1 cbca78d879c2d73201a84bd192a5d9e793ce9815 SHA256 a680d0619e132d3b1efd7ad772b18e8bcf970eeaa2a1672bfccd99c08fe35860
-MISC ChangeLog 456 RMD160 eddb81d0aa6c2211b280724bf9cc8af53509827c SHA1 1dcec6da391f8ea7043677dba642ada01bb692bf SHA256 541697edba9845003deb38ed771bd8d72e137ea5f02aca90d78439f661301f6b
+EBUILD adobe-air-sdk-bin-1.5.3.ebuild 2188 RMD160 6dd4d42b6fb2ce2d1be4f36176964554eeff18ba SHA1 1cabaf1953a185c49ff3b1be3be5fc0368f80095 SHA256 1de68f6de6c24f723a6aff96f727255d44c8bb7c7f23c7cbdb29e43b70a4a056
+MISC ChangeLog 559 RMD160 9db1f80f0bc4651824635ae5c4f6feffd901bbde SHA1 d7c6cd528a099e8795218eaf68f8cda30ccc02fb SHA256 92058a1fb118a4d5678b9c3aa5435fc59ff2cc82b2939b2285cbc08c04e68317
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf

diff --git a/dev-util/adobe-air-sdk-bin/adobe-air-sdk-bin-1.5.3.ebuild b/dev-util/adobe-air-sdk-bin/adobe-air-sdk-bin-1.5.3.ebuild
index d1cd26bbeef2489c31ec1497b4f3caa677bd4407..0cfe29de443d74a9714bba4bdfd705b2e9d0ba3e 100644 (file)
--- a/dev-util/adobe-air-sdk-bin/adobe-air-sdk-bin-1.5.3.ebuild
+++ b/dev-util/adobe-air-sdk-bin/adobe-air-sdk-bin-1.5.3.ebuild
@@ -36,19 +36,19 @@ src_install() {
        local rtdir='runtimes/air/linux/Adobe AIR/Versions/1.0'
 
        # remove the broken symlinks
-       rm -r "${rtdir}"/Resources/nss3/{0d,1d,None} || die
-       use x86 && rm -r "${rtdir}"/Resources/lib{curl,flashplayer}.so || die
+       rm -r "${rtdir}"/Resources/nss3/{0d,1d,None} || die "cleaning symlinks failed"
+       if use x86; then rm -r "${rtdir}"/Resources/lib{curl,flashplayer}.so \
+               || die "sym"; fi
 
        insinto /${sdkdir}
-       doins -r * || die
+       doins -r * || die "doins failed"
 
-       cd "${D}" || die
-       fperms 0755 ${sdkdir}/bin/* ${sdkdir}/"${rtdir}"/{libCore.so,Resources/lib*.so*} || die
+       cd "${D}" || die "cd ${D} failed"
+       fperms 0755 ${sdkdir}/bin/* ${sdkdir}/"${rtdir}"/{libCore.so,Resources/lib*.so*} \
+               || die "chmod failed"
 
-       use x86 && make_wrapper adl /${sdkdir}/bin/adl . \
-               /usr/lib:/usr/lib/nss:/usr/lib/nspr /opt/bin
-       use amd64 && make_wrapper adl /${sdkdir}/bin/adl . \
-               /usr/lib32:/usr/lib32/nss:/usr/lib32/nspr /opt/bin
+       use x86 && make_wrapper adl /${sdkdir}/bin/adl . /usr/lib:/usr/lib/nss:/usr/lib/nspr /opt/bin
+       use amd64 && make_wrapper adl /${sdkdir}/bin/adl . /usr/lib32:/usr/lib32/nss:/usr/lib32/nspr /opt/bin
 
        exeinto /opt/bin
        doexe "${FILESDIR}"/airstart || die "doexe failed"
@@ -60,10 +60,12 @@ src_install() {
        insinto /usr/share/mime/packages
        doins "${FILESDIR}"/${PN}.xml || die "doins failed"
 
-       use x86 && dosym /usr/lib/libcurl.so ${sdkdir}/"${rtdir}"/Resources/libcurl.so \
+       if use x86; then
+               dosym /usr/lib/libcurl.so ${sdkdir}/"${rtdir}"/Resources/libcurl.so \
                && dosym /opt/netscape/plugins/libflashplayer.so \
                ${sdkdir}/"${rtdir}"/Resources/libflashplayer.so \
                || die "dosym failed"
+       fi
 }
 
 pkg_postinst() {