diff --git a/app-misc/hatools/Manifest b/app-misc/hatools/Manifest index 06ca8e810b70..b31fcfd0e593 100644 --- a/app-misc/hatools/Manifest +++ b/app-misc/hatools/Manifest @@ -1,2 +1 @@ -DIST hatools-2.00.tar.gz 154527 RMD160 38451c2d0df46969d989fe445a06c53dddcd47fd SHA1 0711de4ee59d40355ed8948a3d0786040577a458 SHA256 38acceaaec0ba8f3a33fb92d2d10d7e979a5698e89731313ec1df3d6fd35bd0c DIST hatools-2.14.tar.gz 156771 RMD160 fa6b953789869f2746f5b4001ca58cd942757bd6 SHA1 1376fee2185e5855e75ab818d57dd845008280a6 SHA256 4bad4723056f87f30633a4702b96be3b2e0d1218b7b96a79c71f42ca3f5dd109 diff --git a/app-misc/hatools/hatools-2.00.ebuild b/app-misc/hatools/hatools-2.00.ebuild deleted file mode 100644 index c96d6b639159..000000000000 --- a/app-misc/hatools/hatools-2.00.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/hatools/hatools-2.00.ebuild,v 1.5 2012/02/05 18:26:26 armin76 Exp $ - -DESCRIPTION="High availability environment tools for shell scripting" -HOMEPAGE="http://www.fatalmind.com/software/hatools/" -SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README AUTHORS NEWS ChangeLog || die -} diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index f04f5b53c0f8..b19b1a5e5079 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -6,12 +6,18 @@ DIST 9b85f1265346.tar.gz 2276207 RMD160 39bad7830bb5848efae424192ba54811f6285dbe DIST a2ebfdc9db7e.tar.gz 2760030 RMD160 b1e678045ed8f8c4047760799bc25f94083a76f3 SHA1 830de9e94c710eb38f2ca029de4166fd5672412c SHA256 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8 DIST b28ae681bae0.tar.gz 9000397 RMD160 0044bc2978f1eab6fb81b5181049f52a5447522d SHA1 4bbcfed2cec6e34bd6c3880d272be742c058c019 SHA256 dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64 DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee +DIST cff92704c4e0.tar.gz 4261719 RMD160 cf01828a98a6e3139ce33761b2b0f87b0ee6ad48 SHA1 043845bfc67f58e30ee68d9a47f33385ab67702b SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4 DIST icedtea-2.0.tar.gz 4516180 RMD160 91e75405713ead34c7831fd23ce66871bf888427 SHA1 aa2399f951044b82f5ecf7318a8358eb08413afb SHA256 2485d5e7807658bc3488c7e6d4720ef1261a31dd698ce2641f541119e0c2387a DIST icedtea6-1.10.4.tar.gz 6821129 RMD160 4de37c2086ddcebd2e48004aaa6035870394265c SHA1 b38818a80f2635e21457c6230031e5f7493e6acd SHA256 15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851 +DIST icedtea6-1.10.5.tar.gz 6831721 RMD160 24e3c22dafaba9aac21b84643127c2e92f1dc2dd SHA1 ba260275bcfbbbaff153c99b066d2f4ba7a12270 SHA256 7d0f9e833a42b6af308a34d432431f0528a2efa52d7837aa446d1c4c27161a0c +DIST icedtea6-1.11.tar.gz 6334120 RMD160 7037d10072335e1abba264c59713c378c47ba950 SHA1 ec53c683043716bd29611ecb3e9c6f2e89984e72 SHA256 e7d2bc08008de918ca54f8dcd1f8d75c7829948da6b1a9c06761c74a563c3eba DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186 +DIST jaxp144_03.zip 5964999 RMD160 3184f086991075779bcd663e55e24fec5cff1728 SHA1 28c441ccaa2883e6308cff0cf8b51c893da25ff7 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb +DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 RMD160 eef414a11dbcaafd2f830ca34227a869a1af1033 SHA1 e5e86fd4be4c58f8820893437e5e95cff083e757 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b +DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 diff --git a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch new file mode 100644 index 000000000000..804692510847 --- /dev/null +++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch @@ -0,0 +1,143 @@ +Author: Ralph Sennhaser + +The idea is to apply the pax markings before using a freshly built jdk. Be it +for running tests or building additonal vms or after bootstrap to build the +final jdk. + +There are currently two types of pax markings with the userspace utilities +chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A +third type based on xattrs is in development. + +diff --git a/Makefile.am b/Makefile.am +index 82ef261..e17fa5f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -421,7 +421,7 @@ else + ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch + endif + +-if HAS_PAX ++if WITH_PAX + ICEDTEA_PATCHES += patches/no-test_gamma.patch + endif + +@@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch + endif + endif + +-if !HAS_PAX ++if !WITH_PAX + ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch + endif + +@@ -1359,6 +1359,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ + $(ICEDTEA_ENV) \ + -C openjdk \ + $(ICEDTEA_BUILD_TARGET) ++ $(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext +@@ -1586,6 +1587,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ + $(ICEDTEA_ENV_ECJ) \ + -C openjdk-ecj/ \ + $(ICEDTEA_BUILD_TARGET) ++ $(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image + @echo "ecj-poured IcedTea is served:" \ + $(ECJ_BUILD_OUTPUT_DIR) + mkdir -p stamps +diff --git a/acinclude.m4 b/acinclude.m4 +index 503131c..e80b209 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1677,3 +1677,49 @@ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") + AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes") + AC_PROVIDE([$0])dnl + ]) ++ ++AC_DEFUN_ONCE([IT_WITH_PAX], ++[ ++ AC_MSG_CHECKING([for pax utility to use]) ++ AC_ARG_WITH([pax], ++ [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)], ++ [ ++ PAX_COMMAND=${withval} ++ if test "x${PAX_COMMAND}" = "xno"; then ++ PAX_COMMAND="not specified" ++ fi ++ ], ++ [ ++ PAX_COMMAND="not specified" ++ ]) ++ case "x${PAX_COMMAND}" in ++ xchpax) ++ case "${host_cpu}" in ++ i?86) ++ PAX_COMMAND_ARGS="-msp" ++ ;; ++ *) ++ PAX_COMMAND_ARGS="-m" ++ ;; ++ esac ++ ;; ++ xpaxctl) ++ case "${host_cpu}" in ++ i?86) ++ PAX_COMMAND_ARGS="-msp" ++ ;; ++ *) ++ PAX_COMMAND_ARGS="-m" ++ ;; ++ esac ++ ;; ++ *) ++ PAX_COMMAND="not specified" ++ PAX_COMMAND_ARGS="not specified" ++ ;; ++ esac ++ AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified") ++ AC_MSG_RESULT(${PAX_COMMAND}) ++ AC_SUBST(PAX_COMMAND) ++ AC_SUBST(PAX_COMMAND_ARGS) ++]) +diff --git a/configure.ac b/configure.ac +index 580840e..f37ef68 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,6 @@ IT_CHECK_GCC_VERSION + IT_CHECK_NUMBER_OF_PARALLEL_JOBS + IT_CP_SUPPORTS_REFLINK + IT_CAN_HARDLINK_TO_SOURCE_TREE +-IT_CHECK_FOR_PAX + IT_LOCATE_NSS + + # Use xvfb-run if found to run gui tests (check-jdk). +@@ -189,6 +188,9 @@ IT_WITH_TZDATA_DIR + IT_GETDTDTYPE_CHECK + IT_JAVAH + ++IT_WITH_PAX ++AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm]) ++ + dnl pkgconfig cannot be used to find these headers and libraries. + AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] + ,[AC_MSG_ERROR("CUPS headers were not found - +diff --git a/pax-mark-vm.in b/pax-mark-vm.in +new file mode 100644 +index 0000000..bdff735 +--- /dev/null ++++ b/pax-mark-vm.in +@@ -0,0 +1,13 @@ ++#!/bin/sh ++ ++# Taken from Gentoo's pax-utils.eclass ++list_paxables() { ++ file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//' ++} ++ ++if test "@PAX_COMMAND@" != "not specified"; then ++ for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do ++ echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}" ++ @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}" ++ done ++fi diff --git a/dev-java/icedtea/icedtea-6.1.10.5.ebuild b/dev-java/icedtea/icedtea-6.1.10.5.ebuild new file mode 100644 index 000000000000..9fe8de1f1dd4 --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.10.5.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.5.ebuild,v 1.1 2012/02/06 06:49:00 sera Exp $ +# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * +# ********************************************************* + +EAPI="4" + +inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx + +ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) +OPENJDK_BUILD="22" +OPENJDK_DATE="28_feb_2011" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" +JAXP_TARBALL="jaxp144_01.zip" +JAXWS_TARBALL="jdk6-jaxws-b20.zip" +JAF_TARBALL="jdk6-jaf-b20.zip" +HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz" +CACAO_TARBALL="c7bf150bfa46.tar.gz" # 17 Mar 2011 + +DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" +HOMEPAGE="http://icedtea.classpath.org" +SRC_URI=" + http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz + http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} + http://icedtea.classpath.org/download/drops/${JAF_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} + hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} ) + !amd64? ( !sparc? ( !x86? ( + http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} + ) ) )" + +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="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="+X +alsa cjk +cups debug doc examples +hs20 javascript +jbootstrap +nsplugin + +nss pax_kernel pulseaudio +source systemtap test +webstart" + +# Ideally the following were optional at build time. +ALSA_COMMON_DEP=" + >=media-libs/alsa-lib-1.0" +CUPS_COMMON_DEP=" + >=net-print/cups-1.2.12" +X_COMMON_DEP=" + dev-libs/glib + >=media-libs/freetype-2.3.5 + >=x11-libs/gtk+-2.8:2 + >=x11-libs/libX11-1.1.3 + >=x11-libs/libXext-1.1.1 + >=x11-libs/libXi-1.1.3 + >=x11-libs/libXrender-0.9.4 + >=x11-libs/libXtst-1.0.3" +X_DEPEND=" + >=x11-libs/libXau-1.0.3 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXinerama-1.0.2 + >=x11-libs/libXp-1.0.0 + x11-proto/inputproto + >=x11-proto/xextproto-7.1.1 + x11-proto/xineramaproto + x11-proto/xproto" + +COMMON_DEP=" + >=media-libs/giflib-4.1.6 + >=media-libs/libpng-1.2 + >=sys-libs/zlib-1.2.3 + virtual/jpeg + javascript? ( dev-java/rhino:1.6 ) + nss? ( >=dev-libs/nss-3.12.5-r1 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + systemtap? ( >=dev-util/systemtap-1 )" + +# media-fonts/lklug needs ppc ppc64 keywords +RDEPEND="${COMMON_DEP} + !dev-java/icedtea6 + X? ( + ${X_COMMON_DEP} + media-fonts/dejavu + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + !ppc? ( !ppc64? ( media-fonts/lklug ) ) + media-fonts/lohit-fonts + media-fonts/sazanami + ) + ) + alsa? ( ${ALSA_COMMON_DEP} ) + cups? ( ${CUPS_COMMON_DEP} )" + +# Only ant-core-1.7.1-r2 and later properly respect environment variables. +# xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly) +# ca-certificates, perl and openssl are used for the cacerts keystore generation +# xext headers have two variants depending on version - bug #288855 +# !eclipse-ecj-3.7 - bug #392587 +# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} + || ( + >=dev-java/gcj-jdk-4.3 + dev-java/icedtea-bin:6 + dev-java/icedtea:6 + ) + app-arch/cpio + app-arch/zip + app-misc/ca-certificates + >=dev-java/ant-core-1.7.1-r2 + dev-java/ant-nodeps + >=dev-java/xalan-2.7.0:0 + >=dev-java/xerces-2.9.1:2 + dev-lang/perl + dev-libs/openssl + dev-util/pkgconfig + sys-apps/lsb-release + || ( >=sys-devel/autoconf-2.65:2.5 dev-java/icedtea-6.1.10.4:6"; then + JAVA_PKG_FORCE_VM="icedtea-6" + elif has_version "=dev-java/icedtea-bin-6.1.10.4:6"; then + JAVA_PKG_FORCE_VM="icedtea-bin-6" + elif has_version dev-java/gcj-jdk; then + JAVA_PKG_FORCE_VM="gcj-jdk" + else + die "Unable to find a supported VM for building" + fi + + einfo "Forced vm ${JAVA_PKG_FORCE_VM}" + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack ${ICEDTEA_PKG}.tar.gz +} + +java_prepare() { + # icedtea doesn't like some locales. #330433 #389717 + export LANG="C" LC_ALL="C" + + epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 + eautoreconf +} + +src_configure() { + local config bootstrap + local vm=$(java-pkg_get-current-vm) + + # IcedTea6 can't be built using IcedTea7; its class files are too new + if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then + use jbootstrap && bootstrap=yes + elif has "${vm}" gcj-jdk; then + # gcj-jdk ensures ecj is present. + use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap" + bootstrap=yes + else + eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}." + die "Install a GNU Classpath JDK (gcj-jdk)" + fi + + if [[ ${bootstrap} ]]; then + config="${config} --enable-bootstrap" + + # icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337 + local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" + # Don't use eclipse-ecj-3.7 #392587 + local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* ) + ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" ) + if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then + ecj_jar="${ecj_jar%/lib/ecj.jar}" + ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap" + ewarn "Found usable: ${ecj_all[@]##*/}" + ewarn "using ${ecj_all##*/} instead" + ecj_jar="${ecj_all}"/lib/ecj.jar + fi + config="${config} --with-ecj-jar=${ecj_jar}" + else + config="${config} --disable-bootstrap" + fi + + # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... + # Otherwise use CACAO + if ! has "${ARCH}" amd64 sparc x86; then + config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}" + fi + + # OpenJDK-specific parallelism support. Bug #389791, #337827 + # Implementation modified from waf-utils.eclass + # Note that "-j" is converted to "-j1" as the system doesn't support --load-average + local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) + config="${config} --with-parallel-jobs=${procs}"; + einfo "Configuring using --with-parallel-jobs=${procs}" + + if use javascript ; then + config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" + else + config="${config} --without-rhino" + fi + + if use hs20 ; then + config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}" + fi + + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + econf ${config} \ + --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ + --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \ + --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \ + --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \ + --with-jdk-home="$(java-config -O)" \ + --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ + $(use_enable !debug optimizations) \ + $(use_enable doc docs) \ + $(use_enable nss) \ + $(use_enable pulseaudio pulse-java) \ + $(use_enable systemtap) \ + $(use_with pax_kernel pax paxctl) +} + +src_compile() { + # Would use GENTOO_VM otherwise. + export ANT_RESPECT_JAVA_HOME=TRUE + + # ant -diagnostics in Ant 1.8.0 fails without xerces-2 and xalan + # Load the least that's needed to avoid possible classpath collisions. + export ANT_TASKS="xerces-2 xalan ant-nodeps" + + emake +} + +src_test() { + # Use Xvfb for tests + unset DISPLAY + + Xemake -j1 check +} + +src_install() { + local dest="/usr/$(get_libdir)/icedtea${SLOT}" + local ddest="${ED}/${dest}" + dodir "${dest}" + + dodoc README NEWS AUTHORS THANKYOU + dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} + + cd openjdk.build/j2sdk-image || die + + # Ensures HeadlessGraphicsEnvironment is used. + if ! use X; then + rm -r jre/lib/$(get_system_arch)/xawt || die + fi + + # doins can't handle symlinks. + cp -vRP bin include jre lib man "${ddest}" || die + + dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README + + if use doc; then + # java-pkg_dohtml needed for package-list #302654 + java-pkg_dohtml -r ../docs/* || die + fi + + if use examples; then + dodir "${dest}/share"; + cp -vRP demo sample "${ddest}/share/" || die + fi + + if use source; then + cp src.zip "${ddest}" || die + fi + + # Fix the permissions. + find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + + # Needs to be done before generating cacerts + java-vm_set-pax-markings "${ddest}" + + # We need to generate keystore - bug #273306 + einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" + mkdir "${T}/certgen" && cd "${T}/certgen" || die + cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die + for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do + openssl x509 -text -in "${c}" >> all.crt || die + done + ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die + cp -vRP cacerts "${ddest}/jre/lib/security/" || die + chmod 644 "${ddest}/jre/lib/security/cacerts" || die + + # Bug 390663 + cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die + eprefixify "${T}"/fontconfig.Gentoo.properties + insinto "${dest}"/jre/lib + doins "${T}"/fontconfig.Gentoo.properties + + set_java_env "${FILESDIR}/icedtea.env" + if ! use X || ! use alsa || ! use cups; then + java-vm_revdep-mask "${dest}" + fi +} + +pkg_preinst() { + if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then + # portage would preserve the symlink otherwise, related to bug #384397 + rm -f "${EROOT}/usr/lib/jvm/icedtea6" + elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" + elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" + elog "If you had icedtea6 as system VM, the change should be automatic, however" + elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" + elog "and the same holds for any user VM settings. Sorry for the inconvenience." + fi +} diff --git a/dev-java/icedtea/icedtea-6.1.11.ebuild b/dev-java/icedtea/icedtea-6.1.11.ebuild new file mode 100644 index 000000000000..0c735d21b562 --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.11.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.ebuild,v 1.1 2012/02/06 06:49:00 sera Exp $ +# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * +# ********************************************************* + +EAPI="4" + +inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx + +ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) +OPENJDK_BUILD="24" +OPENJDK_DATE="14_nov_2011" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" +JAXP_TARBALL="jaxp144_03.zip" +JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip" +JAF_TARBALL="jdk6-jaf-b20.zip" +CACAO_TARBALL="cff92704c4e0.tar.gz" + +DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" +HOMEPAGE="http://icedtea.classpath.org" +SRC_URI=" + http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz + http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} + http://icedtea.classpath.org/download/drops/${JAF_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} + !amd64? ( !sparc? ( !x86? ( + http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} + ) ) )" + +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="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin + +nss pax_kernel pulseaudio +source systemtap test +webstart" + +# Ideally the following were optional at build time. +ALSA_COMMON_DEP=" + >=media-libs/alsa-lib-1.0" +CUPS_COMMON_DEP=" + >=net-print/cups-1.2.12" +X_COMMON_DEP=" + dev-libs/glib + >=media-libs/freetype-2.3.5 + >=x11-libs/gtk+-2.8:2 + >=x11-libs/libX11-1.1.3 + >=x11-libs/libXext-1.1.1 + >=x11-libs/libXi-1.1.3 + >=x11-libs/libXrender-0.9.4 + >=x11-libs/libXtst-1.0.3" +X_DEPEND=" + >=x11-libs/libXau-1.0.3 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXinerama-1.0.2 + >=x11-libs/libXp-1.0.0 + x11-proto/inputproto + >=x11-proto/xextproto-7.1.1 + x11-proto/xineramaproto + x11-proto/xproto" + +COMMON_DEP=" + >=media-libs/giflib-4.1.6 + >=media-libs/libpng-1.2 + >=sys-libs/zlib-1.2.3 + virtual/jpeg + javascript? ( dev-java/rhino:1.6 ) + nss? ( >=dev-libs/nss-3.12.5-r1 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) + systemtap? ( >=dev-util/systemtap-1 )" + +# media-fonts/lklug needs ppc ppc64 keywords +RDEPEND="${COMMON_DEP} + !dev-java/icedtea6 + X? ( + ${X_COMMON_DEP} + media-fonts/dejavu + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + !ppc? ( !ppc64? ( media-fonts/lklug ) ) + media-fonts/lohit-fonts + media-fonts/sazanami + ) + ) + alsa? ( ${ALSA_COMMON_DEP} ) + cups? ( ${CUPS_COMMON_DEP} )" + +# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. +# ca-certificates, perl and openssl are used for the cacerts keystore generation +# xext headers have two variants depending on version - bug #288855 +# !eclipse-ecj-3.7 - bug #392587 +# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} + || ( + >=dev-java/gcj-jdk-4.3 + dev-java/icedtea-bin:6 + dev-java/icedtea:6 + ) + app-arch/cpio + app-arch/zip + app-misc/ca-certificates + >=dev-java/ant-core-1.8.1 + dev-java/ant-nodeps + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + dev-util/pkgconfig + sys-apps/lsb-release + || ( >=sys-devel/autoconf-2.65:2.5 dev-java/icedtea-6.1.10.4:6"; then + JAVA_PKG_FORCE_VM="icedtea-6" + elif has_version "=dev-java/icedtea-bin-6.1.10.4:6"; then + JAVA_PKG_FORCE_VM="icedtea-bin-6" + elif has_version dev-java/gcj-jdk; then + JAVA_PKG_FORCE_VM="gcj-jdk" + else + die "Unable to find a supported VM for building" + fi + + einfo "Forced vm ${JAVA_PKG_FORCE_VM}" + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack ${ICEDTEA_PKG}.tar.gz +} + +java_prepare() { + # icedtea doesn't like some locales. #330433 #389717 + export LANG="C" LC_ALL="C" + + epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 + eautoreconf +} + +src_configure() { + local config bootstrap + local vm=$(java-pkg_get-current-vm) + + # IcedTea6 can't be built using IcedTea7; its class files are too new + if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then + use jbootstrap && bootstrap=yes + elif has "${vm}" gcj-jdk; then + # gcj-jdk ensures ecj is present. + use jbootstrap || einfo "bootstrap forced on for ${vm}, ignoring use jbootstrap" + bootstrap=yes + else + eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}." + die "Install a GNU Classpath JDK (gcj-jdk)" + fi + + if [[ ${bootstrap} ]]; then + config="${config} --enable-bootstrap" + + # icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337 + local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" + # Don't use eclipse-ecj-3.7 #392587 + local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* ) + ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" ) + if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then + ecj_jar="${ecj_jar%/lib/ecj.jar}" + ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap" + ewarn "Found usable: ${ecj_all[@]##*/}" + ewarn "using ${ecj_all##*/} instead" + ecj_jar="${ecj_all}"/lib/ecj.jar + fi + config="${config} --with-ecj-jar=${ecj_jar}" + else + config="${config} --disable-bootstrap" + fi + + # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... + # Otherwise use CACAO + if ! has "${ARCH}" amd64 sparc x86; then + config="${config} --enable-cacao --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}" + fi + + # OpenJDK-specific parallelism support. Bug #389791, #337827 + # Implementation modified from waf-utils.eclass + # Note that "-j" is converted to "-j1" as the system doesn't support --load-average + local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) + config="${config} --with-parallel-jobs=${procs}"; + einfo "Configuring using --with-parallel-jobs=${procs}" + + if use javascript ; then + config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)" + else + config="${config} --without-rhino" + fi + + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + econf ${config} \ + --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ + --with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \ + --with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \ + --with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \ + --with-jdk-home="$(java-config -O)" \ + --with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \ + $(use_enable !debug optimizations) \ + $(use_enable doc docs) \ + $(use_enable nss) \ + $(use_enable pulseaudio pulse-java) \ + $(use_enable systemtap) \ + $(use_with pax_kernel pax paxctl) +} + +src_compile() { + # Would use GENTOO_VM otherwise. + export ANT_RESPECT_JAVA_HOME=TRUE + + # Load the least that's needed to avoid possible classpath collisions. + export ANT_TASKS="ant-nodeps" + + emake +} + +src_test() { + # Use Xvfb for tests + unset DISPLAY + + Xemake -j1 check +} + +src_install() { + local dest="/usr/$(get_libdir)/icedtea${SLOT}" + local ddest="${ED}/${dest}" + dodir "${dest}" + + dodoc README NEWS AUTHORS THANKYOU + dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} + + cd openjdk.build/j2sdk-image || die + + # Ensures HeadlessGraphicsEnvironment is used. + if ! use X; then + rm -r jre/lib/$(get_system_arch)/xawt || die + fi + + # doins can't handle symlinks. + cp -vRP bin include jre lib man "${ddest}" || die + + dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README + + if use doc; then + # java-pkg_dohtml needed for package-list #302654 + java-pkg_dohtml -r ../docs/* || die + fi + + if use examples; then + dodir "${dest}/share"; + cp -vRP demo sample "${ddest}/share/" || die + fi + + if use source; then + cp src.zip "${ddest}" || die + fi + + # Fix the permissions. + find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + + # Needs to be done before generating cacerts + java-vm_set-pax-markings "${ddest}" + + # We need to generate keystore - bug #273306 + einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" + mkdir "${T}/certgen" && cd "${T}/certgen" || die + cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die + for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do + openssl x509 -text -in "${c}" >> all.crt || die + done + ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die + cp -vRP cacerts "${ddest}/jre/lib/security/" || die + chmod 644 "${ddest}/jre/lib/security/cacerts" || die + + # Bug 390663 + cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die + eprefixify "${T}"/fontconfig.Gentoo.properties + insinto "${dest}"/jre/lib + doins "${T}"/fontconfig.Gentoo.properties + + set_java_env "${FILESDIR}/icedtea.env" + if ! use X || ! use alsa || ! use cups; then + java-vm_revdep-mask "${dest}" + fi +} + +pkg_preinst() { + if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then + # portage would preserve the symlink otherwise, related to bug #384397 + rm -f "${EROOT}/usr/lib/jvm/icedtea6" + elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" + elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" + elog "If you had icedtea6 as system VM, the change should be automatic, however" + elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" + elog "and the same holds for any user VM settings. Sorry for the inconvenience." + fi +} diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 678065f4c387..f872adbcc3b8 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -14,17 +14,19 @@ 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. + Make X buildtime-only depenency. + Make alsa buildtime-only dependency. Build additionally the CACAO virtual machine. + Make CUPS build-only dependency. Use the new version of HotSpot (20). Build additionally the JamVM virtual machine. If possible, recompile the final IcedTea executables with itself. Enable backport of NIO2 to OpenJDK6. Enable NSS security provider support. Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled. - + For building when running a PaX enabled kernel. Enable SystemTap probes in HotSpot. Enable Web Start support (via NetX). Enable support for using XRender with the AWT libraries. - Enable the zero assembler port of HotSpot. diff --git a/media-libs/aalib/aalib-1.4_rc5-r1.ebuild b/media-libs/aalib/aalib-1.4_rc5-r1.ebuild new file mode 100644 index 000000000000..d10c67f397e0 --- /dev/null +++ b/media-libs/aalib/aalib-1.4_rc5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5-r1.ebuild,v 1.1 2012/02/06 06:59:47 slyfox Exp $ + +inherit eutils libtool toolchain-funcs autotools + +MY_P="${P/_/}" +S="${WORKDIR}/${PN}-1.4.0" + +DESCRIPTION="A ASCII-Graphics Library" +HOMEPAGE="http://aa-project.sourceforge.net/aalib/" +SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="X slang gpm" + +RDEPEND="X? ( x11-libs/libX11 ) + slang? ( >=sys-libs/slang-1.4.2 )" +DEPEND="${RDEPEND} + >=sys-libs/ncurses-5.1 + X? ( x11-proto/xproto ) + gpm? ( sys-libs/gpm )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch + epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch + epatch "${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267 + + sed -i -e 's:#include :#include :g' "${S}"/src/*.c + + # Fix bug #165617. + use gpm && sed -i \ + 's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in" + + eautoreconf +} + +src_compile() { + econf \ + $(use_with slang slang-driver) \ + $(use_with X x11-driver) \ + || die + emake CC="$(tc-getCC)" || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc ANNOUNCE AUTHORS ChangeLog NEWS README* +} diff --git a/media-libs/aalib/files/aalib-1.4_rc5-fix-protos.patch b/media-libs/aalib/files/aalib-1.4_rc5-fix-protos.patch new file mode 100644 index 000000000000..b22738a25c6c --- /dev/null +++ b/media-libs/aalib/files/aalib-1.4_rc5-fix-protos.patch @@ -0,0 +1,56 @@ +fix missing protos + + * QA Notice: Package triggers severe warnings which indicate that it + * may exhibit random runtime failures. + * aainfo.c:12:2: warning: incompatible implicit declaration of built-in function 'exit' + * aainfo.c:17:2: warning: incompatible implicit declaration of built-in function 'exit' + * aatest.c:8:5: warning: incompatible implicit declaration of built-in function 'strcpy' + * aatest.c:11:2: warning: incompatible implicit declaration of built-in function 'exit' + * aatest.c:16:2: warning: incompatible implicit declaration of built-in function 'exit' + * aatest.c:21:2: warning: incompatible implicit declaration of built-in function 'exit' + * aafire.c:55:7: warning: incompatible implicit declaration of built-in function 'exit' + * aafire.c:68:3: warning: incompatible implicit declaration of built-in function 'exit' + * aafire.c:154:7: warning: incompatible implicit declaration of built-in function 'exit' + * aasavefont.c:10:2: warning: incompatible implicit declaration of built-in function 'exit' + +Gentoo-bug: http://bugs.gentoo.org/224267 +Reported-by: Peter Hüwe +diff --git a/src/aafire.c b/src/aafire.c +index 4f36149..5e41237 100644 +--- a/src/aafire.c ++++ b/src/aafire.c +@@ -1,4 +1,5 @@ + #include ++#include /* exit() */ + #include "aalib.h" + + #define XSIZ aa_imgwidth(context) +diff --git a/src/aainfo.c b/src/aainfo.c +index d3f6d50..e24082d 100644 +--- a/src/aainfo.c ++++ b/src/aainfo.c +@@ -1,4 +1,4 @@ +- ++#include /* exit() */ + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff --git a/src/aasavefont.c b/src/aasavefont.c +index b00e1e6..16591e8 100644 +--- a/src/aasavefont.c ++++ b/src/aasavefont.c +@@ -1,3 +1,4 @@ ++#include /* exit() */ + #include "aalib.h" + int main(int argc, char **argv) + { +diff --git a/src/aatest.c b/src/aatest.c +index 9816f5d..ed0c2da 100644 +--- a/src/aatest.c ++++ b/src/aatest.c +@@ -1,3 +1,5 @@ ++#include /* strcpy() */ ++#include /* exit() */ + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/media-libs/aalib/metadata.xml b/media-libs/aalib/metadata.xml index 1cadc2e4ec21..4d27789871de 100644 --- a/media-libs/aalib/metadata.xml +++ b/media-libs/aalib/metadata.xml @@ -1,8 +1,12 @@ -video - - media-video@gentoo.org - + video + + media-video@gentoo.org + + + slyfox@gentoo.org + Sergei Trofimovich + diff --git a/metadata/cache/app-misc/hatools-2.00 b/metadata/cache/app-misc/hatools-2.00 deleted file mode 100644 index d6e88eecf5fc..000000000000 --- a/metadata/cache/app-misc/hatools-2.00 +++ /dev/null @@ -1,22 +0,0 @@ - - -0 -http://www.fatalmind.com/software/hatools/hatools-2.00.tar.gz - -http://www.fatalmind.com/software/hatools/ -GPL-2 -High availability environment tools for shell scripting -~mips ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris - - - - - - - -install - - - - - diff --git a/metadata/cache/dev-java/icedtea-6.1.10.5 b/metadata/cache/dev-java/icedtea-6.1.10.5 new file mode 100644 index 000000000000..83e9388aedd6 --- /dev/null +++ b/metadata/cache/dev-java/icedtea-6.1.10.5 @@ -0,0 +1,22 @@ +>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.7.1-r2 dev-java/ant-nodeps >=dev-java/xalan-2.7.0:0 >=dev-java/xerces-2.9.1:2 dev-lang/perl dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 =x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( =sys-devel/autoconf-2.61 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* +6 +http://icedtea.classpath.org/download/source/icedtea6-1.10.5.tar.gz http://download.java.net/openjdk/jdk6/promoted/b22/openjdk-6-src-b22-28_feb_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_01.zip hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/f0f676c5a2c6.tar.gz ) !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/c7bf150bfa46.tar.gz ) ) ) + +http://icedtea.classpath.org +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 +A harness to build OpenJDK using Free Software build tools and dependencies +~amd64 ~ppc ~ppc64 ~x86 +autotools eutils fdo-mime java-pkg-2 java-utils-2 java-vm-2 libtool multilib pax-utils portability prefix toolchain-funcs user versionator virtualx ++X +alsa cjk +cups debug doc examples +hs20 javascript +jbootstrap +nsplugin +nss pax_kernel pulseaudio +source systemtap test +webstart elibc_FreeBSD test + +webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[nsplugin] ) + +4 + +compile configure install postinst postrm preinst prepare prerm setup test unpack + + + + + diff --git a/metadata/cache/dev-java/icedtea-6.1.11 b/metadata/cache/dev-java/icedtea-6.1.11 new file mode 100644 index 000000000000..2d7c3a47357f --- /dev/null +++ b/metadata/cache/dev-java/icedtea-6.1.11 @@ -0,0 +1,22 @@ +>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 =x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( =sys-devel/autoconf-2.61 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* +6 +http://icedtea.classpath.org/download/source/icedtea6-1.11.tar.gz http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_03.zip !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz ) ) ) + +http://icedtea.classpath.org +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 +A harness to build OpenJDK using Free Software build tools and dependencies +~amd64 ~ppc ~ppc64 ~x86 +autotools eutils fdo-mime java-pkg-2 java-utils-2 java-vm-2 libtool multilib pax-utils portability prefix toolchain-funcs user versionator virtualx ++X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin +nss pax_kernel pulseaudio +source systemtap test +webstart elibc_FreeBSD test + +webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[nsplugin] ) + +4 + +compile configure install postinst postrm preinst prepare prerm setup test unpack + + + + + diff --git a/metadata/cache/media-libs/aalib-1.4_rc5-r1 b/metadata/cache/media-libs/aalib-1.4_rc5-r1 new file mode 100644 index 000000000000..810c052ba949 --- /dev/null +++ b/metadata/cache/media-libs/aalib-1.4_rc5-r1 @@ -0,0 +1,22 @@ +X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 ) >=sys-libs/ncurses-5.1 X? ( x11-proto/xproto ) gpm? ( sys-libs/gpm ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool +X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 ) +0 +mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz + +http://aa-project.sourceforge.net/aalib/ +GPL-2 +A ASCII-Graphics Library +~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +autotools eutils libtool multilib portability toolchain-funcs user +X slang gpm + + + + + +compile install unpack + + + + + diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index ad8a0332717a..94a90e54e663 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Mon, 06 Feb 2012 06:36:47 +0000 +Mon, 06 Feb 2012 08:36:47 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index ad8a0332717a..94a90e54e663 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 06 Feb 2012 06:36:47 +0000 +Mon, 06 Feb 2012 08:36:47 +0000 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index ee4290b21859..b5c41d1393c1 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Mon, 06 Feb 2012 06:36:49 +0000 +Mon, 06 Feb 2012 08:36:48 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 7652d0923394..0849ccabc83c 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Mon Feb 6 06:36:47 UTC 2012 +Mon Feb 6 08:36:47 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index d1ee84a81c44..e49b33f2d678 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Mon, 06 Feb 2012 06:45:01 +0000 +Mon, 06 Feb 2012 08:45:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 9f38b29b251c..b51b59f8ca19 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1328510101 Mon Feb 6 06:35:01 2012 UTC +1328517301 Mon Feb 6 08:35:01 2012 UTC diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 7276aec2f898..194883facfb7 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1080,17 +1080,20 @@ dev-java/gnu-classpath:gtk - Build with Gtk+ AWT peers dev-java/gnu-classpath:qt4 - Build with Qt4 AWT peers dev-java/gnu-classpath:xml - Build with native XML backend dev-java/ibm-jdk-bin:javacomm - Enable Java Communications API support +dev-java/icedtea:X - Make X buildtime-only depenency. +dev-java/icedtea:alsa - Make alsa buildtime-only dependency. dev-java/icedtea:cacao - Build additionally the CACAO virtual machine. +dev-java/icedtea:cups - Make CUPS build-only dependency. dev-java/icedtea:hs20 - Use the new version of HotSpot (20). dev-java/icedtea:jamvm - Build additionally the JamVM virtual machine. dev-java/icedtea:jbootstrap - If possible, recompile the final IcedTea executables with itself. dev-java/icedtea:nio2 - Enable backport of NIO2 to OpenJDK6. dev-java/icedtea:nsplugin - Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled. dev-java/icedtea:nss - Enable NSS security provider support. +dev-java/icedtea:pax_kernel - For building when running a PaX enabled kernel. dev-java/icedtea:systemtap - Enable SystemTap probes in HotSpot. dev-java/icedtea:webstart - Enable Web Start support (via NetX). dev-java/icedtea:xrender - Enable support for using XRender with the AWT libraries. -dev-java/icedtea:zero - Enable the zero assembler port of HotSpot. dev-java/icedtea-web:javascript - Enable support for using proxy auto config (PAC) files. dev-java/icedtea-web:nsplugin - Enable the browser plugin (NPPlugin). dev-java/itext:rtf - Build and provide libraries for rich text format diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 1bc5e8c1c04e..181ceeac1822 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.29 2012/01/15 00:35:11 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.30 2012/02/06 08:32:32 robbat2 Exp $ # genkernel-9999 -> latest Git branch "master" # genkernel-VERSION -> normal genkernel release @@ -63,7 +63,10 @@ IUSE="ibm selinux" DEPEND="sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )" -RDEPEND="${DEPEND} app-arch/cpio" +RDEPEND="${DEPEND} + app-arch/cpio + app-misc/pax-utils" +# pax-utils is used for lddtree if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc"