commit: 7d9464b10c9338920d8011b594b14f5e6221e0fb Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Tue Nov 17 21:36:39 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Tue Nov 17 21:36:39 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=7d9464b1
dev-java/icedtea: Restore removed ebuilds. Please STOP deleting ebuilds from this repository. Package-Manager: portage-2.2.20.1 dev-java/icedtea/ChangeLog | 9 +++++ dev-java/icedtea/Manifest | 9 +++++ dev-java/icedtea/icedtea-3.0.0_pre06.ebuild | 8 ++-- ...edtea-6.9999.ebuild => icedtea-6.1.13.9.ebuild} | 25 ++++++------- dev-java/icedtea/icedtea-6.9999.ebuild | 14 +++---- ...7.2.7.0_pre00.ebuild => icedtea-7.2.6.2.ebuild} | 43 ++++++++++++---------- dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild | 12 +++--- dev-java/icedtea/metadata.xml | 2 +- 8 files changed, 71 insertions(+), 51 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 73d44f2..e230deb 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*icedtea-6.1.13.9 (17 Nov 2015) +*icedtea-7.2.6.2 (17 Nov 2015) + + 17 Nov 2015; Andrew John Hughes <[email protected]> + +icedtea-6.1.13.9.ebuild, +icedtea-7.2.6.2.ebuild, icedtea-3.0.0_pre06.ebuild, + icedtea-6.9999.ebuild, icedtea-7.2.7.0_pre00.ebuild, metadata.xml: + dev-java/icedtea: Restore removed ebuilds. Please STOP deleting ebuilds from + this repository. + 13 Nov 2015; Andrew John Hughes <[email protected]> icedtea-6.9999.ebuild: dev-java/icedtea: Update 1.x live e-build following b37 release. diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 2149b5d..655f805 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,3 +1,11 @@ +DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5 +DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3 +DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920 +DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059 +DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a +DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e +DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd +DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c DIST icedtea-2.7-corba-e3445769412d.tar.bz2 1071338 SHA256 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb SHA512 587e4e382922a06f2cb73d767cee1a874011b0d2bf7c49671d41907300246d741280afa842f8b3b4af1e999776e8bb5484b63c11c2179e968bb041bcaf3b6cc9 WHIRLPOOL babdd0ac5089822c3b12f20be9212f94f36ebfedf27a3c7d9e3800e4ccd7d4e114e5702b75ba6be13ffe10d8e0ec94a8daab6a607e346d1f473c268af1261784 DIST icedtea-2.7-hotspot-94f15794d5e7.tar.bz2 8157346 SHA256 8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c SHA512 85fa2b91da2c565e3d57f4b39c70b00dca7ce4d1249b8989b554e73f298c99ba90940bec60fcc66476b567c54935de53bb711a9ff71a9deac8082a4ed9ce2b47 WHIRLPOOL b1d6c25a2d29221061a03c42f3b8bf8d0de3198ff35150d8502daad9d46257c2b5822fde5bfe40662d1815c29399e6e0818214fcbc74d1134d57638719210ff0 DIST icedtea-2.7-jaxp-e3b08dc13807.tar.bz2 2737345 SHA256 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07 SHA512 52e2f3058514892721e2117bcd78fe0b45752874b68b5fd3e8aff4846eabb2fd4ba60e9a7bcd0a463001e22824bee5c88f3dbf2aff0236a3fe8e4a9e1b556638 WHIRLPOOL 934724081e3bcdb7c40fa9b799ae28d132c6b855daaa40305422993172cc7ea506d14c77f39ef7afcf5283fa7c8a360347569d21184413fca12a0a3c7ca9d29d @@ -17,4 +25,5 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 +DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1 DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17 diff --git a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild index f77138f..5665e7b 100644 --- a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild +++ b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild @@ -62,7 +62,7 @@ EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+alsa cacao cjk +cups debug doc examples headless-awt jamvm +jbootstrap +nsplugin +IUSE="+alsa cacao cjk +cups debug doc examples headless jamvm +jbootstrap +nsplugin +nss pax_kernel pulseaudio sctp selinux smartcard +source test zero +webstart" # Ideally the following were optional at build time. @@ -108,7 +108,7 @@ COMMON_DEP=" # cups is needed for X. #390945 #390975 RDEPEND="${COMMON_DEP} !dev-java/icedtea:0 - !headless-awt? ( + !headless? ( ${CUPS_COMMON_DEP} ${X_COMMON_DEP} media-fonts/dejavu @@ -323,7 +323,7 @@ src_install() { # Ensures HeadlessGraphicsEnvironment is used. # Hack; we should get IcedTea to support passing --disable-headful - if use headless-awt ; then + if use headless ; then rm -vf "${ddest}"/jre/lib/$(get_system_arch)/libawt_xawt.so || die fi @@ -361,7 +361,7 @@ src_install() { chmod 644 "${ddest}/jre/lib/security/cacerts" || die set_java_env "${FILESDIR}/icedtea.env" - if use headless-awt || ! use alsa || ! use cups; then + if use headless || ! use alsa || ! use cups; then java-vm_revdep-mask "${dest}" fi java-vm_sandbox-predict /proc/self/coredump_filter diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.1.13.9.ebuild similarity index 94% copy from dev-java/icedtea/icedtea-6.9999.ebuild copy to dev-java/icedtea/icedtea-6.1.13.9.ebuild index 1a74fbf..15c6d9a 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.9.ebuild @@ -9,7 +9,7 @@ EAPI="5" -inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx +inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) ICEDTEA_BRANCH=$(get_version_component_range 1-3) @@ -25,20 +25,21 @@ JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" HOMEPAGE="http://icedtea.classpath.org"; +SRC_PKG="${ICEDTEA_PKG}.tar.xz" SRC_URI=" + http://icedtea.classpath.org/download/source/${SRC_PKG} https://java.net/downloads/openjdk6/${OPENJDK_TARBALL} http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" -EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6"; LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" SLOT="6" -KEYWORDS="" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt - javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio - selinux source systemtap test zero +webstart" +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript + +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux + source systemtap test zero +webstart" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -89,7 +90,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless-awt? ( ${X_COMMON_DEP} ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -147,7 +148,7 @@ pkg_setup() { } src_unpack() { - mercurial_src_unpack + unpack ${SRC_PKG} } java_prepare() { @@ -156,8 +157,6 @@ java_prepare() { # icedtea doesn't like some locales. #330433 #389717 export LANG="C" LC_ALL="C" - - eautoreconf } src_configure() { @@ -230,8 +229,8 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable kerberos system-kerberos) \ @@ -273,7 +272,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless-awt ; then + if use headless ; then rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ {,jre/}bin/policytool bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index 1a74fbf..aa14d2f 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -36,9 +36,9 @@ SLOT="6" KEYWORDS="" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt - javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio - selinux source systemtap test zero +webstart" +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript + +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux + source systemtap test zero +webstart" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless-awt? ( ${X_COMMON_DEP} ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -230,8 +230,8 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable kerberos system-kerberos) \ @@ -273,7 +273,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless-awt ; then + if use headless ; then rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ {,jre/}bin/policytool bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild b/dev-java/icedtea/icedtea-7.2.6.2.ebuild similarity index 92% copy from dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild copy to dev-java/icedtea/icedtea-7.2.6.2.ebuild index 579e2d9..b889523 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.2.ebuild @@ -10,19 +10,19 @@ EAPI="5" SLOT="7" -inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx +inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx ICEDTEA_VER=$(get_version_component_range 2-4) ICEDTEA_BRANCH=$(get_version_component_range 2-3) ICEDTEA_PKG=icedtea-${ICEDTEA_VER} ICEDTEA_PRE=$(get_version_component_range _) -CORBA_TARBALL="e3445769412d.tar.bz2" -JAXP_TARBALL="e3b08dc13807.tar.bz2" -JAXWS_TARBALL="299588405837.tar.bz2" -JDK_TARBALL="2db5e90a399b.tar.bz2" -LANGTOOLS_TARBALL="bc95d2472055.tar.bz2" -OPENJDK_TARBALL="dbfa75121aca.tar.bz2" -HOTSPOT_TARBALL="94f15794d5e7.tar.bz2" +CORBA_TARBALL="a4d55c5cec23.tar.bz2" +JAXP_TARBALL="f1202fb27695.tar.bz2" +JAXWS_TARBALL="14c411b1183c.tar.bz2" +JDK_TARBALL="db69ae53157a.tar.bz2" +LANGTOOLS_TARBALL="73356b81c5c7.tar.bz2" +OPENJDK_TARBALL="601ca7147b8c.tar.bz2" +HOTSPOT_TARBALL="f40363c11191.tar.bz2" CACAO_TARBALL="cacao-c182f119eaad.tar.gz" JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" @@ -43,7 +43,9 @@ ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" HOMEPAGE="http://icedtea.classpath.org"; +SRC_PKG="${ICEDTEA_PKG}.tar.xz" SRC_URI=" + http://icedtea.classpath.org/download/source/${SRC_PKG} ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL} ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL} ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL} @@ -53,18 +55,16 @@ SRC_URI=" ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL} ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" -EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea7"; -EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}" LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~x86" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( !headless-awt )" +REQUIRED_USE="gtk? ( !headless )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) - !headless-awt? ( ${X_COMMON_DEP} ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -189,17 +189,20 @@ pkg_setup() { } src_unpack() { - mercurial_src_unpack + unpack ${SRC_PKG} } java_prepare() { + if ! use cups; then + # CUPS is always needed at build time but you can at least make it dlopen. + sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die + fi + # For bootstrap builds as the sandbox control file might not yet exist. addpredict /proc/self/coredump_filter # icedtea doesn't like some locales. #330433 #389717 export LANG="C" LC_ALL="C" - - eautoreconf } src_configure() { @@ -301,8 +304,8 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable gtk system-gtk) \ @@ -343,7 +346,7 @@ src_install() { rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless-awt; then + if use headless; then rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild index 579e2d9..14fc818 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild +++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild @@ -60,11 +60,11 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M KEYWORDS="" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( !headless-awt )" +REQUIRED_USE="gtk? ( !headless )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) - !headless-awt? ( ${X_COMMON_DEP} ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -301,8 +301,8 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable gtk system-gtk) \ @@ -343,7 +343,7 @@ src_install() { rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless-awt; then + if use headless; then rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die fi diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 83663b2..ccb7c05 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -16,7 +16,7 @@ <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription> <use> <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> + <flag name="headless">Don't install graphical libraries (used to be USE="-X")</flag> <flag name="infinality">Enable better font rendering using fontconfig.</flag> <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag> <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
