Sync with portage [Thu Oct 3 10:24:35 MSK 2013].

mhiretskiy
root 11 years ago
parent dedc498ce8
commit 670d8c1821

@ -1,5 +1,2 @@
DIST espeak-1.42.04-source.zip 1537076 SHA256 3791bb853e9283950d58c02396b3b9b1313adf27c0004bcd1e0cdaf87a683eeb SHA512 e8b1d407b5fe3334c3f244475520f6eeefb7837ed4a88c1c1f2d9846ad1daeaad52de3b01eff31af98422ef377aee84e9ff52c586fb29118f636f73a499c9f67 WHIRLPOOL c55b2fc842c5624708209da70ca400d96af6428a010edc3873713a97bca8d4b72aecbc5338be07d6f5b4dfc4d25389fa6a49eda3eb512eee8320cd4004b6e9e2
DIST espeak-1.45.03-source.zip 1894722 SHA256 74ed21cb0f4f4a040db93ffa9f4dac463a53281fe47ef4e63605a3ee3e8e0eea SHA512 c63a8baff5fd34605d410483b1ccd35dfc2f3a57c3a65cf958ceb698e78ba404ae4c4c8bb83436ebb063fdb112ff60bc64829c5e0518728e8dc6a32657d517e7 WHIRLPOOL 693dcea214e1c272a069cb8ac251f77c280d5223ca3433f10ad24a3860c3f4d62ceed395dd8affa6d16bc2200715d73aadfbac95ea260c9c1cd12a09143a1843
DIST espeak-1.45.04-source.zip 1904805 SHA256 816825f8aadb8ce9487808d35f698a9ac39b158cf43ad0aa98e8b4d7c5ab9780 SHA512 2bf93c9bae151b4ccd8433e9c60e079fa33afe092e7703394884400ab279a42b8106bbcaf48d731bcad40a1fee0d145d22f1f77fd16b5a4ae92bbe34ae60b29f WHIRLPOOL c7307f6671348908a314cfee46cd94049fa53b09db76760b7120c1a5bf18135292c09db68f1b8271aa384139fb69074cb4c8decc4e6719cab12915b519a9cfb5
DIST espeak-1.46.01-source.zip 2371712 SHA256 87fc4fdeea9d5151909515ab6258ca0cccea78356037380fa8dcf09953e93de4 SHA512 585152d190cb07318bf3f86f2f68639248afc750d211a46bac5ca392fbe19a481fb60068fc9cb4bbade95bc76772f1c43b40542151507c97064b149ef875eefb WHIRLPOOL fc3dc72665ab6dcb2a5db3bd96e8dd3ba3cfa9feba4d6bd55ef1a6d2a6d57f6c9278b508a6b7022889a65b0ffe14977bdf4f7d1af0e2ce2f5e51b85c2fc1d9de
DIST espeak-1.47.11-source.zip 2813649 SHA256 9bd4d0569af48a2cb13fa76704dec3124d27025a3f21c87598457976472b360c SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b WHIRLPOOL c26f481d4c3c485ba0eb3fe7ae3bcf36e7001d49e0e27a6f0934fdb9c91cfef4974c1d34daebd0286694346a44c647cfb96769da54536e0b4380778af755673c

@ -1,79 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.42.04.ebuild,v 1.9 2012/05/31 02:10:21 zmedico Exp $
EAPI="2"
inherit eutils multilib
MY_P="${P}-source"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
DESCRIPTION="Speech synthesizer for English and other languages"
HOMEPAGE="http://espeak.sourceforge.net/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="portaudio pulseaudio"
RDEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
pulseaudio? ( media-sound/pulseaudio )"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/${MY_P}
get_audio() {
local MY_AUDIO
if use portaudio; then
MY_AUDIO=portaudio
elif use pulseaudio; then
MY_AUDIO=pulseaudio
else
MY_AUDIO=none
fi
echo ${MY_AUDIO}
}
pkg_setup() {
if ! use portaudio && ! use pulseaudio; then
ewarn
ewarn Since portaudio and pulseaudio are not in your use flags,
ewarn espeak will only be able to create wav files.
ewarn If this is not what you want, press ctrl-c and put either
ewarn portaudio or pulseaudio in your use flags.
ebeep
epause 10
elif use portaudio && use pulseaudio; then
die "You must choose either portaudio or pulseaudio, but not both."
fi
}
src_prepare() {
cd src
# gentoo uses portaudio 19.
if use portaudio; then
mv -f portaudio19.h portaudio.h
fi
}
src_compile() {
cd src
emake AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed"
einfo "Fixing byte order of phoneme data files"
cd "${S}/platforms/big_endian"
make
./espeak-phoneme-data "${S}/espeak-data"
cp -f phondata phonindex phontab "${S}/espeak-data"
}
src_install() {
cd src
make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed"
cd ..
insinto /usr/share/espeak-data
doins -r dictsource
dodoc ChangeLog ReadMe
dohtml -r docs/*
}

@ -1,72 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.03.ebuild,v 1.2 2012/05/31 02:10:21 zmedico Exp $
EAPI="4"
inherit eutils multilib toolchain-funcs
MY_P="${P}-source"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
DESCRIPTION="Speech synthesizer for English and other languages"
HOMEPAGE="http://espeak.sourceforge.net/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="portaudio pulseaudio"
REQUIRED_USE="portaudio? ( !pulseaudio )
pulseaudio? ( !portaudio )"
RDEPEND=" pulseaudio? ( media-sound/pulseaudio )
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/${MY_P}
get_audio() {
if use portaudio; then
echo portaudio
elif use pulseaudio; then
echo pulseaudio
else
echo none
fi
}
src_prepare() {
cd src
# gentoo uses portaudio 19.
mv -f portaudio19.h portaudio.h
}
src_compile() {
cd src
emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all
einfo "Fixing byte order of phoneme data files"
cd "${S}/platforms/big_endian"
make
./espeak-phoneme-data "${S}/espeak-data"
cp -f phondata phonindex phontab "${S}/espeak-data"
}
src_install() {
cd src
make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install
cd ..
insinto /usr/share/espeak-data
doins -r dictsource
dodoc ChangeLog.txt ReadMe
dohtml -r docs/*
}
pkg_postinst() {
if ! use portaudio && ! use pulseaudio; then
ewarn "Since portaudio and pulseaudio are not in your use flags,"
ewarn "espeak will only be able to create wav files."
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
ewarn "with either portaudio or pulseaudio USE flag enabled."
fi
}

@ -1,73 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.46.01.ebuild,v 1.4 2013/02/02 22:17:43 ago Exp $
EAPI="4"
inherit eutils multilib toolchain-funcs
MY_P="${P}-source"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
DESCRIPTION="Speech synthesizer for English and other languages"
HOMEPAGE="http://espeak.sourceforge.net/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="portaudio pulseaudio"
REQUIRED_USE="portaudio? ( !pulseaudio )
pulseaudio? ( !portaudio )"
RDEPEND="media-sound/sox
pulseaudio? ( media-sound/pulseaudio )
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/${MY_P}
get_audio() {
if use portaudio; then
echo portaudio
elif use pulseaudio; then
echo pulseaudio
else
echo none
fi
}
src_prepare() {
cd src
# gentoo uses portaudio 19.
mv -f portaudio19.h portaudio.h
}
src_compile() {
cd src
emake PREFIX="${EPREFIX}/usr" AUDIO="$(get_audio)" \
CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" all
einfo "Fixing byte order of phoneme data files"
cd "${S}/platforms/big_endian"
make
./espeak-phoneme-data "${S}/espeak-data"
cp -f phondata phonindex phontab "${S}/espeak-data"
}
src_install() {
cd src
make DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="\$(PREFIX)/$(get_libdir)" AUDIO="$(get_audio)" install
cd ..
insinto /usr/share/espeak-data
doins -r dictsource
dodoc ChangeLog.txt ReadMe
dohtml -r docs/*
}
pkg_postinst() {
if ! use portaudio && ! use pulseaudio; then
ewarn "Since portaudio and pulseaudio are not in your use flags,"
ewarn "espeak will only be able to create wav files."
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
ewarn "with either portaudio or pulseaudio USE flag enabled."
fi
}

@ -1,92 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.47.11.ebuild,v 1.5 2013/09/22 20:14:41 williamh Exp $
EAPI=5
inherit eutils multilib toolchain-funcs
MY_P="${P}-source"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
DESCRIPTION="Speech synthesizer for English and other languages"
HOMEPAGE="http://espeak.sourceforge.net/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="portaudio pulseaudio"
RDEPEND="
media-sound/sox
pulseaudio? ( media-sound/pulseaudio )
portaudio? ( >=media-libs/portaudio-19_pre20071207 )"
DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}/${MY_P}/src
get_audio() {
if use portaudio && use pulseaudio; then
echo runtime
elif use portaudio; then
echo portaudio
elif use pulseaudio; then
echo pulseaudio
else
echo none
fi
}
src_prepare() {
# gentoo uses portaudio 19.
mv -f portaudio19.h portaudio.h
}
src_compile() {
emake \
PREFIX="${EPREFIX}/usr" \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
CXX="$(tc-getCXX)" \
CXXFLAGS="${CXXFLAGS}" \
AR="$(tc-getAR)" \
AUDIO="$(get_audio)" \
all
einfo "Fixing byte order of phoneme data files"
cd "${S}/platforms/big_endian"
emake
./espeak-phoneme-data "${S}/espeak-data"
cp -f phondata phonindex phontab "${S}/espeak-data"
}
src_install() {
emake \
PREFIX="${EPREFIX}/usr" \
LIBDIR="\$(PREFIX)/$(get_libdir)" \
DESTDIR="${D}" \
AUDIO="$(get_audio)" \
install
cd ..
insinto /usr/share/espeak-data
doins -r dictsource
dodoc ChangeLog.txt ReadMe
dohtml -r docs/*
}
pkg_preinst() {
local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
if [ -d "${voicedir}" ]; then
rm -rf "${voicedir}"
fi
}
pkg_postinst() {
if ! use portaudio && ! use pulseaudio; then
ewarn "Since portaudio and pulseaudio are not in your use flags,"
ewarn "espeak will only be able to create wav files."
ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
ewarn "with either portaudio or pulseaudio USE flag enabled."
fi
}

@ -1 +1,2 @@
DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d

@ -0,0 +1,22 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.2.ebuild,v 1.1 2013/10/02 23:49:35 gregkh Exp $
EAPI="4"
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/openssl
sys-apps/util-linux"
DEPEND="${RDEPEND}
sys-apps/help2man
sys-boot/gnu-efi
app-crypt/sbsigntool
virtual/pkgconfig"

@ -1,4 +1,2 @@
DIST libsecret-0.12.tar.xz 476552 SHA256 323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01 SHA512 920da07b8674816b9f139dc71e79721d1767025e799e99dea7458c3c3b54c81ae2f4aa55ad55194e0c151fa23d13eae12928c9bbfac1c67d9ae6eed3d8a1efa4 WHIRLPOOL 1bcc96a175519f2d24ec8c5f8ee61ae0ca851511c540d69230ab05a67d7192ac5827d407c06aa054820ee1ea714efee7ee15927b4fcc152fae73ef66bb768f24
DIST libsecret-0.14.tar.xz 483620 SHA256 58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5 SHA512 63b8fd947d63f178f48a79aa195f4b6a9eb1e802134779436981ab8aa00b268a449709139704843656f8b4616cc13a2dbc79a4ba4460b09cf250cef3478fd172 WHIRLPOOL 301d88c4fcf35038456800748b349c303edf96323d96cf7b80324d85fe97ca3be22ce4b79ef07dc6d42a7fb6050dedf51d3d409f9e514eac7685d0139e407c63
DIST libsecret-0.15.tar.xz 484532 SHA256 33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8 SHA512 d89f3b52c5300306b92b222a56c976e5c42f761c2a8691b0dbac9f533853a54f6dd91f9f22f577e336c77e9771dd3cb098963dab086759ead2750f2a8fce5dca WHIRLPOOL 23eb06d6ed09023704b73cd9c1927bed09e38a58ec9694e43f8838879ce4f34ac67efb7a8f0b7770b26260ccb474c2f4e7c398f326b94dd08b63d7fe22e03ff1
DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183

@ -1,73 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.12.ebuild,v 1.9 2013/01/28 14:56:10 aballier Exp $
EAPI="5"
VALA_MIN_API_VERSION=0.18
VALA_USE_DEPEND=vapigen
inherit eutils gnome2 python vala virtualx
DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
HOMEPAGE="https://live.gnome.org/Libsecret"
LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
SLOT="0"
IUSE="+crypt debug +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
COMMON_DEPEND="
>=dev-libs/glib-2.31.0:2
crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
introspection? ( >=dev-libs/gobject-introspection-1.29 )"
RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-keyring-3"
# Add ksecrets to RDEPEND when it's added to portage
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
dev-util/gdbus-codegen
dev-util/gtk-doc-am
>=dev-util/intltool-0.35.0
sys-devel/gettext
virtual/pkgconfig
test? (
dev-python/mock
introspection? (
=dev-lang/python-2*
>=dev-libs/gjs-1.32
dev-python/pygobject:3 )
)
vala? ( $(vala_depend) )"
pkg_setup() {
# python is only needed for tests
if use test && use introspection; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--enable-manpages
--disable-strict
--disable-coverage
--disable-static
$(use_enable crypt gcrypt)
$(use_enable introspection)
$(use_enable vala)"
# FIXME: disable failing test
sed -e '/test_get_sync);/d' \
-e '/test_get_async);/d' \
-i libsecret/tests/test-service.c || die
use vala && vala_src_prepare
gnome2_src_prepare
}
src_test() {
Xemake check
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.14.ebuild,v 1.2 2013/03/30 23:16:06 eva Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15-r1.ebuild,v 1.1 2013/10/03 02:25:29 tetromino Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15.ebuild,v 1.1 2013/03/31 16:06:16 eva Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15.ebuild,v 1.2 2013/10/03 02:25:29 tetromino Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
@ -22,8 +22,9 @@ COMMON_DEPEND="
>=dev-libs/glib-2.32.0:2
crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
introspection? ( >=dev-libs/gobject-introspection-1.29 )"
RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-keyring-3"
RDEPEND="${COMMON_DEPEND}"
# Temporarily removed from RDEPEND to allow stabilization:
# >=gnome-base/gnome-keyring-3
# Add ksecrets to RDEPEND when it's added to portage
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt

@ -0,0 +1,29 @@
From 21e984fa9d93a760cc03f5d9d13d023809227df2 Mon Sep 17 00:00:00 2001
From: James Bottomley <JBottomley@Parallels.com>
Date: Thu, 11 Apr 2013 21:12:17 -0700
Subject: image.c: clear image variable
Not zeroing the image after talloc occasionally leads to a segfault because
the programme thinks it has a signature when in reality it just has a junk
pointer and segfaults.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---
src/image.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/image.c b/src/image.c
index cc55791..10eba0e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -401,6 +401,7 @@ struct image *image_load(const char *filename)
return NULL;
}
+ memset(image, 0, sizeof(*image));
rc = fileio_read_file(image, filename, &image->buf, &image->size);
if (rc)
goto err;
--
1.8.2.1

@ -0,0 +1,39 @@
From e58a528ef57e53008222f238cce7c326a14572e2 Mon Sep 17 00:00:00 2001
From: James Bottomley <JBottomley@Parallels.com>
Date: Mon, 30 Sep 2013 19:25:37 -0700
Subject: [PATCH 4/4] Fix for multi-sign
The new Tianocore multi-sign code fails now for images signed with
sbsigntools. The reason is that we don't actually align the signature table,
we just slap it straight after the binary data. Unfortunately, the new
multi-signature code checks that our alignment offsets are correct and fails
the signature for this reason. Fix by adding junk to the end of the image to
align the signature section.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---
src/image.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/image.c b/src/image.c
index 10eba0e..519e288 100644
--- a/src/image.c
+++ b/src/image.c
@@ -385,7 +385,13 @@ static int image_find_regions(struct image *image)
/* record the size of non-signature data */
r = &image->checksum_regions[image->n_checksum_regions - 1];
- image->data_size = (r->data - (void *)image->buf) + r->size;
+ /*
+ * The new Tianocore multisign does a stricter check of the signatures
+ * in particular, the signature table must start at an aligned offset
+ * fix this by adding bytes to the end of the text section (which must
+ * be included in the hash)
+ */
+ image->data_size = align_up((r->data - (void *)image->buf) + r->size, 8);
return 0;
}
--
1.8.4

@ -0,0 +1,38 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild,v 1.1 2013/10/03 02:09:21 gregkh Exp $
EAPI="4"
inherit eutils toolchain-funcs
DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/openssl
sys-apps/util-linux"
DEPEND="${RDEPEND}
sys-apps/help2man
sys-boot/gnu-efi
virtual/pkgconfig"
src_prepare() {
local iarch
case ${ARCH} in
ia64) iarch=ia64 ;;
x86) iarch=ia32 ;;
amd64) iarch=x86_64 ;;
*) die "unsupported architecture: ${ARCH}" ;;
esac
sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
epatch "${FILESDIR}"/0002-image.c-clear-image-variable.patch
epatch "${FILESDIR}"/0003-Fix-for-multi-sign.patch
}

@ -1,2 +1,2 @@
DIST ess-12.09.tgz 3332863 SHA256 3167a84c9958605e9c1de7dc2dce564e22e89b79c9d1ba7ff7f66013af56f2b8 SHA512 652bac7965dfc594071a8cb332692522696930bce1617938a88835962a246faa6bcd1eb7ab0a340fbce71c2d93a8953ecf49dec684080635c0135c1db097d35c WHIRLPOOL 14c63d4397e635da5b7c5244ddc814c23ba494f4cdaa79081b35eef9c04c71c6c875c009518e9bd4e37f945c4a2b4f62ed27c93eebcfa65e090e03c77d995391
DIST ess-5.14.tgz 7272065 SHA256 982b625f5c3f0e11d2cd8903e15026b5ecac6775415e8eb3cd120d0b9950dcc6 SHA512 b4a726f4565e70ac5d960a96fc1cb4780b966bc2845233e0369e1a3462c3728c27cece27c2f89b8b74936dcbe63770e50c58c07e30ac8ed890c59e6301e6eada WHIRLPOOL 101bf76fba513c0f370c396878426c97cb518a0a37da63686c2825a7c6cb6aa2270a78711fa1b56b3951b0da42e268ebd5f8741d2fde832ce0198c4f2d6017e5
DIST ess-13.09.tgz 3356969 SHA256 d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2 SHA512 96a91a41c9b390c27646e4b95d7a41e6b22d592c82bf775f2e1b70905c7bc684c3d6645496275d245c9f882030da1b3bd5cd3ba5711acbec3a07cdb2d065a5dd WHIRLPOOL 3560d95bcb43a65ca86787274fa96106611a98041cf63905a4066223247d8557405b7557da2c468d836d4570d4e791aa36e84e76585fc9668729926ef0759598

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-5.14.ebuild,v 1.6 2012/09/29 09:39:33 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-13.09.ebuild,v 1.1 2013/10/02 18:13:31 ulm Exp $
EAPI=4
EAPI=5
inherit elisp
@ -12,12 +12,10 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
DEPEND="app-text/texi2html
virtual/latex-base"
RDEPEND=""
SITEFILE="50${PN}-gentoo.el"
@ -32,7 +30,7 @@ src_install() {
DOCDIR="${ED}/usr/share/doc/${PF}" \
install
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
# Most documentation is installed by the package's build system.
rm -f "${ED}${SITELISP}/${PN}/ChangeLog"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.2-r3.ebuild,v 1.1 2013/09/24 16:57:41 cardoe Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.2-r3.ebuild,v 1.3 2013/10/02 06:23:14 ago Exp $
EAPI=5
@ -24,7 +24,7 @@ else
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
fi
S="${WORKDIR}/${P%_rc*}"

@ -4,3 +4,4 @@ DIST vagrant-1.2.6.tar.gz 257600 SHA256 11deed3af85345008d43e2ca2ebde43e719dcb44
DIST vagrant-1.2.7.tar.gz 258038 SHA256 8058b0a62789c48cf4cadbfe2fff0cf1827ce595a84348552d7e3f7427a7f1fe SHA512 c9d2e99f8636cf899c3a4ed9c743b6d6987932ffd9bebd7c9ddcec90a686d2ea0aaf109691518cade199b65b986637ce106aeb9ad1ebb91b045e2f12f5b2a2ea WHIRLPOOL 22e6c01a5e4c2155f15c1652ce5df934efc4d95b8e11e42bdae9945456d2f16b305ee0a77cc2c2f343e4a28f6b7003a93d9588c8ea454c9cad90e3eafc5431a5
DIST vagrant-1.3.1.tar.gz 2182753 SHA256 d11d11347fc0ad37c535d7bb2d18fe30840bc5851882cea7eb72e7343f4ee2d2 SHA512 f7510b658c8895687764c04013c132012c6ffbdc07ad28815edc1b01e0ba6f583fd9a281e100d87c8731a8ea0978651465082fe19831b740b084c49c0b47cf62 WHIRLPOOL c7c113bbe7a92d7575fda749f11c36edb91b7af3cec726dce4dffde93fea91156fdb8dd61619c9a4ea570ceb21b132ab94370ed61e21231cba3bab5762e3297c
DIST vagrant-1.3.3.tar.gz 2187037 SHA256 e57abf02f729fe46d2f34636723cc7b9965b923cdeda78bc43770a41e476c345 SHA512 8fe1314165389f85c86b1d35e96072077b4a0087ffe07262f4ec413276bb6bf1bfa7010090398fe6e8fa66b26f0f3376b67b44d0f6e4c170722c8a9991bd4ab7 WHIRLPOOL 9003f9d39940dba25ba16ca007db0f13e35bb3f35412d1d26b6666eccb4c559e5633cd18c3f14840c1b5702a2e6d79a877376298176c1b3fd3d5dd604f9f8bb0
DIST vagrant-1.3.4.tar.gz 2189594 SHA256 b6214477777cee96817574283804a96f0d939c8068f198455d5491ed75fa4f13 SHA512 96c619f507da9765a2bcc5dfebb78cb024c2a7571546cf08efb5db0db537c3d46673d99a5a3ed30dec8da5cf82d57f7bf85484c97f2668df05fe879e7c53a721 WHIRLPOOL 23c215c8e2eb14f4816f9fee8db2028a82f19fe8206f48efc1281cba8b7d0b2ecdad65d11b21bae66bd942b3035d14aa640b0815e86efab5617a75271e867f92

@ -0,0 +1,67 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.3.4.ebuild,v 1.1 2013/10/03 00:50:11 radhermit Exp $
EAPI="5"
USE_RUBY="ruby19"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
RUBY_FAKEGEM_EXTRAINSTALL="config keys plugins templates"
RUBY_FAKEGEM_TASK_DOC=""
inherit ruby-fakegem eutils
DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
HOMEPAGE="http://vagrantup.com/"
SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos"
IUSE="test"
# Missing ebuild for contest
RESTRICT="test"
RDEPEND="${RDEPEND}
net-misc/curl
!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
ruby_add_rdepend "
>=dev-ruby/childprocess-0.3.7
>=dev-ruby/erubis-2.7.0
dev-ruby/i18n:0.6
>=dev-ruby/json-1.5.1
>=dev-ruby/log4r-1.1.9
>=dev-ruby/net-ssh-2.6.6
>=dev-ruby/net-scp-1.1.0
"
ruby_add_bdepend "
dev-ruby/rake
test? ( dev-ruby/mocha virtual/ruby-minitest )
"
all_ruby_prepare() {
# remove bundler support
sed -i '/[Bb]undler/d' Rakefile || die
rm Gemfile || die
# loosen dependencies
sed -e '/childprocess\|erubis\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
-i ${PN}.gemspec || die
epatch "${FILESDIR}"/${PN}-1.2.1-no-warning.patch
epatch "${FILESDIR}"/${PN}-1.2.2-rvm.patch
}
pkg_postinst() {
if use x64-macos ; then
ewarn
ewarn "For Mac OS X prefixes, you must install the virtualbox"
ewarn "package specifically for OS X which can be found at:"
ewarn "https://www.virtualbox.org/wiki/Downloads"
ewarn
fi
}

@ -0,0 +1,46 @@
x86/xsave: initialize extended register state when guests enable it
Till now, when setting previously unset bits in XCR0 we wouldn't touch
the active register state, thus leaving in the newly enabled registers
whatever a prior user of it left there, i.e. potentially leaking
information between guests.
This is CVE-2013-1442 / XSA-62.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -307,6 +307,7 @@ int validate_xstate(u64 xcr0, u64 xcr0_a
int handle_xsetbv(u32 index, u64 new_bv)
{
struct vcpu *curr = current;
+ u64 mask;
if ( index != XCR_XFEATURE_ENABLED_MASK )
return -EOPNOTSUPP;
@@ -320,9 +321,23 @@ int handle_xsetbv(u32 index, u64 new_bv)
if ( !set_xcr0(new_bv) )
return -EFAULT;
+ mask = new_bv & ~curr->arch.xcr0_accum;
curr->arch.xcr0 = new_bv;
curr->arch.xcr0_accum |= new_bv;
+ mask &= curr->fpu_dirtied ? ~XSTATE_FP_SSE : XSTATE_NONLAZY;
+ if ( mask )
+ {
+ unsigned long cr0 = read_cr0();
+
+ clts();
+ if ( curr->fpu_dirtied )
+ asm ( "stmxcsr %0" : "=m" (curr->arch.xsave_area->fpu_sse.mxcsr) );
+ xrstor(curr, mask);
+ if ( cr0 & X86_CR0_TS )
+ write_cr0(cr0);
+ }
+
return 0;
}

@ -0,0 +1,171 @@
x86: properly handle hvm_copy_from_guest_{phys,virt}() errors
Ignoring them generally implies using uninitialized data and, in all
cases dealt with here, potentially leaking hypervisor stack contents to
guests.
This is XSA-63.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Tim Deegan <tim@xen.org>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -2308,11 +2308,7 @@ void hvm_task_switch(
rc = hvm_copy_from_guest_virt(
&tss, prev_tr.base, sizeof(tss), PFEC_page_present);
- if ( rc == HVMCOPY_bad_gva_to_gfn )
- goto out;
- if ( rc == HVMCOPY_gfn_paged_out )
- goto out;
- if ( rc == HVMCOPY_gfn_shared )
+ if ( rc != HVMCOPY_okay )
goto out;
eflags = regs->eflags;
@@ -2357,13 +2353,11 @@ void hvm_task_switch(
rc = hvm_copy_from_guest_virt(
&tss, tr.base, sizeof(tss), PFEC_page_present);
- if ( rc == HVMCOPY_bad_gva_to_gfn )
- goto out;
- if ( rc == HVMCOPY_gfn_paged_out )
- goto out;
- /* Note: this could be optimised, if the callee functions knew we want RO
- * access */
- if ( rc == HVMCOPY_gfn_shared )
+ /*
+ * Note: The HVMCOPY_gfn_shared case could be optimised, if the callee
+ * functions knew we want RO access.
+ */
+ if ( rc != HVMCOPY_okay )
goto out;
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -87,17 +87,28 @@ static int hvm_mmio_access(struct vcpu *
{
for ( i = 0; i < p->count; i++ )
{
- int ret;
-
- ret = hvm_copy_from_guest_phys(&data,
- p->data + (sign * i * p->size),
- p->size);
- if ( (ret == HVMCOPY_gfn_paged_out) ||
- (ret == HVMCOPY_gfn_shared) )
+ switch ( hvm_copy_from_guest_phys(&data,
+ p->data + sign * i * p->size,
+ p->size) )
{
+ case HVMCOPY_okay:
+ break;
+ case HVMCOPY_gfn_paged_out:
+ case HVMCOPY_gfn_shared:
rc = X86EMUL_RETRY;
break;
+ case HVMCOPY_bad_gfn_to_mfn:
+ data = ~0;
+ break;
+ case HVMCOPY_bad_gva_to_gfn:
+ ASSERT(0);
+ /* fall through */
+ default:
+ rc = X86EMUL_UNHANDLEABLE;
+ break;
}
+ if ( rc != X86EMUL_OKAY )
+ break;
rc = write_handler(v, p->addr + (sign * i * p->size), p->size,
data);
if ( rc != X86EMUL_OKAY )
@@ -165,8 +176,28 @@ static int process_portio_intercept(port
for ( i = 0; i < p->count; i++ )
{
data = 0;
- (void)hvm_copy_from_guest_phys(&data, p->data + sign*i*p->size,
- p->size);
+ switch ( hvm_copy_from_guest_phys(&data,
+ p->data + sign * i * p->size,
+ p->size) )
+ {
+ case HVMCOPY_okay:
+ break;
+ case HVMCOPY_gfn_paged_out:
+ case HVMCOPY_gfn_shared:
+ rc = X86EMUL_RETRY;
+ break;
+ case HVMCOPY_bad_gfn_to_mfn:
+ data = ~0;
+ break;
+ case HVMCOPY_bad_gva_to_gfn:
+ ASSERT(0);
+ /* fall through */
+ default:
+ rc = X86EMUL_UNHANDLEABLE;
+ break;
+ }
+ if ( rc != X86EMUL_OKAY )
+ break;
rc = action(IOREQ_WRITE, p->addr, p->size, &data);
if ( rc != X86EMUL_OKAY )
break;
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -340,14 +340,24 @@ static int dpci_ioport_write(uint32_t mp
data = p->data;
if ( p->data_is_ptr )
{
- int ret;
-
- ret = hvm_copy_from_guest_phys(&data,
- p->data + (sign * i * p->size),
- p->size);
- if ( (ret == HVMCOPY_gfn_paged_out) &&
- (ret == HVMCOPY_gfn_shared) )
+ switch ( hvm_copy_from_guest_phys(&data,
+ p->data + sign * i * p->size,
+ p->size) )
+ {
+ case HVMCOPY_okay:
+ break;
+ case HVMCOPY_gfn_paged_out:
+ case HVMCOPY_gfn_shared:
return X86EMUL_RETRY;
+ case HVMCOPY_bad_gfn_to_mfn:
+ data = ~0;
+ break;
+ case HVMCOPY_bad_gva_to_gfn:
+ ASSERT(0);
+ /* fall through */
+ default:
+ return X86EMUL_UNHANDLEABLE;
+ }
}
switch ( p->size )
--- a/xen/arch/x86/hvm/vmx/realmode.c
+++ b/xen/arch/x86/hvm/vmx/realmode.c
@@ -39,7 +39,9 @@ static void realmode_deliver_exception(
again:
last_byte = (vector * 4) + 3;
- if ( idtr->limit < last_byte )
+ if ( idtr->limit < last_byte ||
+ hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4) !=
+ HVMCOPY_okay )
{
/* Software interrupt? */
if ( insn_len != 0 )
@@ -64,8 +66,6 @@ static void realmode_deliver_exception(
}
}
- (void)hvm_copy_from_guest_phys(&cs_eip, idtr->base + vector * 4, 4);
-
frame[0] = regs->eip + insn_len;
frame[1] = csr->sel;
frame[2] = regs->eflags & ~X86_EFLAGS_RF;

@ -0,0 +1,57 @@
commit 95a0770282ea2a03f7bc48c6656d5fc79bae0599
Author: Tim Deegan <tim@xen.org>
Date: Thu Sep 12 14:16:28 2013 +0100
x86/mm/shadow: Fix initialization of PV shadow L4 tables.
Shadowed PV L4 tables must have the same Xen mappings as their
unshadowed equivalent. This is done by copying the Xen entries
verbatim from the idle pagetable, and then using guest_l4_slot()
in the SHADOW_FOREACH_L4E() iterator to avoid touching those entries.
adc5afbf1c70ef55c260fb93e4b8ce5ccb918706 (x86: support up to 16Tb)
changed the definition of ROOT_PAGETABLE_XEN_SLOTS to extend right to
the top of the address space, which causes the shadow code to
copy Xen mappings into guest-kernel-address slots too.
In the common case, all those slots are zero in the idle pagetable,
and no harm is done. But if any slot above #271 is non-zero, Xen will
crash when that slot is later cleared (it attempts to drop
shadow-pagetable refcounts on its own L4 pagetables).
Fix by using the new ROOT_PAGETABLE_PV_XEN_SLOTS when appropriate.
Monitor pagetables need the full Xen mappings, so they keep using the
old name (with its new semantics).
This is XSA-64.
Signed-off-by: Tim Deegan <tim@xen.org>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Xen 4.3.x and xen-unstable are vulnerable.
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index 4c4c2ba..3fed0b6 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -1433,15 +1433,19 @@ void sh_install_xen_entries_in_l4(struct vcpu *v, mfn_t gl4mfn, mfn_t sl4mfn)
{
struct domain *d = v->domain;
shadow_l4e_t *sl4e;
+ unsigned int slots;
sl4e = sh_map_domain_page(sl4mfn);
ASSERT(sl4e != NULL);
ASSERT(sizeof (l4_pgentry_t) == sizeof (shadow_l4e_t));
/* Copy the common Xen mappings from the idle domain */
+ slots = (shadow_mode_external(d)
+ ? ROOT_PAGETABLE_XEN_SLOTS
+ : ROOT_PAGETABLE_PV_XEN_SLOTS);
memcpy(&sl4e[ROOT_PAGETABLE_FIRST_XEN_SLOT],
&idle_pg_table[ROOT_PAGETABLE_FIRST_XEN_SLOT],
- ROOT_PAGETABLE_XEN_SLOTS * sizeof(l4_pgentry_t));
+ slots * sizeof(l4_pgentry_t));
/* Install the per-domain mappings for this domain */
sl4e[shadow_l4_table_offset(PERDOMAIN_VIRT_START)] =

@ -0,0 +1,23 @@
x86: properly set up fbld emulation operand address
This is CVE-2013-4361 / XSA-66.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -3156,11 +3156,11 @@ x86_emulate(
break;
case 4: /* fbld m80dec */
ea.bytes = 10;
- dst = ea;
+ src = ea;
if ( (rc = ops->read(src.mem.seg, src.mem.off,
&src.val, src.bytes, ctxt)) != 0 )
goto done;
- emulate_fpu_insn_memdst("fbld", src.val);
+ emulate_fpu_insn_memsrc("fbld", src.val);
break;
case 5: /* fild m64i */
ea.bytes = 8;

@ -0,0 +1,135 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0-r1.ebuild,v 1.1 2013/10/02 17:22:28 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
if [[ $PV == *9999 ]]; then
KEYWORDS=""
REPO="xen-unstable.hg"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
KEYWORDS="~amd64 ~x86"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
fi
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask pae xsm"
DEPEND="${PYTHON_DEPS}
efi? ( >=sys-devel/binutils-2.22[multitarget] )
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"
RESTRICT="test"
# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"
REQUIRED_USE="flask? ( xsm )"
pkg_setup() {
python-any-r1_pkg_setup
if [[ -z ${XEN_TARGET_ARCH} ]]; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64; then
export XEN_TARGET_ARCH="x86_64"
else
die "Unsupported architecture!"
fi
fi
if use flask ; then
export "XSM_ENABLE=y"
export "FLASK_ENABLE=y"
elif use xsm ; then
export "XSM_ENABLE=y"
fi
}
src_prepare() {
# Drop .config and fix gcc-4.6
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
if use efi; then
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
export EFI_VENDOR="gentoo"
export EFI_MOUNTPOINT="boot"
fi
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default custom-cflags
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} \; || die "failed to re-set custom-cflags"
fi
# not strictly necessary to fix this
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
#Security patches
epatch "${FILESDIR}"/${PN}-CVE-2013-1442-XSA-62.patch \
"${FILESDIR}"/${PN}-CVE-2013-4355-XSA-63.patch \
"${FILESDIR}"/${PN}-CVE-2013-4356-XSA-64.patch \
"${FILESDIR}"/${PN}-CVE-2013-4361-XSA-66.patch
epatch_user
}
src_configure() {
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
if use custom-cflags; then
filter-flags -fPIE -fstack-protector
replace-flags -O3 -O2
else
unset CFLAGS
fi
}
src_compile() {
# Send raw LDFLAGS so that --as-needed works
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
}
src_install() {
local myopt
use debug && myopt="${myopt} debug=y"
use pae && myopt="${myopt} pae=y"
# The 'make install' doesn't 'mkdir -p' the subdirs
if use efi; then
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
fi
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
}

@ -0,0 +1,35 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.5.90-r2.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
EAPI="4"
inherit leechcraft
DESCRIPTION="Monocle, the modular document viewer for LeechCraft."
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+djvu debug +fb2 +pdf +spectre"
DEPEND="~app-leechcraft/lc-core-${PV}
pdf? ( app-text/poppler[qt4] )
djvu? ( app-text/djvu )
spectre? (
app-text/libspectre
|| (
app-text/poppler[-lcms]
<app-text/ghostscript-gpl-9.07
)
)"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs="
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
$(cmake-utils_use_enable pdf MONOCLE_PDF)
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)"
cmake-utils_src_configure
}

@ -0,0 +1,42 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.5.99-r1.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
EAPI="5"
inherit leechcraft
DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug +djvu doc +fb2 +pdf +spectre"
RDEPEND="~app-leechcraft/lc-core-${PV}
pdf? ( app-text/poppler[qt4] )
djvu? ( app-text/djvu )
spectre? (
app-text/libspectre
|| (
app-text/poppler[-lcms]
<app-text/ghostscript-gpl-9.07
)
)"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
$(cmake-utils_use_with doc DOCS)
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
$(cmake-utils_use_enable pdf MONOCLE_PDF)
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
}

@ -0,0 +1,42 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.6.0-r1.ebuild,v 1.1 2013/10/02 09:49:30 maksbotan Exp $
EAPI="5"
inherit leechcraft
DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug +djvu doc +fb2 +pdf +spectre"
RDEPEND="~app-leechcraft/lc-core-${PV}
pdf? ( app-text/poppler[qt4] )
djvu? ( app-text/djvu )
spectre? (
app-text/libspectre
|| (
app-text/poppler[-lcms]
<app-text/ghostscript-gpl-9.07
)
)"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_enable djvu MONOCLE_SEEN)
$(cmake-utils_use_with doc DOCS)
$(cmake-utils_use_enable fb2 MONOCLE_FXB)
$(cmake-utils_use_enable pdf MONOCLE_PDF)
$(cmake-utils_use_enable spectre MONOCLE_POSTRUS)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.2 2013/04/14 16:18:51 pinkbyte Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.3 2013/10/02 09:49:30 maksbotan Exp $
EAPI="5"
@ -15,7 +15,13 @@ IUSE="debug +djvu doc +fb2 +pdf +spectre"
RDEPEND="~app-leechcraft/lc-core-${PV}
pdf? ( app-text/poppler[qt4] )
djvu? ( app-text/djvu )
spectre? ( app-text/libspectre )"
spectre? (
app-text/libspectre
|| (
app-text/poppler[-lcms]
<app-text/ghostscript-gpl-9.07
)
)"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild,v 1.1 2013/03/08 22:07:58 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild,v 1.2 2013/10/02 08:28:53 maksbotan Exp $
EAPI="4"
@ -14,5 +14,6 @@ IUSE="debug"
DEPEND="~app-leechcraft/lc-core-${PV}
>=dev-libs/boost-1.52.0
dev-libs/qjson
dev-qt/qtwebkit:4"
RDEPEND="${DEPEND}"

@ -0,0 +1,20 @@
From 952a7e728356681f019f3a5076169daa24b946b9 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@gnome.org>
Date: Mon, 30 Sep 2013 12:07:49 +0000
Subject: Terminate udev rules with an empty line
Apparently newer udev versions now complain about the lack of it. Reported by
Frederic Crozat.
---
diff --git a/tools/mpi2udev.py b/tools/mpi2udev.py
index d33055b..33fdfa2 100755
--- a/tools/mpi2udev.py
+++ b/tools/mpi2udev.py
@@ -126,4 +126,4 @@ for f in sys.argv[2:]:
parse_mpi(f, hwdb)
# udev rules footer
-os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"')
+os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"\n')
--
cgit v0.9.0.2-2-gbebe

@ -0,0 +1,43 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-21-r1.ebuild,v 1.1 2013/10/02 07:00:16 ssuominen Exp $
EAPI=5
PYTHON_COMPAT=( python{3_2,3_3} )
inherit eutils python-any-r1
DESCRIPTION="A repository of data files describing media player capabilities"
HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE=""
# http://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
RDEPEND=">=virtual/udev-196[hwdb(+)]"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig"
DOCS="AUTHORS NEWS README"
# This ebuild does not install any binaries
RESTRICT="binchecks strip"
src_prepare() {
epatch "${FILESDIR}"/${P}-udev.patch
}
pkg_postinst() {
# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
udevadm hwdb --update --root="${ROOT%/}"
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
return 0
fi
udevadm control --reload
}

@ -0,0 +1,86 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild,v 1.1 2013/10/02 11:01:40 jlec Exp $
EAPI="5"
PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0)
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
DESCRIPTION="Collection of administration scripts for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}
!<=app-portage/gentoolkit-dev-0.2.7
|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
sys-apps/gawk
sys-apps/grep
virtual/python-argparse[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
"${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
)
python_prepare_all() {
python_export_best
echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
VERSION="${PVR}" "${PYTHON}" setup.py set_version
mv ./bin/revdep-rebuild{,.py} || die
distutils-r1_python_prepare_all
}
python_install_all() {
distutils-r1_python_install_all
# Rename the python versions of revdep-rebuild, since we are not ready
# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
# revdep-rebuild.sh. Leaving the python version available for potential
# testing by a wider audience.
dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
# Create cache directory for revdep-rebuild
keepdir /var/cache/revdep-rebuild
use prefix || fowners root:0 /var/cache/revdep-rebuild
fperms 0700 /var/cache/revdep-rebuild
# remove on Gentoo Prefix platforms where it's broken anyway
if use prefix; then
elog "The revdep-rebuild command is removed, the preserve-libs"
elog "feature of portage will handle issues."
rm "${ED}"/usr/bin/revdep-rebuild*
rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
rm -rf "${ED}"/etc/revdep-rebuild
rm -rf "${ED}"/var
fi
}
pkg_postinst() {
# Only show the elog information on a new install
if [[ ! ${REPLACING_VERSIONS} ]]; then
elog
elog "For further information on gentoolkit, please read the gentoolkit"
elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
elog
elog "Another alternative to equery is app-portage/portage-utils"
elog
elog "Additional tools that may be of interest:"
elog
elog " app-admin/eclean-kernel"
elog " app-portage/diffmask"
elog " app-portage/flaggie"
elog " app-portage/install-mask"
elog " app-portage/portpeek"
elog " app-portage/smart-live-rebuild"
fi
}

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>tools-portage</herd>
<longdescription>
<herd>tools-portage</herd>
<longdescription>
Gentoolkit is a collection of useful adminstration scripts particular to
the Gentoo Linux distribution. It contains rough drafts and
implementations of features that may in time make it into Portage, or

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.7.ebuild,v 1.1 2013/04/24 18:50:57 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.7.ebuild,v 1.2 2013/10/03 03:43:15 tetromino Exp $
EAPI=5
GCONF_DEBUG="no"
@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
IUSE="doc"
RDEPEND="
>=dev-cpp/glibmm-2.26.0:2[doc?]
>=dev-cpp/glibmm-2.36.0:2[doc?]
>=dev-libs/atk-1.12
dev-libs/libsigc++:2
!<dev-cpp/gtkmm-2.22.0

@ -1 +0,0 @@
DIST neoengine-0.8.2.tar.bz2 1568596 SHA256 351d5efcf4e5b5aebad76a2696b1feaeb21678045b68cb553e0ee3377c3a1c26 SHA512 52ac3013f9cd7fc970cb24a1aa167803d95829d80b0d158047801cdb95a03deedde53db70681f3771b6cd6e735cafc12179c42e1d49fc39835f4956865889ea8 WHIRLPOOL c49a9198fe746c551452859c2698c68ffd045afe390409fc22e58d17f092b30ac5f2b7a95822d66c7488d78d2e3e91302385146f1988662186b75b4a264edde4

@ -1,11 +0,0 @@
--- configure.in.dynamic.old 2013-05-11 21:22:22.767118628 +0200
+++ configure.in.dynamic 2013-05-11 21:22:33.104393474 +0200
@@ -6,7 +6,7 @@
AC_INIT([neoengine], [neoengine_version], [http://www.neoengine.org/], [mattias@realityrift.com])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([neoengine], [neoengine_version])
-AM_CONFIG_HEADER(buildconfig.h)
+AC_CONFIG_HEADER(buildconfig.h)
AC_LANG(C++)
# Templates

@ -1,20 +0,0 @@
--- neoengine/logstream.h.old 2006-04-15 02:04:46.000000000 +0200
+++ neoengine/logstream.h 2006-04-15 02:06:19.000000000 +0200
@@ -259,6 +259,7 @@
virtual void Write( const std::string &rstrMsg );
};
+class NEOENGINE_API LogSource;
/**
* \brief Stream buffer for the log source
--- neoengine/font.h.old 2006-04-15 02:10:55.000000000 +0200
+++ neoengine/font.h 2006-04-15 02:11:13.000000000 +0200
@@ -85,6 +85,7 @@
+class NEOENGINE_API FontManager;
/**
* \brief Font abstraction. Loads, prints and other methods.

@ -1,155 +0,0 @@
diff -Nurpa neoengine.orig/neoengine/core.cpp neoengine/neoengine/core.cpp
--- neoengine.orig/neoengine/core.cpp 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/core.cpp 2008-12-16 09:48:05.000000000 +0300
@@ -64,6 +64,8 @@
# include <sys/sysctl.h>
#endif
+#include <cstdlib>
+
using namespace std;
diff -Nurpa neoengine.orig/neoengine/hash.h neoengine/neoengine/hash.h
--- neoengine.orig/neoengine/hash.h 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/hash.h 2008-12-16 09:46:50.000000000 +0300
@@ -30,7 +30,7 @@
#include "base.h"
#include <string>
-
+#include <cstring>
/**
* \file hash.h
diff -Nurpa neoengine.orig/neoengine/particle.cpp neoengine/neoengine/particle.cpp
--- neoengine.orig/neoengine/particle.cpp 2008-12-16 09:43:17.000000000 +0300
+++ neoengine/neoengine/particle.cpp 2008-12-16 09:50:37.000000000 +0300
@@ -29,6 +29,8 @@
#include "timer.h"
#include "logstream.h"
+#include <cstdlib>
+
using namespace std;
diff -Nurpa neoengine.orig/neoengine/shader.cpp neoengine/neoengine/shader.cpp
--- neoengine.orig/neoengine/shader.cpp 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/shader.cpp 2008-12-16 09:53:32.000000000 +0300
@@ -32,6 +32,8 @@
#include "logstream.h"
#include "strutil.h"
+#include <cstdlib>
+
using namespace std;
diff -Nurpa neoengine.orig/neoengine/strutil.cpp neoengine/neoengine/strutil.cpp
--- neoengine.orig/neoengine/strutil.cpp 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/strutil.cpp 2008-12-16 09:54:23.000000000 +0300
@@ -25,6 +25,7 @@
***************************************************************************/
#include "strutil.h"
+#include <cstring>
using namespace std;
diff -Nurpa neoengine.orig/neoengine/tcp.cpp neoengine/neoengine/tcp.cpp
--- neoengine.orig/neoengine/tcp.cpp 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/tcp.cpp 2008-12-16 09:56:21.000000000 +0300
@@ -54,6 +54,9 @@
# define SOCKET_ERROR -1
#endif /* __APPLE__ */
+#include <cstring>
+#include <cstdlib>
+
using namespace std;
diff -Nurpa neoengine.orig/neoengine/udp.cpp neoengine/neoengine/udp.cpp
--- neoengine.orig/neoengine/udp.cpp 2008-12-16 09:43:18.000000000 +0300
+++ neoengine/neoengine/udp.cpp 2008-12-16 09:57:05.000000000 +0300
@@ -57,6 +57,8 @@
# define SOCKET_ERROR -1
#endif /* __APPLE__ */
+#include <cstring>
+
using namespace std;
diff -Nurpa neoengine.orig/neochunkio/texlayer.cpp neoengine/neochunkio/texlayer.cpp
--- neoengine.orig/neochunkio/texlayer.cpp 2004-03-27 22:25:18.000000000 +0300
+++ neoengine/neochunkio/texlayer.cpp 2008-12-17 01:27:41.000000000 +0300
@@ -40,6 +40,7 @@
#include <vector>
#include <sstream>
#include <iomanip>
+#include <cstdlib>
using namespace std;
using namespace NeoEngine;
diff -Nurpa neoengine.orig/neochunkio/vertexbuffer.cpp neoengine/neochunkio/vertexbuffer.cpp
--- neoengine.orig/neochunkio/vertexbuffer.cpp 2004-03-15 10:35:50.000000000 +0300
+++ neoengine/neochunkio/vertexbuffer.cpp 2008-12-17 01:28:12.000000000 +0300
@@ -37,7 +37,7 @@
#include <vector>
#include <string>
-
+#include <cstdlib>
using namespace std;
using namespace NeoEngine;
diff -Nurpa neoengine.orig/neodevopengl/extensions.h neoengine/neodevopengl/extensions.h
--- neoengine.orig/neodevopengl/extensions.h 2004-06-12 20:47:42.000000000 +0400
+++ neoengine/neodevopengl/extensions.h 2008-12-16 23:17:49.000000000 +0300
@@ -486,8 +486,8 @@ extern fpglGetProgramivARB
typedef GLuint (NEOGLAPIENTRY * fpglGenFragmentShadersATI)( GLuint );
typedef void (NEOGLAPIENTRY * fpglBindFragmentShaderATI)( GLuint );
typedef void (NEOGLAPIENTRY * fpglDeleteFragmentShaderATI)( GLuint );
-typedef void (NEOGLAPIENTRY * fpglBeginFragmentShaderATI)( GLvoid );
-typedef void (NEOGLAPIENTRY * fpglEndFragmentShaderATI)( GLvoid );
+typedef void (NEOGLAPIENTRY * fpglBeginFragmentShaderATI)( void );
+typedef void (NEOGLAPIENTRY * fpglEndFragmentShaderATI)( void );
typedef void (NEOGLAPIENTRY * fpglPassTexCoordATI)( GLuint, GLuint, GLenum );
typedef void (NEOGLAPIENTRY * fpglSampleMapATI)( GLuint, GLuint, GLenum );
typedef void (NEOGLAPIENTRY * fpglColorFragmentOp1ATI)( GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint );
diff -Nurpa neoengine.orig/neodevopengl/open.cpp neoengine/neodevopengl/open.cpp
--- neoengine.orig/neodevopengl/open.cpp 2004-02-11 19:33:37.000000000 +0300
+++ neoengine/neodevopengl/open.cpp 2008-12-16 23:09:49.000000000 +0300
@@ -32,6 +32,8 @@
#include <neoengine/logstream.h>
+#include <cstdlib>
+
using namespace std;
using namespace NeoEngine;
diff -Nurpa neoengine.orig/neodevopengl/shader-ati.cpp neoengine/neodevopengl/shader-ati.cpp
--- neoengine.orig/neodevopengl/shader-ati.cpp 2004-06-29 20:59:10.000000000 +0400
+++ neoengine/neodevopengl/shader-ati.cpp 2008-12-16 23:13:51.000000000 +0300
@@ -29,6 +29,7 @@
#include <neoengine/scenenode.h>
#include <neoengine/strutil.h>
#include <neoengine/logstream.h>
+#include <cstdlib>
using namespace std;
using namespace NeoEngine;
diff -Nurpa neoengine.orig/neodevopengl/vertexbuffer.cpp neoengine/neodevopengl/vertexbuffer.cpp
--- neoengine.orig/neodevopengl/vertexbuffer.cpp 2004-06-12 08:02:02.000000000 +0400
+++ neoengine/neodevopengl/vertexbuffer.cpp 2008-12-17 01:08:40.000000000 +0300
@@ -25,6 +25,7 @@
***************************************************************************/
#include "vertexbuffer.h"
+#include <cstring>
using namespace NeoEngine;

@ -1,12 +0,0 @@
diff -ur neoengine.orig/neodevopengl/statistics.cpp neoengine/neodevopengl/statistics.cpp
--- neoengine.orig/neodevopengl/statistics.cpp 2003-12-21 13:49:12.000000000 +0200
+++ neoengine/neodevopengl/statistics.cpp 2009-08-10 11:33:21.000000000 +0300
@@ -24,6 +24,8 @@
***************************************************************************/
+#include <stdio.h>
+
#include "statistics.h"
#include "device.h"

@ -1,84 +0,0 @@
--- neofczip/Makefile.am.dynamic.old 2009-03-02 09:17:40.000000000 +0100
+++ neofczip/Makefile.am.dynamic 2009-03-02 09:17:49.000000000 +0100
@@ -1,11 +1,11 @@
lib_LTLIBRARIES = libneofczip.la
-libneofczip_la_SOURCES = neofczip.cpp adler32.c compress.c crc32.c deflate.c gzio.c infback.c inffast.c inflate.c inftrees.c minigzip.c trees.c uncompr.c zutil.c
+libneofczip_la_SOURCES = neofczip.cpp
EXTRA_DIST = zlib.h neofczip.dsp Makefile.am.static Makefile.am.dynamic
-libneofczip_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
+libneofczip_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lz
# set the include path found by configure
INCLUDES = -I..
--- neoicpng/Makefile.am.dynamic.old 2009-03-02 10:03:19.000000000 +0100
+++ neoicpng/Makefile.am.dynamic 2009-03-02 10:03:27.000000000 +0100
@@ -1,9 +1,7 @@
lib_LTLIBRARIES = libneoicpng.la
-libneoicpng_la_SOURCES = neoicpng.cpp png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c \
- pngrtran.c pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c deflate.c \
- inflate.c trees.c zutil.c infblock.c inftrees.c infcodes.c infutil.c inffast.c adler32.c crc32.c
+libneoicpng_la_SOURCES = neoicpng.cpp
EXTRA_DIST = pnggccrd.c pngvcrd.c deflate.h infblock.h infcodes.h inffast.h inffixed.h inftrees.h \
infutil.h pngasmrd.h pngconf.h png.h trees.h zconf.h zlib.h zutil.h \
@@ -11,7 +9,7 @@
neoicpng-static.dsp neoicpng-static.vcproj neoicpng-static.dev \
LICENSE Makefile.am.static Makefile.am.dynamic
-libneoicpng_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
+libneoicpng_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lpng
# set the include path found by configure
INCLUDES = -I..
--- neofcbzip2/Makefile.am.dynamic.old 2009-03-02 10:20:40.000000000 +0100
+++ neofcbzip2/Makefile.am.dynamic 2009-03-02 10:20:49.000000000 +0100
@@ -1,13 +1,13 @@
lib_LTLIBRARIES = libneofcbzip2.la
-libneofcbzip2_la_SOURCES = neofcbzip2.cpp blocksort.c bzlib.c compress.c crctable.c decompress.c huffman.c randtable.c
+libneofcbzip2_la_SOURCES = neofcbzip2.cpp
EXTRA_DIST = bzlib.h bzlib_private.h neofcbzip2.dsp neofcbzip2.vcproj neofcbzip2.dev \
neofcbzip2-static.dsp neofcbzip2-static.vcproj neofcbzip2-static.dev \
Makefile.am.static Makefile.am.dynamic
-libneofcbzip2_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
+libneofcbzip2_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -lbz2
# set the include path found by configure
INCLUDES = -I..
--- neoicjpeg/Makefile.am.dynamic.old 2004-03-22 11:04:21.000000000 +0100
+++ neoicjpeg/Makefile.am.dynamic 2009-03-02 10:26:00.000000000 +0100
@@ -1,15 +1,7 @@
lib_LTLIBRARIES = libneoicjpeg.la
-libneoicjpeg_la_SOURCES = neoicjpeg.cpp \
- jcapimin.c jcmarker.c jdapimin.c jdinput.c jdtrans.c jidctred.c jquant1.c \
- jcapistd.c jcmaster.c jdapistd.c jdmainct.c jerror.c jquant2.c \
- jccoefct.c jcomapi.c jdatadst.c jdmarker.c jfdctflt.c jutils.c \
- jccolor.c jcparam.c jdatasrc.c jdmaster.c jfdctfst.c \
- jcdctmgr.c jcphuff.c jdcoefct.c jdmerge.c jfdctint.c jmemmgr.c \
- jchuff.c jcprepct.c jdcolor.c jdphuff.c jidctflt.c \
- jcinit.c jcsample.c jddctmgr.c jdpostct.c jidctfst.c jmemnobs.c \
- jcmainct.c jctrans.c jdhuff.c jdsample.c jidctint.c
+libneoicjpeg_la_SOURCES = neoicjpeg.cpp
EXTRA_DIST = README jchuff.h jdhuff.h jmemsys.h jpeglib.h \
jconfig.h jerror.h jmorecfg.h jversion.h jdct.h \
@@ -17,7 +9,7 @@
neoicjpeg-static.dsp neoicjpeg-static.vcproj neoicjpeg-static.dev \
Makefile.am.static Makefile.am.dynamic
-libneoicjpeg_la_LIBADD = @NEOENGINE_EXTRA_LIBS@
+libneoicjpeg_la_LIBADD = @NEOENGINE_EXTRA_LIBS@ -ljpeg
# set the include path found by configure
INCLUDES = -I..

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>games</herd>
<longdescription>
NeoEngine is built with platform and API independency as the main goal.
This means that if you build your game using the NeoEngine abstractions
for services such as rendering, audio, file/resource management and
networking, your game will run on all NeoEngine supported platforms with
no changes to your game code. NeoEngine is also designed with an "open"
API in mind. This means you can easily change, remove or add components
you wish.
</longdescription>
</pkgmetadata>

@ -1,58 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-games/neoengine/neoengine-0.8.2-r1.ebuild,v 1.6 2013/05/11 20:06:09 tupone Exp $
EAPI=2
inherit autotools eutils
DESCRIPTION="An open source, platform independent, 3D game engine written in C++"
HOMEPAGE="http://www.neoengine.org/"
SRC_URI="mirror://sourceforge/neoengine/${P}.tar.bz2"
LICENSE="MPL-1.1"
SLOT="0"
KEYWORDS="ppc x86"
IUSE="doc"
RDEPEND="virtual/opengl
media-libs/alsa-lib
media-libs/libpng
virtual/jpeg"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
S=${WORKDIR}/neoengine
src_prepare() {
epatch \
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}/${P}"-gcc43.patch \
"${FILESDIR}"/${P}-nolibs.patch \
"${FILESDIR}"/${P}-gcc44.patch \
"${FILESDIR}"/${P}-automake113.patch
./setbuildtype.sh dynamic
eautoreconf
eautomake neodevopengl/Makefile
eautomake neodevalsa/Makefile
}
src_configure() {
econf \
--disable-dependency-tracking
}
src_compile() {
emake || die
if use doc; then
emake doc || die
fi
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc AUTHORS ChangeLog* NEWS README
use doc && dohtml -r *-api
}

@ -3,3 +3,4 @@ DIST hashable-1.1.2.3.tar.gz 8685 SHA256 9a76e6e64996c5050dc76cbaa842c1b37559c18
DIST hashable-1.1.2.5.tar.gz 9129 SHA256 3fb5d430c9289ebada4991a76fd78f028aaaf17957dc666ddc7b89c98a54713d SHA512 dc6acab7a17709ed483bbc22cb7e29f5518e34102e6ffddbac4dabc2a854d595cf7517fc776e47e55d41c23107636b796150804ef8099dd4545e33f6df1ab0b6 WHIRLPOOL 9de525387fb8fdf9a6262171f15ecec7af4f9592e98782100d75c263137cfc3796156bea90745fdf052ad91c16ce216cfb5594dce0de20528a60486ced8b7ad9
DIST hashable-1.2.0.10.tar.gz 23602 SHA256 675c289bde6d84a0e8072ca5463ae67f73ec0960a1a14c75933a4ec0f03fb994 SHA512 96ad572594d7ec53880fd15d93c2d1abf530282372988e44b8c69a7e0ed6a90e05769b74ee9d184648e6e0c3b006d0c4c1d4be5f7d37b2be1cda587a9133c037 WHIRLPOOL 9e7b1964d21dacaf761e9709ee1b7944ceb037e1b8b7086f0a4129f6c6f7f027899965d5ca75cb11cc82b753c7d202a946ae272c06be27e8a1f94007d4288074
DIST hashable-1.2.0.5.tar.gz 21090 SHA256 107b7b58aa9a2eee81c58bc00638b7c0a9db53e1b7b4de8388a4eb4592c8383b SHA512 399f464b63145d299321305adb28b3d71f4ade2afbff3095d09c547c1bf41ebb5a4978419d240f1a30353dfc897b61b392bb8509f1744fd2e4a8868729dbf05f WHIRLPOOL 296c7aa03ee1ff692ea475b7194d3c0e4aafbe9b2b0fd97d4dc448e615c2461fc00c555a33046a07df65aee78d48cee4a680e574412f454e5cdde3ca4f7bfb79
DIST hashable-1.2.1.0.tar.gz 22389 SHA256 4ec07479fe37174e694b8d54cfc2111648e325fd1d7dce92366ed4ce2e7da126 SHA512 343f6b9eb40d089f0f2187427af7d7b5dbe15884649ddc8e0b140db129f21fc44f6bf41a262a3b2a0c74d967be6f603799472802d835e48a442f836dd8142607 WHIRLPOOL 7c8d174b48b5124f6cc52151d3d47f3da22adf61525a080048eee5ee4aa54598adccd2d189979c3631d72ce2c9312505ec3991748276058342c59e450f1f92fe

@ -0,0 +1,38 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.1 2013/10/03 03:48:40 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.3.3.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="A class for types that can be converted to a hash value"
HOMEPAGE="http://github.com/tibbe/hashable"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+sse2 sse4_1"
RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
>=dev-lang/ghc-6.10.4:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
test? ( dev-haskell/hunit
>=dev-haskell/quickcheck-2.4.0.1
>=dev-haskell/random-1.0 <dev-haskell/random-1.1
>=dev-haskell/test-framework-0.3.3
dev-haskell/test-framework-hunit
>=dev-haskell/test-framework-quickcheck2-0.2.9 )
"
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag sse2 sse2) \
$(cabal_flag sse4_1 sse41)
}

@ -12,4 +12,7 @@
structures. The package provides instances for
basic types and a way to combine hash values.
</longdescription>
<use>
<flag name="sse4_1">Enable optimization for SSE4_1 capable processors (Intel Core 2 Penryn and later chips)</flag>
</use>
</pkgmetadata>

@ -3,3 +3,4 @@ DIST hashtables-1.0.1.3.tar.gz 36267 SHA256 8a35be4c7e2b6a726d76c705eda3aee81bee
DIST hashtables-1.0.1.6.tar.gz 47721 SHA256 8bea51356c6846969967fe161ba247b406a691ae77c9c2be98f9105282d2351c SHA512 e060a057a95bc817f03903f802ac8d267839749cd3f6b67218f4c21ec5f938213407092ac84ee2b4eea63a0c8a1b77b880381cfd6817ad1df93bf419def04ce0 WHIRLPOOL 14cfea33ff6b65f0be97a422a8043852194fd6ed9043a6e087fc14bde3aa8de19d49237aef4b81750df62dc346018de2d3b69e7a0e8f7276a198b0c502ae0ef4
DIST hashtables-1.0.1.8.tar.gz 48392 SHA256 28fed49706e8fc7fe30b6393d9ed05c6d6b3f4bd0eda300c791054adfefe796a SHA512 16d05872983ea4244a8fb89d814a62f49521ab0232af532a6e380d89e95d106c7aa768ada0640a6ec74b725643bc8adb481d7c2e0431544ce6abb1746a74850b WHIRLPOOL a3d0508270c642d04ec4cca3958fb6b2e0bbf08433c7946efb246e707f83e42affdc08891f0e73c592a7e9820fbd29efb496a264044149deedaf776254a55467
DIST hashtables-1.1.0.2.tar.gz 48598 SHA256 e92edb65f776e06e1ae52f16d2452a377c4af231d7990a9f7f109990371b2034 SHA512 1ba281b10f5056dddd1e28df206687445e1edb135cdea88192029641997ba228c31e689d0c00ecc4fcfa4103df472279bf0cb08362c98e458d2e01d4ebb9a874 WHIRLPOOL ac62aa6d472929ebc2d3c10ffa4d6ff72e0cb96bd3b7b5c1bd0f4f881525aca7ebfc568d83e14d0dfcd82ce056692fb04e016b96de178474befb640211fac9aa
DIST hashtables-1.1.2.0.tar.gz 48525 SHA256 101f4f3c4bf84d53ac309814b627aeb2e9eb3c919aac91d6c9278c4e98fe16e0 SHA512 4320b31b66ba958a1dab85cf30ba081085d0db4fbc3ef283ec5fad9c7000c1c3bbe05ef631ce4279503675c5c6c6de688062996e957c13cb4051cc3a00da6287 WHIRLPOOL 0d5ba64f8df944190532a9ae13f6f8a18fff37ac52031103641c9f08786f5b47fcfac1bf621caa283a8502dfd2f607c43647b34c743d91ddca6a05327184ed6d

@ -0,0 +1,38 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.0.ebuild,v 1.1 2013/10/03 04:00:24 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.3.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="Mutable hash tables in the ST monad"
HOMEPAGE="http://github.com/gregorycollins/hashtables"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="sse4_1"
RDEPEND="dev-haskell/primitive:=[profile?]
>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
>=dev-lang/ghc-6.10.4:=
|| ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
"
src_configure() {
haskell-cabal_src_configure \
--flag=-portable \
$(cabal_flag sse4_1 sse41)
--flag=-debug \
--flag=-bounds-checking \
--flag=unsafe-tricks
}

@ -99,4 +99,7 @@
Please send bug reports to
&lt;https://github.com/gregorycollins/hashtables/issues&gt;.
</longdescription>
<use>
<flag name="sse4_1">Enable optimization for SSE4_1 capable processors (Intel Core 2 Penryn and later chips)</flag>
</use>
</pkgmetadata>

@ -1,2 +1,3 @@
DIST lens-3.9.0.2.tar.gz 454635 SHA256 825e75c46d986d47dafd7cc17f596c312283f9521ccbc3aafcbebd3fc6470332 SHA512 7a07c61377566e7062cb1b6353e0760ea1f567066cc0b7bc9cf70dfa21e2dcc0a6c2e9248027c9016aa3bc03f58c563a391f7da212655ee212ac8eaacc8d7c08 WHIRLPOOL 5a1c0c1c81af79d406fcd1876d35d00a4a65cf0fbf8192f47446fe6c81969bc5f1ccaf6f24b62efd11922fe44379e95973cf2bf1f7a44488d6aa04e08fddc0bc
DIST lens-3.9.1.tar.gz 454705 SHA256 4a3affc668ccd96f31d26c5e7d5d91a16a514bc4dd37186ab45d9aa7ca3a3b90 SHA512 e68c21e5c139f0463d0b91a6c401bc7679c3ff88dd5eacb7eabc3c0ae7869f73ce4a70e95a1f2a17bf38fe88c5d7ebf5b5c58f34fb4cab3ec5d9d53cae447b06 WHIRLPOOL 4359d95b124a7017e83c38538d6cad7dbc69f837adadb8aa839d21e6d03513b99941185bf1446471e121112a200680472db16eb2f38823b37555524b768c7517
DIST lens-3.9.2.tar.gz 454678 SHA256 53c87cb926c05c60593e4603f053633a0af127826f76bfebeecdbce11407ec9e SHA512 63e3a39d0d0ad16d27a8e2319163f333b67bc9df2d89d1b7fbc4dd9944cd098f0ba4a571a66939a640143c86c2f3008d5db3619af14f11a8cbcc07c424349f7a WHIRLPOOL 74b68bb19c684e8877c37092eedc299c636b0edaa0b1edc463534649182562245f661036c2dd3d30518b6fb3ca2f1f1a55ec251c9aeb028129d250c3eedac86e

@ -0,0 +1,87 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lens/lens-3.9.2.ebuild,v 1.1 2013/10/03 02:33:51 gienah Exp $
EAPI=5
# ebuild generated by hackport 0.3.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Lenses, Folds and Traversals"
HOMEPAGE="http://github.com/ekmett/lens/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?]
>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?]
>=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?]
>=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?]
>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
>=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?]
>=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?]
>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
>=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?]
>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?]
>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
>=dev-lang/ghc-7.0.1:=
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10.0.0
test? ( test-doctests? ( dev-haskell/deepseq
>=dev-haskell/doctest-0.9.1
dev-haskell/nats
>=dev-haskell/simple-reflect-0.3.1
test-hunit? ( >=dev-haskell/hunit-1.2
>=dev-haskell/test-framework-0.6
>=dev-haskell/test-framework-hunit-0.2
>=dev-haskell/test-framework-th-0.2
test-properties? ( >=dev-haskell/quickcheck-2.4
>=dev-haskell/test-framework-quickcheck2-0.2 ) )
!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
>=dev-haskell/test-framework-0.6
>=dev-haskell/test-framework-quickcheck2-0.2
>=dev-haskell/test-framework-th-0.2 ) ) )
!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
>=dev-haskell/test-framework-0.6
>=dev-haskell/test-framework-hunit-0.2
>=dev-haskell/test-framework-th-0.2
test-properties? ( >=dev-haskell/quickcheck-2.4
>=dev-haskell/test-framework-quickcheck2-0.2 ) )
!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
>=dev-haskell/test-framework-0.6
>=dev-haskell/test-framework-quickcheck2-0.2
>=dev-haskell/test-framework-th-0.2 ) ) ) )
"
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag benchmark-uniplate benchmark-uniplate) \
$(cabal_flag dump-splices dump-splices) \
$(cabal_flag inlining inlining) \
$(cabal_flag lib-werror lib-werror) \
$(cabal_flag old-inline-pragmas old-inline-pragmas) \
$(cabal_flag safe safe) \
$(cabal_flag test-doctests test-doctests) \
$(cabal_flag test-hunit test-hunit) \
$(cabal_flag test-properties test-properties) \
$(cabal_flag trustworthy trustworthy)
}

@ -0,0 +1 @@
DIST org.apache.felix.gogo.runtime-0.10.0-project.tar.gz 69837 SHA256 474e62ffbb5b5f6d0d3aa22086ee2ae76122ceb8c2eeb19a042e20046dfdb6d4 SHA512 a71100796e400103cf9d46fcdb7bf45b5d1d180328db27900915c1771650297c9135589dc91e4c2194634b4312ea7c064b71496a7e11e9a3393bdc6eeb70e03d WHIRLPOOL 9667ce09ee913339c8a76fbe3f0da157707a2fef43214ef99fe13bb86e1633c4ef573bf81c629655c6451a88288924569501d13671f5a8d2058d941be98838b0

@ -0,0 +1,43 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-gogo-runtime/felix-gogo-runtime-0.10.0.ebuild,v 1.1 2013/10/02 22:13:23 tomwij Exp $
EAPI="5"
inherit java-pkg-2 java-ant-2 java-osgi
DESCRIPTION="Felix Gogo Runtime"
HOMEPAGE="http://felix.apache.org/site/apache-felix-gogo.html"
LICENSE="Apache-2.0"
MY_PN="org.apache.felix.gogo.runtime"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://apache/felix/${MY_P}-project.tar.gz"
SLOT="0"
KEYWORDS="~amd64"
DEPEND=">=virtual/jdk-1.5
dev-java/osgi-compendium:0
dev-java/osgi-core-api:0"
RDEPEND=">=virtual/jre-1.5"
S="${WORKDIR}/${MY_P}"
java_prepare() {
cp "${FILESDIR}"/${P}-build.xml build.xml || die
epatch "${FILESDIR}"/${P}-event-properties-to-map.patch
}
JAVA_ANT_REWRITE_CLASSPATH="true"
src_compile() {
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar)"
java-pkg-2_src_compile
}
src_install() {
java-osgi_newjar "${S}"/target/${MY_P}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
}

@ -0,0 +1,294 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 5/13/13 1:33 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
<project name="org.apache.felix.gogo.runtime-from-maven" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
<property name="maven.build.finalName" value="org.apache.felix.gogo.runtime-0.10.0"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
<property name="maven.build.resourceDir.1" value="."/>
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
<property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
<pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/>
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
<javac destdir="${maven.build.outputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.5"
verbose="false"
fork="false"
source="1.5">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${maven.build.outputDir}/META-INF"/>
<copy todir="${maven.build.outputDir}/META-INF">
<fileset dir="${maven.build.resourceDir.1}">
<include name="LICENSE*"/>
<include name="NOTICE*"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
<javac destdir="${maven.build.testOutputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.5"
verbose="false"
fork="false"
source="1.5">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${maven.test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${maven.test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}"
packagenames="*"
destdir="${maven.reporting.outputDirectory}/apidocs"
access="protected"
old="false"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false"/>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
basedir="${maven.build.outputDir}"
excludes="**/package.html"/>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true"/>
</condition>
</target>
<target name="get-deps"
depends="test-offline"
description="Download all dependencies"
unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
<get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar"
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar"
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
</target>
</project>

@ -0,0 +1,22 @@
--- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java 2013-05-13 13:40:57.071766332 +0200
+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2 2013-05-13 13:41:30.725096685 +0200
@@ -18,7 +18,7 @@
*/
package org.apache.felix.gogo.runtime.activator;
-import java.util.Properties;
+import java.util.HashMap;
import org.apache.felix.gogo.api.CommandSessionListener;
import org.apache.felix.service.command.CommandSession;
@@ -43,8 +43,8 @@
public void beforeExecute(CommandSession session, CharSequence command) {
EventAdmin admin = (EventAdmin) tracker.getService();
if (admin != null) {
- Properties props = new Properties();
- props.setProperty("command", command.toString());
+ HashMap<String, String> props = new HashMap<String, String>();
+ props.put(new String("command"), command.toString());
Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
admin.postEvent(event);
}

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -0,0 +1 @@
DIST org.apache.felix.shell-1.4.3-source-release.tar.gz 75190 SHA256 daea2ae1cd3e28dbbcf5da964ffa5b6cb37ccc102dc070b878203900e8bf292a SHA512 fe1b3927789a18626715e52a634fa069fdd1505f425a48d76ec6abbb181f511ff5a3af176c70f634241830b185d32cd7eb71a271d62a754366141cd959cb54a4 WHIRLPOOL 6836e3503a26b887997786f2214b32eca527b9b28b98fb9a54179be756fd15f1d41a531ae54bfada956a7a8e66444464b0cd6203b240fb7c283059ae2a90f422

@ -0,0 +1,45 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-shell/felix-shell-1.4.3.ebuild,v 1.2 2013/10/02 22:24:19 tomwij Exp $
EAPI="5"
inherit java-pkg-2 java-ant-2 java-osgi
DESCRIPTION="Felix Shell"
HOMEPAGE="http://felix.apache.org/"
LICENSE="Apache-2.0"
MY_PN="org.apache.felix.shell"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
SLOT="0"
KEYWORDS="~amd64"
DEPEND=">=virtual/jdk-1.5
dev-java/felix-gogo-runtime:0
dev-java/felix-utils:0
dev-java/osgi-compendium:0
dev-java/osgi-core-api:0"
RDEPEND=">=virtual/jre-1.5"
S="${WORKDIR}/${MY_P}"
java_prepare() {
cp "${FILESDIR}"/${P}-build.xml build.xml || die
}
JAVA_ANT_REWRITE_CLASSPATH="true"
src_compile() {
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar):$(java-pkg_getjar --build-only felix-utils felix-utils.jar)"
java-pkg-2_src_compile
}
src_install() {
mv "${S}"/target/{${MY_P},${PN}}.jar || die
java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
}

@ -0,0 +1,299 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 5/13/13 2:41 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
<project name="org.apache.felix.shell-from-maven" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
<property name="maven.build.finalName" value="org.apache.felix.shell-1.4.3"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
<property name="maven.build.resourceDir.1" value="."/>
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
<property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/>
<pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
<javac destdir="${maven.build.outputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.3"
verbose="false"
fork="false"
source="1.3">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${maven.build.outputDir}">
<fileset dir="${maven.build.resourceDir.0}"/>
</copy>
<mkdir dir="${maven.build.outputDir}/META-INF"/>
<copy todir="${maven.build.outputDir}/META-INF">
<fileset dir="${maven.build.resourceDir.1}">
<include name="changelog.txt"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
<javac destdir="${maven.build.testOutputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="1.3"
verbose="false"
fork="false"
source="1.3">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${maven.test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${maven.test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}"
packagenames="*"
destdir="${maven.reporting.outputDirectory}/apidocs"
access="protected"
old="false"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false"/>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true"/>
</condition>
</target>
<target name="get-deps"
depends="test-offline"
description="Download all dependencies"
unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
<get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
</target>
</project>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -0,0 +1 @@
DIST org.apache.felix.utils-1.2.0-source-release.tar.gz 36109 SHA256 281872667d5968875f5f5b12878145c7f184ffb89d3ddf8ad757070e0722105c SHA512 4b3a16abc92963c16c363791423483c14eb02792cc65d58a884777c6be25b05a226492280cf2f77183ad5b86cb5710076a118a58af34f6c717273bfdf93bc171 WHIRLPOOL a9422c4fda79d1ba32cfff923d911a4e91fab463c8de0b870f43daf683222f86963690834df1d37a67f3cba4849a1f85433f7239abd100abfa1c6ef3a1d6b91c

@ -0,0 +1,46 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/felix-utils/felix-utils-1.2.0.ebuild,v 1.1 2013/10/02 22:18:52 tomwij Exp $
EAPI="5"
inherit java-pkg-2 java-ant-2 java-osgi
DESCRIPTION="Felix Utils"
HOMEPAGE="http://felix.apache.org/"
LICENSE="Apache-2.0"
MY_PN="org.apache.felix.utils"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://apache/felix/${MY_P}-source-release.tar.gz"
SLOT="0"
KEYWORDS="~amd64"
DEPEND=">=virtual/jdk-1.5
dev-java/felix-gogo-runtime:0
dev-java/osgi-compendium:0
dev-java/osgi-core-api:0"
RDEPEND=">=virtual/jre-1.5"
S="${WORKDIR}/${MY_P}"
java_prepare() {
cp "${FILESDIR}"/${P}-build.xml build.xml || die
epatch "${FILESDIR}"/${P}-java-fixes.patch
}
JAVA_ANT_REWRITE_CLASSPATH="true"
src_compile() {
EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only osgi-core-api osgi-core-api.jar):$(java-pkg_getjar --build-only osgi-compendium osgi-compendium.jar):$(java-pkg_getjar --build-only felix-gogo-runtime felix-gogo-runtime.jar)"
java-pkg-2_src_compile
}
src_install() {
mv "${S}"/target/{${MY_P},${PN}}.jar || die
java-osgi_dojar "${S}"/target/${PN}.jar ${MY_PN} ${MY_PN} "Export-Package: ${MY_PN}"
}

@ -0,0 +1,299 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
<!-- ====================================================================== -->
<!-- ====================================================================== -->
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
<!-- ====================================================================== -->
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
<!-- Generated by Maven Ant Plugin on 5/13/13 2:09 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
<project name="org.apache.felix.utils-from-maven" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
<property name="maven.build.finalName" value="org.apache.felix.utils-1.2.0"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
<property name="maven.build.resourceDir.1" value="."/>
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
<property name="maven.build.testDir.0" value="src/test/java"/>
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
<property name="maven.settings.offline" value="false"/>
<property name="maven.settings.interactiveMode" value="true"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"/>
<pathelement location="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"/>
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/>
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
<javac destdir="${maven.build.outputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="jsr14"
verbose="false"
fork="false"
source="1.5">
<src>
<pathelement location="${maven.build.srcDir.0}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${maven.build.outputDir}/META-INF"/>
<copy todir="${maven.build.outputDir}/META-INF">
<fileset dir="${maven.build.resourceDir.1}">
<include name="changelog.txt"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
<javac destdir="${maven.build.testOutputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="jsr14"
verbose="false"
fork="false"
source="1.5">
<src>
<pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
<copy todir="${maven.build.testOutputDir}">
<fileset dir="${maven.build.testResourceDir.0}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${maven.test.reports}" if="test">
<fileset dir="${maven.build.testDir.0}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${maven.test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${maven.test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${maven.build.srcDir.0}"
packagenames="*"
destdir="${maven.reporting.outputDirectory}/apidocs"
access="protected"
old="false"
verbose="false"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
linksource="false"
breakiterator="false"/>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
<!-- ====================================================================== -->
<!-- Download dependencies target -->
<!-- ====================================================================== -->
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${maven.settings.offline}" arg2="true"/>
</condition>
</target>
<target name="get-deps"
depends="test-offline"
description="Download all dependencies"
unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0"/>
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/junit/junit/4.0"/>
<get src="http://repository.apache.org/snapshots/junit/junit/4.0/junit-4.0.jar"
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.0/junit-4.0.jar"
dest="${maven.repo.local}/junit/junit/4.0/junit-4.0.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/>
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar"
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/>
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"
usetimestamp="false"
ignoreerrors="true"/>
</target>
</project>

@ -0,0 +1,47 @@
--- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2012-06-12 08:56:50.000000000 +0200
+++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2013-05-13 14:25:58.601527069 +0200
@@ -25,6 +25,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
+import java.util.Map.Entry;
import org.apache.felix.utils.version.VersionTable;
import org.osgi.framework.Filter;
@@ -111,6 +111,19 @@
converted = conv;
}
+ @Override
+ public boolean matches(Map<String, ?> map)
+ {
+ Map nonGenericMap = new HashMap();
+
+ for(Entry<String, ?> entry : map.entrySet())
+ {
+ nonGenericMap.put(entry.getKey(), entry.getValue());
+ }
+
+ return match0(nonGenericMap);
+ }
+
/**
* Filter using a service's properties.
@@ -575,13 +587,13 @@
switch (operation) {
case APPROX :
case EQUAL : {
- return ((Version) value1).compareTo(converted) == 0;
+ return ((Version) value1).compareTo((Version) converted) == 0;
}
case GREATER: {
- return ((Version) value1).compareTo(converted) >= 0;
+ return ((Version) value1).compareTo((Version) converted) >= 0;
}
case LESS: {
- return ((Version) value1).compareTo(converted) <= 0;
+ return ((Version) value1).compareTo((Version) converted) <= 0;
}
}
} else {

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -1,2 +1,3 @@
DIST OGNL_3_0_8.tar.gz 3564389 SHA256 e32d78c88985fc8f2c9ab5fb208d7dc22593dea32ed959b46b1d9101b99127d3 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6 WHIRLPOOL a5e21dcccc4bfc424412abf94c48a3f45ba541a9e25bd0c7c4dc11869cac7051f586e5883011d03c75187fcd432195b526cfb53e3a300fbe2f84f5b4cd67e12a
DIST ognl-2.6.9-dist.zip 2338429 SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 SHA512 7883f4e2c3c4b1fab5966481c661cdb3fdd7489717333e985dc7a517fbf14f82e3c218f81e8ad94008f7fcd6e66d166bd03227ff5f1df6a203e1cbc2985bd44c WHIRLPOOL 821d93653b6217b69d575abcfaad9639d8f4e46699124b2ffc0d1ae8ba1fc763ec89b0bf6991b2a929b9e5d31e1b1fcbaf1fd1f6931952ed5f1c4df4d82c372c
DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233

@ -0,0 +1,48 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-3.0.8.ebuild,v 1.2 2013/10/02 18:54:44 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Object-Graph Navigation Language"
HOMEPAGE="http://www.ognl.org/"
SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
LICENSE="Apache-1.1"
SLOT="3.0"
KEYWORDS="~amd64 ~x86"
CDEPEND="dev-java/javassist:3"
RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
app-arch/unzip
${CDEPEND}"
S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
java_prepare() {
find -name '*.jar' -exec rm -v {} + || die
cp "${DISTDIR}/osbuild.xml" "${S}/" || die
sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
-i osbuild.xml || die
cd lib/build
java-pkg_jar-from javassist-3
}
EANT_DOC_TARGET="javadocs"
src_install() {
java-pkg_newjar build/ognl-2.7.2.jar ${PN}.jar
use doc && java-pkg_dohtml -r dist/docs/api
use source && java-pkg_dosrc src/java/*
}

@ -0,0 +1,2 @@
DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897

@ -0,0 +1,20 @@
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"

@ -0,0 +1,15 @@
--- a/core/maven-build.xml
+++ b/core/maven-build.xml
@@ -271,12 +271,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/core/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -0,0 +1,67 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-core/struts-core-2.3.15.2.ebuild,v 1.1 2013/10/02 22:43:39 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2
MY_PN="struts"
MY_P="${MY_PN}-${PV}-src"
DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
SRC_URI="mirror://apache/struts/source/${MY_P}.zip
http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz"
HOMEPAGE="http://struts.apache.org/index.html"
LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64"
COMMON_DEPS="dev-java/commons-fileupload:0
dev-java/commons-lang:3.1
dev-java/freemarker:2.3
dev-java/ognl:3.0
dev-java/struts-xwork:2
dev-java/velocity:0
java-virtuals/servlet-api:3.0"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEPS}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/ant-junit:0 )
${COMMON_DEPS}"
S="${WORKDIR}/${MY_PN}-${PV}/src/core"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="struts-xwork-2"
src_unpack() {
unpack ${MY_P}.zip
cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
unpack ${MY_PN}-build.xml-${PV}.tar.xz
java-pkg_getjars commons-fileupload,commons-lang-3.1,freemarker-2.3,ognl-3.0,velocity,servlet-api-3.0
}
java_prepare() {
find . -name '*.jar' -print -delete || die
epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch
epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch
}
src_test() {
EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
}
src_install() {
java-pkg_newjar target/${MY_PN}2-core-${PV}.jar
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java/com
}

@ -0,0 +1,3 @@
DIST struts-2.3.15.2-build.xml-classpath.patch 26778 SHA256 757fa1e729a3b196807e53350dbbd9d0a2fb2830095ac0227b4324f019cc27d1 SHA512 c84fd2226ccfaabb9405c27017b52d2a951a106ecc1f8fed1dd447b30e052572e6a81d66b1732ffe51dfd7078944938de417248a5a6816a32fbb1ffc610c3da6 WHIRLPOOL 7d7b7849f49cdc5502b2686555779a6bb231e18bc936f24ee0570319f1f84d57bf9239282e256968a07f067d8815f0a8f63de692221745a744bb91a32daa0859
DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897

@ -0,0 +1,406 @@
--- a/convention/maven-build.xml
+++ b/convention/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/convention/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/config-browser/maven-build.xml
+++ b/config-browser/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/config-browser/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/javatemplates/maven-build.xml
+++ b/javatemplates/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/javatemplates/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/jasperreports/maven-build.xml
+++ b/jasperreports/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jasperreports/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/jfreechart/maven-build.xml
+++ b/jfreechart/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jfreechart/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/jsf/maven-build.xml
+++ b/jsf/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/jsf/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/pell-multipart/maven-build.xml
+++ b/pell-multipart/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/pell-multipart/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/plexus/maven-build.xml
+++ b/plexus/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/plexus/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/sitegraph/maven-build.xml
+++ b/sitegraph/maven-build.xml
@@ -260,13 +260,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/sitegraph/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"
- value="org.apache.struts2.sitegraph.SiteGraph"/>
- </manifest>
</jar>
</target>
--- a/sitemesh/maven-build.xml
+++ b/sitemesh/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/sitemesh/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/spring/maven-build.xml
+++ b/spring/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/spring/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/struts1/maven-build.xml
+++ b/struts1/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/struts1/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/tiles/maven-build.xml
+++ b/tiles/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/tiles/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/dojo/maven-build.xml
+++ b/dojo/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/dojo/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/rest/maven-build.xml
+++ b/rest/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/rest/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/portlet/maven-build.xml
+++ b/portlet/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/portlet/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/portlet-tiles/maven-build.xml
+++ b/portlet-tiles/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/portlet-tiles/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/junit/maven-build.xml
+++ b/junit/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/junit/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/testng/maven-build.xml
+++ b/testng/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/testng/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/dwr/maven-build.xml
+++ b/dwr/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/dwr/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/oval/maven-build.xml
+++ b/oval/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/oval/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/osgi/maven-build.xml
+++ b/osgi/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/osgi/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/json/maven-build.xml
+++ b/json/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/json/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/embeddedjsp/maven-build.xml
+++ b/embeddedjsp/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/embeddedjsp/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/gxp/maven-build.xml
+++ b/gxp/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/gxp/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/cdi/maven-build.xml
+++ b/cdi/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/cdi/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/tiles3/maven-build.xml
+++ b/tiles3/maven-build.xml
@@ -238,12 +238,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/plugins/tiles3/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>

@ -0,0 +1,50 @@
--- a/plugins/maven-build.xml
+++ b/plugins/maven-build.xml
@@ -22,7 +22,6 @@
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
- <ant antfile="build.xml" dir="codebehind" target="clean"/>
<ant antfile="build.xml" dir="convention" target="clean"/>
<ant antfile="build.xml" dir="config-browser" target="clean"/>
<ant antfile="build.xml" dir="javatemplates" target="clean"/>
@@ -57,7 +56,6 @@
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
- <ant antfile="build.xml" dir="codebehind" target="compile"/>
<ant antfile="build.xml" dir="convention" target="compile"/>
<ant antfile="build.xml" dir="config-browser" target="compile"/>
<ant antfile="build.xml" dir="javatemplates" target="compile"/>
@@ -92,7 +90,6 @@
<!-- ====================================================================== -->
<target name="compile-tests" description="Compile the test code">
- <ant antfile="build.xml" dir="codebehind" target="compile-tests"/>
<ant antfile="build.xml" dir="convention" target="compile-tests"/>
<ant antfile="build.xml" dir="config-browser" target="compile-tests"/>
<ant antfile="build.xml" dir="javatemplates" target="compile-tests"/>
@@ -127,7 +124,6 @@
<!-- ====================================================================== -->
<target name="test" description="Run the test cases">
- <ant antfile="build.xml" dir="codebehind" target="test"/>
<ant antfile="build.xml" dir="convention" target="test"/>
<ant antfile="build.xml" dir="config-browser" target="test"/>
<ant antfile="build.xml" dir="javatemplates" target="test"/>
@@ -162,7 +158,6 @@
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
- <ant antfile="build.xml" dir="codebehind" target="javadoc"/>
<ant antfile="build.xml" dir="convention" target="javadoc"/>
<ant antfile="build.xml" dir="config-browser" target="javadoc"/>
<ant antfile="build.xml" dir="javatemplates" target="javadoc"/>
@@ -197,7 +192,6 @@
<!-- ====================================================================== -->
<target name="package" description="Package the application">
- <ant antfile="build.xml" dir="codebehind" target="package"/>
<ant antfile="build.xml" dir="convention" target="package"/>
<ant antfile="build.xml" dir="config-browser" target="package"/>
<ant antfile="build.xml" dir="javatemplates" target="package"/>

@ -0,0 +1,50 @@
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -38,7 +38,5 @@
<ant antfile="build.xml" dir="tiles" target="clean"/>
<ant antfile="build.xml" dir="dojo" target="clean"/>
<ant antfile="build.xml" dir="rest" target="clean"/>
- <ant antfile="build.xml" dir="portlet" target="clean"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="clean"/>
<ant antfile="build.xml" dir="junit" target="clean"/>
<ant antfile="build.xml" dir="testng" target="clean"/>
@@ -73,7 +72,5 @@
<ant antfile="build.xml" dir="tiles" target="compile"/>
<ant antfile="build.xml" dir="dojo" target="compile"/>
<ant antfile="build.xml" dir="rest" target="compile"/>
- <ant antfile="build.xml" dir="portlet" target="compile"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="compile"/>
<ant antfile="build.xml" dir="junit" target="compile"/>
<ant antfile="build.xml" dir="testng" target="compile"/>
@@ -108,7 +106,5 @@
<ant antfile="build.xml" dir="tiles" target="compile-tests"/>
<ant antfile="build.xml" dir="dojo" target="compile-tests"/>
<ant antfile="build.xml" dir="rest" target="compile-tests"/>
- <ant antfile="build.xml" dir="portlet" target="compile-tests"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="compile-tests"/>
<ant antfile="build.xml" dir="junit" target="compile-tests"/>
<ant antfile="build.xml" dir="testng" target="compile-tests"/>
@@ -143,7 +140,5 @@
<ant antfile="build.xml" dir="tiles" target="test"/>
<ant antfile="build.xml" dir="dojo" target="test"/>
<ant antfile="build.xml" dir="rest" target="test"/>
- <ant antfile="build.xml" dir="portlet" target="test"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="test"/>
<ant antfile="build.xml" dir="junit" target="test"/>
<ant antfile="build.xml" dir="testng" target="test"/>
@@ -178,7 +174,5 @@
<ant antfile="build.xml" dir="tiles" target="javadoc"/>
<ant antfile="build.xml" dir="dojo" target="javadoc"/>
<ant antfile="build.xml" dir="rest" target="javadoc"/>
- <ant antfile="build.xml" dir="portlet" target="javadoc"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="javadoc"/>
<ant antfile="build.xml" dir="junit" target="javadoc"/>
<ant antfile="build.xml" dir="testng" target="javadoc"/>
@@ -213,7 +208,5 @@
<ant antfile="build.xml" dir="tiles" target="package"/>
<ant antfile="build.xml" dir="dojo" target="package"/>
<ant antfile="build.xml" dir="rest" target="package"/>
- <ant antfile="build.xml" dir="portlet" target="package"/>
- <ant antfile="build.xml" dir="portlet-tiles" target="package"/>
<ant antfile="build.xml" dir="junit" target="package"/>
<ant antfile="build.xml" dir="testng" target="package"/>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -0,0 +1,106 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild,v 1.1 2013/10/02 22:54:44 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
MY_PN="struts"
MY_P="${MY_PN}-${PV}-src"
DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
SRC_URI="mirror://apache/struts/source/${MY_P}.zip
http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz
http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-${PV}-build.xml-classpath.patch"
HOMEPAGE="http://struts.apache.org/index.html"
LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64"
COMMON_DEPS="dev-java/commons-beanutils:1.7
dev-java/commons-lang:3.1
dev-java/commons-io:1
dev-java/freemarker:2.3
dev-java/juel:0
dev-java/ognl:3.0
dev-java/osgi-core-api:0
dev-java/struts-core:${SLOT}
dev-java/struts-xwork:${SLOT}
dev-java/velocity:0
java-virtuals/servlet-api:3.0"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEPS}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/ant-junit:0 )
${COMMON_DEPS}"
S="${WORKDIR}/${MY_PN}-${PV}/src/plugins"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-xwork-${SLOT}"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
EANT_BUILD_TARGET="package"
EANT_TEST_TARGET="test"
# javatemplates/maven-build.xml:149:
# Test org.apache.struts2.views.java.simple.AbstractCommonAttributesTest failed
# Cannot instantiate test case: testRenderTextFieldDynamicAttrs
RESTRICT="test"
src_unpack() {
unpack ${MY_P}.zip
cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
unpack ${MY_PN}-build.xml-${PV}.tar.xz
}
java_prepare() {
find . -name '*.jar' -print -delete || die
epatch "${DISTDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch
epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch
epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-codebehind.patch
epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-portlet.patch
# Remove tests that don't build due to test files that aren't installed.
rm jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
java-pkg_getjars commons-beanutils-1.7,commons-io-1,commons-lang-3.1,freemarker-2.3,juel,ognl-3.0,osgi-core-api,servlet-api-3.0,velocity
}
src_test() {
EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})"
EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
java-pkg-2_src_test
}
src_install() {
for plugin in $(find . -mindepth 1 -maxdepth 1 -type d | sed 's:./::g' | tr '\n' ' ') ; do
[[ ! -d ${plugin}/target ]] && continue
einfo "Installing plugin '${plugin}' ..."
java-pkg_newjar ${plugin}/target/${MY_PN}2-${plugin}-plugin-${PV}.jar ${plugin}.jar
if use doc ; then
java-pkg_dojavadoc ${plugin}/target/site/apidocs
mkdir "${D}"/usr/share/doc/${P}/${plugin} || die
mv "${D}"/usr/share/doc/${P}/{html,${plugin}/html} || die
fi
use source && java-pkg_dosrc ${plugin}/src/main/java/org
done
if use doc ; then
rm "${D}"/usr/share/${PN}-${SLOT}/api || die
fi
}
pkg_postinst() {
elog "The 'codebehind' and 'portlet' plugins are not in this release because they don't build yet."
}

@ -0,0 +1,2 @@
DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
</pkgmetadata>

@ -0,0 +1,66 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild,v 1.1 2013/10/02 22:35:39 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2
MY_PN="struts"
MY_P="${MY_PN}-${PV}-src"
DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: XWork Core"
SRC_URI="mirror://apache/struts/source/${MY_P}.zip
http://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz"
HOMEPAGE="http://struts.apache.org/index.html"
LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64"
COMMON_DEPS="dev-java/asm:3
dev-java/commons-io:1
dev-java/commons-lang:3.1
dev-java/commons-logging:0
dev-java/ognl:3.0
dev-java/slf4j-api:0"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEPS}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/ant-junit:0 )
${COMMON_DEPS}"
S="${WORKDIR}/${MY_PN}-${PV}/src/xwork-core"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="asm-3,commons-io-1,commons-lang-3.1,commons-logging,ognl-3.0,slf4j-api"
# Could not open files of the name xwork-jar.xml
RESTRICT="test"
src_unpack() {
unpack ${MY_P}.zip
cd "${WORKDIR}"/${MY_PN}-${PV}/src || die
unpack ${MY_PN}-build.xml-${PV}.tar.xz
}
java_prepare() {
find . -name '*.jar' -print -delete || die
java-pkg_getjars asm-4,commons-io-1,commons-lang-2.1,commons-logging,ognl-3.0,slf4j-api
}
src_test() {
EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test
}
src_install() {
java-pkg_dojar target/xwork-core.jar
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java/com
}

@ -1 +1,3 @@
DIST struts-1.2.9-src.tar.gz 5754377 SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e SHA512 a3d4ea1a0aef70d73bdc156d525b155a09b6ab22c367f6d0fe76ae16bde404bb33f78a7927fcea967105401915adff9a94b3ddbb81ac5ee10d5eb3430d97a93e WHIRLPOOL bb4a89f09177ef726d0c1bc4a250f152e7b63063791423d541d24d7e415a46bc74b9002d5e984e47c76b8a75acd44ecfbac762a70462bdda33facb0a9aa0b9d5
DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86
DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897

@ -0,0 +1,249 @@
diff -urN a/apps/blank/maven-build.xml b/apps/blank/maven-build.xml
--- a/apps/blank/maven-build.xml 2013-10-02 15:52:07.637985555 +0200
+++ b/apps/blank/maven-build.xml 2013-10-02 15:52:29.756985531 +0200
@@ -243,32 +243,6 @@
<target name="package" depends="compile,test" description="Package the application">
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
<war destfile="${maven.build.dir}/${maven.build.finalName}.war"
compress="true"
webxml="src/main/webapp/WEB-INF/web.xml">
--- a/apps/mailreader/maven-build.xml
+++ b/apps/mailreader/maven-build.xml
@@ -198,36 +198,6 @@
<target name="package" depends="compile,test" description="Package the application">
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts-mailreader-dao/1.3.5/struts-mailreader-dao-1.3.5.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
<war destfile="${maven.build.dir}/${maven.build.finalName}.war"
compress="true"
webxml="src/main/webapp/WEB-INF/web.xml">
--- a/apps/showcase/maven-build.xml
+++ b/apps/showcase/maven-build.xml
@@ -334,112 +334,6 @@
<target name="package" depends="compile,test" description="Package the application">
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-struts1-plugin/2.3.15.2/struts2-struts1-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts-core/1.3.10/struts-core-1.3.10.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-chain/commons-chain/1.2/commons-chain-1.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-dojo-plugin/2.3.15.2/struts2-dojo-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-jsf-plugin/2.3.15.2/struts2-jsf-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-sitemesh-plugin/2.3.15.2/struts2-sitemesh-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-tiles-plugin/2.3.15.2/struts2-tiles-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-dwr-plugin/2.3.15.2/struts2-dwr-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-json-plugin/2.3.15.2/struts2-json-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-jsp/2.0.6/tiles-jsp-2.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-spring-plugin/2.3.15.2/struts2-spring-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/velocity/velocity-tools/1.3/velocity-tools-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/opensymphony/sitemesh/2.4.2/sitemesh-2.4.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/uk/ltd/getahead/dwr/1.1.1/dwr-1.1.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-impl/1.1.2/myfaces-impl-1.1.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-el/commons-el/1.0/commons-el-1.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-api/1.1.2/myfaces-api-1.1.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
<war destfile="${maven.build.dir}/${maven.build.finalName}.war"
compress="true"
webxml="src/main/webapp/WEB-INF/web.xml">
--- a/apps/rest-showcase/maven-build.xml
+++ b/apps/rest-showcase/maven-build.xml
@@ -273,56 +273,6 @@
<target name="package" depends="compile,test" description="Package the application">
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-rest-plugin/2.3.15.2/struts2-rest-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/com/thoughtworks/xstream/xstream/1.4.2/xstream-1.4.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/net/sf/json-lib/json-lib/2.3/json-lib-2.3-jdk15.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/>
<war destfile="${maven.build.dir}/${maven.build.finalName}.war"
compress="true"
webxml="src/main/webapp/WEB-INF/web.xml">

@ -0,0 +1,162 @@
--- a/apps/blank/maven-build.xml
+++ b/apps/blank/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -159,6 +159,7 @@
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
+ <pathelement path="${gentoo.test.classpath}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
--- a/apps/mailreader/maven-build.xml
+++ b/apps/mailreader/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
--- a/apps/portlet/maven-build.xml
+++ b/apps/portlet/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -159,6 +159,7 @@
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
+ <pathelement path="${gentoo.test.classpath}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
--- a/apps/showcase/maven-build.xml
+++ b/apps/showcase/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -159,6 +159,7 @@
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
+ <pathelement path="${gentoo.test.classpath}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
--- a/apps/rest-showcase/maven-build.xml
+++ b/apps/rest-showcase/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -159,6 +159,7 @@
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
+ <pathelement path="${gentoo.test.classpath}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
--- a/bundles/admin/maven-build.xml
+++ b/bundles/admin/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -153,7 +153,7 @@
description="Compile the test code"
unless="maven.test.skip">
<mkdir dir="${maven.build.testOutputDir}"/>
- <javac destdir="${maven.build.testOutputDir}"
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}"
nowarn="false"
debug="true"
optimize="false"
@@ -159,6 +159,7 @@
<path refid="build.test.classpath"/>
<pathelement location="${maven.build.outputDir}"/>
<pathelement location="${maven.build.testOutputDir}"/>
+ <pathelement path="${gentoo.test.classpath}" />
</classpath>
<batchtest todir="${maven.test.reports}" unless="test">
<fileset dir="${maven.build.testDir.0}">
--- a/bundles/demo/maven-build.xml
+++ b/bundles/demo/maven-build.xml
@@ -125,7 +125,7 @@
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.outputDir}"/>
- <javac destdir="${maven.build.outputDir}"
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}"
nowarn="false"
debug="true"
optimize="false"

@ -0,0 +1,30 @@
--- a/bundles/admin/maven-build.xml
+++ b/bundles/admin/maven-build.xml
@@ -271,12 +271,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/admin/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>
--- a/bundles/demo/maven-build.xml
+++ b/bundles/demo/maven-build.xml
@@ -271,12 +271,8 @@
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
compress="true"
index="false"
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/demo/target/classes/META-INF/MANIFEST.MF"
basedir="${maven.build.outputDir}"
excludes="**/package.html">
- <manifest>
- <attribute name="Main-Class"/>
- </manifest>
</jar>
</target>

@ -0,0 +1,50 @@
--- a/apps/maven-build.xml
+++ b/apps/maven-build.xml
@@ -24,7 +24,6 @@
<target name="clean" description="Clean the output directory">
<ant antfile="build.xml" dir="blank" target="clean"/>
<ant antfile="build.xml" dir="mailreader" target="clean"/>
- <ant antfile="build.xml" dir="portlet" target="clean"/>
<ant antfile="build.xml" dir="showcase" target="clean"/>
<ant antfile="build.xml" dir="rest-showcase" target="clean"/>
</target>
@@ -36,7 +35,6 @@
<target name="compile" description="Compile the code">
<ant antfile="build.xml" dir="blank" target="compile"/>
<ant antfile="build.xml" dir="mailreader" target="compile"/>
- <ant antfile="build.xml" dir="portlet" target="compile"/>
<ant antfile="build.xml" dir="showcase" target="compile"/>
<ant antfile="build.xml" dir="rest-showcase" target="compile"/>
</target>
@@ -48,7 +46,6 @@
<target name="compile-tests" description="Compile the test code">
<ant antfile="build.xml" dir="blank" target="compile-tests"/>
<ant antfile="build.xml" dir="mailreader" target="compile-tests"/>
- <ant antfile="build.xml" dir="portlet" target="compile-tests"/>
<ant antfile="build.xml" dir="showcase" target="compile-tests"/>
<ant antfile="build.xml" dir="rest-showcase" target="compile-tests"/>
</target>
@@ -60,7 +57,6 @@
<target name="test" description="Run the test cases">
<ant antfile="build.xml" dir="blank" target="test"/>
<ant antfile="build.xml" dir="mailreader" target="test"/>
- <ant antfile="build.xml" dir="portlet" target="test"/>
<ant antfile="build.xml" dir="showcase" target="test"/>
<ant antfile="build.xml" dir="rest-showcase" target="test"/>
</target>
@@ -72,7 +68,6 @@
<target name="javadoc" description="Generates the Javadoc of the application">
<ant antfile="build.xml" dir="blank" target="javadoc"/>
<ant antfile="build.xml" dir="mailreader" target="javadoc"/>
- <ant antfile="build.xml" dir="portlet" target="javadoc"/>
<ant antfile="build.xml" dir="showcase" target="javadoc"/>
<ant antfile="build.xml" dir="rest-showcase" target="javadoc"/>
</target>
@@ -84,7 +79,6 @@
<target name="package" description="Package the application">
<ant antfile="build.xml" dir="blank" target="package"/>
<ant antfile="build.xml" dir="mailreader" target="package"/>
- <ant antfile="build.xml" dir="portlet" target="package"/>
<ant antfile="build.xml" dir="showcase" target="package"/>
<ant antfile="build.xml" dir="rest-showcase" target="package"/>
</target>

@ -0,0 +1,56 @@
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -22,8 +22,5 @@
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
- <ant antfile="build.xml" dir="xwork-core" target="clean"/>
- <ant antfile="build.xml" dir="core" target="clean"/>
<ant antfile="build.xml" dir="apps" target="clean"/>
- <ant antfile="build.xml" dir="plugins" target="clean"/>
<ant antfile="build.xml" dir="bundles" target="clean"/>
@@ -35,8 +33,5 @@
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
- <ant antfile="build.xml" dir="xwork-core" target="compile"/>
- <ant antfile="build.xml" dir="core" target="compile"/>
<ant antfile="build.xml" dir="apps" target="compile"/>
- <ant antfile="build.xml" dir="plugins" target="compile"/>
<ant antfile="build.xml" dir="bundles" target="compile"/>
@@ -48,8 +44,5 @@
<!-- ====================================================================== -->
<target name="compile-tests" description="Compile the test code">
- <ant antfile="build.xml" dir="xwork-core" target="compile-tests"/>
- <ant antfile="build.xml" dir="core" target="compile-tests"/>
<ant antfile="build.xml" dir="apps" target="compile-tests"/>
- <ant antfile="build.xml" dir="plugins" target="compile-tests"/>
<ant antfile="build.xml" dir="bundles" target="compile-tests"/>
@@ -61,8 +55,5 @@
<!-- ====================================================================== -->
<target name="test" description="Run the test cases">
- <ant antfile="build.xml" dir="xwork-core" target="test"/>
- <ant antfile="build.xml" dir="core" target="test"/>
<ant antfile="build.xml" dir="apps" target="test"/>
- <ant antfile="build.xml" dir="plugins" target="test"/>
<ant antfile="build.xml" dir="bundles" target="test"/>
@@ -74,8 +66,5 @@
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
- <ant antfile="build.xml" dir="xwork-core" target="javadoc"/>
- <ant antfile="build.xml" dir="core" target="javadoc"/>
<ant antfile="build.xml" dir="apps" target="javadoc"/>
- <ant antfile="build.xml" dir="plugins" target="javadoc"/>
<ant antfile="build.xml" dir="bundles" target="javadoc"/>
@@ -87,8 +77,5 @@
<!-- ====================================================================== -->
<target name="package" description="Package the application">
- <ant antfile="build.xml" dir="xwork-core" target="package"/>
- <ant antfile="build.xml" dir="core" target="package"/>
<ant antfile="build.xml" dir="apps" target="package"/>
- <ant antfile="build.xml" dir="plugins" target="package"/>
<ant antfile="build.xml" dir="bundles" target="package"/>

@ -0,0 +1,105 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-2.3.15.2.ebuild,v 1.1 2013/10/02 23:02:51 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="doc source test"
WANT_ANT_TASKS="ant-trax"
inherit java-pkg-2 java-ant-2
MY_P="${P}-src"
DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
SRC_URI="mirror://apache/struts/source/${MY_P}.zip
http://dev.gentoo.org/~tomwij/files/dist/${PN}-build.xml-${PV}.tar.xz"
HOMEPAGE="http://struts.apache.org/index.html"
LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64"
COMMON_DEPS="
dev-java/felix-shell:0
dev-java/osgi-core-api:0
dev-java/struts-core:${SLOT}
dev-java/struts-plugins:${SLOT}
dev-java/struts-xwork:${SLOT}
java-virtuals/servlet-api:2.3"
RDEPEND=">=virtual/jre-1.5
${COMMON_DEPS}"
DEPEND=">=virtual/jdk-1.5
test? ( dev-java/ant-junit:0 )
${COMMON_DEPS}"
S="${WORKDIR}/${P}/src"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-plugins-${SLOT},struts-xwork-${SLOT}"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
EANT_BUILD_TARGET="package"
EANT_TEST_TARGET="test"
# TODO: Incompatible with newer junit; we either need to patch it or slot junit.
RESTRICT="test"
src_unpack() {
unpack ${MY_P}.zip
cd "${S}" || die
unpack ${PN}-build.xml-${PV}.tar.xz
}
java_prepare() {
find . -name '*.jar' -print -delete || die
epatch "${FILESDIR}"/${P}-build.xml-remove-core-and-plugins.patch
epatch "${FILESDIR}"/${P}-build.xml-classpath.patch
epatch "${FILESDIR}"/${P}-build.xml-manifest.patch
epatch "${FILESDIR}"/${P}-build.xml-apps-package.patch
epatch "${FILESDIR}"/${P}-build.xml-remove-apps-portlet.patch
java-pkg_getjars felix-shell,osgi-core-api,servlet-api-2.3
}
src_install() {
insinto /usr/share/${PN}-${SLOT}/
# Misses apps/portlet.
for dir in apps/{blank,mailreader,rest-showcase,showcase} bundles/{admin,demo} ; do
if [[ ${dir} == "apps/"* ]] ; then
doins ${dir}/target/${PN}2-${dir/apps\//}.war
else
java-pkg_newjar ${dir}/target/${PN}2-osgi-*-bundle-${PV}.jar ${dir/bundles\//}.jar
fi
if use doc ; then
java-pkg_dojavadoc ${dir}/target/site/apidocs
mkdir "${D}"/usr/share/doc/${P}/${dir/*\//} || die
mv "${D}"/usr/share/doc/${P}/{html,${dir/*\//}/html} || die
fi
if [[ ${dir} == *"mailreader"* ]] ; then
use source && java-pkg_dosrc ${dir}/src/main/java/mailreader2
else
use source && java-pkg_dosrc ${dir}/src/main/java/org
fi
done
if use doc ; then
rm "${D}"/usr/share/${PN}-${SLOT}/api || die
fi
}
src_test() {
EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})"
EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
java-pkg-2_src_test
}
pkg_postinst() {
elog "The application 'portlet' is not in this release because it doesn't build."
}

@ -0,0 +1 @@
DIST execline-1.2.3.tar.gz 84643 SHA256 4346a472d69be99e4c561ed6f8d520668d5a0445370b8dfa053634caa5267dca SHA512 d82466339dabceeadfbed4dd2d5d5f098f765e3acb6e88815ae30b3b30c8e64b2418b77ebf0922849c6992404a06b5d6edc8cf7ee88a98e8e068d389837602f8 WHIRLPOOL 0364993813c2a0453d454d4bff442441424879aba6ed4e885b296d64e68fcc8e904573c035c08f49144fc8bff33e0ccf162b5420b6da1dd24602d621b7025779

@ -0,0 +1,64 @@
# Copyright 2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/execline/execline-1.2.3.ebuild,v 1.1 2013/10/02 22:59:32 williamh Exp $
EAPI=5
inherit multilib toolchain-funcs
DESCRIPTION="a non-interactive scripting language similar to SH"
HOMEPAGE="http://www.skarnet.org/software/execline/"
SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
COMMON_DEPEND=">=dev-libs/skalibs-1.4.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
S=${WORKDIR}/admin/${P}
src_configure()
{
echo $(tc-getCC) ${CFLAGS} > conf-compile/conf-cc
echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-dynld
echo /usr/$(get_libdir)/execline > conf-compile/conf-install-library
echo /$(get_libdir) > conf-compile/conf-install-library.so
echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-ld
echo > conf-compile/conf-stripbins
echo > conf-compile/conf-striplibs
rm conf-compile/flag-slashpackage
echo /usr/lib/skalibs/sysdeps > conf-compile/import
echo /usr/include/skalibs > conf-compile/path-include
echo /usr/$(get_libdir)/skalibs > conf-compile/path-library
echo /$(get_libdir)/skalibs > conf-compile/path-library.so
}
src_compile()
{
emake -j1
}
src_install()
{
into /
dobin command/*
dolib.so library.so/*
insinto /etc
doins etc/*
insinto /usr/include
doins include/*
if use static-libs ; then
into /usr
dolib.a library/*
fi
dodoc $(find doc -type f ! -name "*.html" ! -name "COPYING")
dohtml -r doc/*
}

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
<longdescription lang="en">
Execline is a non-interactive scripting language similar to sh.
According to the home page, the syntax is far mor logical and
predictable than sh, and has no security issues.
</longdescription>
</pkgmetadata>

@ -1,6 +1,7 @@
DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805

@ -0,0 +1,37 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-14.0.0.080.ebuild,v 1.1 2013/10/02 13:05:24 jlec Exp $
EAPI=5
INTEL_DPN=parallel_studio_xe
INTEL_DID=3447
INTEL_DPV=2013_sp1
INTEL_SUBDIR=composerxe
INTEL_SINGLE_ARCH=false
inherit intel-sdp
DESCRIPTION="Intel C/C++ Compiler"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
IUSE="eclipse linguas_ja"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND="
!dev-lang/ifc[linguas_ja]
eclipse? ( dev-util/eclipse-sdk )"
RDEPEND="${DEPEND}
~dev-libs/intel-common-${PV}[compiler]"
INTEL_BIN_RPMS="compilerproc compilerproc-devel"
INTEL_DAT_RPMS="compilerproc-common"
CHECKREQS_DISK_BUILD=325M
src_install() {
if ! use linguas_ja; then
find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
fi
intel-sdp_src_install
}

@ -1,6 +1,7 @@
DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805

@ -0,0 +1,35 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/idb/idb-13.0.0.080.ebuild,v 1.1 2013/10/02 13:20:50 jlec Exp $
EAPI=5
INTEL_DPN=parallel_studio_xe
INTEL_DID=3447
INTEL_DPV=2013_sp1
INTEL_SUBDIR=composerxe
INTEL_SINGLE_ARCH=false
inherit intel-sdp
DESCRIPTION="Intel C/C++/FORTRAN debugger"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
IUSE="eclipse"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=">=dev-libs/intel-common-13.1[compiler]"
RDEPEND="${DEPEND}
virtual/jre
eclipse? ( dev-util/eclipse-sdk )"
INTEL_BIN_RPMS="idb"
INTEL_DAT_RPMS="idb-common idbcdt"
CHECKREQS_DISK_BUILD=475M
src_prepare() {
sed \
-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
}

@ -1,6 +1,7 @@
DIST parallel_studio_xe_2013.tgz 2097190124 SHA256 22ac8d6dd1bf9fd646c1d1322c0a9051b89b6dba975112d492cccd8359f8dc0a SHA512 d49c519c0b2f82e6fc0db6820d5f84999d2a973d8caa0e103c0ad355644f52d209147a2b3a884effad9bbae117bd9ebbad4869f5440009355ffacb65cae274fa WHIRLPOOL bb5f05ceeae39f794dcd6c4fafafb2e5ebf8e5332083f7eaf357dddb9b2a1e94f52f82f850a8b0aefe1920f2fd21be67bfa8aafa9590707e25e84e9f2be07bd5
DIST parallel_studio_xe_2013_ia32.tgz 1161979592 SHA256 3f0ff2ece4cfc5ec3d7c2fddefeda2b55b1295a0d62440c172a14d8e60b7b551 SHA512 9818d0e8ee1f36527f5899480381c252528274248974001f136e7aecc196ab4a049aeabed5835c18f0b08153d3a36a7fc8d850aec455bb9b5f71d95d17dc161e WHIRLPOOL 2772bb70b968f765af1c47ecb11a9e0b0220890ed37d0a81cb911f9ec43dda8cbdd85f3b0cacf1b1794ca239684f3381e54bada668b0b4a40244da684c3b04a5
DIST parallel_studio_xe_2013_intel64.tgz 1448188683 SHA256 6d3f5a635e86bc6d71d970458d746df8f4f239e8892347d76b4eda18946048f3 SHA512 679abcb2089fc9570bad0fe8b7dd6aeb0e13831f2f79e485ce150e593e7c0d2c8c25c03520124261291f0fa418a9b873e86a81b6962ad8bbae60bc2acbc594b6 WHIRLPOOL 85ee892aac2691375edf4624842a6931b3eaab34be64b97282c025810cb2db4ea05426263af5249525724d3437da6337189e6a4af6a1efc8f7713a854b8e4ce1
DIST parallel_studio_xe_2013_sp1.tgz 3294385739 SHA256 ba65fdf7afbac0276a948ef8d4e1578297a0115548d5f3465c7ed4012030f696 SHA512 ee7995d39b604de6fed0bb87535c48666ca9ffa13975b6adcce170d746f2ee648b5c4a428ed8ef196226f204b3b17a833f379ab4fa57b4a1ebe7c89cc899ea66 WHIRLPOOL 213c8261c161df80732d958bf9e13a286aca2dd6ce16be30fee92d626051bc855c4a1ffe82b12f1bf9095771ca5b128463d839c14748d086b50527e7d09b76a7
DIST parallel_studio_xe_2013_update1.tgz 2148568608 SHA256 870a9909e661aa75738c2d0851f7554c56696c40db2266ddd21fd6c5c6ae0986 SHA512 ce1b32be3e4efbedc43f17e0930e0c67d55129d756b7168e51a9a956c510df7e5c194a02813e42931ef21acbc1f07a6ecda0b79074c879281ddbd7e5da055400 WHIRLPOOL 059f2f27590079907bbc202dfe81a3900018133d46a28d383dd3960c247019b49e4cf767e90601ed11a8194a4c370269b831c9c780ee90b8d4104668cda0f4b0
DIST parallel_studio_xe_2013_update1_ia32.tgz 1208336795 SHA256 e1e2ac8e1cf559a539aec1b9ab06b71d041e986bba6db69cbb5025ecaee90e89 SHA512 76e23d359ae8698496b605e006c3038a8e4bd38f15369fdb95e436279c60d41a1d14d74763459d5aead321fd3b4601ef527d674af87170bab7911d5338595b30 WHIRLPOOL b93e8a8ce5f1e3487c187d6c2cd835836abc03bbae19b7376910ea713da9efabb5703449ca397bd10c92334ff0c6fcc8e4674898e695479e13c6d9223e2b52c5
DIST parallel_studio_xe_2013_update1_intel64.tgz 1493318875 SHA256 f39f63df9d0fc150643c753fcfdb788a75db64e266adca06bcf4f084f3210808 SHA512 d5524a89fbb327a61b7d983dfca8caedf904234c09a934373c38024b4af9955063c4c5c1895eff9b66de3c14d9d401a86634cef7cd80f923fc9196366cfc7a7e WHIRLPOOL 3d0294ab0d4daba28462066cbe8d46772192e55d0b6648202f9f85f49a6cf4ff90a999566b3575fd988df8afefb1cabc1a8146c16fe170c449253659f7b43805

@ -0,0 +1,35 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-14.0.0.080.ebuild,v 1.1 2013/10/02 13:15:03 jlec Exp $
EAPI=5
INTEL_DPN=parallel_studio_xe
INTEL_DID=3447
INTEL_DPV=2013_sp1
INTEL_SUBDIR=composerxe
INTEL_SINGLE_ARCH=false
inherit intel-sdp
DESCRIPTION="Intel FORTRAN Compiler"
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
IUSE="linguas_ja"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND="!dev-lang/ifc[linguas_jp]"
RDEPEND="${DEPEND}
~dev-libs/intel-common-${PV}[compiler]"
INTEL_BIN_RPMS="compilerprof compilerprof-devel"
INTEL_DAT_RPMS="compilerprof-common"
CHECKREQS_DISK_BUILD=375M
src_install() {
if ! use linguas_ja; then
find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
fi
intel-sdp_src_install
}

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.20.17.13.ebuild,v 1.1 2013/10/02 01:47:35 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.20.17.13.ebuild,v 1.3 2013/10/02 06:09:15 ago Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{6,7} )
@ -15,7 +15,7 @@ LICENSE="BSD"
soname_version="${PV}"
SLOT="0/${soname_version}"
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE="icu neon readline"
RDEPEND="icu? ( dev-libs/icu:= )

@ -0,0 +1,69 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.34.0-r1.ebuild,v 1.1 2013/10/03 03:54:17 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit gnome2 pax-utils python-any-r1 virtualx
DESCRIPTION="Javascript bindings for GNOME"
HOMEPAGE="http://live.gnome.org/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="examples test"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
RDEPEND=">=dev-libs/glib-2.32:2
>=dev-libs/gobject-introspection-1.33.10
dev-libs/dbus-glib
sys-libs/readline
x11-libs/cairo
>=dev-lang/spidermonkey-1.8.5:0
virtual/libffi
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
sys-devel/gettext
virtual/pkgconfig
"
pkg_setup() {
python-any-r1_pkg_setup
}
src_configure() {
# AUTHORS, ChangeLog are empty
DOCS="NEWS README"
# FIXME: add systemtap/dtrace support, like in glib:2
# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
# XXX: Do NOT enable coverage, completely useless for portage installs
gnome2_src_configure \
--disable-systemtap \
--disable-dtrace \
--disable-coverage \
$(use_enable test tests)
}
src_test() {
# Tests need dbus
Xemake check
}
src_install() {
# installation sometimes fails in parallel
gnome2_src_install -j1
if use examples; then
insinto /usr/share/doc/"${PF}"/examples
doins "${S}"/examples/*
fi
# Required for gjs-console to run correctly on PaX systems
pax-mark mr "${ED}/usr/bin/gjs-console"
}

@ -1,5 +1,4 @@
DIST gmime-2.4.32.tar.xz 685512 SHA256 a0e8f3a1949e7281e92edc5dd6309a7ca34b6838c6acf7b7f1563a41b5ddd74b SHA512 623cb5fe70104612db31b41752c68bd3dfbafb87402f49c13f87f0e1e864ebdc0587ea6192e627fcd7958a76cd3fd6a29bfb409e4b9bc08ce12c7fbeb8dce57a WHIRLPOOL a36abebaa4a3f475b3f03de3797e7d6d02eb21e0876856058baf91a7ce8e9af615968e98a5dedd59fbef3e8adf5ad41957b0c98db226169ef298f9ab89cefa36
DIST gmime-2.4.33.tar.xz 692336 SHA256 27dfa99967c19d2e8707b2670bd084dd514167925cca92cbd474298fc515d391 SHA512 15efb527ea6162b63a4773b0f4b30f0e34cb96e46fd85c5489a9fb4b262b837c8a563eeaf737f82dc805ecce379e5247c32c84f6d8127aea3cb9fdf3c0bcc973 WHIRLPOOL abb9c7e66222fb290b339ce0a5172fbe2780ac6101b1838d5f15ac0b85b55c6c1a4c8d7ead7d55d8b71a5284af93ec4d182ba34ac3168ef9ccf2bfe174ce2282
DIST gmime-2.6.13.tar.xz 731888 SHA256 42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154 SHA512 2e7c632e1e2a5b8df7f6f381512a05b89f57b5a981adbfbdce8a7e7e0370d02f438efec5ad80dbbc23438c15c14b83a55d589a41b988fc1893934172a60fc0de WHIRLPOOL e899c96e728814851f55522a2a38c51882fe1cf2cdec5e4971830f26c0ff74675118ff16c653ded47abfe3e089dd24cf2020d59ffd08582057bd5e86b3c684e9
DIST gmime-2.6.17.tar.xz 739208 SHA256 22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f SHA512 1c6eb020bddd422d199d8f3efcd34bd9ee2a1cb10ffbbc601b790f4125474b0869c43e8896273a118ffbc1586352d6cc5d758bb1e02b67831f49148b080930e8 WHIRLPOOL 63eb7bb082e33b3505bb841f984a5109408f6c7ed102ea68f02f2ce0e65f4e9356fb70398a923ebe2b605424a39596ea23210afb2b74328dd19469e2d7b169e7
DIST gmime-2.6.18.tar.xz 740400 SHA256 783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6 SHA512 33d323fd19cc7c1ea23f78c994944aeffa5464c45aaf53a5042fe1a597f4c4e8479f8178c0a26ed25ce03a0e2d0049c40b96a6ef6157c0784662a47b13ccefdb WHIRLPOOL 86539c986aa0f3428bff197bcb89d44eb43b2f92c193c55bf072600ea912f3af2e2cf01de33f0ac045795890d331858d9c207c89b4e968206becf6e258021432

@ -0,0 +1,34 @@
From 1373f11f9b3ecdbfb58a70a742506f3f6d5c57d8 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@gnome.org>
Date: Sun, 29 Sep 2013 17:34:25 +0000
Subject: Oops, eclose each reference msgid token between '<' and '>'
---
diff --git a/gmime/gmime-message.c b/gmime/gmime-message.c
index 170116b..b6243fd 100644
--- a/gmime/gmime-message.c
+++ b/gmime/gmime-message.c
@@ -642,16 +642,18 @@ write_references (GMimeStream *stream, const char *name, const char *value)
reference = references;
while (reference != NULL) {
n = strlen (reference->msgid);
- if (len > 1 && len + n + 1 >= GMIME_FOLD_LEN) {
+ if (len > 1 && len + n + 3 >= GMIME_FOLD_LEN) {
g_string_append_len (folded, "\n\t", 2);
len = 1;
} else {
- g_string_append_len (folded, " ", 1);
+ g_string_append_c (folded, ' ');
len++;
}
+ g_string_append_c (folded, '<');
g_string_append_len (folded, reference->msgid, n);
- len += n;
+ g_string_append_c (folded, '>');
+ len += n + 2;
reference = reference->next;
}
--
cgit v0.9.2

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

Loading…
Cancel
Save