Sync with portage [Wed Sep 26 23:09:44 MSK 2012].

mhiretskiy
root 12 years ago
parent 5134360aed
commit 4a3ba1ad8e

@ -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/app-admin/gam-server/gam-server-0.1.10-r1.ebuild,v 1.8 2012/08/19 19:08:13 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10-r1.ebuild,v 1.9 2012/09/26 11:12:43 ssuominen Exp $
EAPI="3"
GNOME_ORG_MODULE="gamin"
@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="debug kernel_linux"
RDEPEND=">=dev-libs/glib-2:2

@ -1,76 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.13 2012/05/05 14:20:43 ssuominen Exp $
EAPI="3"
GNOME_ORG_MODULE="gamin"
inherit autotools eutils flag-o-matic libtool multilib python gnome.org
DESCRIPTION="Library providing the FAM File Alteration Monitor API"
HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
SRC_URI="${SRC_URI}
mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="debug kernel_linux"
RDEPEND=">=dev-libs/glib-2:2
>=dev-libs/libgamin-0.1.10
!app-admin/fam
!<app-admin/gamin-0.1.10"
DEPEND="${RDEPEND}"
#S=${WORKDIR}/${MY_P}
src_prepare() {
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
# Fix compile warnings; bug #188923
epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
# Fix file-collision due to shared library, upstream bug #530635
epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
# Fix compilation with latest glib, bug #382783
epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
# Fix crosscompilation issues, bug #267604
epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
# Enable linux specific features on armel, upstream bug #588338
epatch "${FILESDIR}/${P}-armel-features.patch"
# Drop DEPRECATED flags
sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
# autoconf is required as the user-cflags patch modifies configure.in
# however, elibtoolize is also required, so when the above patch is
# removed, replace the following call with a call to elibtoolize
AT_M4DIR="${WORKDIR}" eautoreconf
}
src_configure() {
# fixes bug 225403
#append-flags "-D_GNU_SOURCE"
if ! has_version virtual/pkgconfig; then
export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
export DAEMON_LIBS="-lglib-2.0"
fi
econf \
--disable-debug \
--disable-libgamin \
--without-python \
$(use_enable kernel_linux inotify) \
$(use_enable debug debug-api)
}
src_install() {
emake DESTDIR="${D}" install || die
}

@ -0,0 +1,100 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/keepass/keepass-2.20-r1.ebuild,v 1.1 2012/09/26 13:34:34 kensington Exp $
EAPI=4
inherit eutils fdo-mime gnome2-utils mono multilib
MY_PN="KeePass"
DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
HOMEPAGE="http://keepass.info/"
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="aot"
COMMON_DEPEND=">=dev-lang/mono-2.10.5"
RDEPEND="${COMMON_DEPEND}
dev-dotnet/libgdiplus[cairo]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip"
S=${WORKDIR}
src_prepare() {
# Remove Windows-specific things
pushd Build || die
. PrepMonoDev.sh || die
popd || die
# KeePass looks for some XSL files in the same folder as the executable,
# we prefer to have it in /usr/share/KeePass
epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
}
src_compile() {
# Build with Release target
xbuild /target:KeePass /property:Configuration=Release || die
# Run Ahead Of Time compiler on the binary
if use aot; then
cp Ext/KeePass.exe.config Build/KeePass/Release/
mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
fi
}
src_install() {
# Wrapper script to launch mono
make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
# Some XSL files
insinto /usr/share/${PN}/XSL
doins Ext/XSL/*
insinto /usr/$(get_libdir)/${PN}/
exeinto /usr/$(get_libdir)/${PN}/
doins Ext/KeePass.exe.config
# Default configuration, simply says to use user-specific configuration
doins Ext/KeePass.config.xml
# The actual executable
doexe Build/KeePass/Release/KeePass.exe
# Copy the AOT compilation result
if use aot; then
doexe Build/KeePass/Release/KeePass.exe.so
fi
# Prepare the icons
newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
# Create a desktop entry and associate it with the KeePass mime type
make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
# MIME descriptor for .kdbx files
insinto /usr/share/mime/packages/
doins "${FILESDIR}/${PN}.xml"
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
elog "Optional dependencies:"
elog " x11-misc/xdotool (enables autotype)"
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
}

@ -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/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild,v 1.6 2012/08/05 11:02:50 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild,v 1.7 2012/09/26 11:11:08 ssuominen Exp $
EAPI=4
inherit eutils gnome2-utils toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
KEYWORDS="amd64 ppc x86"
IUSE="debug nls"
dvdi_langs="cs de it pt_BR ru sv"

@ -1,2 +1 @@
DIST 134003-kencfs-1.1.tar.gz 77254 SHA256 6e40dd54657fd4ac0a51b938e1fb825c3b3a9323aa8ce19012ec6d286de3a0e2 SHA512 02201a9cb5bd302f3f272a88a50892fb5d26215ed804062111b3fff2e516a17b634f9822f0eab6d3c5de996e5a24bcfc97fc7c09b0e456fa92bdfb852e94573a WHIRLPOOL eeb4c575e332e01f91272c26d20c03da222c398c71565e3dcf59397ad536e26b8894e022171d9e5bb3363f7a8917f908d05593fd0848035b4c200ea7e94dcb28
DIST 134003-kencfs-1.2.tar.gz 79623 SHA256 0769d0e5500edbdd90886af4dc5e668c37aee0ba9c4e29e5202ce05169f10a42 SHA512 f94a90bd20475c913910dfcdb1b1d229bddb84dc0d478e04a35af3b0ad461bb29ec45ebea8c76a5899c131f80b16c7f0923da58dd2085b1da272bb6d29dbd203 WHIRLPOOL eeb9229eebf175259ee44c37204b17e1de37a291cbb27e52592bdc5a8394a6644f5a6d81b3ee462a50a33d9aa84faa6c01539de6a2b1d8e85e12fc8ca8d4b87d

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.1.ebuild,v 1.1 2011/09/25 15:17:26 dilfridge Exp $
EAPI=4
inherit qt4-r2
DESCRIPTION="GUI frontend for encfs"
HOMEPAGE="http://kde-apps.org/content/show.php?content=134003"
SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
IUSE=""
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="kde-base/kdelibs
x11-libs/qt-gui:4"
RDEPEND="${DEPEND}
sys-fs/encfs"
PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )

@ -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/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.8 2012/09/25 19:12:18 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.9 2012/09/26 15:53:37 xarthisius Exp $
EAPI=4
WANT_AUTOMAKE="none"
@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"

@ -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/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.8 2012/09/25 19:12:18 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.9 2012/09/26 15:53:37 xarthisius Exp $
EAPI=4
@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"

@ -1 +1,2 @@
DIST kile-2.1.2.tar.bz2 4858519 SHA256 82d1e405e0b2aa8125cdc2dbf5bbfbb20488515bde763bf7b7cde69e6575a55b SHA512 b6963f4d69547a534d2382027900cf4493784dcb7ffdb2b0836785eca1714b96dfb76598414221addf7e42667204ab702cbf5992491fc8cdc3b3c9dbdcd770e5 WHIRLPOOL 6152b695653d46557d97a27cfc4e99f22af1f50509d3c17334fb5c11d73fa9ce2d8e8f57ce9a91a63ca6606d240834b8fa42ea92e46080333a48f23d320ccaa6
DIST kile-2.1.3.tar.bz2 4911212 SHA256 a063ec4fca1ba5a063ffdcdb538967af35ade01d71fa7db6ea691ba2cf88cea2 SHA512 820cb5e2579f243ce87409aa4d483a58b0a2cf1d86bff72dd12264570bfe72e7819c88aa4333080f8281e54e8315e2c11f961b41f13a6215913dfa4f7bd3feda WHIRLPOOL 1bc56ad82c72807fcf93ffeb4dbd4222a7660c00e852378a9007c7aa4a96a5130497ca23815a74c92f631fcb261dbf35f7d5453e849f6fb82c9f3c802058ab31

@ -0,0 +1,60 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-2.1.3.ebuild,v 1.1 2012/09/26 12:36:19 johu Exp $
EAPI=4
if [[ ${PV} != *9999* ]]; then
KDE_DOC_DIRS="doc"
KDE_HANDBOOK="optional"
MY_P=${P/_beta/b}
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
else
EGIT_REPO_URI="http://anongit.kde.org/kile"
GIT_ECLASS="git"
fi
inherit kde4-base ${GIT_ECLASS}
DESCRIPTION="A Latex Editor and TeX shell for KDE"
HOMEPAGE="http://kile.sourceforge.net/"
LICENSE="FDL-1.2 GPL-2"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
SLOT="4"
IUSE="debug +pdf +png"
DEPEND="
x11-misc/shared-mime-info
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdebase-data)
|| (
$(add_kdebase_dep okular 'pdf?,postscript')
app-text/acroread
)
virtual/latex-base
virtual/tex-base
pdf? (
app-text/dvipdfmx
app-text/ghostscript-gpl
)
png? (
app-text/dvipng
media-gfx/imagemagick[png]
)
"
S=${WORKDIR}/${MY_P}
DOCS=( kile-remote-control.txt )
src_prepare() {
kde4-base_src_prepare
# I know upstream wants to help us but it doesn't work..
sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-i CMakeLists.txt || die
[[ ${PV} != *9999* ]] && { use handbook || rm -fr doc ; }
}

@ -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/app-editors/nano/nano-2.3.1-r2.ebuild,v 1.4 2012/09/26 02:50:15 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r2.ebuild,v 1.6 2012/09/26 11:16:48 ago Exp $
EAPI="3"
@ -18,7 +18,7 @@ HOMEPAGE="http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-g
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug justify +magic minimal ncurses nls slang spell unicode"
RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]

@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/doctest-mode/doctest-mode-0.4.ebuild,v 1.8 2009/09/06 16:33:20 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/doctest-mode/doctest-mode-0.4.ebuild,v 1.9 2012/09/26 05:33:15 ulm Exp $
EAPI=2
@ -10,7 +10,7 @@ DESCRIPTION="An Emacs major mode for editing Python source"
HOMEPAGE="http://www.cis.upenn.edu/~edloper/projects/doctestmode/"
SRC_URI="http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> ${PN}.el"
LICENSE="as-is"
LICENSE="HPND"
SLOT="0"
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd"
IUSE=""

@ -1,6 +1,3 @@
;;; nxml-docbook5-schemas site-lisp configuration
;; This must be executed after rng-schema-locating-files
;; is set in rng-loc (which is part of nxml-mode).
(eval-after-load "rng-loc"

@ -1,6 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild,v 1.2 2011/03/12 14:41:55 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild,v 1.3 2012/09/26 06:50:11 ulm Exp $
EAPI=4
NEED_EMACS=23
inherit elisp
@ -9,17 +11,20 @@ DESCRIPTION="Add support for DocBook 5 schemas to NXML"
HOMEPAGE="http://www.docbook.org/schemas/5x.html"
SRC_URI="http://www.docbook.org/xml/5.0/rng/docbookxi.rnc"
LICENSE="as-is"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
SITEFILE=60${PN}-gentoo.el
S="${WORKDIR}"
SITEFILE="60${PN}-gentoo.el"
src_unpack() { :; }
src_compile() { :; }
src_install() {
insinto ${SITEETC}/${PN}
doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc || die "install failed"
doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
}

@ -1,6 +1,3 @@
;;; nxml-gentoo-schemas site-lisp configuration
;; This must be executed after rng-schema-locating-files
;; is set in rng-loc (which is part of nxml-mode).
(eval-after-load "rng-loc"

@ -1,6 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild,v 1.1 2011/11/29 21:08:05 flameeyes Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild,v 1.2 2012/09/26 06:25:08 ulm Exp $
EAPI=4
NEED_EMACS=23
inherit elisp
@ -9,18 +11,17 @@ DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
HOMEPAGE="http://dev.gentoo.org/~flameeyes/${PN}/"
SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
LICENSE="as-is"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
IUSE=""
SITEFILE=60${PN}-gentoo.el
SITEFILE="60${PN}-gentoo.el"
src_compile() { :; }
src_install() {
insinto ${SITEETC}/${PN}
doins schemas.xml *.rnc || die "install failed"
doins schemas.xml *.rnc
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
dodoc DONATING
}

@ -1,6 +1,3 @@
;;; nxml-svg-schemas site-lisp configuration
;; This must be executed after rng-schema-locating-files
;; is set in rng-loc (which is part of nxml-mode).
(eval-after-load "rng-loc"

@ -1,6 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.3 2011/03/12 14:42:45 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.4 2012/09/26 06:56:28 ulm Exp $
EAPI=4
NEED_EMACS=23
inherit elisp
@ -11,36 +13,32 @@ HOMEPAGE="http://www.w3.org/TR/SVG11/"
# but since it's unversioned, I versioned it and got it locally.
SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-${PV}.zip"
# This is truly as-is!
LICENSE="as-is"
LICENSE="HPND"
# In a future we might have 1.2 schemas too, but for now we can only
# install this one anyway because the schemas.xml syntax is not
# sophisticated enough.
SLOT="1.1"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Yes this requires Java, but I'd rather not repackage this, if you
# know something better in C, I'll be glad to use that.
DEPEND="app-text/trang"
RDEPEND=""
SITEFILE=60${PN}-gentoo.el
S="${WORKDIR}"
SITEFILE="60${PN}-gentoo.el"
src_unpack() {
unpack ${A}
src_prepare() {
# we don't need the doctype for our work
sed -i -e '/DOCTYPE grammar/d' *.rng || die "sed failed"
}
src_compile() {
emake -f "${FILESDIR}/Makefile-trang" || die "trang failed"
emake -f "${FILESDIR}/Makefile-trang"
}
src_install() {
insinto ${SITEETC}/${PN}
doins "${FILESDIR}/schemas.xml" *.rnc || die "install failed"
insinto "${SITEETC}/${PN}"
doins "${FILESDIR}/schemas.xml" *.rnc
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
}

@ -1,3 +1,3 @@
DIST python-mode-5.2.0.tgz 73566 SHA256 84ee977fb7c639bc96cd4e8db0145c7a182489456e4d95a71c3612258b5013ac SHA512 cc31962bd99f76d5a250418ce53a88d6b06282810389d737c383637fba867716a8845a72390c0f87213963647315af34de857e5beb674b921461bf02212b62ca WHIRLPOOL 38e2097f65737bcf0e208bd50b2e34b8d2478160344806b8fcbddebb74f7622ffda97014be551515b996235900a7973fae912930853b1fb362dbb3d763de449d
DIST python-mode.el-6.0.10.tar.gz 200815 SHA256 6ace5ed34169516c80969249d78739df527aad023694eb7a81256e608fef3630 SHA512 470655591814b71d1d7dcea03c2e700bc68f3ca38b86b625dedcdfc403cd98e33e8040ba04d94274a3b52abb1c896a9254482018ae16c12117de7f75ed2ada3f WHIRLPOOL 30bf4a76a29bb8d89b07aa3258280db4aeb00c741f9122277e72339146970ca23128f1627abdb35bd51c14eb595c0f349e265e82d330f94ff882d4e1b8cf89ce
DIST python-mode.el-6.0.5.tar.gz 178565 SHA256 468af8fc5c37cdbcb942bc5dc9562024f2f7d7725da3032d009bae424a53e026 SHA512 3c67ce545f49835dfb22850f05719f2535028b853fcb2561e3613f2d3bd5123275f9d86a4e398d45e59c6a19bca95a378d789c352cf8b6553be12216f035dd51 WHIRLPOOL 670c5f56a1362af91f0cd62b70bb3f6a58eb04365f387343f9925a89552a5fd48de10544478220496fa4018b8cb5b5167c6f2fbf888a69ea86054c226bf10456
DIST python-mode.el-6.0.11.tar.gz 273877 SHA256 0dca69a5db0d5b6c4f7597c1c7cac46af76a395e390217d54aa3187548a7e3eb SHA512 a6184d3582559079d112456abe346e8eedad480e2771e07b7088ce3d78fe96c70f8b6d0af39ab7f4c26b0bc52e5ad26aeaf84ab9a39efe1c6a272d433651f8ea WHIRLPOOL e7e1b4b48be1b5a1825cbfb41f32c308a6c29c0097da0a0bb49f0d638169387faaf9bfddd2e26a1b144630f2fcc580c187ea60fd165bbd1134c7665af7af900b

@ -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/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.7 2012/03/02 20:48:46 ranger Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.8 2012/09/26 06:21:05 ulm Exp $
EAPI=3
@ -10,7 +10,7 @@ DESCRIPTION="An Emacs major mode for editing Python source"
HOMEPAGE="https://launchpad.net/python-mode"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tgz"
LICENSE="GPL-3"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""

@ -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/app-emacs/python-mode/python-mode-6.0.10.ebuild,v 1.1 2012/08/10 23:15:45 fauli Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.0.10.ebuild,v 1.2 2012/09/26 06:21:05 ulm Exp $
EAPI=4
@ -11,7 +11,7 @@ DESCRIPTION="An Emacs major mode for editing Python source"
HOMEPAGE="https://launchpad.net/python-mode"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
LICENSE="GPL-3 as-is"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""

@ -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/app-emacs/python-mode/python-mode-6.0.5.ebuild,v 1.1 2012/03/07 16:54:33 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.0.11.ebuild,v 1.1 2012/09/26 06:21:05 ulm Exp $
EAPI=4
@ -11,14 +11,11 @@ DESCRIPTION="An Emacs major mode for editing Python source"
HOMEPAGE="https://launchpad.net/python-mode"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
LICENSE="GPL-3 as-is"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
S="${WORKDIR}/${MY_P}"
# remove bundled pymacs.el
ELISP_REMOVE="pymacs.el"
SITEFILE="50${PN}-gentoo.el"
DOCS="NEWS README"

@ -0,0 +1,54 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vboxgtk/vboxgtk-0.8.0-r1.ebuild,v 1.1 2012/09/26 13:01:11 hasufell Exp $
EAPI="4"
PYTHON_COMPAT="python2_6 python2_7"
inherit gnome2-utils python-distutils-ng
DESCRIPTION="GTK frontend for VirtualBox"
HOMEPAGE="http://code.google.com/p/vboxgtk/"
SRC_URI="http://vboxgtk.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
|| ( app-emulation/virtualbox[-headless,python,sdk]
>=app-emulation/virtualbox-bin-2.2.2[python] )
>=dev-python/pygobject-2.28.0:2"
DOCS=( AUTHORS README )
PKG_LINGUAS="cs gl"
for PKG_LINGUA in ${PKG_LINGUAS}; do
IUSE="${IUSE} linguas_${PKG_LINGUA/-/_}"
done
python_prepare_all() {
for LINGUA in ${PKG_LINGUAS}; do
if ! use linguas_${LINGUA/-/_}; then
rm -r po/"${LINGUA}".po || die "LINGUAS removal failed"
fi
done
}
python_install_all() {
dodoc ${DOCS[@]}
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}

@ -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/app-misc/geoclue/geoclue-0.12.99.ebuild,v 1.4 2012/09/11 14:01:51 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.99.ebuild,v 1.5 2012/09/26 14:10:14 ago Exp $
EAPI=4
inherit autotools eutils
@ -11,7 +11,7 @@ SRC_URI="http://freedesktop.org/~hadess/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE="connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo"
REQUIRED_USE="skyhook? ( networkmanager )"

@ -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/app-misc/tmux/tmux-1.6.ebuild,v 1.7 2012/09/22 02:48:50 pinkbyte Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.6.ebuild,v 1.8 2012/09/26 12:19:51 blueness Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
KEYWORDS="amd64 ~mips ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="vim-syntax"
DEPEND="

@ -0,0 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/trash-cli/trash-cli-0.12.9.14-r1.ebuild,v 1.1 2012/09/26 12:22:12 hasufell Exp $
EAPI=4
PYTHON_COMPAT="python2_6 python2_7"
inherit python-distutils-ng vcs-snapshot
DESCRIPTION="Python scripts to manipulate trash cans via the command line"
HOMEPAGE="https://github.com/andreafrancia/trash-cli"
SRC_URI="http://github.com/andreafrancia/${PN}/tarball/${PV} ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools"

@ -1,24 +1,12 @@
DIST amd64-bin-libreoffice-base-3.5.4.2-r1.tar.xz 76837568 SHA256 bc785d04de8fb3054484da86415a4c84ed398df63fda72a488363ead08fafd2a SHA512 4f753a0205ae7432ce41030c05cc192f16d748047798390b2e80425e02c43de9eb395a231143a0cdb6718ceab346dfb6c3ce264ac4b07bc220cf85422aad4b76 WHIRLPOOL b50a93c4521902ce844dfeeaf749cdb455c26839e61b8e02d722b5a9094e6b742945098d68e72a625da280063ecd37c9db6396495e51097c6b1c0e37eb69919d
DIST amd64-bin-libreoffice-base-3.5.5.3.tar.xz 76857984 SHA256 e3990695fa70b4e80f416dba8609b523a1a282906d8822471578762771fe3101 SHA512 573b118354f9b005d39fdf1339647450da904619afedfd1cf3bf09894be7e7552ccff40a0e1dadad16e83a7f013201a47e68c4766c66b4e2f8f8521df573991c WHIRLPOOL 4b6b5c01e1c4676a073330dceb660b6238f1fc0cb7ef691d54b8d6e8d303ff52389fdf9672301be11917d058ea4f1f61d54f683d527d5b2f417820ddd5295736
DIST amd64-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz 81548412 SHA256 b746c51f3a1535e4d6df7e05cf39b46bf8dda2ad3f70e9a8d6401655f8acf4e6 SHA512 eb9d9f62791ccf6025e57109b64c4925176ac4f4472e1be8430b0761fd6dcd9302f9adfa5cf6ce7a0083df0262d60ca0efe1b76d6e81597e0d97ed0ae9100020 WHIRLPOOL 5a0db88c5ef52fc9e9e1f02047ac4a7279edeb1594ff1c783c15e6010e4e51b48046723797f11ff9b0eeee379a9f1da8ade67f449fa46dec0503293343ecd20d
DIST amd64-bin-libreoffice-base-java-3.5.5.3.tar.xz 81547036 SHA256 cf903ffc547985e35f82b7ba0e5b8ef30b1670e7a4bee2b6360bf40943571460 SHA512 01918a898441f5db199737b8e28ac94f445f074b7426c0de5047cd9df9573a889cce73489760389a1495a10524f0d8c4e118f318469b45a3df933fb1ab20e02e WHIRLPOOL 35724bb7344bcf8e555b3034ec29531a670bda0b272a6d2b2b16019eb40fb5258f4a2946cbab551d6c5b2314f558c97a75807f5211ca865d8f11918902fee6b1
DIST amd64-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz 76936220 SHA256 93287a3b878d2a2ac0ed047645679299335d44219e37ff0b1674fe5c458e8ce4 SHA512 e36f242ca48fa4b4b9670215f15ca5717f20119dbe14b1ea7677a219eb5ba449a46a7cea0659d9a4f306272e64db4ff1506f2a3c9b68ec8ffc65699632a09c27 WHIRLPOOL 4413f7582de9f202d648da6373cc2151d059ef544b51d23e48deeee66c248b7bd3b9fd3e79919b9a0a6d46320a2015363b6466cb410b82788b927295db0143a1
DIST amd64-bin-libreoffice-gnome-3.5.5.3.tar.xz 76960252 SHA256 7382b15818cc96fe6224f43c25695674a9522eff43ef43fc700d938917c28291 SHA512 7971ffd2209fd9bc5cdd5413f19081c8058bfb3cbe452d6ef2ecb4193fb9f7fa03da3cf31b63e39ea03c69fa9389d08bbf970457ffd7b4fbc67384c1c143aa6b WHIRLPOOL 12653d9a33f0464323e636803a4b4b12ea32769c6f4f838ed13ca0a40ed7b00d4e6feaeaddbf3cdc9bda5ba853fa23fe91760ddead7de21b97d25de32fa63d89
DIST amd64-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 81649352 SHA256 0f072eade4ba36281750409a9f2749a1f00b98dbf3b08e47b2d29e4b58117dff SHA512 3040ad52d14a6e9e92b21bb77464c9585685c487e8cb4c45e36bbdc3427b8316f107326d0e824cbfc4f7a12a221bb5764939a2de6d53b7a61133cfc5d0051ff0 WHIRLPOOL 42dccfa92db92a8e0bbd6b057df0985b22404d9b377c2a7eb364f71d65259bca6f8cb477215c2d58a47cfb74e43b83f892edb311f5f6c5295fc3326f14076f3b
DIST amd64-bin-libreoffice-gnome-java-3.5.5.3.tar.xz 81659368 SHA256 419eb4071b5bb74455cbf7c8bc96fcace38f247d369ee9ea7c915960805eaa55 SHA512 d680913dd07873d2053430a0049798611653a3ab6e9ea7609b84a4b1433a6d769482177e79da1c04b8138b18fdb655b84cb8063b20fa92a17718537639955fdc WHIRLPOOL 982f77efd95171c2075f59967c8c650a7ed8a77ea087f4995a251d397e462da5cc955a8fd828d8a834dc2d001e38bb0afa69f4aa55ef9dd154643b012831076d
DIST amd64-bin-libreoffice-kde-3.5.4.2-r1.tar.xz 76892264 SHA256 d771cd1dac3621cd00608a3077213a2616cc4928fd6ce6607e042e3b03b1ab2d SHA512 71015256803bbb6c702f4896edb73384c6fff8e9f71bfbdd93125f6b6dbca0773f9ccf7979930fb6516c44632fcc9456c1cf3ea6c2b89c7f3f4b211d8e9d69e2 WHIRLPOOL a3c7f392904d45f9076ce84db1863fd567e062d341cae92e869e9d99f1f0fb48adb017492f94f54d9f3eb91a13d80f5e88d1c76977d512444bfb42df65578caf
DIST amd64-bin-libreoffice-kde-3.5.5.3.tar.xz 76893536 SHA256 0ea3cf9192f0bb49661775a5ead4ae933e0581f7dfbee5acd0a4237aa650a750 SHA512 0fbd9900efea9fadb36489487bfafeffa90c1ed672257a4ebf2fc7e575d143102fb722f63e4befc34f805ee5c4e1415aa57639fb1904713110fa7b10b25010f5 WHIRLPOOL 61417200edc142cff5b1eab1ff4c798e4980f41b94b377ac39cdb08d12576bc65d17f035e0bb59d17d8cfabd927586d5de8afed9f7c3378f014ef66d0cc27f40
DIST amd64-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz 81594828 SHA256 f46853f5088421e6f9cc663ded560df860a323f5a7b6c33e23f06abfc1681a9e SHA512 48353ba055e880f88afb810d7fc4b9f8f405871a2112a4f7fe819626fa2f6808ba45152c294fe12d8da30e1cf65e597a8a3c3f6a8df004a61cd42b6e70079daf WHIRLPOOL 82970cbf1669e7686af39e23baa258e20476770de2ac984ac6d2a0b583521a2d359081e9926cfdff20655d3ad0993323675434eb05f085f864ddd252633ead4e
DIST amd64-bin-libreoffice-kde-java-3.5.5.3.tar.xz 81609840 SHA256 28cebeb54c077672af554dcfd14172ac2b95673b9aa4dccb2473b0b5aa3cf30f SHA512 05fe5e59d864cac134443ce4972acc100e74a30f802695d681119d3e7447ac59bb486f1fdcb3eb807752e66dbc34b32bf5fd1e26451c1b0d51c93437266e333c WHIRLPOOL 4ca9c9abba59f77b0b990e591f07fed9b591375e8eb7f0cbc88aca7f6f45dcc2c64cd3c79c0f64d3ca9e0b4bc9e62deca4a6c3cbde492e5cd414474a14bde752
DIST x86-bin-libreoffice-base-3.5.4.2-r1.tar.xz 75020464 SHA256 d03f7dee46a5d9f2fdc5c7679badcbe3952360e7a31c485934c7fb8b04655087 SHA512 1c80fd13d4987b702606b1d266e3a4961cfa79ed75a1e409f1f850266f32decb9d885a21871e7d75f8950cb9809f82dd9c0b50687abb336a50d31515c66810f4 WHIRLPOOL 9fbc81bd7473827bd98259ce7ddd942a1dd8523cb5a88bbe3a4e4922af48f24d34218b1d8c1cf740884559318862af900cd9622da776e599dd9ed0d1cb67ecad
DIST x86-bin-libreoffice-base-3.5.5.3.tar.xz 75130636 SHA256 a78e1482a1343640b083f5e944cc99752cf898ec23e9d6a2e43bfc86c59be9bb SHA512 2ee449edc285d51a33f81d851977b1fc8f48a8ea98591e0c651acb222c6a8c2d24bf9c7a578885433477515cfbfc67a2ef6e28afd274775ca279d838a2afad16 WHIRLPOOL ef853aa8416932b180a2fc83fe80b2c49a3e3a8a5dd176b3fcfa73a5489d8edd179d46ec3e7ae79f0467b0ee91a8d95320e8c39d830d5762efd73bad3c4158b2
DIST x86-bin-libreoffice-base-java-3.5.4.2-r1.tar.xz 79728264 SHA256 4bee2375adffcefec252b364f6ba946493c4b4364e3bea2c5f30e32b67c413ad SHA512 1309169050606dda61ca2172a96351c2621f9082a6dbb4b0723ff4ada0fcfb0bad43c9079012d980ec2bd378bd24c8039ced986c44194b36e1c4dd66adde3d11 WHIRLPOOL 4a861016cecfd1a6891415b2b6ea17508e281c0158314fbdc41c694da630cbb347385d466c924957b9dc91c3dc8645db49b3d420919cc33d34f1dd2ba9a2d23b
DIST x86-bin-libreoffice-base-java-3.5.5.3.tar.xz 79843968 SHA256 2ad3e3714e61a386f8992cdb5e8b0d6a13e15a5a8e9d3d1666a5f85e0f59a87a SHA512 994b389ea9cd29784b0e91430bc5efb26d9843277b0628c8642f57275e29ac4ff20034df9f1e232538a001dd311cb9773f7af35255ba6a755a5e12a782d69456 WHIRLPOOL e4f8a344220a44685ec580a42b2b208d11ede9e8b2f56c7b13fe1b266fc58a7059826585ee863e8f73981eed8e9e8c59f6548992dbcec93eb544668b65936a72
DIST x86-bin-libreoffice-gnome-3.5.4.2-r1.tar.xz 75118392 SHA256 260b514cbfe0dfe197b1cf9348accb716fecb86c58c5972080ef960422570a17 SHA512 4f8f6e8399fa5b3139192c469d18dd81e23d401f6c88e44245ed34456d5c528e4df291edd3bcd7d75cd7b13f1e852c939b6402f41b14df9207f6367c60fa24fe WHIRLPOOL 6dd22fd9af44adb98208cdecd04a1bcd4170c01ffec31aa5384c2ca658995d04745aa6d4e57cf82df2368017b3d7fb423255a6819c8d3b0e7ac3c6d9e4e1b658
DIST x86-bin-libreoffice-gnome-3.5.5.3.tar.xz 75223724 SHA256 226455e05dd200c87d42ee3ac7c1fe927c84204767d7d8ff64ad6579dfc20598 SHA512 1e50b506e98e662a923563c9343069ec9b5f4a7d87c0c04073f46f3a28f5cc3f028339e94dab5927887c3e0bd36db2d15374de74a197bd95c7d505cebe123373 WHIRLPOOL 00dfce8e6e1cd00eea6a6840601317a774295119aeb58cc5c9c02489f177d061890ad4b7e4688154d9d9e029e326c877dc68bff800a77a11f4137353eca00535
DIST x86-bin-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 79815720 SHA256 c018de2c4e16fdc28936b31c43bb78f845a2fa922f7770faf7c568a0526c208e SHA512 1941ad3eb55782c7d02bcdeaacdca0228e4a7e1922449c7ecf63109a15a416615ad2ef8c4c09fd77016cda66fe5024f4eb7e890f5a53502ea2fc4792f9ee5d1e WHIRLPOOL 5135835bc180310b6f7f2274e6c006503bbaa0baf433a3c8335c0cc9355f85a4d6e78348d4eb98e051343b35fea71c4ddf4b3e7b16ebc60208d4ab4a081a0898
DIST x86-bin-libreoffice-gnome-java-3.5.5.3.tar.xz 79920296 SHA256 ba5a42892af7b3ea9ea54aa983b2e398fac222078116c8b55166ba74b762e80e SHA512 e72043a2853d47b28742aa4b832c5b98ec6ad1e2df4605bb3e261b25e052504595578611438cf9d03cc6e97a388e32d5b2c08d2dcb0beda8c8ddf6b47adee994 WHIRLPOOL 3d12cb72880d542556b19bf32897aac3e221a41000f876d2363202408c116fcdee52c9aee9434647df1a192ef1245a01af169a1001553326df4f0712641359dc
DIST x86-bin-libreoffice-kde-3.5.4.2-r1.tar.xz 75070032 SHA256 767b4112bd3234a64a16ddd9c5c3e232d4e087fc464da8bfe9e3a1fce1809a98 SHA512 9309d460b507243af01fe9548945acd98391f85befc307612166f13b7868a8fc4d82ee3c7c5bf80771752c9f6ee31462f24de08501083956804346cf348c1f49 WHIRLPOOL 5f8fe4d430c6a34554be4ca2ac0aea933dca3727e67bb1d28c4f7fa8af250097f4c17bdd35b53b1f2bcb18e71ca2eeea15ebf10ea2e88e92c2f8072789e87afc
DIST x86-bin-libreoffice-kde-3.5.5.3.tar.xz 75174980 SHA256 34494a74f838f93ee2c8062f298156853bb63474cc3029f9e0dd25f3ec2e60d1 SHA512 bde7ce69b37152d999a9f973b1c0f116c81d291b9bd4998f94ee45701b4d97b47dbb911a6806ba3209155abac638065e19597413bb4b0b389ff705ee3223f1ad WHIRLPOOL 7ea366af0cb763a2f70d474d3b20d5d0580fc472e20dd6649b4f722f6a1d5194ec32115edfbe8620f5b7490aaa36ca1391094a91fd4fa8454f4abe4f75bfa38e
DIST x86-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz 79772804 SHA256 9248e1557df216538ccb9b68d786dcf578cb21e2da331a3b2a70bf64d73a2ab4 SHA512 4d40e07b73fb16668d1f9897945db3b5f47a2b342053bb5aab8885807d5685e7b22dab3d69b95598e4a874a9263ae2980972bd4e413d39eac44d95512500a572 WHIRLPOOL eff491ec09ff67cd093b7a5cf338939a491f6b83aeb2d1c1fe4b16f9c762c0296cd8ae5382e65fe6a6567b134712a158e74bcec910f63e260a281e077d07c2ab
DIST x86-bin-libreoffice-kde-java-3.5.5.3.tar.xz 79877120 SHA256 522c78141326454cb5d84605cb8ed4a89fbc948fedaf6826c13b07aaee61e1cf SHA512 2869ee9918754d10d9aff1dd45ee11cbd1150197bd5ac4c81287b1fd6dcb439e73c0f042771111af16a2a8426b35aefb543c96a125ac21e3732e70559ce12ae8 WHIRLPOOL 30dcc33faa56e6118636a2cc93687d76dfe6ff1664a7e4cb7aa01a818f6bb0e10670694e04eab40898b0edef221832952b502b4e60dd966bbe2e4102897a0a50

@ -1,197 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.4.2-r1.ebuild,v 1.7 2012/07/19 16:25:10 kensington Exp $
EAPI=4
KDE_REQUIRED="optional"
CMAKE_REQUIRED="never"
BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
BASE_X86_URI="mirror://gentoo/x86-bin-"
inherit kde4-base java-pkg-opt-2 pax-utils prefix
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI_AMD64="
kde? (
!java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tar.xz )
java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
)
gnome? (
!java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
)
!kde? ( !gnome? (
!java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tar.xz )
java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
) )
"
SRC_URI_X86="
kde? (
!java? ( ${BASE_X86_URI}${PN/-bin}-kde-${PVR}.tar.xz )
java? ( ${BASE_X86_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
)
gnome? (
!java? ( ${BASE_X86_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
java? ( ${BASE_X86_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
)
!kde? ( !gnome? (
!java? ( ${BASE_X86_URI}${PN/-bin}-base-${PVR}.tar.xz )
java? ( ${BASE_X86_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
) )
"
SRC_URI="
amd64? ( ${SRC_URI_AMD64} )
x86? ( ${SRC_URI_X86} )
"
IUSE="+cups debug gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="-* amd64 x86"
BIN_COMMON_DEPEND="
=app-text/libexttextcat-3.2*
=dev-cpp/libcmis-0.1*
=dev-libs/icu-49*
>=sys-libs/glibc-2.14.1-r3
kde? ( >=kde-base/kdelibs-4.8.0:4 >=x11-libs/qt-core-4.8.0:4 )
"
NSS_DEPEND="
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
"
COMMON_DEPEND="
${BIN_COMMON_DEPEND}
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
dev-cpp/libcmis
dev-db/unixODBC
dev-libs/expat
>=dev-libs/glib-2.28
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-49
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
>=media-libs/libpng-1.4
media-libs/libvisio
>=net-misc/curl-7.21.4
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
>=dev-libs/dbus-glib-0.92
gnome? ( gnome-extra/evolution-data-server )
gnome? (
gnome-base/gconf:2
gnome-base/orbit
)
>=x11-libs/gtk+-2.24:2
media-gfx/graphite2
>=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10
java? (
>=dev-java/bsh-2.0_beta4
dev-java/lucene:2.9
dev-java/lucene-analyzers:2.3
)
net-libs/neon
${NSS_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice
!app-office/openoffice-bin
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
>=app-office/libreoffice-l10n-3.5.0
"
# after all it's a binary package
DEPEND=""
# only one flavor at a time
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
RESTRICT="test strip"
S="${WORKDIR}"
PYTHON_UPDATER_IGNORE="1"
pkg_pretend() {
[[ $(gcc-major-version) -lt 4 ]] || \
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
}
pkg_setup() {
kde4-base_pkg_setup
}
src_unpack() {
default
}
src_prepare() {
cp "${FILESDIR}"/50-${PN} "${T}"
eprefixify "${T}"/50-${PN}
}
src_configure() { :; }
src_compile() { :; }
src_install() {
dodir /usr
cp -aR "${S}"/usr/* "${ED}"/usr/
# prevent revdep-rebuild from attempting to rebuild all the time
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use cups || \
ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
use java || \
ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -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/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.6 2012/08/14 12:55:30 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.5.3.ebuild,v 1.7 2012/09/26 11:23:05 scarabeus Exp $
EAPI=4
@ -57,6 +57,7 @@ BIN_COMMON_DEPEND="
=app-text/libexttextcat-3.3*
=dev-cpp/libcmis-0.1*
=dev-libs/icu-49*
=media-gfx/graphite2-1.1*
>=sys-libs/glibc-2.14.1-r3
kde? ( >=kde-base/kdelibs-4.8.0:4 >=x11-libs/qt-core-4.8.0:4 )
"

@ -2,3 +2,4 @@ DIST enscript-1.6.4.tar.gz 1036734 SHA256 45299a4db47c9c08c3649d4f62b211ae79ef51
DIST enscript-1.6.5.1.tar.gz 1314983 SHA256 57bf356c1c44bcb02865c6f7337a18d0b51042388d5f10e6bbbcdd15e368f58b SHA512 86163472abbd6ac9e84b4b6ca4048855ff2a91f41bfb1b59b9d962927d10799d2bf73db1f8f5e5ec53876191b56cb21ff18c076f4a9873f552cb507332c85db4 WHIRLPOOL fc734a9a9bfe579f6246aaa368e538bfe96a602b65447f0d08e7cac9492501467123c015722db42b2e573b89a4276a1e1c84d1b4a5274ec8633e64246deb9cb5
DIST enscript-1.6.5.2.tar.gz 1318283 SHA256 db3e33bdb36f9e7252a386ea1faa9b5444cc9ba0ac2dd46fffc1f14887a4cb75 SHA512 8e0ecb95fb4fed79bc82094c86dfc449d429581511840cc68b8e3dd1c04a532adf9ccbd1fe6f325b3b5df8192311c69a294a6367c8891c60a70698cd037038e1 WHIRLPOOL c3364fcea489727cbb4bd37ab6df938c4723168cd5f53f6d25ec98624b183e1aad5261172c5d237ba0b724b132047aa969933b5e48729f9bb049b86cd35d8610
DIST enscript-1.6.5.tar.gz 1308918 SHA256 224ee94eb1c3c527d550a5bd7ef7a229cb2be76bf6dbad98e91093f1cfb304eb SHA512 310c4d9a3e9791a290dde875798d6f0dd6ddadc87f95e249aa90ab8e0263a8396128e13b6a854925dd3369153817967bfedfe12df4407527f2d8c6c21ba138d5 WHIRLPOOL b7f9e5084ff242be8193febb85913d5bc1f30265e01250476bd592ff79fd4b8d1774a38cefc8da0ef1c7e9cf22647ddf885022b0708344e2c073fe903c3d4836
DIST enscript-1.6.6.tar.gz 1330493 SHA256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc WHIRLPOOL 718d06a76add39cc916a4a30262049787de73aee5e569407bf5a40eba4f90cd47c89ed6cc151269175d4fe250c15f6a04aed138828315988697d5b9eda03d055

@ -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/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.4 2012/05/12 01:46:57 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.5.2-r1.ebuild,v 1.5 2012/09/26 14:41:10 jer Exp $
EAPI="2"
@ -10,7 +10,7 @@ DESCRIPTION="powerful text-to-postscript converter"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
SLOT="0"
LICENSE="GPL-3"
IUSE="nls ruby"

@ -0,0 +1,52 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.6.ebuild,v 1.1 2012/09/26 14:27:26 jer Exp $
EAPI="2"
inherit eutils
DESCRIPTION="powerful text-to-postscript converter"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
SLOT="0"
LICENSE="GPL-3"
IUSE="nls ruby"
DEPEND="
sys-devel/flex
sys-devel/bison
nls? ( sys-devel/gettext )
"
RDEPEND="nls? ( virtual/libintl )"
src_prepare() {
epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
}
src_configure() {
econf $(use_enable nls)
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
insinto /usr/share/enscript/hl
doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
if use ruby ; then
insinto /usr/share/enscript/hl
doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
fi
}
pkg_postinst() {
elog "Now, customize /etc/enscript.cfg."
}

@ -0,0 +1,54 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.9-r1.ebuild,v 1.1 2012/09/26 12:14:16 hasufell Exp $
EAPI=4
PYTHON_COMPAT="python2_6 python2_7"
PYTHON_USE="sqlite,xml"
inherit eutils gnome2-utils python-distutils-ng
DESCRIPTION="A note taking application"
HOMEPAGE="http://keepnote.org/"
SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
RDEPEND="dev-python/pygobject:2
dev-python/pygtk:2
x11-misc/xdg-utils"
DOCS=( CHANGES )
python_prepare_all() {
epatch "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch
}
python_test() {
"${PYTHON}" test/testing.py || die
}
python_install_all() {
dodoc ${DOCS[@]}
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
einfo
elog "optional dependencies:"
elog " app-text/gtkspell:2 (spell checking)"
einfo
}
pkg_postrm() {
gnome2_icon_cache_update
}

@ -1,31 +0,0 @@
--- unix/Makefile.in
+++ unix/Makefile.in
@@ -134,24 +134,24 @@
ranlib $@
libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
- $(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
ar rcu $@ mk4tcl.o mk4too.o $(LOBJS)
ranlib $@
Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
- $(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
ar cru $@ $(PYOBJS) $(LOBJS)
ranlib $@
Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
- $(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES)
- $(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \

@ -1,98 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.15 2012/09/09 15:13:33 armin76 Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit eutils multilib python toolchain-funcs
DESCRIPTION="Embedded database library"
HOMEPAGE="http://www.equi4.com/metakit/"
SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="python static tcl"
DEPEND="tcl? ( >=dev-lang/tcl-8.3.3-r2 )"
RDEPEND="${DEPEND}"
RESTRICT="test"
pkg_setup() {
if use python; then
python_pkg_setup
fi
}
src_prepare() {
epatch "${FILESDIR}/${P}-LDFLAGS.patch"
}
src_configure() {
local myconf mycxxflags
use tcl && myconf+=" --with-tcl=/usr/include,/usr/$(get_libdir)"
use static && myconf+=" --disable-shared"
use static || mycxxflags="-fPIC"
sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS} ${mycxxflags} -I\$(srcdir)/../include:" unix/Makefile.in || die
CXXFLAGS="${CXXFLAGS} ${mycxxflags}" unix/configure \
${myconf} \
--host=${CHOST} \
--prefix=/usr \
--libdir=/usr/$(get_libdir) \
--infodir=/usr/share/info \
--mandir=/usr/share/man
}
src_compile() {
emake SHLIB_LD="$(tc-getCXX) -shared"
if use python; then
python_copy_sources
building() {
emake \
SHLIB_LD="$(tc-getCXX) -shared" \
pyincludedir="$(python_get_includedir)" \
python
}
python_execute_function -s building
fi
}
src_install () {
emake DESTDIR="${D}" install
if use python; then
installation() {
dodir "$(python_get_sitedir)" || return 1
emake \
DESTDIR="${D}" \
pylibdir="$(python_get_sitedir)" \
install-python
}
python_execute_function -s installation
fi
dodoc CHANGES README
dohtml Metakit.html
dohtml -a html,gif,png,jpg -r doc/*
}
pkg_postinst() {
if use python; then
python_mod_optimize metakit.py
fi
}
pkg_postrm() {
if use python; then
python_mod_cleanup metakit.py
fi
}

@ -0,0 +1,84 @@
--- CMakeLists.txt.orig 2012-09-25 21:47:27.591130679 +0200
+++ CMakeLists.txt 2012-09-25 21:51:02.953508806 +0200
@@ -4,6 +4,7 @@
# options available for user's input
OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
+OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF)
OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
@@ -50,6 +51,7 @@
INCLUDE(CheckCXXCompilerFlag)
INCLUDE(CheckTypeSize)
INCLUDE(TestBigEndian)
+INCLUDE(FindPkgConfig)
#Set the custom CMake module directory where our include/lib finders are
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
@@ -197,6 +199,10 @@
MESSAGE(FATAL_ERROR "No Qt4 found")
ENDIF(QT_FOUND)
+IF (WANT_INTERNAL_LOKI)
+ELSE (WANT_INTERNAL_LOKI)
+ pkg_check_modules(LOKI REQUIRED ferrisloki)
+ENDIF (WANT_INTERNAL_LOKI)
IF (WANT_INTERNAL_QSCINTILLA)
MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")
--- src/CMakeLists.txt.orig 2012-09-25 22:45:20.702694011 +0200
+++ src/CMakeLists.txt 2012-09-25 22:47:39.742124547 +0200
@@ -3,7 +3,10 @@
#Subdirectories
# ADD_SUBDIRECTORY(i18n)
-ADD_SUBDIRECTORY(loki)
+# Default: loki as 3rd party lib!
+IF (WANT_INTERNAL_LOKI)
+ ADD_SUBDIRECTORY(loki)
+ENDIF(WANT_INTERNAL_LOKI)
IF (WIN32)
ADD_SUBDIRECTORY(windows)
ENDIF (WIN32)
@@ -468,7 +471,9 @@
QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
-LINK_DIRECTORIES(./loki)
+IF (WANT_INTERNAL_LOKI)
+ LINK_DIRECTORIES(./loki)
+ENDIF(WANT_INTERNAL_LOKI)
IF (WIN32)
LINK_DIRECTORIES(./windows)
ENDIF (WIN32)
@@ -477,7 +482,10 @@
ENDIF (WANT_INTERNAL_QSCINTILLA)
-SET(TORA_LOKI_LIB "tora_loki_lib")
+IF (WANT_INTERNAL_LOKI)
+ SET(LOKI_LIBRARIES "tora_loki_lib")
+ SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include)
+ENDIF(WANT_INTERNAL_LOKI)
IF (WANT_INTERNAL_QSCINTILLA)
SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib)
ENDIF (WANT_INTERNAL_QSCINTILLA)
@@ -493,7 +501,7 @@
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${QT_INCLUDES}
- ${CMAKE_CURRENT_SOURCE_DIR}/loki/include
+ ${LOKI_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/otl
)
@@ -590,7 +598,7 @@
ENDIF (USE_TROTL)
# static
-TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB})
+TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES})
IF (WANT_INTERNAL_QSCINTILLA)
TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES})
ENDIF (WANT_INTERNAL_QSCINTILLA)

@ -0,0 +1,80 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r2.ebuild,v 1.1 2012/09/26 06:50:53 haubi Exp $
EAPI=2
inherit cmake-utils eutils
DESCRIPTION="TOra - Toolkit For Oracle"
HOMEPAGE="http://tora.sourceforge.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
IUSE="debug mysql oracle oci8-instant-client postgres"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="
dev-libs/ferrisloki
x11-libs/qscintilla
x11-libs/qt-gui:4
x11-libs/qt-sql:4[mysql?,postgres?]
x11-libs/qt-xmlpatterns:4
oci8-instant-client? (
dev-db/oracle-instantclient-basic
dev-db/oracle-instantclient-sqlplus
)
postgres? ( dev-db/postgresql-server )
"
RDEPEND="${DEPEND}"
pkg_setup() {
if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then
eerror "ORACLE_HOME variable is not set."
eerror
eerror "You must install Oracle >= 8i client for Linux in"
eerror "order to compile TOra with Oracle support."
eerror
eerror "Otherwise specify -oracle in your USE variable."
eerror
eerror "You can download the Oracle software from"
eerror "http://otn.oracle.com/software/content.html"
die
fi
}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc-4.7.patch #430044
epatch "${FILESDIR}"/${P}-ext-loki.patch #383109
sed -i \
-e "/COPYING/ d" \
CMakeLists.txt || die "Removal of COPYING file failed"
}
src_configure() {
local mycmakeargs=()
if use oracle || use oci8-instant-client ; then
mycmakeargs=(-DENABLE_ORACLE=ON)
else
mycmakeargs=(-DENABLE_ORACLE=OFF)
fi
mycmakeargs+=(
-DWANT_RPM=OFF
-DWANT_BUNDLE=OFF
-DWANT_BUNDLE_STANDALONE=OFF
-DWANT_INTERNAL_QSCINTILLA=OFF
-DWANT_INTERNAL_LOKI=OFF
$(cmake-utils_use_enable postgres PGSQL)
$(cmake-utils_use_want debug)
# path variables
-DTORA_DOC_DIR=share/doc/${PF}
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
doicon src/icons/${PN}.xpm || die
domenu debian/${PN}.desktop || die
}

@ -1,52 +1,13 @@
DIST 0036fe6fe7dc.tar.gz 3971078 SHA256 245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2 SHA512 45644cc13d7d44d43c949c78fb2399e9aa796562026f9570de10cf3677381b578af83c1720b0a4fa6c0be2f8493975e05f3805fc06fcebc733630dae9340d7ae WHIRLPOOL 452ef804a5eb87ca47d67083c4a43049301b3ea8a56e9031eb38edbb702d370f67314b7b76c0656f57c8b99bc41669811bed92478701cfd34bfa8c7322f14778
DIST 0b776ef59474.tar.gz 128861 SHA256 15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe SHA512 2cb8838b44b83a596b34a383b1578eaeb4be6c8df453531c66630f134633c757a958ad86f18327eefcb4501aed9225d62d8836ae15b796e0c0179ce692aafd53 WHIRLPOOL e9dade224f0dbfe8639b67a8fa811b689fac8af36f87703e871ea467a1fa13262743e32c65bef200f06271950933e3604a31648627a3138cdcc99f86e1783864
DIST 0cf6181d44db.tar.gz 2311102 SHA256 9fbd9e68422aaae9b6962bb7a9400a45959bf36b5f1ea443fbbd270dda9feca1 SHA512 c3dda08fc4a134537c6662877190e444fb3cf9cb2e47b52a2225af101a1c3d8d41abaa34390fa1cd0d0a864411269d514e9a839086b8b3071462bf47babc3359 WHIRLPOOL a73a2f75b2822c2d9d207c0d6f52a42451004a843f02aa15a307ceb0ff770ce81f9087a560c339d3d944510c01055290eae137d27b93a9c7e234cf18ea5ebb07
DIST 0e651e004747.tar.gz 8994812 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1 SHA512 5a1c7e8079fc2955983edb7bd5d85b3470a944b59f18bc5b3f41d7bee14964b8315a19753ac0ac2fcb75b04cbebcdcb043b858615b0cbba34cbd1b6aabb75306 WHIRLPOOL 016f7211a4e6e0145ee28b76b6a99f4a56d607bb050393e525ae3158f9953b955c6090823525315f654fdb81ac4afa5f88e9eb463a9b80756800bf705d94dba4
DIST 1cf75c0e2c96.tar.gz 3985855 SHA256 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e SHA512 d800aeb9685548ba6e4955dfd3dfd63fe656b5075ab6847e7c98043c50ed3a3494a727037380adbf0be801fd4a2932f003b97708a936277994939c49fca6a6d6 WHIRLPOOL d34c568db93f00e111f11149683b3ceb3b1f085cb241eb8df1e4b51758699d9ebdded5e40609fb2fbf5d620a344499756f02b11447d18c50655230d24256972d
DIST 22cc03983e20.tar.gz 129111 SHA256 ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 SHA512 c6d067471a4b1ee77a88395ff03795358db8f633a68006b6f5f8f2cf9c6db95cb144ab824d5c6a1474053485660fc6d31aecd765932373a91badac35b0393881 WHIRLPOOL a1aa2aae22d5cbfbce582e1d6025b548ae42dbc5e6712789ea322224231e1c76ececb795242c04d5480394beb36a1c60e6adb63aca96a3b096b928c1a1bd363a
DIST 3231f3e9c517.tar.gz 1449514 SHA256 9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274 SHA512 b918b7ceaadc4f265f54a0c74ed88ddea72a7bba54c39fb38a780fcf88138bbf723624f445852b1a8394b19e11dc9503323ad19b46c41170046128c414f0a285 WHIRLPOOL 61486703bf67ae02816efef5c586c59b69a7c410ed4a2de2c2cce4068ddc08bf1e31352a3c89ff79d32c7bfbff8340ac4265b075dc49d5390e6cc5c4bfb265a3
DIST 335fb0b059b7.tar.gz 3971488 SHA256 ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd SHA512 af9d77d1819d20142179aa4ae2f51b5713381539626762698691940ae25e451c4304d865ceef6d4cccd73e015a7b4caba8e1dc11d1ee7718e5e3f0d46148f5cc WHIRLPOOL 8905ec62a5411003a50822ad4122c538ca942e0b2c9223c33abc7d4cf0fcadefc12e5bc6b05ec52bf98167f2bacdf03d4606fb0b20a1382d7ea23e5ae70fe02e
DIST 338c21646c76.tar.gz 1447906 SHA256 10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3 SHA512 a7b9aa38297bf42a755a7c0250e8106b374f44764542bd3d314a0c93af5c0261f9d15717ccbd024b2272f04cd220e24a74232b6fa4b2df847e5ee889b978cd0b WHIRLPOOL 20fe9bebaca713e54b26c34b5bb61830ac833f769f2278068ad90cd35a7dcff541574f5323c2f8b0cfd048e68d8b49d1e5b08a72866eb8b27e5fcd09ccd022a8
DIST 38deb372c569.tar.gz 1450094 SHA256 b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93 SHA512 e2649648d752d8b412e249c0ff5d319fca3043c053d29a60fa6f79f44211656c92e0c83f04d3ab0c3be1e1201aea0f14ac3035f9a7ef53446e429bd7ab33ab9f WHIRLPOOL 21edaa9d200a316f6602c3569e5af132cbc5c31e3793c8b6452eb21e10d58811619ccdf0a2fd224a701c85a8670f9a5440e1f71005787c8740dfaf65f7aaa0a6
DIST 3e0087ab5e92.tar.gz 9591074 SHA256 3e85e236b683c14bad9505f414a0acd876956bb8e67362acd6a5bbae99bbe9e4 SHA512 33ceb4cfbdccd1913241b216670e4c59d81dc5419d8c416e6c88fc97cff43088c3b1a1c60d85e456679baae8e47c454f1be04428c3e94fd5ed1313eb84bd1678 WHIRLPOOL 28bb1dab51e347df91e19945d0ecb69c97704ca44bd35389297c7bad51d4c71bdbc635c0acb290a71cdebbc224dda2924f3832ca985e5e627c4e32a1eebef7eb
DIST 49a6fc8f712f.tar.gz 128837 SHA256 26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54 SHA512 c27ceda3527b80d0cb24101f3e8e4e8eae7c17e88543823610d3d152692a0717bb234db27ddf519b62080fba9248ae29656a0e0f991b07d64357b4afbd41d5a8 WHIRLPOOL 03d541655a6580478b2f86a57ce6d099970012b82054261e70297de3aaff2868046dca90967fbd5f0c101a4549cf8acb3063cf5d3b7f290ca6f2facb7ddff86c
DIST 507eee662587.tar.gz 44936515 SHA256 b7a309b177f53281fba881f379619a6ce36f1f733da610af1275ed160dbe6d02 SHA512 da77c0ba25b89a2eb61fcbe74a0a44bb82fdd38e6210cc65037cd0828437bed35f21bd2bde4f15c6ad6513dc6a1a4d2a43c02c903585bce645aab8524a29a72d WHIRLPOOL 3e86bd29d251ca18b23b1fa44ee55c67d9b56572cd7fe56fbc467b153fdb50086b30591a8642e9121c6224065181d5b3ee888c21b81435c4d665f752ba2e4290
DIST 50f6f276a06c.tar.gz 43434230 SHA256 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d SHA512 2a39043200c81571a4f5bb2011915f1ff2f692e783ae970b3917c9d67ef269fc6b73b9bd23da9a4afde39bb31dba53792bf9241e4b01731bc7e4520f05cf264e WHIRLPOOL 2d494d91d0667ed5c3d672f7c8e18b1ca0684aacf31edef7081b95fca4beb3aa172a2acc88325cfbfde0235290a846b93c2a343e08d7b1442855f072e31e63b0
DIST 5471e01ef43b.tar.gz 2761767 SHA256 1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d SHA512 53396ef5f19f0062e0393b0525e909a49f1ba0af2ed08ef2c3ef48bcd532be7ebbc9f9ee4947466cf4ee5486ef6695c3e42fbcce39045fdb6c3387d694eecde8 WHIRLPOOL 8089242c7b843436df3b6552c07c421f00b8c2300e28a58bbffb37265a1df424fd15c62cfd98e16135bffb357cd4a9665855a7d91a98c59de58528fc0de5a7d1
DIST 5617f6c5cc94.tar.gz 1447230 SHA256 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3 SHA512 e69344abd1daa14cad99c4ab397d138d61a57b13965333dbf627193d3a262ca45c953b9338ca651727c001135c54c905d1aec20fcf7702928b9088989c386d55 WHIRLPOOL 392229728f661ba601fd18ea2b7f7de682e7721e1dc04de71f8acee1f8b486b11f4e1028188f7fa60c282b8fcc775851b39e18327962e6de5baa3dd796fed637
DIST 6c3b742b735d.tar.gz 44788667 SHA256 48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e SHA512 4be68e6d0d46c56f597f0750496f9b19c70a44f8aff07df91e17af71af7a368ae7de090e74e9eaaa9120222523afaeab5a50c483deaf09c1a16cfe0634cc7304 WHIRLPOOL 16322e86c2d1f9e2db1ccb7c3010759dbba1886e325d5f9b2aaea475ba4416cfeee8d3bf1ba9464d25a492b3e132eef7d60a2f2d6cd2fd5256f317dee2f728cd
DIST 7a8825b15df6.tar.gz 3986524 SHA256 297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2 SHA512 5a6459c1d214510adabf9d4f7f62841a34f3ba406c08c12d3e7212399de3e2c36b59511a28b234f076552b4e1b1a96de90bc0fd19472e0d01d310aff7a73d572 WHIRLPOOL 870693026238ec603365ac8175dde13ea180baded1e25d87b78452ea5dc6beaec8f87a1863f3938e4679d5691b24526dfa33a304d53d89aa011ae72d904629ae
DIST 7edfbfe974f2.tar.gz 2760671 SHA256 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa SHA512 561f3a5409f74c1a27eb793fb1a3ec8355df7eb6449994d497621a546c2eafcdf99a625df67cb01a3bd06d07099137d0f7b926a119aafc31e3167dfb35fc17ea WHIRLPOOL d3ce038cb44f45d34f783841233cb7418a7961631afe1760e026984c32555acd6af4795ef4b88bf75decda593b3f7fd567ae0b1b21f3b201a0441519c390d7ea
DIST 7fae6a3a68c7.tar.gz 1453824 SHA256 8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f SHA512 76b29c79d4219857ab8b628086d3ea9379c490402643bc4947d3253b012115e97c5f4463f54fe7abf5d82227d722e3cb5ebb5060cdaa881bcc214670200040e0 WHIRLPOOL 55cc41286aaf4df881313dcc28664cfaf3f18b51947951a3a47b41ba7081b168941723700e6128f59729460e4c50c0ab192afc7539d131e6e48130799b4cae8c
DIST 839d0155f7cc.tar.gz 44793871 SHA256 19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7 SHA512 815b6036a07552caa96814b3f6559fb5e99cf77168b590137e69a838bdea1b9fc277f3bdecf4f56e07040fcbe1a3b1d7ddd03fb9a7094b208c9e44d81daed919 WHIRLPOOL f6639be4f40d6df9ae4734c97e438bb4a221566a87151bccd97f3db9b417b4e6a484b223a8f62b92ca18a06b3014fd80f20a6de517809520456c4e985b332f93
DIST 867d5041bee6.tar.gz 2311092 SHA256 ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707 SHA512 eca7177ceca9f90b344167330bba7a3e53989ccfea6bf0e38851735d4bf9dc8f23f1238d26373f1e19c804e7ec05aa4e84c0004847af116bc2183aded9c34cde WHIRLPOOL 18f007a4378c54c6a1ff1befbea87b39e65b3ec48cf69ac7374c3fe695d58197909b4d2952cf7d81ba9c35c40172c89c3c5cb496c1d82140d92435c06ab570d6
DIST 889dffcf4a54.tar.gz 9363922 SHA256 b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41 SHA512 e4c4cf5e2112eb9829c43ff9b381d34211245f3291181f309fc91181360fe83b8cf12ce21dac67a400e64eaca4e2ef2dbab2a6c07da7d79de99c03103e5eeb46 WHIRLPOOL 79898542e59eac28c223c142e352285e496c91fc133d0a1ddf3990fdd4032209011365a7ea9f456ef07205da97bbe751372058c4d49d260e6913a3c88d4db519
DIST 8b7c4c5f6ba9.tar.gz 9101747 SHA256 22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2 SHA512 46ea6c2d60dc2f2daadc31c33663c5d48a20121274fea6ca90afc9c470861cd9f4c53bcf4d6b8ad4e3a8fe90fd73282413d10c05f1c240d64f99acb7e7d336f1 WHIRLPOOL 8c172ddb43093474a75ff202d3b8c71e3f993724442a96c1c6036cd30f75cc8cccd0a71b8a78f610dcfc6e33580f43dadf112ca366ca6bec128ee34636f87487
DIST 9a744f20cfc5.tar.gz 2754118 SHA256 d8a6012bfb7217d3033b4b2c530753f336a5ea52e487f776f0399c87d7979b99 SHA512 da3946d02275b8f3685a2dd260ca391e3ca3f55518ea87b8a702f460c61f18fcc5b19e076dec13b241da2b665615289aba2cc18dc61d6da57f3934ec38f81671 WHIRLPOOL 5745df4b3b7f7e3888ee3075025367d19eb753b8f4195672da23866151bbdeb6853eace4d2c63ecf6c5d2278ec1cdaf4b10b2677f4e9f5bbb01518403f082ac7
DIST 9bd1d8e8b802.tar.gz 3863897 SHA256 2bddebe957905927dde720619601ffc22d3067448e6079a2befe2ba30de99a15 SHA512 3061095facb5b0216fd40055bc72cdecf3ce57d49974df6691addbbc296596f1c734440db59a843ddde86b8862fd9f497da79e3a9a2730618fa7465b3a404669 WHIRLPOOL 5b5d364a984b9f29df55b272c74800a57db981288f9b5ac1513de24775434dc22b826847a5dde3b82209b0aca60f73aeae2d533b959b260d31429e7bb203a47e
DIST a3fa5d49d528.tar.gz 130422 SHA256 c9c03e96be355de46f7aef23209afe2e9ff58c9bd4cf3e6fa4bebfb8f7dc89aa SHA512 08c0106fd8d0e8c81781e7f002a961d791afeddfa00a9e10ad4eff08e856e69c0360ee9f9e2990ddac7ae24084a9e74acf097636b91bc86dd3f88393112e8242 WHIRLPOOL 1a66ba28258b65b9a87a406cb7a6576d7be3b8fd4f02accdaeb9937770a1e47787cfb4ee4891235b677fb14597c6637fc38016fa14f13da0eca8e734ed82f96c
DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
DIST abfb890c262a.tar.gz 2761760 SHA256 e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a SHA512 14a4bc79dc5b70aedcd03bdb75edc08276d6723d2697054975c474d19df703b87f407982599ada7c8cb981f61b5de30e071292e37d2727cd3496505370519577 WHIRLPOOL e534a30d32dff0e5c852353aada373ee68316e1e9ec8991b6c86885b59e49fbc5b88bd3164b652cbff7f73587f138d274b3058ad14f56c8a6f028ebc7ecb8110
DIST acba2d30209d.tar.gz 130448 SHA256 ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528 SHA512 deabb45a62fde29f4d896351a52742fd27f4410899a0b0fa613f5a7142b0a0125a02c36b14ab21f6d98af671e606d032b47edcd5167d498c1f5173b4d83a4818 WHIRLPOOL 4f8dd5ec721ba7fdd163e54d0f83521444962b1ff5c6c0a165773e9dea23c343c2a5c049029ad4144145af8a87e8704c5c9e68a1e8b3572be804a36b9151bff7
DIST b534c4c6cd9b.tar.gz 2291346 SHA256 c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c SHA512 134554bcd68986ec574e88a5571bc55eb224a2e4a453e7762e9c87b97b871094a2ce828f4d403dd644b927bc303cb6699e34e0beab832e43c800a46e36352aab WHIRLPOOL ab8abfc586830532bfed09fd58e8336a07f936deee248846342c9897b20b55ceadfcbd1783b4c16ee4329964839337b7a9838c67ff95e2004c79a5feb8587800
DIST beea46c7086b.tar.gz 2304058 SHA256 17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb SHA512 05847a1f83248ef1f41a221cd6e8d274f29490286a0162e29d56661d82702dbb9e58b24b2815ca803749f060a6549871f6e235e4193e819f2c326b9fc9c2486f WHIRLPOOL 9499dcd542d14403ee79276d4884e41feeb88440e837078e827c401c2659e12ebec4d132c656ae1f25bde2261e6d13c88b3f79a154b7b21696989e2aace7e711
DIST bfe5efd70bce.tar.gz 9363244 SHA256 86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514 SHA512 2a015fef6673f85f152f7d2d9298a6773befec34686a1a170c88b069be5a7de62c51d63afe24fcca7681d1f099956eafb85296107b7bf481925e2b2a9a1b7d5d WHIRLPOOL 22a21277aafd840697191db8f27c0e6cba88c960442b95d474800b7aa994de1d7b0701d7f968bfc1720eb36ae52797c9491faa4a9769a1cf314205aa317c1700
DIST c89c6ac953e7.tar.gz 2754322 SHA256 a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8 SHA512 d71228526b24bb4ae8aceeaf51ee77cb1ffb0d7aa6373f61f83d13c6428446327c3ba7edd80eb7ba32c55de2916e00ca06ba8c420d6137cb4afeead843ea242d WHIRLPOOL cb34cc39d8595e1d18abd85d95779e8f83bc3fcafc89558d6fc2d163d7e4b00d0715e7e2883d22ac477535158c52c85f584abd75161b4a903eb31aee6010fae5
DIST cff92704c4e0.tar.gz 4261719 SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861 WHIRLPOOL efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959
DIST d5ddeffc4651.tar.gz 43435299 SHA256 e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98 SHA512 42e4847e20111427f0b1460ee92ba0c72048696c096072084ddee983fe171b30f1c4481080def4368f99a1e15bebf9f242a5a213166459b955a968d848d51dc0 WHIRLPOOL 35abb980f983737c4d3e84a3174cc7b0d0008e8f16ebca2460b0ccbec9411611944c00d1dca5683a9e716b8e279d4e84bfbe21d8846f711ebb32ec569696fde3
DIST e9b200124386.tar.gz 1453778 SHA256 07dcf05edc38ae63e4b667437cd23e5c3edbf6e03ffd7ce4b3eb24ea4c868468 SHA512 4852ad060d5f645433671da48591015ca8068554f1e1646b449288a35d4c9983dd7ba685db527106cddfcf456ae2bf337b776370c4a269a814bcd8c7348e2eca WHIRLPOOL 6bdb53adc0b8219c3d305a5fa798c1191848f7e929a75eb8cfaa045e89bece895405192bc51248a6f1b304292d8645c14f3228723ffe1d24ced3ced3abe04b95
DIST ea39d76b3bde.tar.gz 9593612 SHA256 25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844 SHA512 1ce50a238e3420a56c3f17aa6744031be8124c9984525cd66c74ec7871bb1c25aaa2aa729f23e58a59fb27e4365a3fb268f26097062d69581549c08a83cb0719 WHIRLPOOL 2fde8912e828ef5e0d448b0ee6a019cd76d35dc85e5e8604023103cb2c4cb6274d82e432f05822231ec537845cc13a1371ccf4bc804e5a490d9269396e744dd5
DIST ee4bd94136ec.tar.gz 3863931 SHA256 26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5 SHA512 b995ff0e4ea3dac907a30a437aeb1c21a0ecb248c5e8f62cf5c77511c255da2471e34a23758b66c2419bf9e040a2949bf4069f564edc4944964cd144341c9034 WHIRLPOOL f833dd202edb9786b023d0634311834aee3e4cefd51caf8815a5235de8bab85370329c1fdda9461a5bd0f037fe02f4662ed622f2e29e8d4aea7f8b06456a2b49
DIST f78eb7e08ee1.tar.gz 44934222 SHA256 74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224 SHA512 7b5f09c42403c35d3d11bc22a291709158702abb699cca74e7f3ebcdacd684c8cdd4fd555c85e1b84e57b61f2c0e1bbd5c482bbc448506a67f643ee76b3ceb72 WHIRLPOOL 4cef5657368e52c5c79c3bca96bb6e79168950d9f7277a3addac4b701050b690da43d31877cecdc1e5259d86dba3b795cd9b36ec75d334f0702ec4542803020d
DIST f855bdb37537.tar.gz 2303970 SHA256 d46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19 SHA512 fe866421f2dc98558093d9db0cbe1639b434f63d7a676e41b5d8874a46cf36f5b1d1aa16586c980692d0bae4097399f47939c099c0369c30e2200ba9fd9a0fc7 WHIRLPOOL fedb457aa2f09bca9416b00406838f3ed1baaeb133fe49c98e73ffb7be278ebf1eb7dcba42f6a0c7758404b47ec34b9f382a8dcdf8e988256264592f01b7990e
DIST icedtea-2.1.1.tar.gz 4658834 SHA256 4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65 SHA512 055fa8787a49152944c2141d284be358c0e0e7248dc8c56002c06a49040d9b994cf7184b2406bec60771b7621a16c0936384089503f129bbb856f805512c7f5a WHIRLPOOL 70d55da5dd44b424ec23f350a9e0061112588e81bcb64cf50c53e679ba056c6212020069e556ef59baac2421994823843f4eaa4dc41ffa17b154600c0644e2ff
DIST icedtea-2.1.tar.gz 4687722 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6 SHA512 a126f42928387a5482643006422b3a87e8e66d1d0495096944e539256bdb4d0c5d4423d8888a9d9d9a85fb04fec1cbff2488a2bbd6ff1bc46ffcc54623897276 WHIRLPOOL 3a22beff7c51b22487d45538b2b95540ed64facfcc5be0603b19cd8ea5f62b278c82600ee158c58d909103f4f82c7a405eac643043aeb64dd1bb9b881aa49665
DIST icedtea-2.2.1.tar.gz 4715301 SHA256 0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6 SHA512 03e216e29ed12e8514c4e829c66b5d11f0d9935455409be30fe01874a81a438544a99ed2b6a501d341f79f036bf3c1606ba7c25b27de6fbc6f204457c16779cd WHIRLPOOL 5287ff2a0d950a8b203e0ecc6f6c95aa082ab01105f81287ffb2a43753bf31d3acf7c4b0433acbc2a683112f989b31e2ee75bb8b7a6dce2112c9eafacaeb150b
DIST icedtea-2.2.tar.gz 4749395 SHA256 98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5 SHA512 69418c22d7d6635d236e4ba3b8995019ff1d2ecc1166d10606a797239eed952e4a91dc5cec9ea61433b6cc855a4a8de112f638f6f01ab0ec45ca1440d47b78b9 WHIRLPOOL 4288bec9ad76374ef8d27a9549356361a17bba6bc5f0066c9a523b4b3d0f40abd8c89fd0214386b1a453b7e77723a00f348dc71258169bf7af7abf234967d69d
DIST icedtea-2.3.1.tar.gz 4740854 SHA256 4d5f253fb20d4026ae55e8ab97840e257ca5b89897593a68dd18bb1c48b6f3e9 SHA512 0f415b84f18019690309b57ced53eb23e9a92b3537672b7185062a721ca3f533af65d4571a42501204f6442a22c41762837e222ff02a34c5f628607c009ff2d8 WHIRLPOOL e9794b9a3173302ebf2479dbb3e3b6db0f00ad5213c146c99da4b688164870cd1e9a825e25436e624384f889bb15e59ac03917c1205881997e9c43fe936d4f2e
DIST icedtea-2.3.2.tar.gz 5042922 SHA256 d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2 SHA512 e1d56b0576d87f546dd10dc3b684db8af555599706582efc3535ef96732ca1934b1f1bda99dc706b6c242834fdbb16fbd94827e876110cbff1fd7338475d7ae1 WHIRLPOOL 170486abd82b63687d9af14b724aa9143c25a4463802534fe4e0e3470ebcb5950e91353f11170c5d6238015c2fd0124c7ee81388664412fc9ab89df7418f299e
DIST icedtea6-1.11.2.tar.gz 6387625 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5 SHA512 0aa85aba480a59edacb639e639610fc2967834f5b528a8418d972ad5e391913a74546d682943d7df71841281caf5d3639cc49bcdfafd6ef6eebdc0d4899b1018 WHIRLPOOL 7bdaa91b0b50857de18ae13b721572e1fdc7ecbdbd30b15c992bbc2c90ec11aaf7476a8f7b98a54d5dd54b9891e1a3ec0f95be0280fa4b04ec6ce47f51d55da0
DIST icedtea6-1.11.3.tar.gz 6340923 SHA256 7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4 SHA512 517c81d24c26b583ed3c0cbd3ecd1a4379b9ea323c03349c12e1cb5125ec84c1e91adc3382b8a8bf2146115347d97462cb4d89c7af4bdb485f89aed864d9b082 WHIRLPOOL 532ec3212ffa0a9f97dec174e23a1af3874b2bef2ed327ae3cb97a1b8a920fd1c62008fa458d582df7ce28aa130371644759892137829a01856a3047df75b88f
DIST icedtea6-1.11.4.tar.gz 6379356 SHA256 7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd SHA512 e50dea9674d5badeebdafe50ca81b5f195cb8fa898ae43f5110971aebf5f5419b2841786aa132e839fec569206a70fb4ace0111ecf5a1b0fe567561fc28a8ccf WHIRLPOOL ac5349ddf715bab29e2e8a93e13e5e8a056c14b8a63976ac1ea96ed14ae7ee0d383eb97716e71d7b348649dab19d58e2c824b0a76128e2cb6518b29c49dd0e50
DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
DIST jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz 298410 SHA256 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c SHA512 5843bdf7e00a120e6dc545b4d2d69f2fb72cb0e368a9fe5e280536bf065c6cb207c75c32477f3ef7d210c8dcbcb93324c14042579b92b177c651dfae1ae95b54 WHIRLPOOL b0a40fd4929acac5d3a24c3aabc9666baf071b84b56e3992d3a191eea202bf8d7d169a68a390816dec606df2055902f33ce10c8c0a5d1b6d46ff7a8869e8098f

@ -1,85 +0,0 @@
# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1339588177 -3600
# Node ID df0999b55509faf1504b3ff55152a61a7cff57fc
# Parent e6d81fc2c9439652f903664d51a13732c73485ea
Make compile-for-7.patch apply after cacao/memory.patch
2012-06-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
Apply compile-for-7-cacao-mem.patch instead of
compile-for-7.patch when using a compiler that
supports diamond and either USING_CACAO or BUILD_CACAO
are set.
* patches/boot/compile-for-7-cacao-mem.patch:
Version of compile-for-7.patch post applying
cacao/memory.patch.
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,8 +364,16 @@
if JAVAC_LACKS_DIAMOND
ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
else
+if USING_CACAO
+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
+else
+if BUILD_CACAO
+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
+else
ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
endif
+endif
+endif
if DTDTYPE_QNAME
ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
diff --git a/patches/boot/compile-for-7-cacao-mem.patch b/patches/boot/compile-for-7-cacao-mem.patch
new file mode 100644
--- /dev/null
+++ b/patches/boot/compile-for-7-cacao-mem.patch
@@ -0,0 +1,42 @@
+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:48:41.838257784 +0100
+@@ -139,8 +139,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make 2012-06-13 11:36:03.057522188 +0100
+@@ -131,8 +131,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make 2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make 2012-06-13 11:36:19.537797380 +0100
+@@ -43,8 +43,8 @@
+ !endif
+
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION=6
+-BOOT_TARGET_CLASS_VERSION=6
++BOOT_SOURCE_LANGUAGE_VERSION=7
++BOOT_TARGET_CLASS_VERSION=7
+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+

@ -1,257 +0,0 @@
# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1339484856 -3600
# Node ID 1a9e619bc32e81697bf4200a607935ee00c8d388
# Parent 7ceb431c104f1da9cbabebdcc223b008e0177a71
Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
2012-03-20 Andrew John Hughes <ahughes@redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Define only once and
rename from IT_FIND_JAVA_COMPILER.
(IT_FIND_ECJ): Use same form as detection
for java, javah, jar and rmic.
(IT_FIND_JAVAC): Likewise.
(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
java and javac actually work together to compile code
before running other tests such as the dtdtype one.
(IT_CHECK_FOR_CLASS): Depend on java/javac working.
(IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
(IT_JAVAH): Depend on java/javac working.
* configure.ac: Invoke IT_FIND_COMPILER rather than
IT_FIND_JAVA_COMPILER.
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -117,50 +117,41 @@
AC_SUBST(OS_PATH)
])
-AC_DEFUN([IT_FIND_JAVA_COMPILER],
+AC_DEFUN([IT_FIND_COMPILER],
[
- JAVAC=${SYSTEM_JDK_DIR}/bin/javac
IT_FIND_JAVAC
IT_FIND_ECJ
IT_USING_ECJ
+ AC_SUBST(ECJ)
AC_SUBST(JAVAC)
])
-AC_DEFUN([IT_FIND_ECJ],
+AC_DEFUN_ONCE([IT_FIND_ECJ],
[
+ ECJ_DEFAULT=/usr/bin/ecj
+ AC_MSG_CHECKING([if an ecj binary was specified])
AC_ARG_WITH([ecj],
- [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
+ [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_ECJ(${withval})
+ if test "x${withval}" = "xyes"; then
+ ECJ=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_ECJ
- fi
+ ECJ="${withval}"
fi
],
[
- IT_CHECK_ECJ
+ ECJ=no
])
- if test "x${JAVAC}" = "x"; then
- if test "x{ECJ}" != "x"; then
- JAVAC="${ECJ}"
- fi
+ AC_MSG_RESULT(${ECJ})
+ if test "x${ECJ}" = "xno"; then
+ ECJ=${ECJ_DEFAULT}
fi
-])
-
-AC_DEFUN([IT_CHECK_ECJ],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for ecj)
- ECJ="$1"
- AC_MSG_RESULT(${ECJ})
- else
- AC_PATH_PROG(ECJ, "$1")
- fi
+ AC_MSG_CHECKING([if $ECJ is a valid executable file])
+ if test -x "${ECJ}" && test -f "${ECJ}"; then
+ AC_MSG_RESULT([yes])
else
+ ECJ=""
AC_PATH_PROG(ECJ, "ecj")
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.1")
@@ -171,43 +162,45 @@
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.3")
fi
+ if test -z "${ECJ}"; then
+ AC_PATH_PROG(ECJ, "ecj-3.4")
+ fi
fi
])
-AC_DEFUN([IT_FIND_JAVAC],
+AC_DEFUN_ONCE([IT_FIND_JAVAC],
[
+ JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
+ AC_MSG_CHECKING([if a javac binary was specified])
AC_ARG_WITH([javac],
[AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${withval})
+ if test "x${withval}" = "xyes"; then
+ JAVAC=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${JAVAC})
- fi
+ JAVAC="${withval}"
fi
],
- [
- IT_CHECK_JAVAC(${JAVAC})
+ [
+ JAVAC=no
+ ])
+ AC_MSG_RESULT(${JAVAC})
+ if test "x${JAVAC}" = "xno"; then
+ JAVAC=${JAVAC_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $JAVAC is a valid executable file])
+ if test -x "${JAVAC}" && test -f "${JAVAC}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVAC=""
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+ AC_SUBST(JAVAC)
])
])
-AC_DEFUN([IT_CHECK_JAVAC],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for javac)
- JAVAC="$1"
- AC_MSG_RESULT(${JAVAC})
- else
- AC_PATH_PROG(JAVAC, "$1")
- fi
- else
- AC_PATH_PROG(JAVAC, "javac")
- fi
-])
-
-AC_DEFUN([IT_FIND_JAVA],
+AC_DEFUN_ONCE([IT_FIND_JAVA],
[
JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
AC_MSG_CHECKING([if a java binary was specified])
@@ -1158,6 +1151,7 @@
])
AC_DEFUN([IT_JAVAH],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
SUPERCLASS=Test.java
SUBCLASS=TestImpl.java
@@ -1452,6 +1446,44 @@
AC_CONFIG_FILES([tz.properties])
])
+dnl check that javac and java work
+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_REQUIRE([IT_FIND_COMPILER])
+ AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ System.out.println("Hello World!");
+ }
+}]
+EOF
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_jdk_works=yes;
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([VM failed to run compiled class.])
+ fi
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([Compiler failed to compile Java code.])
+ fi
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+ ])
+AC_PROVIDE([$0])dnl
+])
+
dnl Generic macro to check for a Java class
dnl Takes two arguments: the name of the macro
dnl and the name of the class. The macro name
@@ -1459,6 +1491,7 @@
dnl replaced by '_' and all letters capitalised.
dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
AC_DEFUN([IT_CHECK_FOR_CLASS],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1504,7 +1537,8 @@
AC_PROVIDE([$0])dnl
])
-AC_DEFUN([IT_GETDTDTYPE_CHECK],[
+AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1561,7 +1595,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_dtdtype=no;
else
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@
IT_CHECK_IF_DOWNLOADING
IT_CHECK_FOR_JDK
IT_FIND_JAVA
-IT_FIND_JAVA_COMPILER
+IT_FIND_COMPILER
IT_FIND_JAVAH
IT_FIND_JAR
IT_FIND_RMIC

@ -1,25 +0,0 @@
# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1338297380 -3600
# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
# Parent 2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
Don't add a suffix for building the default, IcedTea.
2012-05-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(versioning): Don't add a suffix if building
the default project, 'icedtea'.
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1435,7 +1435,7 @@
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ;
endif
- if test x"$(PROJECT_NAME)" != "xjdk7"; then \
+ if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
proj_suffix="-$(PROJECT_NAME)"; \
fi ; \
if test x"$(VERSION_SUFFIX)" != "x"; then \

@ -1,13 +0,0 @@
--- acinclude.m4.orig 2012-02-25 15:44:58.208371766 +0100
+++ acinclude.m4 2012-02-25 15:46:03.592027548 +0100
@@ -2011,7 +2011,9 @@
AC_MSG_RESULT(${ENABLE_SYSTEM_GTK})
if test x"${ENABLE_SYSTEM_GTK}" = "xyes"; then
dnl Check for Gtk+ headers and libraries.
- PKG_CHECK_MODULES(GTK, gtk+-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
+ dnl Explicitly include gthread-2.0 to get g_thread_init even on glib 2.32
+ dnl where it is deprecated.
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0,[GTK_FOUND=yes],[GTK_FOUND=no])
if test "x${GTK_FOUND}" = xno
then
AC_MSG_ERROR([Could not find Gtk+; install Gtk+ or build with --disable-system-gtk to use the in-tree headers.])

@ -1,202 +0,0 @@
Author: Ralph Sennhaser <sera@gentoo.org>
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.
The embedded test_gamma.patch is taken from icedtea 2.0 itself.
diff --git a/Makefile.am b/Makefile.am
index 129edf2..158b149 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -279,6 +279,10 @@ else
ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
+if WITH_PAX
+ICEDTEA_PATCHES += patches/test_gamma.patch
+endif
+
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -300,7 +304,6 @@ ICEDTEA_BOOT_PATCHES = \
patches/boot/jar.patch \
patches/boot/symbols.patch \
patches/boot/tobin.patch \
- patches/boot/test_gamma.patch \
patches/boot/tools.jar.patch \
patches/boot/jopt.patch \
patches/boot/jaxp-dependency.patch \
@@ -320,6 +323,10 @@ ICEDTEA_BOOT_PATCHES = \
patches/boot/ecj-autoboxing.patch \
patches/boot/xsltproc.patch
+if !WITH_PAX
+ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
+endif
+
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
endif
@@ -1612,6 +1619,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.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
@@ -1765,6 +1773,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot \
$(ICEDTEA_BUILD_TARGET)
+ $(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
@echo "Bootstrapped IcedTea is served:" \
$(BOOT_BUILD_OUTPUT_DIR)
mkdir -p stamps
diff --git a/acinclude.m4 b/acinclude.m4
index 5310d71..f08f1a9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2181,3 +2181,49 @@ rmdir tmp.$$
AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "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 e0b866b..7c665ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,9 @@ IT_WITH_PROJECT
IT_ENABLE_HG
IT_WITH_TZDATA_DIR
+IT_WITH_PAX
+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
+
AC_PATH_TOOL([HG],[hg])
if test "x${enable_hg}" = "xyes"; then
if test "x${HG}" = x; then
diff --git a/patches/test_gamma.patch b/patches/test_gamma.patch
new file mode 100644
index 0000000..7e8d3d6
--- /dev/null
+++ b/patches/test_gamma.patch
@@ -0,0 +1,47 @@
+diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
+--- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile 2009-10-30 17:37:07.000000000 +0000
++++ openjdk/hotspot/make/linux/Makefile 2009-10-30 17:45:40.000000000 +0000
+@@ -287,42 +287,36 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_ZERO): $(SUBDIRS_ZERO)
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_SHARK): $(SUBDIRS_SHARK)
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
diff --git a/pax-mark-vm.in b/pax-mark-vm.in
new file mode 100644
index 0000000..118bb61
--- /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

@ -1,31 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 49d8bc4..85ac971 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+ patches/test_gamma.patch \
+ patches/pax-mark-rmic-java.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
new file mode 100644
index 0000000..ad80f3a
--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ $(prep-target)
++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ $(RMIC) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -v1.2 \

@ -1,143 +0,0 @@
diff -Nru icedtea-2.1.1.orig/acinclude.m4 icedtea-2.1.1/acinclude.m4
--- icedtea-2.1.1.orig/acinclude.m4 2012-06-13 02:56:54.455836680 +0100
+++ icedtea-2.1.1/acinclude.m4 2012-06-13 02:57:31.660476528 +0100
@@ -2258,3 +2258,18 @@
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
+
+AC_DEFUN([IT_USING_CACAO],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
+ if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
+ it_cv_cacao=yes;
+ else
+ it_cv_cacao=no;
+ fi
+ ])
+ USING_CACAO=$it_cv_cacao
+ AC_SUBST(USING_CACAO)
+ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
+ AC_PROVIDE([$0])dnl
+])
diff -Nru icedtea-2.1.1.orig/configure.ac icedtea-2.1.1/configure.ac
--- icedtea-2.1.1.orig/configure.ac 2012-06-13 02:56:54.459836748 +0100
+++ icedtea-2.1.1/configure.ac 2012-06-13 02:57:31.660476528 +0100
@@ -101,6 +101,7 @@
IT_FIND_JAR
IT_FIND_RMIC
IT_FIND_NATIVE2ASCII
+IT_USING_CACAO
if test "x$enable_bootstrap" = "xyes"; then
IT_FIND_ECJ_JAR
IT_FIND_TOOL([XSLTPROC], [xsltproc])
diff -Nru icedtea-2.1.1.orig/Makefile.am icedtea-2.1.1/Makefile.am
--- icedtea-2.1.1.orig/Makefile.am 2012-06-13 02:56:54.403835785 +0100
+++ icedtea-2.1.1/Makefile.am 2012-06-13 02:57:31.648476322 +0100
@@ -249,6 +249,11 @@
patches/cacao/launcher.patch \
patches/cacao/jsig.patch \
patches/cacao/memory.patch
+else
+if USING_CACAO
+ICEDTEA_PATCHES += \
+ patches/cacao/memory.patch
+endif
endif
if ENABLE_CACAO
diff -Nru icedtea-2.1.1.orig/patches/cacao/launcher.patch icedtea-2.1.1/patches/cacao/launcher.patch
--- icedtea-2.1.1.orig/patches/cacao/launcher.patch 2012-06-13 02:28:23.950879620 +0100
+++ icedtea-2.1.1/patches/cacao/launcher.patch 2012-06-13 02:59:50.858865063 +0100
@@ -1,14 +1,3 @@
---- openjdk/jdk/make/docs/Makefile.orig 2010-08-27 20:01:53.000000000 +0200
-+++ openjdk/jdk/make/docs/Makefile 2010-09-07 12:56:00.309691118 +0200
-@@ -70,7 +70,7 @@
- ifeq ($(ARCH_DATA_MODEL),64)
- MAX_VM_MEMORY = 1024
- else
-- MAX_VM_MEMORY = 512
-+ MAX_VM_MEMORY = 768
- endif
-
- # List of all possible directories for javadoc to look for sources
--- openjdk/jdk/src/share/bin/java.c.orig 2010-09-07 05:24:49.307192201 +0200
+++ openjdk/jdk/src/share/bin/java.c 2010-09-07 12:56:00.309691118 +0200
@@ -174,6 +174,8 @@
diff -Nru icedtea-2.1.1.orig/patches/cacao/memory.patch icedtea-2.1.1/patches/cacao/memory.patch
--- icedtea-2.1.1.orig/patches/cacao/memory.patch 2012-06-13 02:28:23.954879676 +0100
+++ icedtea-2.1.1/patches/cacao/memory.patch 2012-06-13 03:01:11.156239098 +0100
@@ -1,6 +1,70 @@
---- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
-+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
-@@ -554,6 +554,7 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
+@@ -141,7 +141,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
+@@ -133,7 +133,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-07 19:21:17.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-13 03:36:26.364575315 +0100
+@@ -45,7 +45,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION=6
+ BOOT_TARGET_CLASS_VERSION=6
+-JAVAC_FLAGS=-g -encoding ascii
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ ProjectFile=jvm.vcproj
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 14:12:38.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-13 03:36:26.380575614 +0100
+@@ -447,7 +447,7 @@
+ else \
+ echo "false"; \
+ fi)
+- MAX_VM_MEMORY := 512
++ MAX_VM_MEMORY := 1536
+ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
+ else
+ MB_OF_MEMORY := unknown
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 14:12:38.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile 2012-06-13 03:36:26.380575614 +0100
+@@ -69,9 +69,9 @@
+ # NOTE: javadoc will not complete without these larger settings.
+ # WARNING: This could cause thrashing on low memory machines.
+ ifeq ($(ARCH_DATA_MODEL),64)
+- MAX_VM_MEMORY = 1024
++ MAX_VM_MEMORY = 1792
+ else
+- MAX_VM_MEMORY = 512
++ MAX_VM_MEMORY = 768
+ endif
+
+ # List of all possible directories for javadoc to look for sources
+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
+--- openjdk.orig/langtools/make/build.xml 2012-02-15 08:26:56.000000000 +0000
++++ openjdk/langtools/make/build.xml 2012-06-13 03:36:26.380575614 +0100
+@@ -796,6 +796,7 @@
<compilerarg value="-implicit:none"/>
<compilerarg value="-Xprefer:source"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>

@ -1,25 +0,0 @@
# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1338297380 -3600
# Node ID fb4e64ae06a31c878cc711579fe87a6f626f73fb
# Parent 2c3c929e038c6c64d79ecf98005f5fd2f4d0f37d
Don't add a suffix for building the default, IcedTea.
2012-05-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(versioning): Don't add a suffix if building
the default project, 'icedtea'.
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1435,7 +1435,7 @@
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ;
endif
- if test x"$(PROJECT_NAME)" != "xjdk7"; then \
+ if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
proj_suffix="-$(PROJECT_NAME)"; \
fi ; \
if test x"$(VERSION_SUFFIX)" != "x"; then \

@ -1,31 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 49d8bc4..85ac971 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+ patches/test_gamma.patch \
+ patches/pax-mark-rmic-java.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
new file mode 100644
index 0000000..ad80f3a
--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ $(prep-target)
++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ $(RMIC) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -v1.2 \

@ -1,184 +0,0 @@
# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1339542060 -3600
# Node ID e6d81fc2c9439652f903664d51a13732c73485ea
# Parent 1a9e619bc32e81697bf4200a607935ee00c8d388
PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
2012-06-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR986
* Makefile.am:
(ICEDTEA_PATCHES): Add memory patch when
building using CACAO as well, even if the
result is not a CACAO build.
* acinclude.m4:
(IT_USING_CACAO): New macro; detects use of
CACAO as the build VM so memory limits can
be raised accordingly.
* configure.ac: Call IT_USING_CACAO.
* patches/cacao/launcher.patch:
Move memory increase to memory.patch.
* patches/cacao/memory.patch:
Extend with additional cases in HotSpot and
the JDK.
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,6 +249,11 @@
patches/cacao/launcher.patch \
patches/cacao/jsig.patch \
patches/cacao/memory.patch
+else
+if USING_CACAO
+ICEDTEA_PATCHES += \
+ patches/cacao/memory.patch
+endif
endif
if ENABLE_CACAO
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2278,3 +2278,18 @@
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
+
+AC_DEFUN([IT_USING_CACAO],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
+ if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
+ it_cv_cacao=yes;
+ else
+ it_cv_cacao=no;
+ fi
+ ])
+ USING_CACAO=$it_cv_cacao
+ AC_SUBST(USING_CACAO)
+ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
+ AC_PROVIDE([$0])dnl
+])
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@
IT_FIND_JAR
IT_FIND_RMIC
IT_FIND_NATIVE2ASCII
+IT_USING_CACAO
if test "x$enable_bootstrap" = "xyes"; then
IT_FIND_ECJ_JAR
IT_FIND_TOOL([XSLTPROC], [xsltproc])
diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch
+++ b/patches/cacao/launcher.patch
@@ -1,15 +1,3 @@
-diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
---- openjdk.orig/jdk/make/docs/Makefile 2012-03-21 17:09:55.000000000 +0000
-+++ openjdk/jdk/make/docs/Makefile 2012-03-23 00:46:49.461847958 +0000
-@@ -73,7 +73,7 @@
- else ifeq ($(ARCH),universal)
- MAX_VM_MEMORY = 1024
- else
-- MAX_VM_MEMORY = 512
-+ MAX_VM_MEMORY = 768
- endif
-
- # List of all possible directories for javadoc to look for sources
diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
--- openjdk.orig/jdk/src/share/bin/java.c 2012-03-21 17:09:55.000000000 +0000
+++ openjdk/jdk/src/share/bin/java.c 2012-03-23 00:46:49.461847958 +0000
diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
--- a/patches/cacao/memory.patch
+++ b/patches/cacao/memory.patch
@@ -1,6 +1,85 @@
---- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
-+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
-@@ -554,6 +554,7 @@
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/bsd/makefiles/rules.make 2012-06-12 10:50:20.974290246 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -120,7 +120,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -45,7 +45,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION=6
+ BOOT_TARGET_CLASS_VERSION=6
+-JAVAC_FLAGS=-g -encoding ascii
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ ProjectFile=jvm.vcproj
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-12 10:50:20.982290377 +0100
+@@ -537,7 +537,7 @@
+ else \
+ echo "false"; \
+ fi)
+- MAX_VM_MEMORY := 512
++ MAX_VM_MEMORY := 1536
+ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
+ else
+ MB_OF_MEMORY := unknown
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100
+@@ -69,11 +69,11 @@
+ # NOTE: javadoc will not complete without these larger settings.
+ # WARNING: This could cause thrashing on low memory machines.
+ ifeq ($(ARCH_DATA_MODEL),64)
+- MAX_VM_MEMORY = 1024
++ MAX_VM_MEMORY = 1792
+ else ifeq ($(ARCH),universal)
+- MAX_VM_MEMORY = 1024
++ MAX_VM_MEMORY = 1792
+ else
+- MAX_VM_MEMORY = 512
++ MAX_VM_MEMORY = 768
+ endif
+
+ # List of all possible directories for javadoc to look for sources
+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
+--- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100
++++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100
+@@ -796,6 +796,7 @@
<compilerarg value="-implicit:none"/>
<compilerarg value="-Xprefer:source"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>

@ -1,217 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 49d8bc4..b20ee99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -235,7 +235,8 @@ REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = \
+ patches/warnings-are-errors.patch
# Conditional patches
@@ -437,7 +438,9 @@ ICEDTEA_ENV = \
USE_SYSTEM_CUPS="true" \
CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" \
- ALT_STRIP_POLICY=no_strip
+ ALT_STRIP_POLICY=no_strip \
+ COMPILER_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@" \
+ JAVAC_WARNINGS_FATAL="@WARNINGS_ARE_ERRORS@"
if ENABLE_CACAO
ICEDTEA_ENV += \
diff --git a/acinclude.m4 b/acinclude.m4
index f0a336f..3dc4aa0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2244,3 +2244,23 @@ AC_DEFUN_ONCE([IT_WITH_PAX],
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
+
+AC_DEFUN_ONCE([IT_WARNINGS_ARE_ERRORS],
+[
+ AC_MSG_CHECKING([whether to treat warnings as errors.])
+ AC_ARG_ENABLE([warnings-are-errors],
+ [AS_HELP_STRING(--enable-warnings-are-errors,treat warnings as errors [[default=yes]])],
+ [
+ if test x"${enableval}" = "xyes"; then
+ WARNINGS_ARE_ERRORS="true"
+ else
+ WARNINGS_ARE_ERRORS="false"
+ fi
+ ],
+ [
+ dnl use local defaults
+ WARNINGS_ARE_ERRORS=
+ ])
+ AC_MSG_RESULT([${WARNINGS_ARE_ERRORS}])
+ AC_SUBST([WARNINGS_ARE_ERRORS])
+])
diff --git a/configure.ac b/configure.ac
index 36c9d77..af52bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ IT_DISABLE_TESTS
IT_DISABLE_HOTSPOT_TESTS
IT_DISABLE_LANGTOOLS_TESTS
IT_DISABLE_JDK_TESTS
+IT_WARNINGS_ARE_ERRORS
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
diff --git a/patches/boot/ecj-opts.patch b/patches/boot/ecj-opts.patch
index 99ed532..284bd37 100644
--- a/patches/boot/ecj-opts.patch
+++ b/patches/boot/ecj-opts.patch
@@ -5,8 +5,8 @@ diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/jav
PACKAGE = java.nio
LIBRARY = nio
PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
+OTHER_JAVACFLAGS += -Xlint:serial -Werror
- include $(BUILDDIR)/common/Defs.gmk
-
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
+ ifneq ($(JAVAC_WARNINGS_FATAL),false)
+ OTHER_JAVACFLAGS += -Werror
+ endif
diff --git a/patches/warnings-are-errors.patch b/patches/warnings-are-errors.patch
new file mode 100644
index 0000000..7fe1e08
--- /dev/null
+++ b/patches/warnings-are-errors.patch
@@ -0,0 +1,129 @@
+--- openjdk/hotspot/make/linux/makefiles/adlc.make
++++ openjdk/hotspot/make/linux/makefiles/adlc.make
+@@ -67,8 +67,10 @@
+ CXXFLAGS += -DASSERT
+
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+-# Compiler warnings are treated as errors
+-CFLAGS_WARN = -Werror
++# Treat compiler warnings as errors, unless warnings are allowed
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++ CFLAGS_WARN = -Werror
++endif
+ CFLAGS += $(CFLAGS_WARN)
+
+ OBJECTNAMES = \
+--- openjdk/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -149,8 +149,10 @@
+ CFLAGS += -pipe
+ endif
+
+-# Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++# Treat compiler warnings as errors, unless warnings are allowed
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++ WARNINGS_ARE_ERRORS = -Werror
++endif
+
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+--- openjdk/hotspot/make/solaris/makefiles/gcc.make
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make
+@@ -111,8 +111,10 @@
+ endif
+
+
+-# Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++# Treat compiler warnings as errors, unless warnings are allowed
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++ WARNINGS_ARE_ERRORS = -Werror
++endif
+ # Enable these warnings. See 'info gcc' about details on these options
+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
+--- openjdk/jdk/make/java/nio/Makefile
++++ openjdk/jdk/make/java/nio/Makefile
+@@ -31,7 +31,10 @@
+ PACKAGE = java.nio
+ LIBRARY = nio
+ PRODUCT = java
+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial
++ifneq ($(JAVAC_WARNINGS_FATAL),false)
++ OTHER_JAVACFLAGS += -Werror
++endif
+ include $(BUILDDIR)/common/Defs.gmk
+
+ NIO_SRC = $(SHARE_SRC)/classes/java/nio
+--- openjdk/jdk/make/java/sun_nio/Makefile
++++ openjdk/jdk/make/java/sun_nio/Makefile
+@@ -31,7 +31,11 @@
+ PACKAGE = sun.nio
+ PRODUCT = sun
+
+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
++ifneq ($(JAVAC_WARNINGS_FATAL),false)
++ OTHER_JAVACFLAGS += -Werror
++endif
++
+ include $(BUILDDIR)/common/Defs.gmk
+
+ #
+--- openjdk/jdk/make/sun/native2ascii/Makefile
++++ openjdk/jdk/make/sun/native2ascii/Makefile
+@@ -30,7 +30,10 @@
+ BUILDDIR = ../..
+ PACKAGE = sun.tools.native2ascii
+ PRODUCT = sun
+-OTHER_JAVACFLAGS += -Xlint:serial -Werror
++OTHER_JAVACFLAGS += -Xlint:serial
++ifneq ($(JAVAC_WARNINGS_FATAL),false)
++ OTHER_JAVACFLAGS += -Werror
++endif
+ include $(BUILDDIR)/common/Defs.gmk
+
+ # This program must contain a manifest that defines the execution level
+--- openjdk/jdk/make/sun/nio/cs/Makefile
++++ openjdk/jdk/make/sun/nio/cs/Makefile
+@@ -36,7 +36,10 @@
+ # This re-directs all the class files to a separate location
+ CLASSDESTDIR = $(TEMPDIR)/classes
+
+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror
++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
++ifneq ($(JAVAC_WARNINGS_FATAL),false)
++ OTHER_JAVACFLAGS += -Werror
++endif
+ include $(BUILDDIR)/common/Defs.gmk
+
+ #
+--- openjdk/jdk/make/tools/Makefile
++++ openjdk/jdk/make/tools/Makefile
+@@ -29,7 +29,10 @@
+
+ BUILDDIR = ..
+
+-SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true JAVAC_WARNINGS_FATAL=true
++SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
++ifneq ($(JAVAC_WARNINGS_FATAL),false)
++ SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
++endif
+ include $(BUILDDIR)/common/Defs.gmk
+
+ # Note: freetypecheck is built by Sanity.gmk if needed
+--- openjdk/langtools/make/Makefile
++++ openjdk/langtools/make/Makefile
+@@ -111,6 +111,10 @@
+ ANT_OPTIONS += -Ddebug.classfiles=true
+ endif
+
++ifeq ($(JAVAC_WARNINGS_FATAL),false)
++ ANT_OPTIONS += -Djavac.lint.opts=-Xlint:all,-deprecation
++endif
++
+ # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
+ # and the somewhat misnamed CLASS_VERSION (-target NN)
+ ifdef TARGET_CLASS_VERSION

@ -1,31 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 49d8bc4..85ac971 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+ patches/test_gamma.patch \
+ patches/pax-mark-rmic-java.patch
endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
new file mode 100644
index 0000000..ad80f3a
--- /dev/null
+++ b/patches/pax-mark-rmic-java.patch
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ $(prep-target)
++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ $(RMIC) -classpath "$(CLASSDESTDIR)" \
+ -d $(CLASSDESTDIR) \
+ -v1.2 \

@ -1,316 +0,0 @@
# 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.2.ebuild,v 1.1 2012/05/14 16:27:04 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 ~ia64 ~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/unzip
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
virtual/pkgconfig
sys-apps/lsb-release
${X_DEPEND}
jbootstrap? (
|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
)
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
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
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
}

@ -1,336 +0,0 @@
# 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.3.ebuild,v 1.2 2012/06/24 08:19:48 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"
JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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}
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="+X +alsa cacao 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/unzip
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
virtual/pkgconfig
sys-apps/lsb-release
${X_DEPEND}
jbootstrap? (
|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
)
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:6 )
nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
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 #422525
epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap enable_cacao
local vm=$(java-pkg_get-current-vm)
# IcedTea6 can't be built using IcedTea7; its class files are too new
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
fi
config="${config} --${bootstrap}-bootstrap"
if [[ ${bootstrap} == enable ]]; then
# 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}"
fi
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use CACAO
if ! has "${ARCH}" amd64 sparc x86; then
enable_cacao=yes
elif use cacao; then
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
ewarn 'If so, please rebuild with USE="-cacao"'
enable_cacao=yes
fi
if [[ ${enable_cacao} ]]; then
config="${config} --enable-cacao"
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-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_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 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}
docompress -x /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
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
}

@ -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/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.1 2012/09/02 11:48:02 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.4.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@ -213,7 +213,7 @@ src_configure() {
einfo "Configuring using --with-parallel-jobs=${procs}"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
else
config="${config} --without-rhino"
fi

@ -1,340 +0,0 @@
# 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-7.2.1.1.ebuild,v 1.2 2012/06/24 08:19:48 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="4"
inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
OPENJDK_TARBALL="22cc03983e20.tar.gz"
CORBA_TARBALL="338c21646c76.tar.gz"
HOTSPOT_TARBALL="8b7c4c5f6ba9.tar.gz"
JAXP_TARBALL="7a8825b15df6.tar.gz"
JAXWS_TARBALL="7edfbfe974f2.tar.gz"
JDK_TARBALL="d5ddeffc4651.tar.gz"
LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
CACAO_TARBALL="a567bcb7f589.tar.gz"
JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
>=dev-libs/glib-2.26
media-libs/fontconfig
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=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
>=x11-libs/pango-1.24.5"
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/lcms:2
>=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 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
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
# 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:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
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
virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:7 )
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7 icedtea7
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# 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"
epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
config="${config} --with-ecj-jar=${ecj_jar}"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use JamVM as it's the only possibility right now
if ! has "${ARCH}" amd64 sparc x86; then
config="${config} --enable-jamvm"
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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_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 -j 1
}
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
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
docompress -x /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
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. 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
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 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
}

@ -1,334 +0,0 @@
# 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-7.2.1.ebuild,v 1.4 2012/05/03 07:42:50 jdhore Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="4"
inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
OPENJDK_TARBALL="22cc03983e20.tar.gz"
CORBA_TARBALL="5617f6c5cc94.tar.gz"
HOTSPOT_TARBALL="0e651e004747.tar.gz"
JAXP_TARBALL="1cf75c0e2c96.tar.gz"
JAXWS_TARBALL="7edfbfe974f2.tar.gz"
JDK_TARBALL="50f6f276a06c.tar.gz"
LANGTOOLS_TARBALL="b534c4c6cd9b.tar.gz"
JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
!amd64? ( !sparc? ( !x86? (
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
>=dev-libs/glib-2.26
media-libs/fontconfig
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=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
>=x11-libs/pango-1.24.5"
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/lcms:2
>=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 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
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
# 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:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
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
virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
|| ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:7 )
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7 icedtea7
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# 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"
epatch "${FILESDIR}"/${PN}-7.2.0_pax_kernel_support.patch #389751
epatch "${FILESDIR}"/${PN}-7.2.0-explicit-gthread.patch #402481
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" icedtea7 icedtea-7 icedtea-bin-7 icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
config="${config} --with-ecj-jar=${ecj_jar}"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use JamVM as it's the only possibility right now
if ! has "${ARCH}" amd64 sparc x86; then
config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_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 -j 1
}
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
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
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. 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
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 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
}

@ -1,343 +0,0 @@
# 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-7.2.2.1.ebuild,v 1.3 2012/06/27 19:08:57 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="4"
inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
OPENJDK_TARBALL="0b776ef59474.tar.gz"
CORBA_TARBALL="38deb372c569.tar.gz"
HOTSPOT_TARBALL="889dffcf4a54.tar.gz"
JAXP_TARBALL="335fb0b059b7.tar.gz"
JAXWS_TARBALL="5471e01ef43b.tar.gz"
JDK_TARBALL="6c3b742b735d.tar.gz"
LANGTOOLS_TARBALL="beea46c7086b.tar.gz"
CACAO_TARBALL="a567bcb7f589.tar.gz"
JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
>=dev-libs/glib-2.26
media-libs/fontconfig
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=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
>=x11-libs/pango-1.24.5"
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/lcms:2
>=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 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
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
# 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:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
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
virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:7 )
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7 icedtea7
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# 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"
epatch "${FILESDIR}"/${PN}-${SLOT}-no_suffix.patch
epatch "${FILESDIR}"/${PN}-${SLOT}-compiler_detection_cleanup.patch
epatch "${FILESDIR}"/${P}-pr986-cacao_memory_fix.patch
epatch "${FILESDIR}"/${PN}-${SLOT}-compile_for_7_cacao_mem.patch
epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
epatch "${FILESDIR}"/${P}-warnings_are_errors.patch #310503 #418359
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
config="${config} --with-ecj-jar=${ecj_jar}"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use JamVM as it's the only possibility right now
if ! has "${ARCH}" amd64 sparc x86; then
config="${config} --enable-jamvm"
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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--disable-downloading \
--disable-warnings-are-errors \
$(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 check
}
src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}/${dest}"
dodir "${dest}"
dodoc README NEWS AUTHORS
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
docompress -x /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
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. 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
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 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
}

@ -1,334 +0,0 @@
# 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-7.2.2.ebuild,v 1.1 2012/06/10 13:56:19 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="4"
inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
OPENJDK_TARBALL="49a6fc8f712f.tar.gz"
CORBA_TARBALL="3231f3e9c517.tar.gz"
HOTSPOT_TARBALL="bfe5efd70bce.tar.gz"
JAXP_TARBALL="0036fe6fe7dc.tar.gz"
JAXWS_TARBALL="abfb890c262a.tar.gz"
JDK_TARBALL="839d0155f7cc.tar.gz"
LANGTOOLS_TARBALL="f855bdb37537.tar.gz"
JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/corba/archive/${CORBA_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxp/archive/${JAXP_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/hotspot/archive/${HOTSPOT_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_VER}/langtools/archive/${LANGTOOLS_TARBALL}
!amd64? ( !sparc? ( !x86? (
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
>=dev-libs/glib-2.26
media-libs/fontconfig
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=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
>=x11-libs/pango-1.24.5"
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/lcms:2
>=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 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
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
# 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:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
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
virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:7 )
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7 icedtea7
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# 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"
epatch "${FILESDIR}"/${P}-no_suffix.patch
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 icedtea-7 icedtea-bin-7 icedtea7
}
src_configure() {
local config bootstrap
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
config="${config} --with-ecj-jar=${ecj_jar}"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use JamVM as it's the only possibility right now
if ! has "${ARCH}" amd64 sparc x86; then
config="${config} --enable-jamvm --with-jamvm-src-zip=${DISTDIR}/${JAMVM_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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--disable-downloading \
$(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 check
}
src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}/${dest}"
dodir "${dest}"
dodoc README NEWS AUTHORS
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
docompress -x /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
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. 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
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 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
}

@ -1,337 +0,0 @@
# 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-7.2.3.1.ebuild,v 1.1 2012/08/31 14:28:28 caster Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
# *********************************************************
EAPI="4"
inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
ICEDTEA_VER=$(get_version_component_range 2-)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
OPENJDK_TARBALL="a3fa5d49d528.tar.gz"
CORBA_TARBALL="e9b200124386.tar.gz"
HOTSPOT_TARBALL="3e0087ab5e92.tar.gz"
JAXP_TARBALL="9bd1d8e8b802.tar.gz"
JAXWS_TARBALL="9a744f20cfc5.tar.gz"
JDK_TARBALL="507eee662587.tar.gz"
LANGTOOLS_TARBALL="0cf6181d44db.tar.gz"
CACAO_TARBALL="a567bcb7f589.tar.gz"
JAMVM_TARBALL="jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.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://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_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="7"
KEYWORDS="~amd64 ~ia64 ~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/atk-1.30.0
>=dev-libs/glib-2.26
media-libs/fontconfig
>=media-libs/freetype-2.3.5
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=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
>=x11-libs/pango-1.24.5"
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/lcms:2
>=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 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
!dev-java/icedtea:0
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
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
# 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:7
dev-java/icedtea-bin:6
dev-java/icedtea:7
dev-java/icedtea:6
)
app-arch/cpio
app-arch/unzip
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
virtual/pkgconfig
sys-apps/attr
sys-apps/lsb-release
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
PDEPEND="webstart? ( dev-java/icedtea-web:7 )
nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="
icedtea-7 icedtea-bin-7 icedtea7
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
gcj-jdk"
JAVA_PKG_WANT_SOURCE="1.5"
JAVA_PKG_WANT_TARGET="1.5"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
}
src_unpack() {
unpack ${ICEDTEA_PKG}.tar.gz
}
java_prepare() {
# 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"
epatch "${FILESDIR}"/${P}-pax_mark_rmic_java.patch #422525
eautoreconf
}
bootstrap_impossible() {
# Fill this according to testing what works and what not
has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
}
src_configure() {
local config bootstrap
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
bootstrap="disable"
if use jbootstrap; then
if bootstrap_impossible "${vm}"; then
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
else
bootstrap="enable"
fi
fi
if has "${vm}" gcj-jdk; then
# gcj-jdk ensures ecj is present.
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
bootstrap="enable"
local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
config="${config} --with-ecj-jar=${ecj_jar}"
fi
config="${config} --${bootstrap}-bootstrap"
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
# Otherwise use JamVM as it's the only possibility right now
if ! has "${ARCH}" amd64 sparc x86; then
config="${config} --enable-jamvm"
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-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
--with-jdk-home="$(java-config -O)" \
--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
--disable-downloading --disable-Werror \
$(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 check
}
src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}/${dest}"
dodir "${dest}"
dodoc README NEWS AUTHORS
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
docompress -x /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
# Don't hide classes
rm lib/ct.sym || die
#402507
mkdir jre/.systemPrefs || die
touch jre/.systemPrefs/.system.lock || die
touch jre/.systemPrefs/.systemRootModFile || die
# 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
# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
# install it anyway. 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
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-7.2.0:7"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea7"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
elog "If you had icedtea7 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
}

@ -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/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.1 2012/09/02 10:52:37 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.2.ebuild,v 1.2 2012/09/26 08:42:27 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@ -205,7 +205,7 @@ src_configure() {
einfo "Configuring using --with-parallel-jobs=${procs}"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino:1.6 js.jar)"
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
else
config="${config} --without-rhino"
fi

@ -8,6 +8,7 @@ DIST gcc-ada-4.3.6.tar.bz2 5309618 SHA256 a2721a41965f361938bc9d86e3cc7ba12dc6b7
DIST gcc-ada-4.4.3.tar.bz2 5470203 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290
DIST gcc-ada-4.4.5.tar.bz2 5470412 SHA256 0fdfd6318faba7bd39dde6fdc78c8334636be1e9fdcf4bd84f39372882abd177 SHA512 fcb344b53f3cfeddfd5b504b0bc419ef28bd770c45c6731fa97ca70acb64a3e3d9b5c76fbe3e89142c90563bc480724aea0f70a0f157dafc6a3998894523abd8 WHIRLPOOL 9008cc7225ce6ea1658c18fe0d0fbbb801a31f597c57a55c99a0a4d63a83da53440fa3473644f680449a7186f4c46cfe833b5b758884d533ebf379bd00bff9ee
DIST gcc-ada-4.4.7.tar.bz2 5492474 SHA256 fb9f30b85d48838390554b948d137487f0db09ad5f8ba73ca4d7ca35765c6ed8 SHA512 4447dfb2353018108ffc88a0fdeccca224a5fc9e4cbb75d8ee136c38c2937a368a677ff6e4df1a1431338fc1adc26fcd1f0f9cf963e5e98e4e28bc22e7e72cb5 WHIRLPOOL 5f6d7356d74725c0658e79ba1022df187cc08588835dae49867dc29c62b9b61d11e265b1a4636fe3e152b45a0bc65bb45ae69cac4ed1cd0447cc7603398adf44
DIST gcc-ada-4.5.4.tar.bz2 5755385 SHA256 8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e SHA512 9d160fba38e4482c01eb66735559086527ce9032ecd73a90fc0eea5e96f960cc11f7ed2dded1d8eb70a10a7706ea8f80b48b61db25fdda8724ba3a32f4d464fc WHIRLPOOL 8349c8be9e4805bf61d28db540469060ab851e2a3c6eada3ce3937805a59e8c8c3344c84b322d334e72e475988c12f4d30b63860514ab68af449d425d7b446c4
DIST gcc-core-3.4.6.tar.bz2 13366790 SHA256 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
DIST gcc-core-4.1.2.tar.bz2 17485561 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
DIST gcc-core-4.2.3.tar.bz2 19319213 SHA256 99ec052e13e8c2bc7d1db86d1c98fb651d45fd3e8ea90b0981c47f6e8826c813
@ -18,6 +19,7 @@ DIST gcc-core-4.3.6.tar.bz2 24448503 SHA256 86af1703be5cc7f40270a66ac15ebcf60887
DIST gcc-core-4.4.3.tar.bz2 26336901 SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356
DIST gcc-core-4.4.5.tar.bz2 26356188 SHA256 dbf012d5616b51d072383a32f71d4217239e7f0096acb07bbf266529a347ab4b SHA512 4578855724443f5504750387a3eccc3491d2148456dfc4f0d21d84ce89f333abee59182bf485a5e9f59f87c5c425c989c6bd3fcfbf8dc97c12a2564f4117cd4f WHIRLPOOL ac6954df0a8469086e8be663bb3646d41860dc7bdf274e2261ca309bd39d11eb561dc70f34acb6163b7a3b856c743b28570d459eeebf7799887ee07e11cbaba3
DIST gcc-core-4.4.7.tar.bz2 25784094 SHA256 c4663b7023909a4a075d3c2b2e17f6e082a9625aebfd0ce7f1d7817e44bf5542 SHA512 318522e170a9e54d051311416dc221d8d727a85d6e24a97fdbd9125d9dea1530930efd04b846c06ddbe3c5acaeef8810e0d4e79b8e9af535f0b08f1f20e5b10b WHIRLPOOL c2964330c174236e734d78ad80462a050b27d23f6b96a66bd5a4c1fce0d5cd4d35c9fba759ffe94b542805fb405071cd05e0945a4806fd8551c285eae7247ffd
DIST gcc-core-4.5.4.tar.bz2 28265185 SHA256 894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a SHA512 82f81a6860155e78cecac846038ceb5a5ec68e399f3ab058c5d569745e47460761f162e92f627d0275a37ff24cbc6582a018b5057d57fc01107f615e59192451 WHIRLPOOL 42324f6da6897e6fac4a4b3476fb1cf46b4461164b84c9f24e5a793e37c211246f9d9bed9f03ee170dc4dd7896579e0f1d1ba11e73e3ec0b92a2caa9191c82f8
DIST gnatboot-3.4-amd64-r2.tar.bz2 12063245 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d
DIST gnatboot-3.4-i386.tar.bz2 10629373 SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049
DIST gnatboot-3.4-ppc.tar.bz2 10996302 SHA256 1f164834e377604a943b230196d9f2a40e8e6753bac4c980d5ca2c00c7674363

@ -0,0 +1,62 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v 1.1 2012/09/26 13:40:52 george Exp $
inherit gnatbuild
DESCRIPTION="GNAT Ada Compiler - gcc version"
HOMEPAGE="http://gcc.gnu.org/"
LICENSE="GMGPL"
IUSE=""
BOOT_SLOT="4.4"
# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
# so the URI's are static.
SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )
sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS="~amd64 ~x86 ~sparc"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-3.0.1
>=dev-libs/gmp-5.0
>=sys-libs/zlib-1.2
>=sys-libs/ncurses-5.7"
DEPEND="${RDEPEND}
>=sys-devel/bison-1.875
>=sys-libs/glibc-2.8
>=sys-devel/binutils-2.20"
#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
# ${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
src_unpack() {
gnatbuild_src_unpack
#fixup some hardwired flags
cd "${S}"/gcc/ada
# universal gcc -> gnatgcc substitution occasionally produces lines too long
# and then build halts on the style check.
#
sed -i -e 's:gnatgcc:gcc:' osint.ads switch.ads ||
die "reversing [gnat]gcc substitution in comments failed"
# gcc pretty much ignores --with-system-zlib. At least it still descends
# into zlib and does configure and build there (gcc bug@7125?). For whatever
# reason this conflicts with multilib in gcc-4.4..
sed -i -e "s:libgui zlib:libgui:" "${S}"/configure
}
src_compile() {
# looks like gnatlib_and_tools and gnatlib_shared have become part of
# bootstrap
gnatbuild_src_compile configure make-tools bootstrap
}

@ -1,20 +1,7 @@
DIST binutils-2.20.1.tar.bz2 17591527 SHA256 71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64 SHA512 b05c93eb9ba8db344fbdee3c5b36ed5a7ad1366f948d41af43286715c7345a2477e0808d25f7bbf81b54ab06c4d46356d44318d56efcdbef42236d1a694411fc WHIRLPOOL 6166462fce695914a32c3295dadb6782716bb6693ee0a2a5543cc925e4967f5bccf38a5a2c244703bb9990acd229d0588a9463c62cec042f24107854c631518e
DIST gcc-4.4.3.tar.bz2 62944934 SHA256 97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040 SHA512 7e94f874f66d248fa930dc415c9442c6c5bff134653dacb7749e1f8a75c4660e29d47661c0f5a254d6fcbdf75a2c37aa7e26091f370a934277421879f98b1928 WHIRLPOOL af2449836826c51ac26bc0b228fedccaa99c7652244e42baab47eff99422940d9b440cf359f8dfb5c2f0c9b509313860aa753c621cd2c17db558c988b856b274
DIST naclbinutils-2.20.1-r7311.patch.bz2 29190 SHA256 37bc2a1faf68e6667cec3c1bae425a7ffac8b20586ec3d0269de7d579e714499 SHA512 6d81a3179aea87cb423018ce5a71be932cfba568efd8de3307c05acdea31313a0fa0b4d7259700a9dd38d83c2958f9b542ba031c03059ae878af556f3a213454 WHIRLPOOL f9bfca68565c406b98d10ea14be90a7b82baf172498c7f4e40ecd51f7559f4779a9c4fb58c1eb589bd8433b5314a33fc6504dd691f523a378d364be7cad92cf1
DIST naclbinutils-2.20.1-r8034.patch.bz2 37750 SHA256 8eb4f280a37f1e6fed0a6b9abf42d19d5211fd3cab45de70a1e9277144b1102e SHA512 82052f6bcf83ba6f2ba733e3eba2be7f6ac394eb7814a53af9268f33b5069323998588af542c3c668abda974fb5d176f230d10aa6800fd44f6710542d7bb6679 WHIRLPOOL 05189803dec73bf6b67843ff4b650e1a72b1f3f5f28f73b21f9f77317add7a451a84a66dd5888aed5f8d76d4c2f388ff8beb640c2dcef51997669d3b618f8516
DIST naclbinutils-2.20.1-r8989.patch.bz2 37758 SHA256 2e8977a7a8b596fb7dbd22f09901b186a159b347f3d8b15dead3f8a694a52e09 SHA512 9cdbc4314ee476154f9d11c9d90bb52cadc4c8b8f9fcefb4dc417b0232eb64cc1302f996d5cee9c8e3232b52071269ae20324ffa9011b7bc62e8be062da41633 WHIRLPOOL d590d47458d61014f9dec63f698bf3dc478a257581886c50ffeed026daa8afa7aec2588ef3b1420c209995a9e91677813c2c8755099892f606d9f8775a349d31
DIST naclbinutils-2.20.1-r9093.patch.bz2 38538 SHA256 ea08fbe4b53317a6f465aee1afaf61c4fcb63765d877156cc42ff267faa103c6 SHA512 b7f9f8105de1adb44f89927ddb47428dbfee597a5cbe3ab85986a55a8403f3fcdb4cebab84019f78f32df540408c9c237929d2c5c4f3b0f4e116712ecce47475 WHIRLPOOL 336299d2e2fba147353675f31e3e2759da5311cf3fec3ccb27081761674f80241b38097b29217457b9422ab06b5b2e0fb751061a10b4a7c86e3c6c5761988f56
DIST naclgcc-4.4.3-r7311.patch.bz2 38041 SHA256 28a2ae1ffed512c29ef67689abe174b94e0cc6e0decd74a9637915b73953b432 SHA512 3fbc5d306fc2f48681f45edcf1fd998f6d907e923a85f2ac28a7523894810ed91201daa430caa4aa1b7bf59c9f63642f8fb3b8e8bda7af8559d766624d0c6647 WHIRLPOOL 853817e598add625931b90e19b3c74fc4a2ede0659f70f693b67b5b4c34378a5f6c11b77019c2af4a5652c0fb555e9e5e3baacf36868d5158c1450031c569668
DIST naclgcc-4.4.3-r8034.patch.bz2 38111 SHA256 b9edb67ed22a45f7cbc9da7786e9adf2c1f9f27a5321c2d2010ef72d3e916db8 SHA512 77a46de79f78c8f57533bcd48b0c30561107d1fe21be90079bc1d9c71a9280f0929847a4d2433a36baf591729c147426b979e57877212527e95f0c93855a0121 WHIRLPOOL c599d1b18cfad4a67b99b27eaa2ee25867848825d1f2981d2a17717e43db3f0bfb50ff4e981d7ecf7c23abfaafb859640e6c4222346fc91f9121afed1b704d1e
DIST naclgcc-4.4.3-r8989.patch.bz2 39584 SHA256 fbfaf4ade5d95abd67d557fcc15219f2dd0292f356fc5f96d687c954424b6420 SHA512 f4826dccb00d2838c865d48327d22dccf58adea28f7f7cb6a0abe21d5d7735ef6df649d4b1b401dbdf3935e503f096902f212be22e554f95374e967d72bb4e77 WHIRLPOOL 4581340f3741c5c031994b653f92534033fe033957b1ffc2133662c7d76cb135874369eeb5c6544f5ef86f1d42640d45622b2f067f6dbd60f05d8cb80dc75cc4
DIST naclgcc-4.4.3-r9093.patch.bz2 39561 SHA256 a90aeb300d886a2ada571e6f0826adca02cb579b026c0c06457589f019317568 SHA512 723fc258a7d57855a5dcf4b11b1d6cc6cc08189d912809e8eda1ea1c31f10c7cebc6230ee2b76a2957fcab0b52ac623899a0e8f619e516c7dfda5139457c3409 WHIRLPOOL 58cf5baa6660f0f98202fb4fa0f58c861cf8ea761c061ff6cd7b47b0d22984f6dc6c50a5d3754e816c11798971269ef7bb9c41246437547de49fd161f4d4b95d
DIST naclnewlib-1.18.0-r7311.patch.bz2 109402 SHA256 677aa08de6ee9391a234e3ab18a2a074745c72078d2c369747ddc3ec818b49cc SHA512 1734a46d4627953a338df64cf52887b15f98c721067b9c7619d7ec8efaf2869cb74a2e00411020ab553f70461137e60085a1ff989125e81ff5861925b9d291d8 WHIRLPOOL 6ac4db9c470cdc09f7656444f2cfd14b58d42a5c9a6daf86b5628b2978a092c302a788b91f827c0b23e4d37eaa61022c61f1e6003ed0b2ff998991f25c805c13
DIST naclnewlib-1.18.0-r8034.patch.bz2 1851156 SHA256 734548bb725bd0334302ab744da5112f8fb771def9b5c20d489b5491196ae668 SHA512 8214cabc3225d6e6067b7ba0bfd732f88812a3063ef4ee12e2795d54a08e4efab57dc0fa1e8a5eccc00bdd228614f70176e4babcd4bf26e094d1e0e9007885ce WHIRLPOOL cc49111388456ead9090cded429606bbca0f9e1146804d107d2fe92ddc71fc813d5547ed393a21c2e79052a2e0a85e1b2eea337135ed12a5f099972278dba010
DIST naclnewlib-1.20.0-r8989.patch.bz2 84243 SHA256 312520d6cda73df83b943282ff264c0a29d8dfebda8409f681690f5e33c1d249 SHA512 21a46a845a02c029c484c134c6274b2f4e0f2f1c1715bd85a0f27ff18f448c68862650f5638469486506416b37b35e71ee203eb6663c2e9e2ec6c2a241190aeb WHIRLPOOL bd6b490934e252ca860165ff2220a03f4de2bdcbb7a7d31d0f0f98230852c02cf3cbfd7e6f455dc50bd4287a7ddb1628d56cd49b1e269734f7454de0f483490f
DIST naclnewlib-1.20.0-r9093.patch.bz2 92392 SHA256 3db6c5cd3344ca1bdd23db170a20c5e248dbbdb06706574bc4c6dacafddd6c9c SHA512 81f9c26bacc3c914c112b45e8a1012746ace869c60c309d0c2dfac449b26a0c3af1aeee577512eb910b47433e432988a7709d57088445428b108af348ad3e32b WHIRLPOOL da5c0588cc59ec14982be5b01188e4fd8fa72afcc738b2580c685a8d558f03b78e35f0b5de1fcdc3179414ccf61eb7937d5b55f422f9d327da36af454866970a
DIST nacltoolchain-buildscripts-r7311.tar.gz 20113 SHA256 6f4d86b9979e045ca7898fc36fe00757051692b62962de957cccd518c633bcf4 SHA512 3743abbf63ec3033c918e5719ffc06419e8ea29a31cd4a61e4097cbc8f22149e045127a438b721014e5e9cdd844bb73a21da6527437cbe6baede2cc736f7b04e WHIRLPOOL a6ca200cad957b499e5c106ed5b838c45e65cfc369c6e33658175a0b3727c676dd8ee1f621eefc5a2f14ea37a73c9ab80b37c4d12b66d20a4de6824da615570f
DIST nacltoolchain-buildscripts-r8034.tar.gz 20234 SHA256 6af66f74fd45aa41d0bfe5bbc0a6d93aac47389ff319b47640738c7e7ae3c36f SHA512 a6cfe3b9853ff02ffb503ea763f309d177e10a88f4800fda5220eb72a48b152cf42e99ae168b08711e27f0462d1118605d1d9287b6f6f0fc247eb667a15f774e WHIRLPOOL 947a873ce5cecf2d44c4d444f953f76d6ced7cc7f3fa7731da7a7d532d5d1c51305163e7e2b8be5d64520569547c91785dd100480f5d6cda2df5175d0c29cdeb
DIST nacltoolchain-buildscripts-r8989.tar.gz 20316 SHA256 985f12e30192a2aaceeff874a08d2bac997136b704dc2efa8728ab898562d7bd SHA512 0721cdaf682324ee31b1b224e4c34627bca5589da588bb9d029261e1009dd4ea79c41947fd8e813a2b590063dccc0a3b6454adc1fbbe984678ff9b23bafb9289 WHIRLPOOL afad5cfbb24b5618886df95a11f346a9f14505a406601874333e616706e84dff0cc181dbd38a678319693f0754691c5fc8ca3d11db0977d97385340558f1d2df
DIST nacltoolchain-buildscripts-r9093.tar.gz 20364 SHA256 648e17f89fb21a0508eeabc332e243eb4470c3f4906152a475e72cc62ae5c44e SHA512 e81bf5b61150c7022a87d36bdd14bd4694feadf4baa75316cc05f72466a3c4def8a659416399339d3db1a49bf7e988df228c1e466b90098d1041f3b5d8065562 WHIRLPOOL 5ce758c73af352979f1b0a46269d2d00493d03e2b504f4c1ffd98813e4b28816bac07416748ef8648825c1aba30689933a8ffb204aec8076730b117ea031e7db
DIST newlib-1.18.0.tar.gz 13598301 SHA256 d608f22b0b2e7725d2fca13cac19f34bc652d9773acadae778db9881746cb071 SHA512 67b80060fd7bb9d035c004cfbcfbc66b8c8f176366c1ce11ae68dd31b8ee3e02b59ad37ceaf6f54da3c35eeee977c462ddaff4492a27425128ee5d5898840771 WHIRLPOOL 04908a55d1e992877668b80a8e5743f433ab96b7d9f8ab0b936ff4aa27862024490e2856acb88188d7f45ecb0d2197cbc22362f8aaf10ff07b9d89d15d258906
DIST newlib-1.20.0.tar.gz 14571004 SHA256 c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692 SHA512 2abf1d30980e460c4d6ffe4d1682e38403d056048e00675362256731e57fe6759d01e85bcba84258d211941926e13bf3c632ff3824931a844c8b2596e795451f WHIRLPOOL be7996e493b0f2be6992c579796ea9d6968ed3b0a4f5d9c58e1c8b255a1060df18e6ae3d7ecf3a291c5859a6c04bdd39296e9ee5811eb59e2e7646da27089f66

@ -1,87 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p7311.ebuild,v 1.3 2012/01/18 11:29:52 ago Exp $
EAPI="4"
inherit eutils flag-o-matic multilib
BINUTILS_PV="2.20.1"
NEWLIB_PV="1.18.0"
GCC_PV="4.4.3"
NACL_REVISION="${PV##*_p}"
DESCRIPTION="Native Client newlib-based toolchain (only for compiling IRT)"
HOMEPAGE="http://code.google.com/chrome/nativeclient/"
SRC_URI="mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.bz2
ftp://sources.redhat.com/pub/newlib/newlib-${NEWLIB_PV}.tar.gz
mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/nacltoolchain-buildscripts-r${NACL_REVISION}.tar.gz
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclbinutils-${BINUTILS_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclnewlib-${NEWLIB_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclgcc-${GCC_PV}-r${NACL_REVISION}.patch.bz2
"
LICENSE="BSD" # NaCl
LICENSE+=" || ( GPL-3 LGPL-3 )" # binutils
LICENSE+=" NEWLIB LIBGLOSS GPL-2" # newlib
LICENSE+=" GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" # gcc
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
# Stripping with a non-NaCl strip breaks the toolchain, bug #386931.
# Tests are broken, bug #391761.
RESTRICT="strip test"
# Executable section checks do not make sense for newlib, bug #390383.
QA_EXECSTACK="usr/lib*/nacl-toolchain-newlib/*/lib*/*"
RDEPEND="
>=dev-libs/gmp-5.0.2
>=dev-libs/mpfr-3.0.1
>=sys-libs/glibc-2.8
>=sys-libs/zlib-1.1.4
"
DEPEND="${RDEPEND}
app-arch/zip
app-arch/unzip
dev-libs/mpc
dev-libs/cloog-ppl
dev-libs/ppl
>=media-libs/libart_lgpl-2.1
>=sys-apps/texinfo-4.8
>=sys-devel/binutils-2.15.94
>=sys-devel/bison-1.875
>=sys-devel/flex-2.5.4
sys-devel/gnuconfig
sys-devel/m4
>=sys-libs/ncurses-5.2-r2
>=sys-apps/sed-4
sys-devel/gettext
virtual/libiconv
virtual/yacc
"
S="${WORKDIR}"
src_prepare() {
mkdir SRC || die
mv binutils-${BINUTILS_PV} SRC/binutils || die
mv newlib-${NEWLIB_PV} SRC/newlib || die
mv gcc-${GCC_PV} SRC/gcc || die
cd SRC || die
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"
}
src_compile() {
strip-flags # See bug #390589.
emake PREFIX="${PWD}/${PN}" CANNED_REVISION="yes" build-with-newlib
}
src_install() {
local TOOLCHAIN_HOME="/usr/$(get_libdir)"
dodir "${TOOLCHAIN_HOME}"
mv "${WORKDIR}/${PN}" "${ED}/${TOOLCHAIN_HOME}" || die
}

@ -1,95 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p8034.ebuild,v 1.2 2012/05/03 09:03:24 phajdan.jr Exp $
EAPI="4"
inherit eutils flag-o-matic multilib
BINUTILS_PV="2.20.1"
NEWLIB_PV="1.18.0"
GCC_PV="4.4.3"
NACL_REVISION="${PV##*_p}"
DESCRIPTION="Native Client newlib-based toolchain (only for compiling IRT)"
HOMEPAGE="http://code.google.com/chrome/nativeclient/"
SRC_URI="mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.bz2
ftp://sources.redhat.com/pub/newlib/newlib-${NEWLIB_PV}.tar.gz
mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/nacltoolchain-buildscripts-r${NACL_REVISION}.tar.gz
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclbinutils-${BINUTILS_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclnewlib-${NEWLIB_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclgcc-${GCC_PV}-r${NACL_REVISION}.patch.bz2
"
LICENSE="BSD" # NaCl
LICENSE+=" || ( GPL-3 LGPL-3 )" # binutils
LICENSE+=" NEWLIB LIBGLOSS GPL-2" # newlib
LICENSE+=" GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" # gcc
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Stripping with a non-NaCl strip breaks the toolchain, bug #386931.
# Tests are broken, bug #391761.
RESTRICT="strip test"
# Executable section checks do not make sense for newlib, bug #390383.
QA_EXECSTACK="usr/lib*/nacl-toolchain-newlib/*/lib*/*"
RDEPEND="
>=dev-libs/gmp-5.0.2
>=dev-libs/mpfr-3.0.1
>=sys-libs/glibc-2.8
>=sys-libs/zlib-1.1.4
"
DEPEND="${RDEPEND}
app-arch/zip
app-arch/unzip
dev-libs/mpc
dev-libs/cloog-ppl
dev-libs/ppl
>=media-libs/libart_lgpl-2.1
>=sys-apps/texinfo-4.8
>=sys-devel/binutils-2.15.94
>=sys-devel/bison-1.875
>=sys-devel/flex-2.5.4
sys-devel/gnuconfig
sys-devel/m4
>=sys-libs/ncurses-5.2-r2
>=sys-apps/sed-4
sys-devel/gettext
virtual/libiconv
virtual/yacc
"
S="${WORKDIR}"
pkg_setup() {
# Unset variables known to break the build. This is a black-list
# rather than white-list because it's not obvious how to come up
# with a comprehensive white-list.
# For more info see bug #413995.
unset -v LANGUAGES || die
}
src_prepare() {
mkdir SRC || die
mv binutils-${BINUTILS_PV} SRC/binutils || die
mv newlib-${NEWLIB_PV} SRC/newlib || die
mv gcc-${GCC_PV} SRC/gcc || die
cd SRC || die
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"
}
src_compile() {
strip-flags # See bug #390589.
emake PREFIX="${PWD}/${PN}" CANNED_REVISION="yes" build-with-newlib
}
src_install() {
local TOOLCHAIN_HOME="/usr/$(get_libdir)"
dodir "${TOOLCHAIN_HOME}"
mv "${WORKDIR}/${PN}" "${ED}/${TOOLCHAIN_HOME}" || die
}

@ -1,95 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p8989.ebuild,v 1.1 2012/06/21 06:28:26 phajdan.jr Exp $
EAPI="4"
inherit eutils flag-o-matic multilib
BINUTILS_PV="2.20.1"
NEWLIB_PV="1.20.0"
GCC_PV="4.4.3"
NACL_REVISION="${PV##*_p}"
DESCRIPTION="Native Client newlib-based toolchain (only for compiling IRT)"
HOMEPAGE="http://code.google.com/chrome/nativeclient/"
SRC_URI="mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.bz2
ftp://sources.redhat.com/pub/newlib/newlib-${NEWLIB_PV}.tar.gz
mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/nacltoolchain-buildscripts-r${NACL_REVISION}.tar.gz
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclbinutils-${BINUTILS_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclnewlib-${NEWLIB_PV}-r${NACL_REVISION}.patch.bz2
http://gsdview.appspot.com/nativeclient-archive2/x86_toolchain/r${NACL_REVISION}/naclgcc-${GCC_PV}-r${NACL_REVISION}.patch.bz2
"
LICENSE="BSD" # NaCl
LICENSE+=" || ( GPL-3 LGPL-3 )" # binutils
LICENSE+=" NEWLIB LIBGLOSS GPL-2" # newlib
LICENSE+=" GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" # gcc
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
# Stripping with a non-NaCl strip breaks the toolchain, bug #386931.
# Tests are broken, bug #391761.
RESTRICT="strip test"
# Executable section checks do not make sense for newlib, bug #390383.
QA_EXECSTACK="usr/lib*/nacl-toolchain-newlib/*/lib*/*"
RDEPEND="
>=dev-libs/gmp-5.0.2
>=dev-libs/mpfr-3.0.1
>=sys-libs/glibc-2.8
>=sys-libs/zlib-1.1.4
"
DEPEND="${RDEPEND}
app-arch/zip
app-arch/unzip
dev-libs/mpc
dev-libs/cloog-ppl
dev-libs/ppl
>=media-libs/libart_lgpl-2.1
>=sys-apps/texinfo-4.8
>=sys-devel/binutils-2.15.94
>=sys-devel/bison-1.875
>=sys-devel/flex-2.5.4
sys-devel/gnuconfig
sys-devel/m4
>=sys-libs/ncurses-5.2-r2
>=sys-apps/sed-4
sys-devel/gettext
virtual/libiconv
virtual/yacc
"
S="${WORKDIR}"
pkg_setup() {
# Unset variables known to break the build. This is a black-list
# rather than white-list because it's not obvious how to come up
# with a comprehensive white-list.
# For more info see bug #413995.
unset -v LANGUAGES || die
}
src_prepare() {
mkdir SRC || die
mv binutils-${BINUTILS_PV} SRC/binutils || die
mv newlib-${NEWLIB_PV} SRC/newlib || die
mv gcc-${GCC_PV} SRC/gcc || die
cd SRC || die
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"
}
src_compile() {
strip-flags # See bug #390589.
emake PREFIX="${PWD}/${PN}" CANNED_REVISION="yes" build-with-newlib
}
src_install() {
local TOOLCHAIN_HOME="/usr/$(get_libdir)"
dodir "${TOOLCHAIN_HOME}"
mv "${WORKDIR}/${PN}" "${ED}/${TOOLCHAIN_HOME}" || die
}

@ -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/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p9093.ebuild,v 1.1 2012/07/17 03:47:19 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/nacl-toolchain-newlib/nacl-toolchain-newlib-0_p9093.ebuild,v 1.3 2012/09/26 10:51:31 ago Exp $
EAPI="4"
@ -28,7 +28,7 @@ LICENSE+=" NEWLIB LIBGLOSS GPL-2" # newlib
LICENSE+=" GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" # gcc
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
# Stripping with a non-NaCl strip breaks the toolchain, bug #386931.

@ -1,5 +1,3 @@
DIST v8-3.11.10.20.tar.bz2 10115536 SHA256 69cc90bdf1032d7a8a14ea9353b9b45969699e8adb31bfb919f1aa7f0a981391 SHA512 8532159a2671d7fbe72196f64d7cf5d391f96e4f326b8d490b00051c55df14553b5c2592c68abfab7e5d6510c35a3b2deb44af75a92daf880ef8d7f0cdffef71 WHIRLPOOL 2874fb3698f27634000631afa09600b6c65be2acaf545cbfa3ed8119ddc39a9a8c71d158a8e4167d288c82247d8f2131dfc7a88aaca5e44b72d664eb5f389ccd
DIST v8-3.12.19.10.tar.bz2 10185871 SHA256 39b7fbc7e115ab59bb47d662f7747fabfef9598fa266811cd6713a620bd9d155 SHA512 8f4825326ff5b72f4a9cbdf652f749d70e30389f0b8039972345f2313a214c844e9ced39fc904e9028106cd1470cfbfa821f0d5e455845c287e1b80cc9149a17 WHIRLPOOL 5b37e408d6fb116662c69964a7f846efe7d48662501db350f51766fea48ae727534656d0c57e36bd9a33601d1a9105ed8dda5fd6a0b23ec1dfa1db50ede3bf41
DIST v8-3.12.19.11.tar.bz2 10184024 SHA256 070b89121f38efef175d435eb087dea6d17ce80de3ced5e984579ce77da9bb77 SHA512 f6dc842e5a36e5b21cfd76118397f983256a8dd5748cc4bdec57969187b0aec014ed46c48e580a4df15bbf1c86bcedd19ac1adc05aa0dae5d1cf0f941982bd92 WHIRLPOOL aced79b3642634008d255972a1ecbe4d6a5138d4818464ea0283529b8ab2a4254d794d5d0541b338b788ab7aec9d5a02984186c1f77fe9bfe7734b211f2d2507
DIST v8-3.13.6.tar.bz2 10197030 SHA256 356e166e922005b784445388a5c46aceef6c702fecd84435a21e105345ecb94c SHA512 67b8bab0d5e8059c8abb17d8acb3b698b9ee9c9b57bd9fd3dd5489b4e6e544cd5a9b11c6638230f73a94a6e18c4fcb532f2b2ca7bab2d8b1721f5f70ab39e967 WHIRLPOOL ce8f22573c4857492a63ab7fbec76077628a34c9e9d2e8d188723b6950fb439c33932bff0cd52260224a352cbc49bb0ca50f877e57f1f578d68fae03deaed4ee
DIST v8-3.13.7.1.tar.bz2 10201729 SHA256 6c903410651d87f67e7c5b35321e8a6709b2e442fa6e283ac2def898fdc4d4a7 SHA512 015285af38b9e9259abb0f1fe2f1c1c24b7280c3a2424c119d9dc64b1d213942a30f6eec8e7517a6badad88e455b8fc97d8ea074d991153853529a29d942a5cf WHIRLPOOL b2f002e5dfc3e9c344dced70c9f0999fa2087636842053df25168af324d71ec3ecffd4d506d924f7d8a6e4303d691cb18bc6af7ccbb49452d38a3b34fa63b581

@ -1,133 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.11.10.20.ebuild,v 1.3 2012/09/02 06:26:16 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs versionator
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE=""
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK=${CXX}
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="$(get_version_component_range 1-3)"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
if [[ ${CHOST} == *-darwin* ]] ; then
# buildsystem is too horrific to get this built correctly
mkdir -p out/${mytarget}/lib.target
mv out/${mytarget}/libv8.so.${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
install_name_tool \
-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
|| die
install_name_tool \
-change \
"${S}"/out/${mytarget}/libv8.so.${soname_version} \
"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
out/${mytarget}/d8 || die
fi
dobin out/${mytarget}/d8 || die
dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -1,133 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.10.ebuild,v 1.1 2012/09/22 17:40:20 floppym Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit eutils multilib pax-utils python toolchain-funcs versionator
DESCRIPTION="Google's open source JavaScript engine"
HOMEPAGE="http://code.google.com/p/v8"
SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE=""
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch
}
src_compile() {
tc-export AR CC CXX RANLIB
export LINK=${CXX}
# Use target arch detection logic from bug #354601.
case ${CHOST} in
i?86-*) myarch=ia32 ;;
x86_64-*)
if [[ $ABI = x86 ]] ; then
myarch=ia32
else
myarch=x64
fi ;;
arm*-*) myarch=arm ;;
*) die "Unrecognized CHOST: ${CHOST}"
esac
mytarget=${myarch}.release
soname_version="$(get_version_component_range 1-3)"
local snapshot=on
host-is-pax && snapshot=off
# TODO: Add console=readline option once implemented upstream
# http://code.google.com/p/v8/issues/detail?id=1781
emake V=1 \
library=shared \
werror=no \
soname_version=${soname_version} \
snapshot=${snapshot} \
${mytarget} || die
pax-mark m out/${mytarget}/{cctest,d8,shell} || die
}
src_test() {
local arg testjobs
for arg in ${MAKEOPTS}; do
case ${arg} in
-j*) testjobs=${arg#-j} ;;
--jobs=*) testjobs=${arg#--jobs=} ;;
esac
done
tools/test-wrapper-gypbuild.py \
-j${testjobs:-1} \
--arch-and-mode=${mytarget} \
--no-presubmit \
--progress=dots || die
}
src_install() {
insinto /usr
doins -r include || die
if [[ ${CHOST} == *-darwin* ]] ; then
# buildsystem is too horrific to get this built correctly
mkdir -p out/${mytarget}/lib.target
mv out/${mytarget}/libv8.so.${soname_version} \
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
install_name_tool \
-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
|| die
install_name_tool \
-change \
"${S}"/out/${mytarget}/libv8.so.${soname_version} \
"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
out/${mytarget}/d8 || die
fi
dobin out/${mytarget}/d8 || die
dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
dodoc AUTHORS ChangeLog || die
}
pkg_preinst() {
preserved_libs=()
local baselib candidate
eshopts_push -s nullglob
for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
baselib=${candidate##*/}
if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
fi
done
eshopts_pop
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib "${preserved_libs[@]}"
fi
}
pkg_postinst() {
if [[ ${#preserved_libs[@]} -gt 0 ]]; then
preserve_old_lib_notify "${preserved_libs[@]}"
fi
}

@ -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/dev-lang/v8/v8-3.12.19.11.ebuild,v 1.1 2012/09/25 18:06:28 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.11.ebuild,v 1.3 2012/09/26 10:51:51 ago Exp $
EAPI="4"
@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
KEYWORDS="amd64 x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE=""
pkg_setup() {

@ -1,2 +1,3 @@
DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a54b9a2e54e18c85abcecb70f SHA512 9d27a9b2c7cf90a7ea420732ac13675c6bc93435d9d9dc4e437e3e2e121d4b2931b995da77d751e2dbcf4c2c5379fda6c4c3c0f6cc222b461d4daa95e9ec2564 WHIRLPOOL 5b4f6ca08695da516f6579399de1decb3a1be6b2520a636812f1b68cb6ee7e05cb546fe7537513deb3f9a3f914808ffeaa956d1daa2c4e0bcf14f22071e9e7c8
DIST autopep8-0.8.1.tar.gz 30427 SHA256 9ab32bd3fdb68045ba9dbac5a9be46ee17a4fc0c19fce567175f3ad1263c934b SHA512 33db363e813e9a123c049f88628faa159fd31523dcd88f98c71e756c4b409a52aedfe0d74324e28868aa712984827e4e543a5355047a3c4f3490b67182902855 WHIRLPOOL 4db9c32c1b067b7685abdf23d1b39f255a4cb2c9fc17e1c6fc16a809fc9e731e0496c422469984c54d18d4901be25a739a8591530f738a98e7efb653c92063f9
DIST autopep8-0.8.tar.gz 29999 SHA256 145786841d9028f21f9d38654d58c30fc84ff2b67199a125e81586063ff23d5a SHA512 efd3da07f3ed352bba0429376efdf11f0bdc817ec43ac6257ae1cd6860c8f89a272c1d830ed4edfa26e6231b08d6eed7b2bb708e7fe9ec18195b5cdaca3d9f8f WHIRLPOOL 3beff5f2912f9b236a17cb4f3f8f0f5583b7ca9dcbd5a1307350605f4245525cacd17d17f57662f203da4508b2f1eacca82d177224f115b3d012ed2688f47675

@ -0,0 +1,44 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.8.1.ebuild,v 1.1 2012/09/26 15:26:59 xarthisius Exp $
EAPI=4
PYTHON_DEPEND="*:2.6"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.5"
inherit distutils vcs-snapshot
DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-python/pep8-1.3
dev-python/setuptools"
DEPEND="${RDEPEND}"
PYTHON_MODNAME=${PN}.py
src_test() {
testing() {
PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/test_${PN}.py
}
python_execute_function testing
}
pkg_postinst() {
distutils_pkg_postinst
ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
ewarn "(indentation checks inside triple-quotes)."
ewarn "If you do not want to be affected by this, then add the"
ewarn "following lines to your local package.mask:"
ewarn " >=dev-python/pep8-1.3"
ewarn " >=dev-python/autopep8-0.6"
}

@ -1,5 +1,6 @@
DIST facter-1.6.0.gem 90624 SHA256 f28b45c5b05ce203c8a75fa7e39e513335244c930ee51ddd154a932e1f34d6a6 SHA512 67c027149ddd6ef56903393495d8acd04c29279e57fa70a51abc36ab0627bf5bf8bd69984e232386d709b7bc84b0af3fe5da641fbcc637e5844b7da9cf35b303 WHIRLPOOL 4c0dd067f549583075ef6dcda66c980d1e1adae2ff8b1266294b7b26534d98e8072eba2705bc5bda92f432c67a33e01d6973da96e0e23c51bf018482b042751c
DIST facter-1.6.10.gem 130560 SHA256 3ef22555aa7062f533b0580371fa5b384a8d609cf00203c9afe0025e133ada4d SHA512 00462a8ad19f7536d078c205ce36d6b6758c5c059a8ebd2d3b93d2ba36ad90f8a15bc9d4bff0d4e70f2c87a34d431a0120ad4fe886ceeb897ee4467d3edbc559 WHIRLPOOL cc855ecbd777ab5e124297db8783e8a081ff302c05fb7aae3034b192058ad6f5756581aac12a7ed4a4d04410a5e45e828c00f90613deb733914311cf7f6ad85e
DIST facter-1.6.12.gem 143872 SHA256 62866a7e75a669aeca9508fcc473cb41b0b6c39f4cacde2d76c2ac994568cf11 SHA512 eef91afc679756016f75e4b3bd3ed3e67edd2fd1734dc3bacc0197054e6ee11b9ca0747ea5769654c12333d29174c018c35d11e5b7e39b6a43f32ed49bc77e78 WHIRLPOOL f17d30f29bc6c4199446906e55d4414e80449ee95a0b807a48fd37221258396ab445e4a8dc10c5bc49744cfa5f654e50f8c22f84e829ba5b16a785f819d06f1d
DIST facter-1.6.3.gem 113664 SHA256 37380028778326ac750909b07a728d9fbe77d143acd05e56ad57cfcfdb3903d7 SHA512 b78d55d857be61bb5ec422a66d9dd8b62bb102a6ebf922f089e777e160ff46a6487b43f85eb9b69819e9285d7fbfca6f73fed38428954b493d4b8a1f826c30da WHIRLPOOL 95760b1a864cc1f392603f33d551857cc8f443eec3dababf9a342fc0d36f3b09a158188c3f85226be9dcfe294ba360c1de368c04ff6c90cdb60a84478fc760bc
DIST facter-1.6.4.gem 114176 SHA256 7e1d391f5896b5b90223a8cf4a2208222ce383ec7764a54d6968fb86c07df9de SHA512 77e61d235503216a7101950db785ae559a802167d8919b633877c0999be14e447206c15a5cdb3820677bc764cb0f7355fddb65a1f8d4e71fdef10cb036d96a02 WHIRLPOOL bf9ade3a735d63e7628fd2f543c7478bc667f2f47afd452c81279dd7e9e1d362cc257728addfa635a5e8281a60141be547e378ea3ea13cdea83154ff5918ebc2
DIST facter-1.6.8.gem 122880 SHA256 d2912887f7f0de10966cec2b69940b8505d64dc2d859a1f919b152a21a2d3734 SHA512 73e096178bb0294972c0834eef687b7bb72da5926c81ea6ba9e7891a173a9e774f3ca9da863f714176e499d7b36ae020e276fc2727331809764282067b96e39c WHIRLPOOL 06f6bf912116abc06d6eb31416da2a645af1c34d0f4cf9a729d337f82c55c152823beb0a764c5b29472e20d24fc0ba55aae06c187955f582ba7737828651888d

@ -0,0 +1,31 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.6.12.ebuild,v 1.1 2012/09/26 06:26:12 graaff Exp $
EAPI="4"
USE_RUBY="ruby18 ruby19 ree18 jruby"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
RUBY_FAKEGEM_BINWRAP="facter"
inherit ruby-fakegem
DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
CDEPEND="
sys-apps/dmidecode
sys-apps/lsb-release
sys-apps/pciutils"
RDEPEND+=" ${CDEPEND}"
DEPEND+=" test? ( ${CDEPEND} )"
ruby_add_bdepend "test? ( dev-ruby/mocha )"

@ -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/dev-util/cppi/cppi-1.17.ebuild,v 1.1 2012/08/05 00:50:26 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/cppi/cppi-1.17.ebuild,v 1.2 2012/09/26 08:18:17 chainsaw Exp $
EAPI=4
@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE="nls"
CPPI_LINGUAS="de eo fi fr hr it ja pl sr sv uk vi"

@ -0,0 +1,85 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/geany-plugins/geany-plugins-1.22-r1.ebuild,v 1.1 2012/09/26 05:33:52 binki Exp $
EAPI=4
inherit autotools-utils vala versionator
DESCRIPTION="A collection of different plugins for Geany"
HOMEPAGE="http://plugins.geany.org/geany-plugins"
SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debugger devhelp enchant gpg gtkspell lua multiterm nls soup webkit"
LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
RDEPEND=">=dev-util/geany-$(get_version_component_range 1-2)
dev-libs/libxml2:2
dev-libs/glib:2
debugger? ( x11-libs/vte:0 )
devhelp? (
dev-util/devhelp
gnome-base/gconf:2
net-libs/webkit-gtk:2
x11-libs/gtk+:2
x11-libs/libwnck:1
)
enchant? ( app-text/enchant )
gpg? ( app-crypt/gpgme )
gtkspell? ( app-text/gtkspell:2 )
lua? ( dev-lang/lua )
multiterm? (
$(vala_depend)
x11-libs/gtk+:2
>=x11-libs/vte-0.28:0
)
soup? ( net-libs/libsoup )
webkit? (
net-libs/webkit-gtk:2
x11-libs/gtk+:2
x11-libs/gdk-pixbuf:2
)"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
src_prepare() {
autotools-utils_src_prepare
use multiterm && vala_src_prepare
}
src_configure() {
# GeanyGenDoc requires ctpl which isn't yet in portage
local myeconfargs=(
--docdir=/usr/share/doc/${PF}
--disable-cppcheck
--disable-extra-c-warnings
--disable-geanygendoc
--enable-geanygdb
--enable-geanymacro
--enable-geanynumberedbookmarks
--enable-gproject
--enable-pretty-printer
--enable-tableconvert
--enable-treebrowser
--enable-xmlsnippets
$(use_enable debugger)
$(use_enable devhelp)
$(use_enable enchant spellcheck)
$(use_enable gpg geanypg)
$(use_enable gtkspell)
$(use_enable multiterm)
$(use_enable lua geanylua)
$(use_enable nls)
# Having updatechecker... when you're using a package manager?
$(use_enable soup updatechecker)
$(use_enable soup geniuspaste)
$(use_enable webkit webhelper)
)
autotools-utils_src_configure
}

@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r4.ebuild,v 1.8 2008/11/04 09:36:42 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r4.ebuild,v 1.9 2012/09/26 07:34:45 ulm Exp $
inherit eutils toolchain-funcs
@ -8,7 +8,7 @@ DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
LICENSE="as-is"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
IUSE=""

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r5.ebuild,v 1.1 2010/08/28 12:32:37 truedfx Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r5.ebuild,v 1.2 2012/09/26 07:34:45 ulm Exp $
inherit eutils toolchain-funcs
@ -8,7 +8,7 @@ DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
LICENSE="as-is"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""

@ -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/eclass/python-distutils-ng.eclass,v 1.26 2012/06/10 14:23:43 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.27 2012/09/26 12:07:45 hasufell Exp $
# @ECLASS: python-distutils-ng
# @MAINTAINER:
@ -59,6 +59,18 @@ fi
# Set to any value to disable automatic reinstallation of scripts in bin
# directories. See python-distutils-ng_src_install function.
# @ECLASS-VARIABLE: PYTHON_USE
# @DEFAULT_UNSET
# @DESCRIPTION:
# Comma-separated list of useflags needed for all(!) allowed
# implementations. This is directly substituted into one or more of
# dev-lang/python[${PYTHON_USE}], dev-python/pypy[${PYTHON_USE}] and
# dev-java/jython[${PYTHON_USE}].
# @CODE
# example 1: PYTHON_USE="xml,sqlite"
# example 2: PYTHON_USE="xml?,threads?,-foo"
# @CODE
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
case "${EAPI}" in
@ -107,16 +119,20 @@ else
fi
unset required_use_str
# avoid empty use deps
_PYTHON_USE="${PYTHON_USE:+[${PYTHON_USE}]}"
# set python DEPEND and RDEPEND
for impl in ${PYTHON_COMPAT}; do
IUSE+=" python_targets_${impl}"
dep_str="${impl/_/.}"
case "${dep_str}" in
python?.?)
dep_str="dev-lang/python:${dep_str: -3}" ;;
dep_str="dev-lang/python:${dep_str: -3}${_PYTHON_USE}" ;;
jython?.?)
dep_str="dev-java/jython:${dep_str: -3}" ;;
dep_str="dev-java/jython:${dep_str: -3}${_PYTHON_USE}" ;;
pypy?.?)
dep_str="dev-python/pypy:${dep_str: -3}" ;;
dep_str="dev-python/pypy:${dep_str: -3}${_PYTHON_USE}" ;;
*)
die "Unsupported implementation: ${impl}" ;;
esac

@ -1 +1 @@
DIST mari0-1.6.zip 3625226 RMD160 3662726121e8318b244f8cfe0a373b99bc39c467 SHA1 e950f741ce1ac185191e332716585f57058d0811 SHA256 b217134425527e879d5355eb7f51e29a60ad0e93550e5769b2f56c04a1f69037
DIST mari0-1.6.zip 3625226 SHA256 b217134425527e879d5355eb7f51e29a60ad0e93550e5769b2f56c04a1f69037 SHA512 20004035141b80180e58a8d209b588273d2879742ca8d8d59b1d20f9e301d976e260574893ea41a290bab57eade0617c10880a4af00dc3b29329ac4805a8be6c WHIRLPOOL 8ffc36d25ceb0d893cda3d068e484194feb6117ed27e4ea3801553868bdd8be35bbf787320ba37962d81851eb83082c528a4449f55acaeeb9dd731e5ba029334

@ -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/games-arcade/mari0/mari0-1.6.ebuild,v 1.6 2012/06/17 12:03:08 ssuominen Exp $
# $Header: /var/cvsroot/gentoo-x86/games-arcade/mari0/mari0-1.6.ebuild,v 1.7 2012/09/26 14:05:33 hasufell Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="${P}.zip"
LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE=""
RESTRICT="fetch" # unsure about legality of graphics

@ -0,0 +1,125 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.1 2012/09/26 10:54:41 ssuominen Exp $
EAPI=4
GCONF_DEBUG=no
GNOME2_LA_PUNT=yes
inherit autotools bash-completion-r1 eutils gnome2
[[ ${PV} = 9999 ]] && inherit gnome2-live
DESCRIPTION="GNOME Virtual Filesystem Layer"
HOMEPAGE="http://www.gnome.org"
LICENSE="LGPL-2+"
SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
fi
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
RDEPEND=">=dev-libs/glib-2.31.0:2
sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
bluetooth? (
>=app-mobilephone/obex-data-server-0.4.5
dev-libs/dbus-glib
net-wireless/bluez
dev-libs/expat )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
gdu? ( || (
>=gnome-base/libgdu-3.0.2
=sys-apps/gnome-disk-utility-3.0.2-r300
=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
ios? (
>=app-pda/libimobiledevice-1.1.0
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
udisks? ( >=sys-fs/udisks-1.90:2 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
virtual/pkgconfig
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
REQUIRED_USE="cdda? ( udev )"
pkg_setup() {
G2CONF="${G2CONF}
--disable-bash-completion
--disable-hal
--disable-schemas-compile
--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
$(use_enable afp)
$(use_enable archive)
$(use_enable avahi)
$(use_enable bluetooth obexftp)
$(use_enable bluray)
$(use_enable cdda)
$(use_enable fuse)
$(use_enable gdu)
$(use_enable gphoto2)
$(use_enable ios afc)
$(use_enable udev)
$(use_enable udev gudev)
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)
$(use_enable udisks udisks2)"
}
src_prepare() {
# Conditional patching purely to avoid eautoreconf
if use gphoto2; then
epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch
epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-2.5-{1,2}.patch
fi
if use archive; then
epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
echo mount-archive.desktop.in >> po/POTFILES.in
echo mount-archive.desktop.in.in >> po/POTFILES.in
fi
if ! use udev; then
sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
if use gphoto2 || use archive || ! use udev; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
AT_M4DIR=. eautoreconf
fi
gnome2_src_prepare
}
src_install() {
gnome2_src_install
newbashcomp programs/gvfs-bash-completion.sh ${PN}
}

@ -1,2 +1,3 @@
DIST 98925-cwp-1.6.2.tar.bz2 198917 SHA256 a3e1b0b456e330d490f5e68b2b36a573689b2271612945fcb64d73b606630c7c SHA512 b9c9be0aab50084344dbe2fb7c0f3befa4d90f083b6a4927ca742a5a267ee8847704dd32eb58aa5700a14841a988673bd565794d3fc5b184289836d2b5eeb6ce WHIRLPOOL f3458c771ef281817c49bae0483155942a88506e4815dfed0688f4bee5fa3f0c51ecc4da65952c4b0be09f08b77797efc60f165fbb45dd203cedd9d4a1d8207e
DIST 98925-cwp-1.6.3.tar.bz2 198854 SHA256 a9beb53c7d272b0dad16392aaf487b000937ef6000097a16d3ce100c8eb4c442 SHA512 9a38d3bf6ed0c3a888782845b9d656f0cce8552b642b6820e439cb450374cebdb9eca6e915992c519339b03b9de50bae27d4c339e04cf9200eff667d285f1722 WHIRLPOOL 2bd42cc8d3b5493d1d2bf30c3b964b702342d048a4bada47b162b746969a3b382a5ec66d2eb6f3039917a1ffb7d9bd5ce08831e093ef6421258f2a0ec4427ad6
DIST 98925-cwp-1.6.4.tar.bz2 198870 SHA256 ed7a3cccbd566b36f5f3ca5b8578b7fe3c8c4f58a24fb23068183a2a30e19646 SHA512 82df633dc212517d8c9569f0ab138ccaa125b4df038c7b070f1e8be6015ab5da9718a0d4f96b783cfb4b0cb4339cf7a1cf1f3e6e2cbd796794da3583f94101b1 WHIRLPOOL 1e4d51c91f5d65ea35a98eb19b6d7c4ba0d903088b7eab7d1522a290c44d6250afafeb220d7034bcf5dba4b81d50c23395593f894c9b629818afdcb001b5afcb

@ -0,0 +1,26 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/customizable-weather/customizable-weather-1.6.4.ebuild,v 1.1 2012/09/26 12:05:44 johu Exp $
EAPI=4
KDE_LINGUAS="br de el es fr hu it nb nl pl ro ru sr sr@latin tr zh_CN"
inherit kde4-base
MY_P="cwp-${PV}"
DESCRIPTION="KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup."
HOMEPAGE="http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid?content=98925"
SRC_URI="http://www.kde-look.org/CONTENT/content-files/98925-${MY_P}.tar.bz2"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="debug"
RDEPEND="
$(add_kdebase_dep plasma-workspace)
"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"

@ -1 +1,2 @@
DIST skanlite-0.8.tar.bz2 2660641 RMD160 16853e070982feb401536f86796a3086c8f13253 SHA1 bfa429ee6fce3f2d38c1013ddc686f9c686bb341 SHA256 b978d42d945c61c6d9c351eb8c1ebe8dad7024868df897f16e134de8b44d26a8
DIST skanlite-0.8.tar.bz2 2660641 SHA256 b978d42d945c61c6d9c351eb8c1ebe8dad7024868df897f16e134de8b44d26a8
DIST skanlite-0.9.tar.bz2 2877440 SHA256 004423ed9e881520d38d396efefd7f8c34e8a22c7506558a595798efd3785369 SHA512 3466d699306a92533398d7c626724603472ca14a24241101f1fcc314ef43806113ab8d4f0a8848efa6c9be7ba11ac4206e9e2c897949fd5bffe52166bee0d702 WHIRLPOOL 488fb6ec8ad98cdf7818a868f41fdd3b47f571e092026cdf8a699aad2e48142c57fd3726e8f1ee835c96833b8aab3f6171cce4f242c0f24dbb7914e3e2ae0f5f

@ -0,0 +1,24 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/skanlite/skanlite-0.9.ebuild,v 1.1 2012/09/26 12:14:43 johu Exp $
EAPI=4
KDE_LINGUAS="be bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hr
hu is it ja km ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru sk sl sq sv tr ug
uk wa zh_CN zh_TW"
KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="KDE image scanning application"
HOMEPAGE="http://www.kde.org/applications/graphics/skanlite/"
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="$(add_kdebase_dep libksane)"
RDEPEND=${DEPEND}

@ -1,3 +1,4 @@
DIST courier-0.65.2.tar.bz2 7152680 RMD160 6a81f74c85f9e78e6514f840598dde634fe070ce SHA1 784893216ea6c43c91606fa550cfdff13060855d SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
DIST courier-0.66.3.tar.bz2 6871617 RMD160 144dc6d5fc2279e50a2f9f349c9c69dd638fe7f8 SHA1 31928fc09dc4e89adae4a601d45df0a9486b7c76 SHA256 5d2f68bdcc89e6a62327b9afed1703a9d2a674f60e0996291f301e7db48d15b5
DIST courier-0.68.2.20120626.tar.bz2 7068120 RMD160 281ca8659451777a69539145f8c855534819e9ee SHA1 40270febb4e2b99402ff6850eb5cb72bc7519f7d SHA256 b1afcd7454cf893a046b090d25e3fde568108dbe0e9df015cdf97a9a0a99ab46
DIST courier-0.65.2.tar.bz2 7152680 SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
DIST courier-0.66.3.tar.bz2 6871617 SHA256 5d2f68bdcc89e6a62327b9afed1703a9d2a674f60e0996291f301e7db48d15b5
DIST courier-0.68.2.20120626.tar.bz2 7068120 SHA256 b1afcd7454cf893a046b090d25e3fde568108dbe0e9df015cdf97a9a0a99ab46
DIST courier-0.69.0.tar.bz2 7061163 SHA256 adfd9d7ad5a8f6256286b797f242f65a0bb90bf52a6104fbcf38e51740f8ab09 SHA512 96e048015392f5673986fc086a8e7a7e8ecece1d6e08b096a05ae3f8f7feabd96e8dcf951fcb265efae773b909479a95f6aa2de88204677658c458079dec5b39 WHIRLPOOL 89fc61474ad0e382e47293b015c9216b9389013071ed0153be6c29b9aa27288b856d9087d41ae951a57f3543705144b44c6295a38d65433c16755c7b947a29f1

@ -0,0 +1,301 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.69.0.ebuild,v 1.1 2012/09/26 16:04:38 hanno Exp $
inherit eutils flag-o-matic multilib
DESCRIPTION="An MTA designed specifically for maildirs"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
HOMEPAGE="http://www.courier-mta.org/"
SLOT="0"
LICENSE="GPL-2"
# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
DEPEND="
>=net-libs/courier-authlib-0.61.0
!gnutls? ( >=dev-libs/openssl-0.9.6 )
gnutls? ( net-libs/gnutls )
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
app-misc/mime-types
fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
pam? ( virtual/pam )
mysql? ( virtual/mysql )
ldap? ( >=net-nds/openldap-1.2.11 )
postgres? ( dev-db/postgresql-base )
spell? ( app-text/aspell )
fam? ( virtual/fam )
!mail-filter/maildrop
!mail-mta/esmtp
!mail-mta/exim
!mail-mta/mini-qmail
!mail-mta/msmtp
!mail-mta/nbsmtp
!mail-mta/netqmail
!mail-mta/nullmailer
!mail-mta/postfix
!mail-mta/qmail-ldap
!mail-mta/sendmail
!mail-mta/ssmtp
"
RDEPEND="${DEPEND}
dev-lang/perl
sys-process/procps"
# get rid of old style virtual/imapd - bug 350792
# all blockers really needed?
RDEPEND="${RDEPEND}
!net-mail/bincimap
!net-mail/courier-imap
!net-mail/cyrus-imapd
!net-mail/uw-imap"
PDEPEND="pam? ( net-mail/mailbase )
crypt? ( >=app-crypt/gnupg-1.0.4 )"
src_unpack() {
unpack ${A}
cd "${S}"
use norewrite && epatch "${FILESDIR}/norewrite.patch"
}
src_compile() {
filter-flags '-fomit-frame-pointer'
local myconf
myconf=""
use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
econf ${myconf} \
$(use_with fam) \
$(use_with ipv6) \
$(use_with spell ispell) \
$(use_with ldap ldapaliasd) \
$(use_enable ldap maildroldap) \
$(use_with gnutls) \
--enable-mimetypes=/etc/mime.types \
--prefix=/usr \
--disable-root-check \
--mandir=/usr/share/man \
--sysconfdir=/etc/courier \
--libexecdir=/usr/$(get_libdir)/courier \
--datadir=/usr/share/courier \
--sharedstatedir=/var/lib/courier/com \
--localstatedir=/var/lib/courier \
--with-piddir=/var/run/courier \
--with-authdaemonvar=/var/lib/courier/authdaemon \
--with-mailuser=mail \
--with-mailgroup=mail \
--with-paranoid-smtpext \
--with-db=gdbm \
--disable-autorenamesent \
--cache-file="${S}/configuring.cache" \
--host="${CHOST}" debug=true || die "./configure"
sed -e'/^install-perms-local:/a\ sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
emake || die "Compile problem"
}
etc_courier() {
# Import existing /etc/courier/file if it exists.
# Add option only if it was not already set or even commented out
file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
grep -q "${word}" "${D}/etc/courier/${file}" || \
echo "${2}" >> "${D}/etc/courier/${file}"
}
etc_courier_chg() {
file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
[ -z "${section}" ] && section="${2}"
grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
}
src_install() {
local f
diropts -o mail -g mail
keepdir /var/run/courier
keepdir /var/lib/courier/tmp
keepdir /var/lib/courier/msgs
make install DESTDIR="${D}" || die "install"
make install-configure || die "install-configure"
# Get rid of files we dont want
if ! use webmail ; then
rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
"${D}/usr/share/courier/sqwebmail/" \
"${D}/usr/sbin/webmaild" \
"${D}/usr/sbin/webgpg" \
"${D}/etc/courier/webmail.authpam" \
"${D}/var/lib/courier/webmail-logincache" \
"${D}"/etc/courier/sqwebmaild*
fi
if ! use web ; then
rm -rf "${D}/usr/share/courier/courierwebadmin/" \
"${D}/etc/courier/webadmin"
fi
for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
done
newinitd "${FILESDIR}/courier-init-r3" "courier"
use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
cd "${D}/etc/courier"
if use webmail ; then
insinto /etc/courier
newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
fi
for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
if use ldap ; then
[ -e ldapaliasrc ] && ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
else
rm -f ldapaliasrc
fi
( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
> "${D}/etc/courier/sizelimit"
etc_courier maildroprc ""
etc_courier esmtproutes ""
etc_courier backuprelay ""
etc_courier locallowercase ""
etc_courier bofh "opt BOFHBADMIME=accept"
etc_courier bofh "opt BOFHSPFTRUSTME=1"
etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
etc_courier bofh "opt BOFHSPFFROM=all"
etc_courier bofh "opt BOFHSPFMAILFROM=all"
etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
etc_courier esmtpd "BOFHBADMIME=accept"
etc_courier esmtpd-ssl "BOFHBADMIME=accept"
etc_courier esmtpd-msa "BOFHBADMIME=accept"
use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
# Fix for a sandbox violation on subsequential merges
# - ticho@gentoo.org, 2005-07-10
dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
cd "${S}"
cp imap/README README.imap
use nls && cp unicode/README README.unicode
dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
dodoc tcpd/README.couriertls
mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
if use webmail ; then
insinto /usr/$(get_libdir)/courier/courier
insopts -m 755 -o mail -g mail
doins "${S}/courier/webmaild"
fi
if use web ; then
insinto /etc/courier/webadmin
insopts -m 400 -o mail -g mail
doins "${FILESDIR}/password.dist"
fi
# avoid name collisions in /usr/sbin, make webadmin match
cd "${D}/usr/sbin"
for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
if use web ; then
sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
|| ewarn "failed to fix webadmin"
sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
|| ewarn "failed to fix webadmin"
fi
# users should be able to send mail. Could be restricted with suictl.
chmod u+s "${D}/usr/bin/sendmail"
dosym /usr/bin/sendmail /usr/sbin/sendmail
}
src_test() {
if [ `whoami` != 'root' ]; then
emake -j1 check || die "Make check failed."
else
einfo "make check skipped, can't run as root."
einfo "You can enable it with FEATURES=\"userpriv\""
fi
}
pkg_postinst() {
use fam && elog "fam daemon is needed for courier-imapd" \
|| ewarn "courier was built without fam support"
}
pkg_config() {
mailhost="$(hostname)"
export mailhost
domainname="$(domainname)"
if [ "x$domainname" = "x(none)" ] ; then
domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
fi
export domainname
if [ "${ROOT}" = "/" ] ; then
file="${ROOT}/etc/courier/locals"
if [ ! -f "${file}" ] ; then
echo "localhost" > "${file}";
echo "${domainname}" >> "${file}";
fi
file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
if [ ! -f "${file}" ] ; then
echo "${domainname}" > "${file}"
/usr/sbin/makeacceptmailfor
fi
file="${ROOT}/etc/courier/smtpaccess/${domainname}"
if [ ! -f "${file}" ]
then
netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
do
i=1
net=""
TIFS="${IFS}"
IFS="."
for o in "${netmask}"
do
if [ "${o}" == "255" ]
then
[ "_${net}" == "_" ] || net="${net}."
t="$(echo "${network}" | cut -d " " -f ${i})"
net="${net}${t}"
fi
i="$((${i} + 1))"
done
IFS="${TIFS}"
echo "doing configuration - relay control for the network ${net} !"
echo "${net} allow,RELAYCLIENT" >> ${file}
done
/usr/sbin/makesmtpaccess
fi
fi
echo "creating cert for esmtpd-ssl:"
/usr/sbin/mkesmtpdcert
echo "creating cert for imapd-ssl:"
/usr/sbin/mkpop3dcert
echo "creating cert for pop3d-ssl:"
/usr/sbin/mkimapdcert
}

@ -1,3 +1,3 @@
DIST asymptote-2.13.src.tgz 1732439 SHA256 a0ac4815aaa367a8bc5cb3fb462267959f73e982d07fd96392c019c9fdfb7a13
DIST asymptote-2.16.src.tgz 1802976 SHA256 523694782a6fe82652b2893482cbe314b139893721887517be3e6820466f48fa SHA512 f50fe5fcb804e649ef8d4a51aea187effc9e0da6382365c577c7bd6971968ae05e0b2b2b9aac3f680c6dace0f941c47d44dd9676a3cfca00f8cb2ac881bbeb33 WHIRLPOOL 4d9238b55a8ab86f2d1e8d011cb5479935b6a3f31ecb797cc180a15a5061df7a3ce4a18b9812e0ef0f0183b29ae34f582358c630930fe7e4124500512ea72b6a
DIST asymptote-2.17.src.tgz 1796563 SHA256 990fa5a4265f829b3e32a12eedf497a0a1b1e5500c5de295a876bab60615a8be SHA512 218878b67a60d73da078a769df77ecc88ba6302e2822ea303d0ebdf57f1e1128a5540bce5f12d011fa755e5c7561e008b7bc37a6bd445ecf4f0cb12afb805989 WHIRLPOOL a5ad75736c2ca8dba7091598887acbfa02b5cc79a342d6b3687bbd292718ea0ebf79c677ac542f1714e97efe597dfc55fcc2ce0d57aab1f0290d524dd47f2948
DIST asymptote-2.19.src.tgz 1797153 SHA256 ba2125a41ffbc3c95b3c27cbaa52e367e0d934ce7ae9129e03f6b41a148e07ec SHA512 3a1ee0dae24e0bd314420b20519cbdacfb91107570557f796f968eacc32c0baef38c9e4ecc208a82067c881fdfa3a2359de485b37c457f30800fc5fb556adc4c WHIRLPOOL ca96c9fe1d22feab8bcbe55b27c4bc2d007050117feeae1a52e960fdd93e0aa9b68d604b6ff421af50b607fa0e55818bdd0a684465d7c53e1b6dacbb6bbe1a74

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.16.ebuild,v 1.1 2012/06/02 18:17:12 grozin Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.19.ebuild,v 1.1 2012/09/26 13:20:17 grozin Exp $
EAPI=3
EAPI=4
SUPPORT_PYTHON_ABIS=1
PYTHON_DEPEND="python? 2"
RESTRICT_PYTHON_ABIS="3.*"
@ -14,11 +14,14 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex python sigsegv svg vim-syntax X"
IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
REQUIRED_USE="offscreen? ( )"
RDEPEND=">=sys-libs/readline-4.3-r5
>=sys-libs/ncurses-5.4-r5
imagemagick? ( media-gfx/imagemagick[png] )
opengl? ( >=media-libs/mesa-8 )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
@ -59,33 +62,35 @@ src_configure() {
$(use_enable boehm-gc gc system) \
$(use_enable fftw) \
$(use_enable gsl) \
$(use_enable opengl gl) \
$(use_enable offscreen) \
$(use_with sigsegv)
}
src_compile() {
emake || die "emake failed"
emake
cd doc
emake asy.1 || die "emake asy.1 failed"
emake asy.1
if use doc; then
# info
einfo "Making info"
emake ${PN}.info || die "emake ${PN}.info failed"
emake ${PN}.info
cd FAQ
emake || die "emake FAQ failed"
emake
cd ..
# pdf
einfo "Making pdf docs"
export VARTEXFONTS="${T}"/fonts
# see bug #260606
emake -j1 asymptote.pdf || die "emake asymptote.pdf failed"
emake CAD.pdf || die "emake CAD.pdf failed"
emake -j1 asymptote.pdf
emake CAD.pdf
fi
cd ..
if use emacs; then
einfo "Compiling emacs lisp files"
elisp-compile base/*.el || die "elisp-compile failed"
elisp-compile base/*.el
fi
}

@ -1,7 +1,7 @@
Index: asymptote-2.16/configure.ac
Index: asymptote-2.19/configure.ac
===================================================================
--- asymptote-2.16.orig/configure.ac
+++ asymptote-2.16/configure.ac
--- asymptote-2.19.orig/configure.ac
+++ asymptote-2.19/configure.ac
@@ -154,7 +154,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
fi
CPPFLAGS_SAVE=$CPPFLAGS

@ -1,7 +1,7 @@
Index: asymptote-2.16/doc/asymptote.texi
Index: asymptote-2.19/doc/asymptote.texi
===================================================================
--- asymptote-2.16.orig/doc/asymptote.texi
+++ asymptote-2.16/doc/asymptote.texi
--- asymptote-2.19.orig/doc/asymptote.texi
+++ asymptote-2.19/doc/asymptote.texi
@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
@dircategory Languages

@ -1,8 +1,8 @@
Index: asymptote-2.16/settings.cc
Index: asymptote-2.19/settings.cc
===================================================================
--- asymptote-2.16.orig/settings.cc
+++ asymptote-2.16/settings.cc
@@ -96,14 +96,14 @@ bool msdos=false;
--- asymptote-2.19.orig/settings.cc
+++ asymptote-2.19/settings.cc
@@ -90,14 +90,14 @@ bool msdos=false;
string HOME="HOME";
string docdir=ASYMPTOTE_DOCDIR;
const char pathSeparator=':';

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>hanno@gentoo.org</email>
</maintainer>
<maintainer>
<email>sping@gentoo.org</email>
<description>backup maintainer</description>
</maintainer>
<use>
<flag name="smp">

@ -1,3 +1,3 @@
DIST v4l-utils-0.8.5.tar.bz2 373882 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c SHA512 d84bea5658b350447741e2aae36458c2ba29f4d6beb8dd4965626a1f60ea1f0b7d12751cab9501c1c5cb3ba9872fc7ac237553e452b3c348f907c4a8274f954a WHIRLPOOL fa941a7e30792993144e7b55dc88cd10c09100e94142ed8c0c0f68bcaf8d12a0c57511f5698225ff9f057c0eb4696d0eff6d0d55fa46673c3db10f5bb9b4b6ca
DIST v4l-utils-0.8.6.tar.bz2 375254 SHA256 3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f
DIST v4l-utils-0.8.6.tar.bz2 375254 SHA256 3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f SHA512 ab3a5637309a97b30afbe73c1025095a7a99355a6ff732a7e3f6e6a98862ced5fb95e5336f72acee41b11d8e9a2a1770e376b8791760369d102940394c074f71 WHIRLPOOL 2ccbda32c9a8989b33ffc7e8647cbf1060a0a49c9ff6936ada5e6b5d2945cf223308f8af094b7c0b2ee0451aeb815946d4fd3aca3ce4bf8a51da947fe33662ad
DIST v4l-utils-0.8.8.tar.bz2 420888 SHA256 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f SHA512 4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4 WHIRLPOOL bcfac96bf78ee9da822ece69ad8f0a2da534ad3103170e07dd192f22c04cf48421769c9f62c6ab1ba8dc2894827e98dd2c1c1fc04b762063dab0f8f5a027f88a

@ -0,0 +1,22 @@
don't bother generating dependency information:
- we don't use/care because we aren't doing rebuilds
- it uses the -Wp flag which is gcc specific for no good reason
upstream has rewritten things to use autotools, so this will go away
once they release another version
--- a/Make.rules
+++ b/Make.rules
@@ -23,10 +23,10 @@ LIB_RELEASE = 0
# And last various rules
%.o: %.c
- $(CC) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
%.o: %.cpp
- $(CXX) -Wp,-MMD,"$*.d",-MQ,"$@",-MP -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
%.so:
$(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*)

@ -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/media-libs/libv4l/libv4l-0.8.8.ebuild,v 1.8 2012/08/27 17:24:09 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.8.ebuild,v 1.9 2012/09/26 05:42:34 vapier Exp $
EAPI=4
inherit eutils linux-info multilib toolchain-funcs
@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
CONFIG_CHECK="~SHMEM"
src_prepare() {
epatch "${FILESDIR}"/${P}-drop-Wp-flags.patch
sed -i \
-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-e "/^LIBDIR =/s:/lib:/$(get_libdir):" \

@ -1,2 +1 @@
DIST kamerka-0.6.tar.gz 69191 SHA256 ac7f3d9d6a2fbff4a106530440f550ddf41ee732cb6dd3dded309bb0dae137f6
DIST kamerka-0.8.1.tar.gz 81830 SHA256 5561f9b025fd15cf5674110ef23f7db23d03f249e5fcb0cd9df8aec5abf853e6 SHA512 c6a19b9c6deb8121f3475abe43060cd087d0fb728a624c1f884fb168cc57850cbafda7c5e2bee24fd21abb8055009b2356c5a6728ba805ec1ef6ace21d246423 WHIRLPOOL a4b93a0ed939f31d69bfbc3b46d6febb345b4565f62ac3e1d3a6363330bd03dc8994a6ab9910a32d2b3cbe03b80842a274f86d61204b08b487c4b5e2b43fdcc6

@ -1,27 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kamerka/kamerka-0.6.ebuild,v 1.2 2012/07/15 16:42:04 kensington Exp $
EAPI=4
inherit kde4-base
SRC_URI="http://dosowisko.net/${PN}/downloads/${P}.tar.gz"
DESCRIPTION="Simple photo taking application with fancy animated interface"
HOMEPAGE="http://dos1.github.com/kamerka/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
media-libs/libv4l
>=x11-libs/qt-core-4.7:4
$(add_kdebase_dep phonon-kde)
"
DEPEND=${RDEPEND}
src_prepare() {
sed -i -e 's/QT_PHONON_LIBRARY/KDE4_PHONON_LIBS/' src/CMakeLists.txt || die
kde4-base_src_prepare
}

@ -1,22 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/kamerka/kamerka-0.8.1.ebuild,v 1.2 2012/07/15 16:42:04 kensington Exp $
EAPI=4
inherit kde4-base
SRC_URI="http://dosowisko.net/${PN}/downloads/${P}.tar.gz"
DESCRIPTION="Simple photo taking application with fancy animated interface"
HOMEPAGE="http://dos1.github.com/kamerka/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
media-libs/libv4l
>=x11-libs/qt-core-4.7:4
$(add_kdebase_dep phonon-kde)
"
DEPEND=${RDEPEND}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save