commit: 2751be30317cc1be4365735eac78ed1391945dc8 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Wed Jul 8 18:28:35 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Wed Jul 8 18:28:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=2751be30
Update CACAO to match new GNU Classpath ebuild. Cleanup file placement and PaX mark VM. Package-Manager: portage-2.2.17 Manifest-Sign-Key: 35964222 dev-java/cacao/ChangeLog | 9 ++- dev-java/cacao/Manifest | 24 +++----- dev-java/cacao/cacao-1.6.0-r1.ebuild | 96 ------------------------------ dev-java/cacao/cacao-1.6.0-r2.ebuild | 110 +++++++++++++++++++++++++++++++++++ dev-java/cacao/files/cacao.env | 8 +-- 5 files changed, 129 insertions(+), 118 deletions(-) diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog index 8c3269e..d62bca7 100644 --- a/dev-java/cacao/ChangeLog +++ b/dev-java/cacao/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-java/cacao -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 21:25:44 radhermit Exp $ +*cacao-1.6.0-r2 (08 Jul 2015) + + 08 Jul 2015; Andrew John Hughes <[email protected]> + +cacao-1.6.0-r2.ebuild, -cacao-1.6.0-r1.ebuild, files/cacao.env: + Update CACAO to match new GNU Classpath ebuild. Cleanup file placement and PaX + mark VM. + *cacao-1.6.0-r1 (20 Sep 2013) 20 Sep 2013; Andrew John Hughes <[email protected]> diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest index 1bdde59..63f243f 100644 --- a/dev-java/cacao/Manifest +++ b/dev-java/cacao/Manifest @@ -1,28 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX cacao.env 620 SHA256 dd41402ec64a24c7bcd57723962a188139e7bcd7fd5647e1d7f5bcf791cd8d49 SHA512 4b89c9ea8aa5a821df177c21d6f1efa29063ae5030edc1cd32029b54a305cb867ba8fc8b5f1c8c5bd174c9298be47138d06f28827c4c04fc43aad17baceddbb2 WHIRLPOOL 35ece180d8284f7a8d71c392c73522897615c4529ba6786f503fae10b5b90a0a72b276a37b93aea6a524c18d206a75dae93cacd51caca440363535bb7781c990 +AUX cacao.env 702 SHA256 19f28634b6751f54668221281ea1e4361ac52ed892a82b6a5d25b7adcaa8db29 SHA512 3f1689a90ff3b559045bef1fb8ce08731c53b8a15a4fd4211509e1ee29d8954825ffc9924ac3a61c63a699df9c6a3bdd78d45412e39eb9a56a56136abbe0df45 WHIRLPOOL 61c57739827db37a953fb8d9b843809d89802a65433420d24efd02707cf47427936d1c4d32dba49b52b09f70e79d8aad036f23e56d282b2f7c6cb12a984367ec AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8 AUX support-7.patch 668 SHA256 fefe2435f0471bb097d99c932b80d4dc74bb2646dd3f3f74140f69fbc3e8043a SHA512 f170eab7242f0400a520ccdfee70a2dda7c5393613edeccf512fbc6a3064de71a030165eb51f0164d04a7964ca612ca0728eb8c59d9de8e11f5f93fa6289bb81 WHIRLPOOL f6d7d81139791e6a068fd634ae5017bd437f1c71309e79f8f5ccf2c432eae3533714fc3ad21cf173e5e815515b25156241d5c64bc8f1b8291a0f1cf53ba52983 AUX system-boehm-gc.patch 847 SHA256 b3b04dbfbc31e83f46fdc3e80391730e54866bce010148b86ae4f4a97717aece SHA512 1329bb10a0297e2182b6628148437779bcd4fb079759e602fa6388154ff5b88a06623d1ee246156f75b7ecaea29c72a884a5cc3ea34c1d516f3a84ee1b6c1d59 WHIRLPOOL 28fa685b5624058529410bbce7cba7822f7c4c51a784dd284e2b0b2a02e52175122fe059a62d218aad96d1c8f2a355996df0c693e64c00e2bbb46c0f7423f270 DIST cacao-1.6.0.tar.gz 4434778 SHA256 f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b WHIRLPOOL 85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63 -EBUILD cacao-1.6.0-r1.ebuild 2961 SHA256 a675726912a510d15d35960b666e99ae136251909d263e21bef5d9b21da8ba19 SHA512 f93121a4f9acd2c6be77511117099eb10152646ae60c9fdd1d99c63ef8e8766c15b44e84e52650a2d61b8e667d85b9b20429bcccc6138c55adfeaa0d1905a21a WHIRLPOOL 0a34f0e34688ec2763e2888e2dd03be76af4e1aef227babb77b1aea7716894c6c708a10c9d2f853d3e6b6baf77eebeadc2e5bc204eb9af47bc0256e6ed0b2fda -MISC ChangeLog 3496 SHA256 ce92c97c21aa368bca850cc618190a6c4c98fdb0553687af16b3baaeb8343a97 SHA512 f72bd31d8f2fc7995d1bdd8495578394124047c0f62d9c27a522d6e6df0b9c59eb4e8eed1a21ef9f41ef94356dc0ed1694107b444034509093f7815fd4275b26 WHIRLPOOL 01230101d88df63f89daff2bbe27bc7c44f49e56657a6e832aed4c6364fd148c57e1315337891cf54e7aa1c718ed6ea3594da08eb161a1293d4da416e4ec22b8 +EBUILD cacao-1.6.0-r2.ebuild 3441 SHA256 53f5ae4bb6b56d5e65a6c28e7374bdc78e04216f29c5f06759cc5712e036f65f SHA512 9fefde9d2f5ed6c4c8fda90c0d92f4d12120babdf7139becede2c8f778ac384221d60df016348a01d6b164d3b29d07b019ecf0b81b66118d26d13689ac34ca93 WHIRLPOOL 4123d9e8ed1483fa0d7d38faafec8aa576c90c820f1e39bbeb0b0ca0d4ce482f373e797bfdd738a20a7b188129f07fde264a09b5ee61f6215ced4e40f189d09a +MISC ChangeLog 3749 SHA256 1e7c94d5438bdf6cea48cc25017ad8168513e11806987fb9cff24a191fd2b8c2 SHA512 667448008732ec2177244983e0ffcd1bda5d056cd94c60194ac3b8a1764dfe780727dd31978d9b73b879a5b3651ef1b9d20a8217daae83013bc9dace582db6fc WHIRLPOOL 593beae549430108a03d71ccf7540ce23fdfcea6164379b111510009e35f2c02000dde85e130473c7ce22631fb94901ba42963ca8332259347a130def90cb6d8 MISC metadata.xml 364 SHA256 4d63397a708380d2d8dbd5c15b9a246c4edb9d63cf630a06d16c3533ad17ab66 SHA512 d5ef277e6ceea9305e15e8ccacd2f99f678c961a4667bec15b7980d2d38d0d1dfa99e518937a821cda6cc60737286e121be77a090182e694cda4ff3ea5666757 WHIRLPOOL cf485290f09ec9369f66269a5e84ad28305cec43a02ffb52a75661fba4737ca929df96d8ef1ee3d373faffa76f1bcd297d9e109d9726e7459f9a4adaa47438bf -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJSO75pAAoJEDuWpXgki9wHwGUQAJRoZG82LigNsoELy0qVskTF -1WIJVQo4fcJhfPlFRgSEv8IaRAyYDep/MykxWU+gZ8uXQWIqexZ5jawTzbW+6PVW -u0/mAqELtOvGZW3RKY4wj1Sw2/5A/oXidLYYBsX7/TAvEs7+/2CVN1KSIPVCGgc8 -UOMYn+quoMOXwvaCuy6FMdDG2YTj41UujsVEP09GJgeXcwJ1XppgBb1FuWz6YWBO -5JcdO14+GUvAyQEaySqDuBxn63ZElU2vZqa6GoKo9TtHbLAJCEHVMDtRbiVC4C3G -ls9nrP5Zkei0B03vMh0qHoitVkCD7S3gLvS29eWfJgxtRc6nAppk2p443cSNdeVP -FMBUc2BWvloyA5Na7oPxxm/LNaV4InO3vdjMq/7UTs5zJYw554/nSi9ndcfKGGyH -s/QngkRD38B+LhWh46EMpwF84V/QRcSOB4x2KHjBPTEjTjzT00j0BrnydBD8gCjt -4IcF1mfQKu5W2B118ndpSS/xz/ie2Jb521lMdtdpZQNXZbJ8kk7zjgvhwkH5/Hj+ -VFHT2PRICSNDyV9AdzAgjyu6sF0Asj1gfqm5ddAO1GNjktpqS+DZoSlfsGTp8Z1G -TuStlbegdhN0KN0i9aXWkGeJioyUPZgNW89Ro+emrBKwojPqDe5LSZ+NZVL+a/gk -cSkjUW5UZSOE8XEpNFhl -=LVoy +iF4EARYIAAYFAlWda88ACgkQz9oPmzWWQiKJ+gEAn/7DfcQ1ORS8Ei3QzL8i2fdM +BRscYnVPZg0mejpf0QUBAO0mHbrnq+y+m+EM4tjJB35hiCp6HC9dvSGnnzocDisJ +=Sadv -----END PGP SIGNATURE----- diff --git a/dev-java/cacao/cacao-1.6.0-r1.ebuild b/dev-java/cacao/cacao-1.6.0-r1.ebuild deleted file mode 100644 index f7538d5..0000000 --- a/dev-java/cacao/cacao-1.6.0-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.7 2012/06/14 21:25:44 radhermit Exp $ - -EAPI=5 -AUTOTOOLS_AUTO_DEPEND="no" - -inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2 - -DESCRIPTION="Cacao Java Virtual Machine" -HOMEPAGE="http://www.cacaojvm.org/"; -SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.gz"; -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -CLASSPATH_SLOT=0.99 -COMMON_DEPEND=" - dev-java/gnu-classpath:${CLASSPATH_SLOT} - || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) - >=dev-libs/boehm-gc-7.2d -" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - test? ( - dev-java/junit:4 - ${AUTOTOOLS_DEPEND} - ) -" - -CLASSPATH_DIR=/usr/gnu-classpath-${CLASSPATH_SLOT} - -src_prepare() { - if use test; then - sed -ie "s:/usr/share/java/junit4.jar:$(java-config -p junit-4):" \ - ./tests/regression/bugzilla/Makefile.am \ - ./tests/regression/base/Makefile.am || die "sed failed" - fi - epatch "${FILESDIR}/system-boehm-gc.patch" - epatch "${FILESDIR}/support-7.patch" - eautoreconf -} - -src_configure() { - # A compiler can be forced with the JAVAC variable if needed - unset JAVAC - append-flags -fno-strict-aliasing - econf --bindir=/usr/${PN}/bin \ - --libdir=/usr/${PN}/lib \ - --datarootdir=/usr/${PN}/share \ - --disable-dependency-tracking \ - --with-java-runtime-library-prefix=${CLASSPATH_DIR} -} - -src_compile() { - default -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodir /usr/bin - dosym /usr/${PN}/bin/cacao /usr/bin/cacao || die - dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs" - - for files in ${CLASSPATH_DIR}/bin/g*; do - if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then - dosym $files /usr/${PN}/bin/javadoc || die - else - dosym $files \ - /usr/${PN}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die - fi - done - - dodir /usr/${PN}/jre/lib - dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip /usr/${PN}/jre/lib/rt.jar - dodir /usr/${PN}/lib - dosym ${CLASSPATH_DIR}/share/classpath/tools.zip /usr/${PN}/lib/tools.jar - - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - exeinto /usr/${PN}/bin - cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/${PN}/bin/cacao#" \ - -e "s#@ECJ_JAR@#${ecj_jar}#" \ - -e "s#@RT_JAR@#${CLASSPATH_DIR}/share/classpath/glibj.zip#" \ - -e "s#@TOOLS_JAR@#${CLASSPATH_DIR}/share/classpath/tools.zip#" \ - | newexe - javac - - local libarch="${ARCH}" - [ ${ARCH} == x86 ] && libarch="i386" - [ ${ARCH} == x86_64 ] && libarch="amd64" - dodir /usr/${PN}/jre/lib/${libarch}/client - dodir /usr/${PN}/jre/lib/${libarch}/server - dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/client/libjvm.so - dosym /usr/${PN}/lib/libjvm.so /usr/${PN}/jre/lib/${libarch}/server/libjvm.so - dosym ${CLASSPATH_DIR}/lib/classpath/libjawt.so /usr/${PN}/jre/lib/${libarch}/libjawt.so - set_java_env -} diff --git a/dev-java/cacao/cacao-1.6.0-r2.ebuild b/dev-java/cacao/cacao-1.6.0-r2.ebuild new file mode 100644 index 0000000..63dc516 --- /dev/null +++ b/dev-java/cacao/cacao-1.6.0-r2.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.7 2012/06/14 21:25:44 radhermit Exp $ + +EAPI=5 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools eutils flag-o-matic java-pkg-2 java-vm-2 + +DESCRIPTION="Cacao Java Virtual Machine" +HOMEPAGE="http://www.cacaojvm.org/"; +SRC_URI="http://www.complang.tuwien.ac.at/cacaojvm/download/${P}/${P}.tar.gz"; +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +COMMON_DEPEND=" + dev-java/gnu-classpath:0 + || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) + >=dev-libs/boehm-gc-7.2d +" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( + dev-java/junit:4 + ${AUTOTOOLS_DEPEND} + ) +" + +src_prepare() { + if use test; then + sed -ie "s:/usr/share/java/junit4.jar:$(java-config -p junit-4):" \ + ./tests/regression/bugzilla/Makefile.am \ + ./tests/regression/base/Makefile.am || die "sed failed" + fi + epatch "${FILESDIR}/system-boehm-gc.patch" + epatch "${FILESDIR}/support-7.patch" + eautoreconf +} + +src_configure() { + # A compiler can be forced with the JAVAC variable if needed + unset JAVAC + append-flags -fno-strict-aliasing + econf --bindir=/usr/libexec/${PN} \ + --libdir=/usr/lib/${PN} \ + --datarootdir=/usr/share/${PN} \ + --disable-dependency-tracking \ + --with-java-runtime-library-prefix=/usr \ + --with-jni_h=/usr/include/classpath \ + --with-jni_md_h=/usr/include/classpath +} + +src_compile() { + default +} + +src_install() { + local CLASSPATH_DIR=/usr/libexec/gnu-classpath + local JDK_DIR=/usr/$(get_libdir)/${PN}-jdk + + emake DESTDIR="${D}" install || die "make install failed" + dodir /usr/bin + dosym /usr/libexec/${PN}/cacao /usr/bin/cacao || die + dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs" + + dodir ${JDK_DIR}/bin + dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java + for files in ${CLASSPATH_DIR}/g*; do + if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then + dosym $files ${JDK_DIR}/bin/javadoc || die + else + dosym $files \ + ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die + fi + done + + dodir ${JDK_DIR}/jre/lib + dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar + dodir ${JDK_DIR}/lib + dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar + + local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" + exeinto ${JDK_DIR}/bin + cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/libexec/${PN}/cacao#" \ + -e "s#@ECJ_JAR@#${ecj_jar}#" \ + -e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \ + -e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \ + | newexe - javac + + local libarch="${ARCH}" + [ ${ARCH} == x86 ] && libarch="i386" + [ ${ARCH} == x86_64 ] && libarch="amd64" + dodir ${JDK_DIR}/jre/lib/${libarch}/client + dodir ${JDK_DIR}/jre/lib/${libarch}/server + dosym /usr/lib/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so + dosym /usr/lib/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so + dosym /usr/$(get_libdir)/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so + set_java_env + + # Can't use java-vm_set-pax-markings as doesn't work with symbolic links + # Ensure a PaX header is created. + local pax_markings="C" + # Usally disabeling MPROTECT is sufficent. + local pax_markings+="m" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + use x86 && pax_markings+="sp" + + pax-mark ${pax_markings} "${ED}"/usr/libexec/${PN}/cacao +} diff --git a/dev-java/cacao/files/cacao.env b/dev-java/cacao/files/cacao.env index ba0cadb..4481713 100644 --- a/dev-java/cacao/files/cacao.env +++ b/dev-java/cacao/files/cacao.env @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/files/cacao.env,v 1.1 2009/07/31 14:28:36 betelgeuse Exp $ -VERSION="CACAO @PV@" -JAVA_HOME=/usr/@PN@ -JDK_HOME=/usr/@PN@ +VERSION="CACAO JDK @PV@" +JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" +JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" JAVAC=${JAVA_HOME}/bin/javac PATH="${JAVA_HOME}/bin" ROOTPATH="${JAVA_HOME}/bin"
