Fix unpacking, thanks to Flameeyes for noticing.

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 01e4dcfbd0ec6cd5d0ec0a491a92a47bb847ab98..88e71f78ec9b88408685cc333e4e0632550faa34 100644 (file)
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.55 2006/12/06 21:22:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.56 2006/12/07 11:40:09 caster Exp $
+
+  07 Dec 2006; Vlastimil Babka <caster@gentoo.org> swt-3.2.1.ebuild:
+  Fix unpacking, thanks to Flameeyes for noticing.
 
   06 Dec 2006; Vlastimil Babka <caster@gentoo.org>
   -files/patches-3.2.1/*, swt-3.2.1.ebuild:

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 0c34218e8cf886c4ab9eb5f1d8cc8e2d3d4aeee1..b8d71f80d1916d6c44b25d3cb71b3966018bd1fc 100644 (file)
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -29,14 +29,14 @@ EBUILD swt-3.2-r2.ebuild 5223 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf SH
 MD5 d3342ff6d0af3a1ac9c7aa29166167aa swt-3.2-r2.ebuild 5223
 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf swt-3.2-r2.ebuild 5223
 SHA256 3515363ece683ebe30dfeac298ef951e9039b5ca93dcd1c2f23aee53696da65f swt-3.2-r2.ebuild 5223
-EBUILD swt-3.2.1.ebuild 4785 RMD160 564b2d4bff1dcea047d79378bb03946059d9b6e8 SHA1 19a190629f6c8d6ec68aa0bb9beb42aba4d3bafb SHA256 c0aa4b87dd79c0d8670b32ceece4b5b36f16dd002551bdc755aba2d669f68356
-MD5 79fc4850873dd8d90b8e9da3aa64674c swt-3.2.1.ebuild 4785
-RMD160 564b2d4bff1dcea047d79378bb03946059d9b6e8 swt-3.2.1.ebuild 4785
-SHA256 c0aa4b87dd79c0d8670b32ceece4b5b36f16dd002551bdc755aba2d669f68356 swt-3.2.1.ebuild 4785
-MISC ChangeLog 10053 RMD160 4c7df19358bf7c63e41553ef67ffea72e52c93b1 SHA1 5dc4b0cc74dd04583fe89637616df4a3b4eb309e SHA256 58763522d20805940c28ccef2033d3022c8a794580bed03c5b3a6049b720781a
-MD5 985c2f83bf25dd72ce98e95f5f4d7875 ChangeLog 10053
-RMD160 4c7df19358bf7c63e41553ef67ffea72e52c93b1 ChangeLog 10053
-SHA256 58763522d20805940c28ccef2033d3022c8a794580bed03c5b3a6049b720781a ChangeLog 10053
+EBUILD swt-3.2.1.ebuild 4942 RMD160 d3ca15106ba49b93e9b76aa180808fabacfa70f3 SHA1 c6ba2d70995ae5c60dbf1d7d4ae7206456453153 SHA256 d5dc824c32705c2f46ffffdff73e8d1c92ee5b32af0bba7263577b61197f83d6
+MD5 7cc8aa35c7bee9829a3a54074a6c4df8 swt-3.2.1.ebuild 4942
+RMD160 d3ca15106ba49b93e9b76aa180808fabacfa70f3 swt-3.2.1.ebuild 4942
+SHA256 d5dc824c32705c2f46ffffdff73e8d1c92ee5b32af0bba7263577b61197f83d6 swt-3.2.1.ebuild 4942
+MISC ChangeLog 10174 RMD160 09cf27182489c0766cb702f91f7723f40d8da99d SHA1 66fa79126482f49b4eef30c125782f5f95ebd192 SHA256 3bb369bff4db455d7969eec8a8557d49bae9e35a270b50b1f5740cd3625a33d9
+MD5 2b5e5c4892e1f4447637f7462880894a ChangeLog 10174
+RMD160 09cf27182489c0766cb702f91f7723f40d8da99d ChangeLog 10174
+SHA256 3bb369bff4db455d7969eec8a8557d49bae9e35a270b50b1f5740cd3625a33d9 ChangeLog 10174
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440

diff --git a/dev-java/swt/swt-3.2.1.ebuild b/dev-java/swt/swt-3.2.1.ebuild
index 7b8009e55a9e8ba7251e4a926273773a11de3cba..f0c6fe4b8edef8656c6275497f1ccf21d2aad45a 100644 (file)
--- a/dev-java/swt/swt-3.2.1.ebuild
+++ b/dev-java/swt/swt-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.5 2006/12/06 21:22:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.6 2006/12/07 11:40:09 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -8,9 +8,9 @@ MY_DMF="R-${PV}-200609210945"
 PATCHSET="${P}-gentoo-patches"
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-x86.zip )
-               amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-x86_64.zip )
-               ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${PV}-gtk-linux-ppc.zip )
+SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip )
+               amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip )
+               ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-ppc.zip )
                mirror://gentoo/${PATCHSET}.tar.bz2"
 
 SLOT="3"
@@ -51,11 +51,15 @@ RDEPEND=">=virtual/jre-1.4
 S="${WORKDIR}"
 
 src_unpack() {
-       unzip -jq "${DISTDIR}/${A}" "*src.zip" || die "unable to extract distfile"
-       unpack "${PATCHSET}.tar.bz2"
-
+       # determine the right file to unpack from $A
+       local DISTFILE=${A/${PATCHSET}.tar.bz2/}
+       # just in case patchset is ordered before distfile
+       DISTFILE=${DISTFILE## }
+       unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
        unpack ./src.zip
 
+       unpack "${PATCHSET}.tar.bz2"
+
        # Cleanup the redirtied directory structure
        rm -rf about_files/
        rm -f .classpath .project