public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: metadata.xml ChangeLog icedtea-web-1.4.2-r1.ebuild icedtea-web-1.5.1.ebuild icedtea-web-1.4.1.ebuild
@ 2014-11-01 22:47 Vlastimil Babka (caster)
  0 siblings, 0 replies; only message in thread
From: Vlastimil Babka (caster) @ 2014-11-01 22:47 UTC (permalink / raw
  To: gentoo-commits

caster      14/11/01 22:47:10

  Modified:             metadata.xml ChangeLog icedtea-web-1.4.2-r1.ebuild
  Added:                icedtea-web-1.5.1.ebuild
  Removed:              icedtea-web-1.4.1.ebuild
  Log:
  Version bump, bug #512094. Adds optional USE=tagsoup which should allow parsing malformed .jnlp files, at the cost of 35 java packages in build-deptree. Depend on app-arch/zip, bug #516696.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.9                  dev-java/icedtea-web/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/metadata.xml?r1=1.8&r2=1.9

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	30 Dec 2013 17:23:46 -0000	1.8
+++ metadata.xml	1 Nov 2014 22:47:10 -0000	1.9
@@ -9,5 +9,6 @@
     <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
     <flag name="icedtea7">Build icedtea-7 support in addition to icedtea-6 support. Requires icedtea{-bin}-7</flag>
     <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+	<flag name="tagsoup">Depend on dev-java/tagsoup which allows parsing malformed .jnlp files</flag>
   </use>
 </pkgmetadata>



1.45                 dev-java/icedtea-web/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	1 Nov 2014 22:05:04 -0000	1.44
+++ ChangeLog	1 Nov 2014 22:47:10 -0000	1.45
@@ -1,6 +1,15 @@
 # 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.44 2014/11/01 22:05:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.45 2014/11/01 22:47:10 caster Exp $
+
+*icedtea-web-1.5.1 (01 Nov 2014)
+
+  01 Nov 2014; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.4.1.ebuild,
+  icedtea-web-1.4.2-r1.ebuild, +icedtea-web-1.5.1.ebuild,
+  +files/icedtea-web-1.5-respect-ldflags.patch, metadata.xml:
+  Version bump, bug #512094. Adds optional USE=tagsoup which should allow
+  parsing malformed .jnlp files, at the cost of 35 java packages in
+  build-deptree. Depend on app-arch/zip, bug #516696.
 
   01 Nov 2014; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.3.2-r7.ebuild:
   Block >=icedtea-7.2.5.3 to make the block mutual.



1.2                  dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2-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.4.2-r1.ebuild?r1=1.1&r2=1.2

Index: icedtea-web-1.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icedtea-web-1.4.2-r1.ebuild	27 Jun 2014 14:39:37 -0000	1.1
+++ icedtea-web-1.4.2-r1.ebuild	1 Nov 2014 22:47:10 -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.4.2-r1.ebuild,v 1.1 2014/06/27 14:39:37 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.4.2-r1.ebuild,v 1.2 2014/11/01 22:47:10 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="5"
@@ -33,6 +33,7 @@
 # Need system junit 4.8+. Bug #389795
 DEPEND="${COMMON_DEP}
 	virtual/pkgconfig
+	app-arch/zip
 	javascript? ( dev-java/rhino:1.6 )
 	nsplugin? ( net-misc/npapi-sdk )
 	test? (	>=dev-java/junit-4.8:4 )"



1.1                  dev-java/icedtea-web/icedtea-web-1.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.5.1.ebuild?rev=1.1&content-type=text/plain

Index: icedtea-web-1.5.1.ebuild
===================================================================
# 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.ebuild,v 1.1 2014/11/01 22:47:10 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)

EAPI="5"

inherit autotools eutils readme.gentoo java-pkg-2 java-vm-2

DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"

LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"

IUSE="doc +icedtea7 javascript +nsplugin tagsoup test"

COMMON_DEP="
	icedtea7? ( || (
		dev-java/icedtea:7 dev-java/icedtea-bin:7
	) )
	!icedtea7? ( || (
		dev-java/icedtea:7 dev-java/icedtea-bin:7
		dev-java/icedtea:6 dev-java/icedtea-bin:6
	) )
	app-admin/eselect-java
	tagsoup? ( dev-java/tagsoup )
	nsplugin? (
		>=dev-libs/glib-2.16
	)"
RDEPEND="${COMMON_DEP}"
# Need system junit 4.8+. Bug #389795
DEPEND="${COMMON_DEP}
	virtual/pkgconfig
	app-arch/zip
	javascript? ( dev-java/rhino:1.6 )
	nsplugin? ( net-misc/npapi-sdk )
	test? (	>=dev-java/junit-4.8:4 )"

# http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-December/011221.html
pkg_setup() {
	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea-bin-7"
	if ! use icedtea7; then
		JAVA_PKG_WANT_BUILD_VM="${JAVA_PKG_WANT_BUILD_VM} icedtea-6 icedtea-bin-6"
	fi
	JAVA_PKG_WANT_SOURCE="1.6"
	JAVA_PKG_WANT_TARGET="1.6"

	java-pkg-2_pkg_setup
	java-vm-2_pkg_setup
}

src_prepare() {
	epatch "${FILESDIR}"/${PN}-1.5-respect-ldflags.patch # bug #356645
	eautoreconf
}

src_configure() {
	local 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}
		--with-jdk-home="${JAVA_HOME}"
		$(use_enable doc docs)
		$(use_enable nsplugin plugin)
		$(use_with javascript rhino)
		$(use_with tagsoup tagsoup $(java-pkg_getjars tagsoup))
	)

	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
	econf "${config[@]}"
}

src_compile() {
	default
}

src_install() {
	default

	if use nsplugin; then
		install_mozilla_plugin "/usr/$(get_libdir)/IcedTeaPlugin.so"
	fi

	mkdir -p "${ED}"/usr/bin || die
	dosym /usr/libexec/${PN}/itweb-settings /usr/bin/itweb-settings || die

	# Should we patch system default lookup instead?
	mkdir -p "${ED}"/etc/.java/deployment/ || die
	echo "deployment.jre.dir=/etc/java-config-2/current-icedtea-web-vm" \
		> "${ED}"/etc/.java/deployment/deployment.properties || die

	readme.gentoo_create_doc
}

pkg_postinst() {
	VMHANDLE="icedtea-web@${GENTOO_VM}" java-vm_check-nsplugin
	java_mozilla_clean_
	readme.gentoo_print_elog
}

pkg_prerm() {
	# override the java-vm-2 eclass check for removing a system VM, as it
	# doesn't make sense here.
	:;
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-11-01 22:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-01 22:47 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: metadata.xml ChangeLog icedtea-web-1.4.2-r1.ebuild icedtea-web-1.5.1.ebuild icedtea-web-1.4.1.ebuild Vlastimil Babka (caster)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox