caster 14/11/02 11:07:03 Modified: ChangeLog icedtea-web-1.5.1-r1.ebuild Removed: icedtea-web-1.5.1.ebuild Log: Reintroduce USE=tagsoup and fix building with USE="-tagsoup" properly, bug #527962.[F (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.47 dev-java/icedtea-web/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?r1=1.46&r2=1.47 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 2 Nov 2014 08:50:06 -0000 1.46 +++ ChangeLog 2 Nov 2014 11:07:03 -0000 1.47 @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea-web # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.46 2014/11/02 08:50:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.47 2014/11/02 11:07:03 caster Exp $ + + 02 Nov 2014; Vlastimil Babka <[email protected]> -icedtea-web-1.5.1.ebuild, + icedtea-web-1.5.1-r1.ebuild: + Reintroduce USE=tagsoup and fix building with USE="-tagsoup" properly, bug + #527962. *icedtea-web-1.5.1-r1 (02 Nov 2014) 1.2 dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild?r1=1.1&r2=1.2 Index: icedtea-web-1.5.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icedtea-web-1.5.1-r1.ebuild 2 Nov 2014 08:50:06 -0000 1.1 +++ icedtea-web-1.5.1-r1.ebuild 2 Nov 2014 11:07:03 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild,v 1.1 2014/11/02 08:50:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild,v 1.2 2014/11/02 11:07:03 caster Exp $ # Build written by Andrew John Hughes ([email protected]) EAPI="5" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +icedtea7 javascript +nsplugin test" +IUSE="doc +icedtea7 javascript +nsplugin tagsoup test" COMMON_DEP=" icedtea7? ( || ( @@ -26,7 +26,7 @@ dev-java/icedtea:6 dev-java/icedtea-bin:6 ) ) app-admin/eselect-java - dev-java/tagsoup + tagsoup? ( dev-java/tagsoup ) nsplugin? ( >=dev-libs/glib-2.16 )" @@ -58,7 +58,13 @@ } src_configure() { - local config=( + local tagsoup_jar + local config + + # bug #527962 + use tagsoup && tagsoup_jar="$(java-pkg_getjars tagsoup)" + + config=( # javaws is managed by eselect java-vm and symlinked to by icedtea so # move it out of the way and symlink itweb-settings back to bin --bindir="${EPREFIX}"/usr/libexec/${PN} @@ -66,6 +72,7 @@ $(use_enable doc docs) $(use_enable nsplugin plugin) $(use_with javascript rhino) + $(use_with tagsoup tagsoup ${tagsoup_jar}) ) unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
