Revbump to replace nsplugin part by icedtea-web-1.1.2-r1, which respects LDFLAGS...

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 9af28ab21531605c6624196161ae48a38b047f1f..f61abb11317ae78a1be54921c344e8368de935d9 100644 (file)
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.67 2011/09/19 09:25:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.68 2011/09/20 07:50:27 caster Exp $
+
+*icedtea6-bin-1.10.3-r2 (20 Sep 2011)
+
+  20 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.10.3-r2.ebuild:
+  Revbump to replace nsplugin part by icedtea-web-1.1.2-r1, which respects
+  LDFLAGS and thus --as-needed removes the (false) libpng14 dependency. Fixes
+  bug #383771.
 
 *icedtea6-bin-1.10.3-r1 (19 Sep 2011)
 

diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest
index 84b78f8f396bf6c6cb032c0771083c2ef90e050e..4d1cbb2dd0056efed14601c3d87c53f07fe4edbb 100644 (file)
--- a/dev-java/icedtea6-bin/Manifest
+++ b/dev-java/icedtea6-bin/Manifest
@@ -14,10 +14,13 @@ DIST icedtea6-bin-libpng15-1.10.3-r1-x86.tar.bz2 17199 RMD160 9d1cd5e5285be002d9
 DIST icedtea6-bin-nsplugin-1.10.3-amd64.tar.bz2 901853 RMD160 8f0a7466b923f7e74b8c61f5a6780cbe36b693e7 SHA1 5e5dc9d7b2df7e5342cde6a3ed034cd23d098f03 SHA256 be394ce6b11b6706037600d28890cb2339581cc569eb50b86f1055891cd56ac3
 DIST icedtea6-bin-nsplugin-1.10.3-r1-amd64.tar.bz2 903283 RMD160 dd1528e492db15dfcf0fd1a35df1519d8f31c3aa SHA1 1f139f54f19060381f7bd72abf6c62f745616beb SHA256 39d796bb6c3038240c0906f353e6cf69783b331647bacd3e670d248746b515a8
 DIST icedtea6-bin-nsplugin-1.10.3-r1-x86.tar.bz2 897166 RMD160 759c93a30a59a2e1da71a25f42ea6e05c889e66c SHA1 f9238019b4880c5c02a97a51ce707328a1208db4 SHA256 3d140a8237c7fcee766ab6027af8b8c2042eaaccb4ffdcd829b9d22eb4aa4f61
+DIST icedtea6-bin-nsplugin-1.10.3-r2-amd64.tar.bz2 903575 RMD160 e2e6686f3bfdbc90dbee94d422d04221a6e58b01 SHA1 e1e3ff7d403167a2b6cb8546a937668270521193 SHA256 0c170c6c67e7fb00308b5e684a50e81c191a9c8ec1aaac9f555b6cc2b965d67a
+DIST icedtea6-bin-nsplugin-1.10.3-r2-x86.tar.bz2 897189 RMD160 0edb8c03e300101263f99519acd91b078be6d5ff SHA1 8c7b286cd6426ffe11394ec5bee1b108cace6138 SHA256 2b387031dbd6d073d52914aeb9feb1aaf51d09e45537f7863b154d820215c0fd
 DIST icedtea6-bin-nsplugin-1.10.3-x86.tar.bz2 895214 RMD160 56f2d1167d3979c42823c325ff89437a9725640c SHA1 f9709e44fd9719f023f50839bf16fba2f10bcb26 SHA256 4583fa09fb83ec79e4ac71b7b423453877bf613cb4e3dfe02f169383f3b92503
 DIST icedtea6-bin-src-1.10.3-r1.tar.bz2 40821581 RMD160 3419b80c28bc001fce7c6fac7363ba613be6f580 SHA1 54f2c9dff1313e488122cf2355bcca8b49a8093a SHA256 3f725f60ddf317b5c1c8b00900ed9e3ad01c67d0533f9bd364c9de9b9511d868
 DIST icedtea6-bin-src-1.10.3.tar.bz2 40818662 RMD160 6285f875e59cd1f6423a45f975cae0dfc9945392 SHA1 d22efefbdefcf1e1e4476dbde44554b96e9f9dd9 SHA256 8a81efcf7ef34b64e1306b041b886a4281a28d9a21ea6cae2f899993d01394dd
 EBUILD icedtea6-bin-1.10.3-r1.ebuild 3359 RMD160 3fbebfb5bfdaac075d83b9c2fdcbcbb2174296d3 SHA1 bcc4ecd4a4a747ea8f684d467198663631fe56b7 SHA256 d1e80c683c37f2961feafcb324d559c80e3cd53972f51a5681d8c23a63174f05
+EBUILD icedtea6-bin-1.10.3-r2.ebuild 3334 RMD160 b0ce4a70c9ae6c5498c9a5f87daa08622b1ffec3 SHA1 645e483a7ab646a43840aa8e3628b22a2a47542c SHA256 31772017e053b39887e8c704d649d1a87fdd85eeac42b2a344dca4c1f3e39795
 EBUILD icedtea6-bin-1.10.3.ebuild 2804 RMD160 b6fdf191d76181ca748dbdb25951e4520f499043 SHA1 c9ff8f30fe540935325c55d76747e76f08d83e7e SHA256 4d5f717f370e4a4d251f4075b67e9605a532671d7685e6036eaf2ab4bddb18cc
-MISC ChangeLog 11094 RMD160 d0f574f01b6f8789e17aa01de8b631aae6cfafd2 SHA1 2e84a4f37777fe96579a91456f5156577714a210 SHA256 9fc472c2a020fafde50d77dd6074aa4de0df41f160a07862857792ab95715b4a
+MISC ChangeLog 11387 RMD160 e19345c6a33f037ad05756cb98c2e864df5be5aa SHA1 7be44653df8b13b8bbaf74f7562567ecbe327b01 SHA256 39c53360d11a97bf71d1b21c230057de7d8236f1d64af28e8f9961e7ec232014
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb

diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild
new file mode 100644 (file)
index 0000000..3c8995f
--- /dev/null
+++ b/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.10.3-r2.ebuild,v 1.1 2011/09/20 07:50:27 caster Exp $
+
+EAPI="3"
+
+inherit java-vm-2
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PV}-r1"
+SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
+               ${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+       x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
+               ${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
+       doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+       examples? (
+               amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+               x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+       )
+       nsplugin? (
+               amd64? ( ${dist}/${PN}-nsplugin-${PVR}-amd64.tar.bz2 )
+               x86? ( ${dist}/${PN}-nsplugin-${PVR}-x86.tar.bz2 )
+       )
+       source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="X alsa doc examples nsplugin source"
+RESTRICT="strip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}"
+
+RDEPEND=">=sys-devel/gcc-4.3
+       >=sys-libs/glibc-2.11.2
+       >=media-libs/giflib-4.1.6-r1
+       virtual/jpeg
+       >=media-libs/libpng-1.4
+       >=sys-libs/zlib-1.2.3-r1
+       "
+PDEPEND="
+       alsa? ( >=media-libs/alsa-lib-1.0.20 )
+       X? (
+               >=media-libs/freetype-2.3.9:2
+               >=media-libs/fontconfig-2.6.0-r2:1.0
+               >=x11-libs/libXext-1.1
+               >=x11-libs/libXi-1.3
+               >=x11-libs/libXtst-1.1
+               >=x11-libs/libX11-1.3
+               x11-libs/libXt
+       )
+       nsplugin? (
+               >=dev-libs/atk-1.30.0
+               >=dev-libs/glib-2.20.5:2
+               >=dev-libs/nspr-4.8
+               >=x11-libs/cairo-1.8.8
+               >=x11-libs/gtk+-2.20.1:2
+               >=x11-libs/pango-1.24.5
+       )"
+DEPEND=""
+
+src_unpack() {
+       unpack ${A}
+
+       if has_version '>=media-libs/libpng-1.5.0'; then
+               einfo "Installing libpng-1.5 ABI version"
+               local arch=${ARCH}
+               use x86 && arch=i386
+               mv -v ${P}-libpng15/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
+       else
+               elog "Installing libpng-1.4 ABI version"
+               elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.5"
+               elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+       fi
+}
+
+src_install() {
+       local dest="/opt/${P}"
+       local ddest="${D}/${dest}"
+       dodir "${dest}" || die
+
+       local arch=${ARCH}
+
+       # doins can't handle symlinks.
+       cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+       dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
+       if use doc ; then
+               dohtml -r ../doc/html/* || die "Failed to install documentation"
+       fi
+
+       if use examples; then
+               cp -pRP share/{demo,sample} "${ddest}" || die
+       fi
+
+       if use source ; then
+               cp src.zip "${ddest}" || die
+       fi
+
+       if use nsplugin ; then
+               cd ..
+               cp -pPR icedtea6-web-bin "${D}/opt/"
+               install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
+               docinto icedtea-web
+               dodoc doc/icedtea-web/*
+       fi
+
+       set_java_env
+       java-vm_revdep-mask
+}
+
+pkg_postinst() {
+       # Set as default VM if none exists
+       java-vm-2_pkg_postinst
+
+       if use nsplugin; then
+               elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
+               elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+               elog "such as Firefox 3.5+ and recent Chromium versions."
+       fi
+}