diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea-web/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/icedtea-web/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch | 11 | ||||
| -rw-r--r-- | dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild | 145 |
4 files changed, 166 insertions, 2 deletions
diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog index 4c4e986b9ccf..86c83be6a17e 100644 --- a/dev-java/icedtea-web/ChangeLog +++ b/dev-java/icedtea-web/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/icedtea-web # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.9 2011/09/06 11:56:40 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.10 2011/09/18 21:53:18 caster Exp $ + +*icedtea-web-1.1.2-r1 (18 Sep 2011) + + 18 Sep 2011; Vlastimil Babka <caster@gentoo.org> + +files/0002-Respect-LDFLAGS.patch, +icedtea-web-1.1.2-r1.ebuild: + Revbump to respect LDFLAGS, bug #356645. 06 Sep 2011; Vlastimil Babka <caster@gentoo.org> +files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch: diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index d6fa1eb85547..8e89d88698ab 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1,7 +1,9 @@ AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7 +AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7 DIST icedtea-web-1.1.2.tar.gz 807736 RMD160 7ca33e6759aec27567a22b07f02afc775339d513 SHA1 f862220b4504e688706b743f68f62c81e57bc183 SHA256 3051f3bf1e1d07ad7aaa28b204821a7c0631848d20ba7942fc23440e774649e4 EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 b3eef443697d0cafb9e1a70c6bb9c93c33038584 SHA1 ff96d27e0bb41d218706a41ad5350d77d17ac2dd SHA256 25a42a88413bdd32f83517ed201ccccfb216407f3e2ac6e2653bb57c91b0ea43 +EBUILD icedtea-web-1.1.2-r1.ebuild 4164 RMD160 bdc174191805228a6dce4c9fdaf787abf1ef3049 SHA1 819a5d3b8d59ac436ff62b48ea1a824de7a98d7e SHA256 d31679bb1080ea28d5697ab14a5939dd93d12fe31071ea5375d83a3f1cb1e869 EBUILD icedtea-web-1.1.2.ebuild 4097 RMD160 4afc897e9040e85afc810a82e21632cfbc8641da SHA1 49521a25026cf2d15b37270e251e3a8fe1a35258 SHA256 d42f088e62c25c0fa3b134c364a5b941d360f4bfe78cc292e31bbb94222420b4 -MISC ChangeLog 1905 RMD160 69a263de259eca4ed578fbb584337c878a1b6e14 SHA1 80e81b644ddeb558f888e9bd21ffa6a0a20942c1 SHA256 888f5321dfb2d1a01926b4fd7561890ed676479ff7c2cfa7fcac6da5946af0ee +MISC ChangeLog 2105 RMD160 e48d732f54e4437020b1e8af65fc5d9ebc0ae1f3 SHA1 1c7be9c9d3efafa5a9f7353eab743fd82efea689 SHA256 d4955a9a458c0b514d3d7501fd5c67c465ec64852bf333c6a53447b95b509030 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6 diff --git a/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch b/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch new file mode 100644 index 000000000000..6f62d08bd614 --- /dev/null +++ b/dev-java/icedtea-web/files/0002-Respect-LDFLAGS.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2011-09-18 23:35:31.396740781 +0200 ++++ Makefile.am 2011-09-18 23:35:44.284392366 +0200 +@@ -216,7 +216,7 @@ + + $(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) + cd $(PLUGIN_DIR) && \ +- $(CXX) $(CXXFLAGS) \ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ + $(PLUGIN_OBJECTS) \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ diff --git a/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild new file mode 100644 index 000000000000..761bc26c4512 --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2011 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.1.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 caster Exp $ +# Build written by Andrew John Hughes (ahughes@redhat.com) + +EAPI="2" + +inherit autotools eutils java-pkg-2 java-vm-2 + +LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" +SLOT="6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="FOSS Java browser plugin and Web Start implementation" +SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" +HOMEPAGE="http://icedtea.classpath.org" + +IUSE="build doc +nsplugin" + +RDEPEND="dev-java/icedtea:${SLOT}" +DEPEND="${RDEPEND} + nsplugin? ( + || ( net-misc/npapi-sdk + >=net-libs/xulrunner-1.9.1 ) )" + +# a bit of hack so the VM switching is triggered without causing dependency troubles +JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" +JAVA_PKG_WANT_SOURCE="1.6" +JAVA_PKG_WANT_TARGET="1.6" + +pkg_setup() { + # quite a hack since java-config does not provide a way for a package + # to limit supported VM's for building and their preferred order + if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then + einfo "Honoring user-set JAVA_PKG_FORCE_VM" + elif has_version dev-java/icedtea:${SLOT}; then + JAVA_PKG_FORCE_VM="icedtea${SLOT}" + else + JAVA_PKG_FORCE_VM="" + # don't die just yet if merging a binpkg - bug #258423 + DIE_IF_NOT_BINPKG=true + fi + + # if the previous failed, don't even run java eclasses pkg_setup + # as it might also die when no VM is present + if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then + einfo "Forced vm ${JAVA_PKG_FORCE_VM}" + java-vm-2_pkg_setup + java-pkg-2_pkg_setup + fi +} + +unset_vars() { + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS +} + +src_unpack() { + if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then + die "Unable to find a supported VM for building" + fi + + default +} + +src_prepare() { + epatch "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch + # bug #356645 + epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch + eautoreconf +} + +src_configure() { + local vmhome=$(java-config -O) + + if use build; then + icedteadir="${ICEDTEA_BIN_DIR}" + installdir="/opt/icedtea${SLOT}-web-bin" + else + icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" + installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" + fi + + unset_vars + + if use build || [[ ${vmhome} == ${icedteadir} ]] ; then + VMHANDLE="icedtea${SLOT}" + else + die "Unexpected install location of IcedTea${SLOT}" + fi + + einfo "Installing IcedTea-Web in ${installdir}" + einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" + if [ ! -e ${vmhome} ] ; then + eerror "Could not find JDK install directory ${vmhome}." + die + fi + + # we need to override all *dir variables that econf sets + # man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know + # the suffix the man page will end up compressed with, anyway + econf \ + --prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ + --with-jdk-home=${icedteadir} \ + $(use_enable doc docs) \ + $(use_enable nsplugin plugin) \ + || die "configure failed" +} + +src_compile() { + # we need this to override the src_compile from java-pkg-2 + default +} + +src_install() { + # parallel make problem bug #372235 + emake -j1 DESTDIR="${D}" install || die "Install failed" + dodoc AUTHORS README NEWS || die + + if use nsplugin; then + local arch=${ARCH}; + use x86 && arch=i386; + install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; + fi + + for binary in javaws itweb-settings; do + dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} + dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} + done +} + +pkg_postinst() { + java-vm_check-nsplugin + java_mozilla_clean_ + + if use nsplugin; then + elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" + elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" + elog "such as Firefox 3.5+, Chromium and perhaps some others too." + fi +} + +pkg_prerm() { + # override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here + :; +} |