diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2005-11-29 22:46:27 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2005-11-29 22:46:27 +0000 |
| commit | 44e51fbf47ca97ce4e093da6faf9c9afa2c12b81 (patch) | |
| tree | 313df4030365bdec6b0009fb83aa3e796acd434c /dev-java | |
| parent | digikam gcc41 fix (diff) | |
| download | gentoo-2-44e51fbf47ca97ce4e093da6faf9c9afa2c12b81.tar.gz gentoo-2-44e51fbf47ca97ce4e093da6faf9c9afa2c12b81.tar.bz2 gentoo-2-44e51fbf47ca97ce4e093da6faf9c9afa2c12b81.zip | |
multilib magic to install
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/swt/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 14 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.1-r1.ebuild | 20 |
3 files changed, 13 insertions, 26 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 5c6c1fffae1b..2cb9fdce6cd5 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/swt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.30 2005/11/23 23:50:20 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.31 2005/11/29 22:46:27 compnerd Exp $ + + 29 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.1-r1.ebuild: + Fixing multilib issues. Minor cleanup 23 Nov 2005; Luis Medinas <metalgod@gentoo.org> swt-3.2_pre1.ebuild: Fix package to be able to build with multilib-strict on amd64. Closes bug diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 5dad27c4ff83..4927636c17d9 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 44c85c4dfac50f9ad293376fff82ab6e ChangeLog 5464 +MD5 791e953468bef0ef68e4eefd65b2dcd9 ChangeLog 5581 MD5 ad4aa305806513ab198281b6e485fbbc files/SWTMessages.properties 2085 MD5 c964f0ff0b83afdfd76d872821540574 files/build.xml 476 MD5 5d9afb3da5c7a84844807032c229b5a0 files/digest-swt-3.1-r1 216 @@ -9,12 +6,5 @@ MD5 686130e25bfbef166609d902f0f16940 files/digest-swt-3.2_pre1 222 MD5 b246c6ca2f33a241ab92d5a8c74da665 files/swt-cairo-0.9.2-amd64.patch 8325 MD5 86a056e193ce8f351e3b12d7f5751861 files/swt-cairo-0.9.2.patch 8692 MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541 -MD5 f387ebc54db186eb59aeb42a256517eb swt-3.1-r1.ebuild 5319 +MD5 8366e72e5d264da0f39763cfa8d049a0 swt-3.1-r1.ebuild 5075 MD5 c0810a3d3ccad699db1d7f91f78e69b8 swt-3.2_pre1.ebuild 5186 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDhQAfwUpWvClEHQoRAkNyAJ0Skb50LWToK8HrR5F0jxhAfkoOxACgg0Ru -8F1kHJkHAub3sorHN9kpZJk= -=fKD2 ------END PGP SIGNATURE----- diff --git a/dev-java/swt/swt-3.1-r1.ebuild b/dev-java/swt/swt-3.1-r1.ebuild index b164f1d0d50f..be32d29b86c6 100644 --- a/dev-java/swt/swt-3.1-r1.ebuild +++ b/dev-java/swt/swt-3.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1-r1.ebuild,v 1.3 2005/10/22 17:01:55 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1-r1.ebuild,v 1.4 2005/11/29 22:46:27 compnerd Exp $ -inherit eutils java-pkg +inherit eutils java-pkg multilib MY_DMF="R-3.1-200506271435" MY_VERSION="3.1" @@ -48,14 +48,8 @@ pkg_setup() { } src_unpack() { - # Extract based on architecture - if [[ ${ARCH} == 'amd64' ]] ; then - unpack swt-${MY_VERSION}-gtk-linux-x86_64.zip || die "Unable to unpack sources" - elif [[ ${ARCH} == 'ppc' ]] ; then - unpack swt-${MY_VERSION}-gtk-linux-ppc.zip || die "Unable to unpack sources" - else - unpack swt-${MY_VERSION}-gtk-linux-x86.zip || die "Unable to unpack sources" - fi + # Portage should do this magically + unpack ${A} || die "Unable to unpack sources" # Clean up the directory structure for f in $(ls); do @@ -94,7 +88,7 @@ src_compile() { fi # Identity the XTEST library location - export XTEST_LIB_PATH=/usr/X11R6/lib + export XTEST_LIB_PATH=/usr/X11R6/$(get_libdir) # Fix the pointer size for AMD64 [[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 @@ -155,7 +149,7 @@ src_compile() { src_install() { java-pkg_dojar swt.jar - java-pkg_sointo /usr/lib + java-pkg_sointo /usr/$(get_libdir) java-pkg_doso *.so dohtml about.html @@ -166,7 +160,7 @@ pkg_postinst() { ewarn ewarn "CAIRO Support is experimental! We are not responsible if" ewarn "enabling support for CAIRO corrupts your Gentoo install," - ewarn "if it blows up your computer, or if it becoming sentient" + ewarn "if it blows up your computer, or if it becomes sentient" ewarn "and chases you down the street yelling random binary!" ewarn ebeep 5 |