summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Medinas <metalgod@gentoo.org>2005-11-23 23:50:20 +0000
committerLuis Medinas <metalgod@gentoo.org>2005-11-23 23:50:20 +0000
commit52be4ed3fb2e1f2769041bdcb3ae06e7dc9a259f (patch)
tree8bb74dc195d8fc3309fa86f53fa2b1c0059ef135 /dev-java/swt
parentStable on amd64. (diff)
downloadhistorical-52be4ed3fb2e1f2769041bdcb3ae06e7dc9a259f.tar.gz
historical-52be4ed3fb2e1f2769041bdcb3ae06e7dc9a259f.tar.bz2
historical-52be4ed3fb2e1f2769041bdcb3ae06e7dc9a259f.zip
Fix package to be able to build with multilib-strict on amd64. Closes bug #113395.
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'dev-java/swt')
-rw-r--r--dev-java/swt/ChangeLog6
-rw-r--r--dev-java/swt/Manifest14
-rw-r--r--dev-java/swt/swt-3.2_pre1.ebuild6
3 files changed, 20 insertions, 6 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 778bcb9b53d1..5c6c1fffae1b 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,10 @@
# 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.29 2005/10/24 16:28:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.30 2005/11/23 23:50:20 metalgod Exp $
+
+ 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
+ #113395.
25 Oct 2005; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.2_pre1.ebuild:
Fixing GTK+ dependency to the lower version which it builds against.
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index d748d4fceec9..5dad27c4ff83 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,4 +1,7 @@
-MD5 cd29c611e2ebf1a7acb39d475e507032 ChangeLog 5305
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44c85c4dfac50f9ad293376fff82ab6e ChangeLog 5464
MD5 ad4aa305806513ab198281b6e485fbbc files/SWTMessages.properties 2085
MD5 c964f0ff0b83afdfd76d872821540574 files/build.xml 476
MD5 5d9afb3da5c7a84844807032c229b5a0 files/digest-swt-3.1-r1 216
@@ -7,4 +10,11 @@ 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 4851df280e8f96a42883d2d44608b20b swt-3.2_pre1.ebuild 5166
+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.2_pre1.ebuild b/dev-java/swt/swt-3.2_pre1.ebuild
index 9f8605eb5c0c..4235ab5ea3cf 100644
--- a/dev-java/swt/swt-3.2_pre1.ebuild
+++ b/dev-java/swt/swt-3.2_pre1.ebuild
@@ -1,6 +1,6 @@
# 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.2_pre1.ebuild,v 1.5 2005/10/24 16:28:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2_pre1.ebuild,v 1.6 2005/11/23 23:50:20 metalgod Exp $
inherit eutils java-pkg
@@ -95,7 +95,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 +155,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