grobian 14/04/28 20:01:19 Modified: oracle-jdk-bin-1.8.0.5.ebuild ChangeLog Log: Fix misc locations in 1.8, bug #508660 (Portage version: HEAD/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild?r1=1.1&r2=1.2 Index: oracle-jdk-bin-1.8.0.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oracle-jdk-bin-1.8.0.5.ebuild 16 Apr 2014 08:57:26 -0000 1.1 +++ oracle-jdk-bin-1.8.0.5.ebuild 28 Apr 2014 20:01:19 -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/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild,v 1.1 2014/04/16 08:57:26 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.5.ebuild,v 1.2 2014/04/28 20:01:19 grobian Exp $ EAPI="5" @@ -141,10 +141,12 @@ mkdir dmgmount hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ -mountpoint "${T}"/dmgmount - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg + local update=$(get_version_component_range 4) + [[ ${#update} == 1 ]] && update="0${update}" + xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv - mv Contents/Home "${S}" + zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv + mv Contents/Home "${WORKDIR}"/jdk${MY_PV} popd > /dev/null else default @@ -277,10 +279,10 @@ pushd "${ddest}"/jre/lib > /dev/null || die local lib needed nlib npath for lib in \ - libJObjC libdecora-sse libglass libjavafx-{font,iio} \ - libjfxmedia libjfxwebkit libprism-es2 ; - do - lib=${lib}.dylib + decora_sse glass jfx{media,webkit} \ + javafx_{font,font_t2k,iio} prism_{common,es2,sw} \ + ; do + lib=lib${lib}.dylib einfo "Fixing self-reference of ${lib}" install_name_tool \ -id "${EPREFIX}${dest}/jre/lib/${lib}" \ 1.59 dev-java/oracle-jdk-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.59&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.59&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.58&r2=1.59 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ChangeLog 17 Apr 2014 08:15:18 -0000 1.58 +++ ChangeLog 28 Apr 2014 20:01:19 -0000 1.59 @@ -1,6 +1,10 @@ # ChangeLog for dev-java/oracle-jdk-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.58 2014/04/17 08:15:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.59 2014/04/28 20:01:19 grobian Exp $ + + 28 Apr 2014; Fabian Groffen <[email protected]> + oracle-jdk-bin-1.8.0.5.ebuild: + Fix misc locations in 1.8, bug #508660 17 Apr 2014; Agostino Sarubbo <[email protected]> -oracle-jdk-bin-1.7.0.51-r1.ebuild:
