sera 14/07/21 00:04:54
Modified: ChangeLog oracle-jdk-bin-1.7.0.65.ebuild
oracle-jdk-bin-1.8.0.11.ebuild
Log:
Fix install with missing xattr support #517626
Fix selinux support #515582
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
3C5CF75A)
Revision Changes Path
1.67 dev-java/oracle-jdk-bin/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.67&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?rev=1.67&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog?r1=1.66&r2=1.67
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog 20 Jul 2014 21:20:33 -0000 1.66
+++ ChangeLog 21 Jul 2014 00:04:54 -0000 1.67
@@ -1,6 +1,11 @@
# 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.66
2014/07/20 21:20:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.67
2014/07/21 00:04:54 sera Exp $
+
+ 21 Jul 2014; Ralph Sennhauser <[email protected]>
+ oracle-jdk-bin-1.7.0.65.ebuild, oracle-jdk-bin-1.8.0.11.ebuild:
+ Fix install with missing xattr support #517626
+ Fix selinux support #515582
*oracle-jdk-bin-1.8.0.11 (20 Jul 2014)
1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.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.7.0.65.ebuild?r1=1.1&r2=1.2
Index: oracle-jdk-bin-1.7.0.65.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-jdk-bin-1.7.0.65.ebuild 20 Jul 2014 19:53:16 -0000 1.1
+++ oracle-jdk-bin-1.7.0.65.ebuild 21 Jul 2014 00:04:54 -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.7.0.65.ebuild,v
1.1 2014/07/20 19:53:16 sera Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.65.ebuild,v
1.2 2014/07/21 00:04:54 sera Exp $
EAPI="5"
@@ -61,12 +61,14 @@
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.7"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel
source"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel
selinux source"
RESTRICT="fetch strip"
QA_PREBUILT="*"
-RDEPEND="
+COMMON_DEP="
+ selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
X? ( !aqua? (
x11-libs/libX11
x11-libs/libXext
@@ -80,7 +82,7 @@
!prefix? ( sys-libs/glibc )"
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
# marking. #427642
-DEPEND="
+DEPEND="${COMMON_DEP}
jce? ( app-arch/unzip )
examples? ( kernel_linux? ( app-arch/unzip ) )
pax_kernel? ( sys-apps/paxctl )"
@@ -155,36 +157,14 @@
fi
}
-src_compile() {
- # This needs to be done before CDS - #215225
- java-vm_set-pax-markings "${S}"
-
- # see bug #207282
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- bin/java -client -Xshare:dump || die
- ;;
- x86)
- bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- bin/java -server -Xshare:dump || die
- ;;
- esac
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest}"
# Create files used as storage for system preferences.
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest}"
# We should not need the ancient plugin for Firefox 2 anymore, plus it
has
# writable executable segments
@@ -205,20 +185,16 @@
dohtml README.html
dodir "${dest}"
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- bin include jre lib man "${ddest}" || die
+ cp -pPR bin include jre lib man "${ddest}" || die
if use derby; then
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- db "${ddest}" || die
+ cp -pPR db "${ddest}" || die
fi
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- demo sample "${ddest}" || die
+ cp -pPR demo sample "${ddest}" || die
if use kernel_linux; then
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
+ cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
"${ddest}"/javafx-samples || die
fi
fi
@@ -240,7 +216,7 @@
fi
if use source; then
- cp src.zip "${ddest}" || die
+ cp -p src.zip "${ddest}" || die
fi
if use !arm && use !x86-macos && use !x64-macos ; then
@@ -271,6 +247,26 @@
doins "${T}"/fontconfig.properties
fi
+ # This needs to be done before CDS - #215225
+ java-vm_set-pax-markings "${ddest}"
+
+ # see bug #207282
+ einfo "Creating the Class Data Sharing archives"
+ case ${ARCH} in
+ arm|ia64)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ ;;
+ x86)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ # limit heap size for large memory on x86 #467518
+ # this is a workaround and shouldn't be needed.
+ ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump
|| die
+ ;;
+ *)
+ ${ddest}/bin/java -server -Xshare:dump || die
+ ;;
+ esac
+
# Remove empty dirs we might have copied
find "${D}" -type d -empty -exec rmdir -v {} + || die
1.2 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.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.11.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.11.ebuild?r1=1.1&r2=1.2
Index: oracle-jdk-bin-1.8.0.11.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-jdk-bin-1.8.0.11.ebuild 20 Jul 2014 21:20:33 -0000 1.1
+++ oracle-jdk-bin-1.8.0.11.ebuild 21 Jul 2014 00:04:54 -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.11.ebuild,v
1.1 2014/07/20 21:20:33 sera Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.11.ebuild,v
1.2 2014/07/21 00:04:54 sera Exp $
EAPI="5"
@@ -61,12 +61,14 @@
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.8"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
~sparc64-solaris ~x64-solaris"
-IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel
source"
+IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel
selinux source"
RESTRICT="fetch strip"
QA_PREBUILT="*"
-RDEPEND="
+COMMON_DEP="
+ selinux? ( sec-policy/selinux-java )"
+RDEPEND="${COMMON_DEP}
X? ( !aqua? (
x11-libs/libX11:0
x11-libs/libXext:0
@@ -78,14 +80,11 @@
doc? ( dev-java/java-sdk-docs:${SLOT} )
fontconfig? ( media-libs/fontconfig:1.0 )
!prefix? ( sys-libs/glibc:* )"
-
-DEPEND="
- jce? ( app-arch/unzip:0 )
- examples? ( kernel_linux? ( app-arch/unzip:0 ) )"
-
# A PaX header isn't created by scanelf, so depend on paxctl to avoid fallback
# marking. See bug #427642.
-DEPEND="${DEPEND}
+DEPEND="${COMMON_DEP}
+ jce? ( app-arch/unzip:0 )
+ examples? ( kernel_linux? ( app-arch/unzip:0 ) )
pax_kernel? ( sys-apps/paxctl:0 )"
S="${WORKDIR}/jdk"
@@ -164,36 +163,14 @@
fi
}
-src_compile() {
- # This needs to be done before CDS - #215225
- java-vm_set-pax-markings "${S}"
-
- # see bug #207282
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- bin/java -client -Xshare:dump || die
- ;;
- x86)
- bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- bin/java -server -Xshare:dump || die
- ;;
- esac
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}${dest}"
# Create files used as storage for system preferences.
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest}"
# We should not need the ancient plugin for Firefox 2 anymore, plus it
has
# writable executable segments
@@ -215,17 +192,14 @@
dohtml README.html
dodir "${dest}"
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- bin include jre lib man "${ddest}" || die
+ cp -pPR bin include jre lib man "${ddest}" || die
if use derby ; then
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- db "${ddest}" || die
+ cp -pPR db "${ddest}" || die
fi
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
- cp -R --preserve=links,mode,ownership,timestamps,xattr \
- demo sample "${ddest}" || die
+ cp -pPR demo sample "${ddest}" || die
fi
if use jce ; then
@@ -245,7 +219,7 @@
fi
if use source ; then
- cp src.zip "${ddest}" || die
+ cp -p src.zip "${ddest}" || die
fi
if use !x86-macos && use !x64-macos ; then
@@ -276,6 +250,26 @@
doins "${T}"/fontconfig.properties
fi
+ # This needs to be done before CDS - #215225
+ java-vm_set-pax-markings "${ddest}"
+
+ # see bug #207282
+ einfo "Creating the Class Data Sharing archives"
+ case ${ARCH} in
+ arm|ia64)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ ;;
+ x86)
+ ${ddest}/bin/java -client -Xshare:dump || die
+ # limit heap size for large memory on x86 #467518
+ # this is a workaround and shouldn't be needed.
+ ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump
|| die
+ ;;
+ *)
+ ${ddest}/bin/java -server -Xshare:dump || die
+ ;;
+ esac
+
# Remove empty dirs we might have copied.
find "${D}" -type d -empty -exec rmdir -v {} + || die
