--- /usr/portage/dev-java/swt/swt-3.6.1.ebuild 2011-03-29 11:31:06.000000000 +0200 +++ swt-3.6.2.ebuild 2011-04-04 11:29:33.573349254 +0200 @@ -7,7 +7,7 @@ inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201009090800" +MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201102101200" MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" @@ -25,14 +25,14 @@ http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip ) ppc64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip + http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )" SLOT="3.6" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="cairo gnome opengl xulrunner" +IUSE="cairo gnome opengl webkit xulrunner" COMMON=">=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 @@ -43,6 +43,7 @@ =gnome-base/libgnomeui-2* ) xulrunner? ( =net-libs/xulrunner-1.9* ) + webkit? ( >=net-libs/webkit-gtk-1.2 ) opengl? ( virtual/opengl virtual/glu @@ -139,6 +140,12 @@ ${make} make_gnome || die "Failed to build GNOME VFS support" fi + if use webkit ; then + einfo "Building the WebKitGTK+ component" + + ${make} make_webkit || die "Failed to build WebKitGTK+ support" + fi + if use xulrunner ; then einfo "Building the Mozilla component against xulrunner-1.9" @@ -189,6 +196,11 @@ use x86-fbsd && swtArch=x86 sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" + use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF" + use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" + use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF" + use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" + use xulrunner || sed -i -e "/ org.eclipse.swt.internal.mozilla; x-internal:=true,/d" "MANIFEST_TMP.MF" java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" java-pkg_sointo /usr/$(get_libdir)