Sync with portage [Wed May 23 09:51:47 MSK 2012].

mhiretskiy
root 12 years ago
parent b23aca6cc6
commit 21a4c22393

@ -0,0 +1,22 @@
hack until gzip pulls a newer gnulib version
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 29 Mar 2012 13:30:41 -0600
Subject: [PATCH] stdio: don't assume gets any more
Gnulib intentionally does not have a gets module, and now that C11
and glibc have dropped it, we should be more proactive about warning
any user on a platform that still has a declaration of this dangerous
interface.
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -125,7 +125,6 @@
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.10 2012/04/26 19:25:30 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.11 2012/05/22 22:04:35 vapier Exp $
inherit eutils flag-o-matic
@ -25,6 +25,7 @@ src_unpack() {
#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
epatch "${FILESDIR}"/${P}-assembler.patch #309079
epatch "${FILESDIR}"/${P}-no-gets.patch
}
src_compile() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/rar-4.1.1.ebuild,v 1.1 2012/03/04 18:26:14 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/rar/rar-4.1.1.ebuild,v 1.2 2012/05/22 21:39:09 jdhore Exp $
EAPI=4
DESCRIPTION="RAR compressor/uncompressor"
@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
KEYWORDS="-* ~amd64 x86"
IUSE="all_sfx static"
DEPEND="all_sfx? ( app-arch/unrar )"

@ -0,0 +1,22 @@
hack until gzip pulls a newer gnulib version
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 29 Mar 2012 13:30:41 -0600
Subject: [PATCH] stdio: don't assume gets any more
Gnulib intentionally does not have a gets module, and now that C11
and glibc have dropped it, we should be more proactive about warning
any user on a platform that still has a declaration of this dangerous
interface.
--- a/gnu/stdio.in.h
+++ b/gnu/stdio.in.h
@@ -125,7 +125,6 @@
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

@ -1,14 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r2.ebuild,v 1.8 2012/03/04 15:35:15 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r2.ebuild,v 1.9 2012/05/22 22:17:10 vapier Exp $
inherit flag-o-matic eutils
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r4.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r4.ebuild,v 1.3 2012/05/22 22:17:10 vapier Exp $
EAPI="2"
@ -8,9 +8,8 @@ inherit flag-o-matic eutils
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25-r1.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25-r1.ebuild,v 1.3 2012/05/22 22:17:10 vapier Exp $
EAPI="3"
@ -8,9 +8,8 @@ inherit flag-o-matic
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.3 2012/03/04 15:35:15 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.25.ebuild,v 1.4 2012/05/22 22:17:10 vapier Exp $
EAPI="3"
@ -8,9 +8,8 @@ inherit flag-o-matic
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.2 2012/03/04 15:35:15 klausman Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26-r1.ebuild,v 1.4 2012/05/22 22:17:10 vapier Exp $
EAPI="3"
@ -8,9 +8,8 @@ inherit flag-o-matic autotools
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
@ -23,6 +22,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-xattr.patch #382067
epatch "${FILESDIR}"/${P}-no-gets.patch
eautoreconf
if ! use userland_GNU ; then

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26.ebuild,v 1.9 2012/03/19 19:02:34 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.26.ebuild,v 1.10 2012/05/22 22:17:10 vapier Exp $
EAPI="3"
@ -8,9 +8,8 @@ inherit flag-o-matic
DESCRIPTION="Use this to make tarballs :)"
HOMEPAGE="http://www.gnu.org/software/tar/"
SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2
mirror://gnu/tar/${P}.tar.bz2"
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
mirror://gnu-alpha/tar/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r2.ebuild,v 1.1 2012/05/19 17:38:22 kensington Exp $
# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.1 2012/05/22 21:28:00 kensington Exp $
EAPI=4
@ -66,6 +66,11 @@ PATCHES=(
"${FILESDIR}/${P}-libavformat54.patch"
)
REQUIRED_USE="
lame? ( encode )
sox? ( encode )
"
src_configure() {
mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
@ -91,6 +96,12 @@ src_configure() {
$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
)
else
mycmakeargs+=(
-DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
-DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
)
fi
kde4-base_src_configure

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r2.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $
EAPI="4"
@ -128,7 +128,7 @@ pkg_postinst() {
elog
if use smartcard; then
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
elog " - sys-apps/pcsc-lite and a compatible reader device;"
elog " - dev-libs/openct and a compatible reader device;"
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17-r3.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $
EAPI="4"
@ -129,7 +129,7 @@ pkg_postinst() {
elog
if use smartcard; then
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
elog " - sys-apps/pcsc-lite and a compatible reader device;"
elog " - dev-libs/openct and a compatible reader device;"
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.7 2012/05/13 11:34:57 swift Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.8 2012/05/22 16:41:57 ssuominen Exp $
EAPI="4"
@ -132,7 +132,7 @@ pkg_postinst() {
elog
if use smartcard; then
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
elog " - sys-apps/pcsc-lite and a compatible reader device;"
elog " - dev-libs/openct and a compatible reader device;"
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.3 2012/05/13 11:34:57 swift Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19.ebuild,v 1.4 2012/05/22 16:41:57 ssuominen Exp $
EAPI="4"
@ -132,7 +132,7 @@ pkg_postinst() {
if use smartcard; then
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
use usb && elog " - a CCID-compatible reader, used directly through dev-libs/libusb;"
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
elog " - sys-apps/pcsc-lite and a compatible reader device;"
elog " - dev-libs/openct and a compatible reader device;"
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.9 2012/05/03 18:16:39 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.10 2012/05/22 19:37:07 eras Exp $
EAPI=2
# PYTHON_BDEPEND="2"
@ -133,6 +133,10 @@ src_install() {
# default database dir
keepdir /var/heimdal
# Ugly hack for broken symlink - bug #417081
rm "${D}"/usr/share/man/man5/qop.5 || die
dosym mech.5 /usr/share/man/man5/qop.5
}
pkg_preinst() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.2 2012/05/03 18:16:39 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.3 2012/05/22 19:37:07 eras Exp $
EAPI=4
# PYTHON_BDEPEND="2"
@ -86,11 +86,11 @@ src_configure() {
}
src_compile() {
emake -j1 || die "emake failed"
emake -j1
}
src_install() {
INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
dodoc ChangeLog README NEWS TODO
@ -132,6 +132,10 @@ src_install() {
# default database dir
keepdir /var/heimdal
# Ugly hack for broken symlink - bug #417081
rm "${D}"/usr/share/man/man5/qop.5 || die
dosym mech.5 /usr/share/man/man5/qop.5
}
pkg_preinst() {

@ -1,4 +1,2 @@
DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5
DIST emacs-24.0.95.tar.gz 51371928 RMD160 14a0ca326c18dc549495e862d83eb9e1917d2ead SHA1 09c1eaed7400f8cc0e5dab9fb2337c3c4cee5449 SHA256 434b8e4a27d376257a6fe93b35936466985ac45c90310e6041e0a0577752df64
DIST emacs-24.0.96.tar.gz 51433984 RMD160 ae8f46637b5cdadf7c401f6fc7e0240937becdb4 SHA1 15f932ad8c6a77107bc19ab3e3a8c8af27259ec2 SHA256 18ed15ff63cfa1ae929ccdb3a39cdc589420bd17dacc5af144c5eb717200f21a
DIST emacs-24.0.97.tar.gz 51474077 RMD160 95ba986c3b13eabac0fc807d9b9e4ddbf64dde02 SHA1 dda4e06125dc35085f2b4c5d0fc4a9fb2a44adc1 SHA256 393620e822fd739344a28a4ec6d4e403e0301ad83cbb2d936b51043bea26afa8

@ -1,369 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.3 2012/05/03 18:33:00 jdhore Exp $
EAPI=4
inherit autotools elisp-common eutils flag-o-matic multilib
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
inherit bzr
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? (
athena? ( x11-libs/libXaw )
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
>=app-emacs/emacs-common-gentoo-1.3[X?]"
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.in)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|| die "unable to sed configure.in"
fi
if ! use gzip-el; then
# Emacs' build system automatically detects the gzip binary and
# compresses el files. We don't want that so confuse it with a
# wrong binary name
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|| die "unable to sed configure.in"
fi
AT_M4DIR=m4 eautoreconf
}
src_configure() {
ALLOWED_FLAGS=""
strip-flags
if use sh; then
replace-flags -O[1-9] -O0 #262359
elif use ia64; then
replace-flags -O[2-9] -O1 #325373
else
replace-flags -O[3-9] -O2
fi
local myconf
if use alsa && ! use sound; then
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x --without-ns"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
myconf="${myconf} $(use_with imagemagick)"
if use xft; then
myconf="${myconf} --with-xft"
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-xft"
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
"(superseded by \"gtk\")"
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
use motif && ewarn "USE flag \"motif\" ignored" \
"(superseded by \"athena\" or \"Xaw3d\")"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf="${myconf} --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
! use gtk && use gtk3 \
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
elif use aqua; then
einfo "Configuring to build with Cocoa support"
myconf="${myconf} --with-ns --disable-ns-self-contained"
myconf="${myconf} --without-x"
else
myconf="${myconf} --without-x --without-ns"
fi
if [[ ${PV##*.} = 9999 ]]; then
# These variables are not needed for building. We add them to
# configure options because they are stored in the Emacs binary
# and available in variable "system-configuration-options".
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
# According to configure, this option is only used for GNU/Linux
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
# out the location because $(get_libdir) does not necessarily return
# something that matches the host OS's libdir naming (e.g. RHEL).
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
crtdir=${crtdir%/*}
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
--disable-maintainer-mode \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
if [[ ${PV##*.} = 9999 ]]; then
emake CC="$(tc-getCC)" bootstrap
# cleanup, otherwise emacs will be dumped again in src_install
(cd src; emake versionclean)
fi
# set last component of emacs-version to (package revision + 1)
touch src/emacs-${FULL_VERSION}.${PR#r}
emake CC="$(tc-getCC)"
}
src_install () {
local i m
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move man pages to the correct place
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
local c=";;"
if use source; then
insinto /usr/share/emacs/${FULL_VERSION}/src
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
c=""
fi
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X ${c}(setq find-function-C-source-directory
X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
if use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
elog "You may want to copy or symlink it into /Applications by yourself."
fi
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
else
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
local f
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[[ -e ${f} ]] || touch "${f}"
done
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
elisp-site-regen
eselect emacs update ifunset
if use X; then
elog "You need to install some fonts for Emacs."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
elog "for how to enable anti-aliased fonts."
elog
fi
elog "You can set the version to be started by /usr/bin/emacs through"
elog "the Emacs eselect module, which also redirects man and info pages."
elog "Therefore, several Emacs versions can be installed at the same time."
elog "\"man emacs.eselect\" for details."
elog
elog "If you upgrade from a previous major version of Emacs, then it is"
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
elog "all byte-compiled elisp files of the installed Emacs packages."
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

@ -1,369 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.2 2012/05/03 18:33:00 jdhore Exp $
EAPI=4
inherit autotools elisp-common eutils flag-o-matic multilib
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
inherit bzr
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? (
athena? ( x11-libs/libXaw )
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
>=app-emacs/emacs-common-gentoo-1.3[X?]"
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.in)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|| die "unable to sed configure.in"
fi
if ! use gzip-el; then
# Emacs' build system automatically detects the gzip binary and
# compresses el files. We don't want that so confuse it with a
# wrong binary name
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|| die "unable to sed configure.in"
fi
AT_M4DIR=m4 eautoreconf
}
src_configure() {
ALLOWED_FLAGS=""
strip-flags
if use sh; then
replace-flags -O[1-9] -O0 #262359
elif use ia64; then
replace-flags -O[2-9] -O1 #325373
else
replace-flags -O[3-9] -O2
fi
local myconf
if use alsa && ! use sound; then
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x --without-ns"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
myconf="${myconf} $(use_with imagemagick)"
if use xft; then
myconf="${myconf} --with-xft"
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-xft"
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
"(superseded by \"gtk\")"
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
use motif && ewarn "USE flag \"motif\" ignored" \
"(superseded by \"athena\" or \"Xaw3d\")"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf="${myconf} --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
! use gtk && use gtk3 \
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
elif use aqua; then
einfo "Configuring to build with Cocoa support"
myconf="${myconf} --with-ns --disable-ns-self-contained"
myconf="${myconf} --without-x"
else
myconf="${myconf} --without-x --without-ns"
fi
if [[ ${PV##*.} = 9999 ]]; then
# These variables are not needed for building. We add them to
# configure options because they are stored in the Emacs binary
# and available in variable "system-configuration-options".
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
# According to configure, this option is only used for GNU/Linux
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
# out the location because $(get_libdir) does not necessarily return
# something that matches the host OS's libdir naming (e.g. RHEL).
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
crtdir=${crtdir%/*}
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
--disable-maintainer-mode \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
if [[ ${PV##*.} = 9999 ]]; then
emake CC="$(tc-getCC)" bootstrap
# cleanup, otherwise emacs will be dumped again in src_install
(cd src; emake versionclean)
fi
# set last component of emacs-version to (package revision + 1)
touch src/emacs-${FULL_VERSION}.${PR#r}
emake CC="$(tc-getCC)"
}
src_install () {
local i m
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move man pages to the correct place
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
local c=";;"
if use source; then
insinto /usr/share/emacs/${FULL_VERSION}/src
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
c=""
fi
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X ${c}(setq find-function-C-source-directory
X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
if use aqua; then
dodir /Applications/Gentoo
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
elog "You may want to copy or symlink it into /Applications by yourself."
fi
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
else
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
local f
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[[ -e ${f} ]] || touch "${f}"
done
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
elisp-site-regen
eselect emacs update ifunset
if use X; then
elog "You need to install some fonts for Emacs."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
elog "for how to enable anti-aliased fonts."
elog
fi
elog "You can set the version to be started by /usr/bin/emacs through"
elog "the Emacs eselect module, which also redirects man and info pages."
elog "Therefore, several Emacs versions can be installed at the same time."
elog "\"man emacs.eselect\" for details."
elog
elog "If you upgrade from a previous major version of Emacs, then it is"
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
elog "all byte-compiled elisp files of the installed Emacs packages."
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.2 2012/05/19 15:58:54 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.3 2012/05/22 20:29:31 ulm Exp $
EAPI=4
@ -106,6 +106,7 @@ src_prepare() {
fi
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
epatch_user
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.5 2012/05/22 20:29:31 ulm Exp $
EAPI=4
@ -104,6 +104,8 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch_user
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.6 2012/05/22 20:33:37 ulm Exp $
EAPI=4
@ -104,6 +104,8 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch_user
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
@ -271,8 +273,8 @@ src_install () {
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
doins -r src/s
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/s/README
c=""
fi

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.2.ebuild,v 1.3 2012/05/21 10:10:49 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/howm/howm-1.3.9.2.ebuild,v 1.4 2012/05/22 21:03:29 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
SITEFILE="50${PN}-gentoo.el"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/riece-8.0.0.ebuild,v 1.4 2012/05/21 10:11:34 phajdan.jr Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emacs/riece/riece-8.0.0.ebuild,v 1.5 2012/05/22 21:04:21 ranger Exp $
EAPI=4
@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"
LICENSE="GPL-3 FDL-1.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~ppc ppc64 x86"
KEYWORDS="~alpha amd64 ppc ppc64 x86"
IUSE="linguas_ja"
RESTRICT="test"

@ -1,3 +1,2 @@
DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
DIST openscap-0.8.2.tar.gz 4524453 RMD160 06f4a08c9145a09f35b7c82e855922f547a247cb SHA1 a0a6e2b805497cb8ae9879674dd591e8bec90fa9 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11

@ -0,0 +1,11 @@
--- tests/probes/interface/test_probes_interface.sh.orig 2012-04-05 14:41:53.846540789 +0200
+++ tests/probes/interface/test_probes_interface.sh 2012-04-05 14:42:41.141285232 +0200
@@ -22,6 +22,8 @@
local DF="test_probes_interface.xml"
local RF="results.xml"
+ require "ipcalc" || return 255
+
[ -f $RF ] && rm -f $RF
if [ ! -x test_probes_interface ]; then

@ -0,0 +1,10 @@
--- tests/probes/process/test_probes_process.xml.sh.orig 2012-04-05 15:49:38.746901398 +0200
+++ tests/probes/process/test_probes_process.xml.sh 2012-04-05 15:50:02.330775903 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -v '\[' | awk '$1 != 2 && $2 != 2 {print $3}' | \
sed -n '2,30p'`)
COUNTER=1

@ -1,70 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.3.ebuild,v 1.4 2011/08/21 03:40:45 phajdan.jr Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit eutils multilib python bash-completion
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
HOMEPAGE="http://www.open-scap.org/"
SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="bash-completion doc nss perl python sql"
RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt )
nss? ( dev-libs/nss )
sql? ( dev-db/opendbx )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl"
DEPEND="${RDEPEND}
perl? ( dev-lang/swig )
python? ( dev-lang/swig )"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_configure() {
local myconf
if use python || use perl ; then
myconf+=" --enable-bindings"
else
myconf+=" --disable-bindings"
fi
if use nss ; then
myconf+=" --with-crypto=nss3"
else
myconf+=" --with-crypto=gcrypt"
fi
econf ${myconf}
}
src_install() {
emake install DESTDIR="${D}" || die
find "${D}" -name '*.la' -delete || die
sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
#--enable-bindings enable all bindings, clean unwanted bindings
if use python && ! use perl ; then
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
fi
if ! use python && use perl ; then
rm -rf "${D}"/$(python_get_sitedir) || die
fi
if use doc ; then
dohtml -r docs/html/* || die
dodoc docs/examples/* || die
fi
if ! use bash-completion ; then
rm -rf "${D}"/etc/bash_completion.d || die
fi
}

@ -1,70 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.4.ebuild,v 1.1 2011/08/19 18:23:13 hwoarang Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit eutils multilib python bash-completion
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
HOMEPAGE="http://www.open-scap.org/"
SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bash-completion doc nss perl python sql"
RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt )
nss? ( dev-libs/nss )
sql? ( dev-db/opendbx )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl"
DEPEND="${RDEPEND}
perl? ( dev-lang/swig )
python? ( dev-lang/swig )"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_configure() {
local myconf
if use python || use perl ; then
myconf+=" --enable-bindings"
else
myconf+=" --disable-bindings"
fi
if use nss ; then
myconf+=" --with-crypto=nss3"
else
myconf+=" --with-crypto=gcrypt"
fi
econf ${myconf}
}
src_install() {
emake install DESTDIR="${D}" || die
find "${D}" -name '*.la' -delete || die
sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
#--enable-bindings enable all bindings, clean unwanted bindings
if use python && ! use perl ; then
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
fi
if ! use python && use perl ; then
rm -rf "${D}"/$(python_get_sitedir) || die
fi
if use doc ; then
dohtml -r docs/html/* || die
dodoc docs/examples/* || die
fi
if ! use bash-completion ; then
rm -rf "${D}"/etc/bash_completion.d || die
fi
}

@ -0,0 +1,104 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.2.ebuild,v 1.1 2012/05/22 20:51:55 hwoarang Exp $
EAPI=3
PYTHON_DEPEND="2"
inherit eutils multilib python bash-completion-r1
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
HOMEPAGE="http://www.open-scap.org/"
SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bash-completion doc nss perl python rpm selinux sql test"
#RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt )
nss? ( dev-libs/nss )
rpm? ( >=app-arch/rpm-4.9 )
sql? ( dev-db/opendbx )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl"
DEPEND="${RDEPEND}
perl? ( dev-lang/swig )
python? ( dev-lang/swig )
test? (
app-arch/unzip
net-misc/ipcalc
sys-apps/grep )"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
#problem sent upstream https://fedorahosted.org/openscap/ticket/45
sed -i 's,unzip,\$1,' tests/test_common.sh || die
#problem sent upstream https://fedorahosted.org/openscap/ticket/46
epatch ${FILESDIR}/test_probes_interface.patch || die
# runlevel isnt supported on gentoo
sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
#According to comment of theses tests, we must modify it. For the moment disable it
sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
epatch ${FILESDIR}/test_probes_process.patch || die
if ! use rpm ; then
sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
fi
if ! use selinux ; then
sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
fi
}
src_configure() {
local myconf
if use python || use perl ; then
myconf+=" --enable-bindings"
else
myconf+=" --disable-bindings"
fi
if use nss ; then
myconf+=" --with-crypto=nss3"
else
myconf+=" --with-crypto=gcrypt"
fi
econf ${myconf}
}
src_install() {
emake install DESTDIR="${D}" || die
find "${D}" -name '*.la' -delete || die
sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
#--enable-bindings enable all bindings, clean unwanted bindings
if use python && ! use perl ; then
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
fi
if ! use python && use perl ; then
rm -rf "${D}"/$(python_get_sitedir) || die
fi
if use doc ; then
dohtml -r docs/html/* || die
dodoc docs/examples/* || die
fi
if use bash-completion ; then
dobashcomp "${D}"/etc/bash_completion.d/oscap
fi
rm -rf "${D}"/etc/bash_completion.d || die
}

@ -1 +1,2 @@
DIST ovaldi-5.10.1.2-src.tar.bz2 14859172 RMD160 e9d6688610b97b4c3a31c4fabf738002ab409e01 SHA1 1119d253cc5e80272ca5acd1e03c3ef5f95aaae8 SHA256 2d00a1bc730f6635beebd52611ee30c914169626ef5adf68ff313295c483d319
DIST ovaldi-5.9.1-src.tar.bz2 14745625 RMD160 ea01a73e0592c007a4611afff1a995ab617ed19b SHA1 7a7667cc2044df49c8413fc01946e00f6ee4a3a5 SHA256 40161ac64fd221543a19f178de283919be2dd7f513a6fb354f1440fe1bfb98e1

@ -0,0 +1,11 @@
--- project/linux/Makefile.orig 2012-01-02 12:08:20.400871287 +0100
+++ project/linux/Makefile 2012-01-02 12:08:48.966488826 +0100
@@ -50,7 +50,7 @@
LIBDIR = -L/usr/local/lib -L/usr/lib
# What libraries do we need?
-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid -lsepol -lselinux
# Determine what package management system is being used
#PACKAGE_RPM = $(shell /usr/bin/env rpm --version 2>/dev/null)

@ -0,0 +1,11 @@
--- src/linux/ProbeFactory.cpp 2010-12-10 13:37:00.019140703 +0100
+++ src/linux/ProbeFactory.cpp 2010-08-27 21:23:41.000000000 +0200
@@ -61,8 +61,6 @@
probe = XmlFileContentProbe::Instance();
} else if(objectName.compare("textfilecontent54_object") == 0) {
probe = TextFileContent54Probe::Instance();
- } else if(objectName.compare("ldap_object") == 0) {
- probe = LDAPProbe::Instance();
// here are the objects defined in the unix schema
} else if(objectName.compare("file_object") == 0) {

@ -0,0 +1,94 @@
--- ./src/linux/ProbeFactory.cpp.old 2011-08-18 14:45:11.314556346 +0200
+++ ./src/linux/ProbeFactory.cpp 2011-08-18 14:45:23.151011753 +0200
@@ -101,10 +101,6 @@
#endif
} else if (objectName.compare("partition_object") == 0) {
probe = PartitionProbe::Instance();
- } else if (objectName.compare("selinuxsecuritycontext_object") == 0) {
- probe = SelinuxSecurityContextProbe::Instance();
- } else if (objectName.compare("selinuxboolean_object") == 0) {
- probe = SelinuxBooleanProbe::Instance();
} else if (objectName.compare("iflisteners_object") == 0) {
probe = IfListenersProbe::Instance();
} else {
--- src/linux/ProbeFactory.h.old 2011-08-18 14:47:23.226501075 +0200
+++ src/linux/ProbeFactory.h 2011-08-18 14:47:34.183998019 +0200
@@ -71,8 +71,6 @@
#include "InetdProbe.h"
#include "PartitionProbe.h"
-#include "SelinuxSecurityContextProbe.h"
-#include "SelinuxBooleanProbe.h"
#include "IfListenersProbe.h"
class AbsProbe;
--- src/probes/unix/Process58Probe.cpp.old 2012-05-22 10:09:52.980828398 +0200
+++ src/probes/unix/Process58Probe.cpp 2012-05-22 10:11:06.266468168 +0200
@@ -29,10 +29,10 @@
//****************************************************************************************//
#ifdef LINUX
-# include <selinux/selinux.h>
-# include <selinux/context.h>
+/*# include <selinux/selinux.h>
+# include <selinux/context.h>*/
# include <sys/capability.h>
-# include <SecurityContextGuard.h>
+/*# include <SecurityContextGuard.h>*/
#endif
#include <fstream>
@@ -328,7 +328,7 @@
pid_t sessionId;
uid_t loginuid;
uint64_t effCap, *effCapp=&effCap;
- string selinuxDomainLabel;
+/* string selinuxDomainLabel;*/
Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;
@@ -423,10 +423,10 @@
}
// this one doesn't require reading anything in /proc
- if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
+/* if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));
item->SetStatus(OvalEnum::STATUS_ERROR);
- }
+ }*/
// The Linux start time is represented as the number of jiffies (1/100 sec)
// that the application was started after the last system reboot. To get an
@@ -491,10 +491,10 @@
// aren't any.
item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
- if (selinuxDomainLabel.empty())
+/* if (selinuxDomainLabel.empty())*/
item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
- else
- item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));
+/* else
+ item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/
if (statStatus == PROC_OK)
item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));
@@ -709,7 +709,7 @@
capMap[capEnum]));
}
}
-
+/*
bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {
security_context_t sctx;
int ec = getpidcon(pid, &sctx);
@@ -732,7 +732,7 @@
*label = tmp;
return true;
}
-
+*/
#elif defined SUNOS
void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {

@ -0,0 +1,20 @@
--- src/CountFunction.cpp.old 2012-01-02 11:37:27.113604532 +0100
+++ src/CountFunction.cpp 2012-01-02 11:37:39.624998573 +0100
@@ -29,6 +29,7 @@
//****************************************************************************************//
#include <cstddef>
+#include <memory>
#include "CountFunction.h"
#include "ComponentFactory.h"
--- src/UniqueFunction.cpp.orig 2012-01-02 11:39:58.564269070 +0100
+++ src/UniqueFunction.cpp 2012-01-02 11:40:12.057615550 +0100
@@ -29,6 +29,7 @@
//****************************************************************************************//
#include <set>
+#include <memory>
#include "Common.h"
#include "ComponentFactory.h"
#include "UniqueFunction.h"

@ -0,0 +1,11 @@
--- src/Main.h.old 2010-10-22 14:59:13.000000000 +0200
+++ src/Main.h 2010-10-22 14:59:38.000000000 +0200
@@ -38,7 +38,7 @@
#endif
#ifdef LINUX
-# define STRNICMP strnicmp
+# define STRNICMP strncasecmp
#elif defined SUNOS
# define STRNICMP strncasecmp
#elif defined DARWIN

@ -0,0 +1,306 @@
--- src/XmlProcessor.cpp.old 2011-08-18 14:51:20.311616357 +0200
+++ src/XmlProcessor.cpp 2011-08-18 14:51:47.214381144 +0200
@@ -35,7 +35,6 @@
// for dom Writer
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/util/XMLUni.hpp>
@@ -53,8 +52,17 @@
//****************************************************************************************//
// DataDirResolver Class //
//****************************************************************************************//
-
+#if XERCES_VERSION_MAJOR < 3
DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {
+#else
+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)
+{
+ return NULL;
+ //return DataDirResolver::resolveEntity (publicId, systemId, NULL);
+}
+
+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {
+#endif
string path = "";
size_t last;
string schemapath = Common::GetSchemaPath();
@@ -104,13 +112,19 @@
try {
XMLPlatformUtils::Initialize();
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
parser = makeParser();
parserWithCallerAdoption = makeParser();
// add one extra feature on this parser to prevent it from
// taking ownership of its documents.
- parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);
+ SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);
+#undef SetParameter
} catch (const XMLException& toCatch) {
string errMsg = "Error: An error occured durring initialization of the xml utilities:\n";
errMsg.append(XmlCommon::ToString(toCatch.getMessage()));
@@ -137,32 +151,55 @@
}
+#if XERCES_VERSION_MAJOR < 3
DOMBuilder *XmlProcessor::makeParser() {
+#else
+DOMLSParser *XmlProcessor::makeParser() {
+#endif
// Instantiate the DOM parser.
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
+#if XERCES_VERSION_MAJOR < 3
DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#else
+ DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#endif
///////////////////////////////////////////////////////
// Set features on the builder
///////////////////////////////////////////////////////
- parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
- parser->setFeature(XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
- parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.
- parser->setFeature(XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
- parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
- parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
+
+ SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
+ SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
+ SetParameter(parser, XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
+#if XERCES_VERSION_MAJOR < 3
+ SetParameter(parser, XMLUni::fgDOMValidation, true); // Report all validation errors.
+#else
+ SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.
+#endif
+ SetParameter(parser, XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
+ SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
+ SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
+ SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#undef SetParameter
///////////////////////////////////////////////////////
//****************************************************************************************//
// The following code was added to handle air-gap operation //
//****************************************************************************************//
/* Look for XML schemas in local directory instead of Internet */
+#if XERCES_VERSION_MAJOR < 3
parser->setEntityResolver (&resolver);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);
+#endif
//****************************************************************************************//
// End of air-gap code //
//****************************************************************************************//
@@ -170,7 +207,11 @@
///////////////////////////////////////////////////////
// Add an Error Handler
///////////////////////////////////////////////////////
+#if XERCES_VERSION_MAJOR < 3
parser->setErrorHandler(&errHandler);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);
+#endif
return parser;
}
@@ -250,24 +291,26 @@
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
+#if XERCES_VERSION_MAJOR < 3
DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+#else
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+#endif
+
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)
+#else
+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)
+#endif
// set feature if the serializer supports the feature/mode
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);
-
- //if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- // theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);
+ //SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);
+#undef SetParameter
//
// Plug in a format target to receive the resultant
// XML stream from the serializer.
@@ -284,7 +327,13 @@
//
// do the serialization through DOMWriter::writeNode();
//
+#if XERCES_VERSION_MAJOR < 3
theSerializer->writeNode(myFormTarget, *doc);
+#else
+ DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();
+ output->setByteStream(myFormTarget);
+ theSerializer->write(doc, output);
+#endif
theSerializer->release();
delete myFormTarget;
--- src/XmlProcessor.h.old 2011-08-18 14:35:41.608703233 +0200
+++ src/XmlProcessor.h 2011-08-18 14:39:21.835597094 +0200
@@ -38,14 +38,17 @@
#include <string>
// required xerces includes
-#include <xercesc/dom/DOMBuilder.hpp>
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/dom/DOMError.hpp>
// for entity resolver
-#include <xercesc/dom/DOMEntityResolver.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
+
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
#include "Exception.h"
@@ -53,12 +56,14 @@
This class extends the default DOMEntityResolver and implments the resolve entity method
to support
*/
-class DataDirResolver : public xercesc::DOMEntityResolver {
+class DataDirResolver : public xercesc::EntityResolver {
public:
/**
*
*/
- xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+// xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+ xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
+ xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
};
/**
@@ -135,7 +140,7 @@
/**
* Has the common code for creating an XML parser.
*/
- xercesc::DOMBuilder *makeParser();
+ xercesc::DOMLSParser *makeParser();
static XmlProcessor* instance;
@@ -144,7 +149,7 @@
* owns the documents it builds. Users must manually destroy
* those documents.
*/
- xercesc::DOMBuilder *parserWithCallerAdoption;
+ xercesc::DOMLSParser *parserWithCallerAdoption;
/**
* This parser doesn't have user-adoption switched on, so it
@@ -156,7 +161,7 @@
* appear to ever be switched off. So to make sure this isn't
* leaking memory, I have created separate parsers.
*/
- xercesc::DOMBuilder *parser;
+ xercesc::DOMLSParser *parser;
/** The entity resolver for both parsers. */
DataDirResolver resolver;
--- src/probes/independent/XmlFileContentProbe.cpp.old 2010-10-22 14:49:22.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.cpp 2010-10-22 14:51:39.000000000 +0200
@@ -419,12 +419,24 @@
return new DummyEntityResolver::DoNothingBinInputStream();
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#else
+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const
+{
+ return NULL;
+}
+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#endif
{
return 0;
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)
+#else
+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)
+#endif
{
return 0;
}
--- src/probes/independent/XmlFileContentProbe.h.old 2010-10-22 14:55:47.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.h 2010-10-22 14:57:00.000000000 +0200
@@ -134,8 +134,14 @@
class DoNothingBinInputStream : public BinInputStream
{
public:
+#if XERCES_VERSION_MAJOR < 3
virtual unsigned int curPos() const;
virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);
+#else
+ virtual XMLFilePos curPos() const;
+ virtual const XMLCh* getContentType() const;
+ virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);
+#endif
};
};
--- src/XmlCommon.cpp.old
+++ src/XmlCommon.cpp
@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
string XmlCommon::GetNamespace(DOMElement *element) {
string xmlns = "";
+#if XERCES_VERSION_MAJOR < 3
xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());
+#else
+ xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());
+#endif
if (xmlns.compare("") == 0) {
xmlns = "";
}

@ -0,0 +1,78 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild,v 1.1 2012/05/22 20:54:50 hwoarang Exp $
EAPI=3
inherit eutils
DESCRIPTION="Free implementation of OVAL"
HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="ldap rpm selinux"
DEPEND="rpm? ( app-arch/rpm )
dev-libs/libgcrypt
dev-libs/libpcre
dev-libs/xalan-c
dev-libs/xerces-c
ldap? ( net-nds/openldap )
selinux? ( sys-libs/libselinux )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${P}-src"
src_prepare() {
epatch "${FILESDIR}"/${P}-xerces3.patch
epatch "${FILESDIR}"/${P}-strnicmp.patch
epatch "${FILESDIR}"/${P}-missing-memory-header.patch
if ! use ldap ; then
einfo "Disabling LDAP probes"
epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
sed -i 's/-lldap//' project/linux/Makefile || die
sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
rm src/probes/independent/LDAPProbe.{cpp,h} || die
fi
# rpm probes support is build dependant only on the presence of the rpm binary
if use rpm ; then
#Same problems as bug 274679, so i do a local copy of the header and patch it
cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
epatch "${FILESDIR}"/use_local_rpmdb.patch
epatch "${FILESDIR}"/rpmdb.patch
else
einfo "Disabling rpm probes"
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
fi
# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
einfo "Disabling dpkg probes"
sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
#Disabling SELinux support
if ! use selinux ; then
rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
rm src/probes/linux/SelinuxBooleanProbe.cpp || die
rm src/probes/linux/SelinuxBooleanProbe.h || die
epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
else
epatch "${FILESDIR}"/${P}-add-selinux-libs.patch
fi
}
src_compile () {
emake -C project/linux || die
}
src_install () {
# no make install in Makefile
dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
dodir /var/log/${PN} || die
insinto /usr/share/${PN}
doins xml/* || die
dodoc docs/{README.txt,version.txt} || die
doman docs/ovaldi.1 || die
}

@ -1,3 +1,2 @@
DIST yasat-400.tar.gz 89667 RMD160 c361ca444529b633ee567bff12883a22b6b057eb SHA1 539821ba26f7feac83da7187b334070434c21b08 SHA256 89d3b5b68f0c872e0817d77b01736279f606d31a64c2674af319c866b2d3e6b8
DIST yasat-421.tar.gz 112834 RMD160 e6efcbeccd7b610814dbf1a01bb605f4a15aa304 SHA1 75f8fcbe205c2e3a2ae970b5df67451f2770e14d SHA256 3db884855051c8ff1489c3a21dee65495e4dd298ae2e9dde9a8e09ab6bf3e166
DIST yasat-456.tar.gz 116257 RMD160 4f108007370df58f52da5f17ca033ce7fe0a74bc SHA1 c49b6f31baf69a5f2a95e3dc76c02e371c3d1f55 SHA256 bc6c598693b9bbebd30d3d4dcf54d94b5e519af524296bffa7c6965f1f843c68
DIST yasat-526.tar.gz 123976 RMD160 d76118c23ed64a51287a1268f8754364a0979a94 SHA1 15081946fa2481f24e15cd760b1329297f7a0c9d SHA256 a4ff957d59923c7c87fbcde27c894d731a3685b8534be17867d9cdc41974e600

@ -1,19 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-421.ebuild,v 1.1 2011/06/16 08:57:28 hwoarang Exp $
DESCRIPTION="Security and system auditing tool"
HOMEPAGE="http://yasat.sourceforge.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
S=${WORKDIR}/${PN}
src_install() {
emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
dodoc README CHANGELOG || die
}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-400.ebuild,v 1.1 2011/03/24 01:02:26 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-526.ebuild,v 1.1 2012/05/22 20:59:30 hwoarang Exp $
DESCRIPTION="Security and system auditing tool"
HOMEPAGE="http://yasat.sourceforge.net"
@ -16,4 +16,5 @@ S=${WORKDIR}/${PN}
src_install() {
emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
dodoc README CHANGELOG || die
doman man/yasat.8 || die
}

@ -1,17 +1,20 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/acdctl-1.1.ebuild,v 1.5 2009/06/28 18:03:43 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/acdctl/acdctl-1.1.ebuild,v 1.6 2012/05/22 16:27:12 ssuominen Exp $
EAPI="2"
EAPI=4
DESCRIPTION="Apple Cinema Display Control"
HOMEPAGE="http://www.technocage.com/~caskey/acdctl/"
SRC_URI="http://www.technocage.com/~caskey/acdctl/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="ppc"
IUSE=""
DEPEND="dev-libs/libusb:0"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}"
src_install() {
dobin acdctl

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild,v 1.1 2011/10/26 22:47:17 williamh Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-2.0.2.ebuild,v 1.2 2012/05/22 22:31:54 williamh Exp $
EAPI=4
@ -21,6 +21,7 @@ LICENSE="GPL-2"
IUSE=""
RDEPEND="dev-util/dialog
net-dialup/mingetty
>=sys-apps/baselayout-2
>=sys-apps/openrc-0.8.2-r1
sys-apps/pciutils

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-9999.ebuild,v 1.9 2011/10/25 03:05:17 williamh Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-9999.ebuild,v 1.10 2012/05/22 22:31:54 williamh Exp $
EAPI=4
@ -21,6 +21,7 @@ LICENSE="GPL-2"
IUSE=""
RDEPEND="dev-util/dialog
net-dialup/mingetty
>=sys-apps/baselayout-2
>=sys-apps/openrc-0.8.2-r1
sys-apps/pciutils

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.6 2011/04/03 21:25:36 scarabeus Exp $
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/bitpim/bitpim-1.0.6-r1.ebuild,v 1.7 2012/05/22 16:33:29 ssuominen Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@ -26,7 +26,7 @@ COMMON_DEPEND="dev-python/apsw
>=dev-python/paramiko-1.7.1
dev-python/pycrypto
)
usb? ( dev-libs/libusb:0 )"
usb? ( virtual/libusb:0 )"
DEPEND="${COMMON_DEPEND}
usb? ( dev-lang/swig )"
RDEPEND="${COMMON_DEPEND}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.28.0.ebuild,v 1.5 2011/08/13 07:15:53 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.28.0.ebuild,v 1.6 2012/05/22 16:06:13 ssuominen Exp $
EAPI="3"
@ -19,7 +19,7 @@ IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"
RDEPEND="bluetooth? ( net-wireless/bluez )
curl? ( net-misc/curl )
usb? ( dev-libs/libusb:1 )
usb? ( virtual/libusb:1 )
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql-server )
dbi? ( >=dev-db/libdbi-0.8.3 )

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.29.0.ebuild,v 1.2 2011/08/13 07:15:53 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.29.0.ebuild,v 1.3 2012/05/22 16:06:13 ssuominen Exp $
EAPI="3"
@ -19,7 +19,7 @@ IUSE="curl debug bluetooth irda mysql postgres dbi nls python usb"
RDEPEND="bluetooth? ( net-wireless/bluez )
curl? ( net-misc/curl )
usb? ( dev-libs/libusb:1 )
usb? ( virtual/libusb:1 )
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql-server )
dbi? ( >=dev-db/libdbi-0.8.3 )

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.30.0.ebuild,v 1.2 2011/08/13 07:15:53 xarthisius Exp $
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.30.0.ebuild,v 1.3 2012/05/22 16:06:13 ssuominen Exp $
EAPI="3"
@ -19,7 +19,7 @@ IUSE="bash-completion curl debug bluetooth irda mysql postgres dbi nls python us
RDEPEND="bluetooth? ( net-wireless/bluez )
curl? ( net-misc/curl )
usb? ( dev-libs/libusb:1 )
usb? ( virtual/libusb:1 )
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql-server )
dbi? ( >=dev-db/libdbi-0.8.3 )

@ -8,8 +8,11 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf
DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
DIST libreoffice-binfilter-3.5.2.2.tar.xz 5979532 RMD160 104eb7ef0c53700b664d7cae871d96ac9cd2a286 SHA1 feeaa103adf07f9eb5578f4073a8a464b2abadfd SHA256 aadccf388989331d0738059e6fd0c70b9fb48bb6ca622a243365d8253b1a4b30
DIST libreoffice-binfilter-3.5.3.2.tar.xz 5979484 RMD160 48a65d7d3b5f7de01ee4e2d74a1ba2a3ec29805a SHA1 b499371af021ee59622d179c3a32dc736611653d SHA256 332344f8b8241e30ef31fc2f4ed24b2b1b2d252a7eae64cd9709fd1a7c7da847
DIST libreoffice-binfilter-3.5.4.2.tar.xz 5978820 RMD160 272f7467b82eb99ca3a81fdea5692ae6da59aedf SHA1 89a156c9603aac1f70dc1b4108fa3cb335ffe1fa SHA256 7c1a471358c4028ef8aa542c50ce0852ba2960be9dfb2ebbf0103ad59389d07a
DIST libreoffice-branding-gentoo-0.4.tar.xz 130792 RMD160 39c693e84e13d7199f9505b5616cffd5b7072d3b SHA1 e12d41b67b75f3507b86d12b3c182195269d6210 SHA256 9a870560cd470234039ab136c1bb023a0da3fa8d0ffa4f6770b830fec707fc9a
DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 RMD160 e8d475d184fdfd75f348772edac6a6eb76613341 SHA1 83da8ba0db288a827e805780e01edeccd2f51ccc SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63
DIST libreoffice-core-3.5.2.2.tar.xz 103296172 RMD160 8e1b87e2ea35683ee31e0a2b209d85f14ba85753 SHA1 ab0cfa84a11ec4d18afe7095235a4b4c904e9649 SHA256 df681145f7f1dda30e3f82d4924722957662d744df0e7b6fa024b2bd53fb3dc6
DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7fc44a911ee2744 SHA1 33bdaec948367c5b06c2b6a7c39ceaa865abe28d SHA256 182a1dadbf4ed7dc758466aa4f1c2ee79dbc57d65ba94872fa6aaeef3f3847ad
DIST libreoffice-core-3.5.4.2.tar.xz 103422460 RMD160 e118cfa44ba198fa3d3fe8fc21bd1e3940270868 SHA1 a01d77612c9678d52a75fb160590bb76d670d7f6 SHA256 3eeb89d05fa423c446767defd54ff89456b2ead8fc4628c3403043d4c1845faa
DIST libreoffice-help-3.5.3.2.tar.xz 1857688 RMD160 e836522c25b19a03af5645baeb8e5349a9d74e46 SHA1 305c5fa9213f90c9f87d67e5e7d4b8faac49ee1a SHA256 cf6e6d9610aa594597fb079cac5091b0f4ab4a063c5f4a82021b0b4a6fa539ae
DIST libreoffice-help-3.5.4.2.tar.xz 1857756 RMD160 ce00c1893e0315fa7cee156707553fdcebb552d2 SHA1 0d417affc2b91ef345cb010f3a2d11a6417b7f44 SHA256 61e93d4ad9c1ad1308fe85f8416bf9dfafd875ba9cdb2050890b7b0e1abf4869

@ -0,0 +1,548 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2.ebuild,v 1.1 2012/05/23 00:22:24 dilfridge Exp $
EAPI=4
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="threads,xml"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src
http://download.documentfoundation.org/libreoffice/old/src
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
# Core MUST be first!
MODULES="core binfilter help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]]; then
SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
else
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
fi
done
unset mod
done
unset i
fi
unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
SRC_URI+=" ${ADDONS_SRC}"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
+vba +webdav +xmlsec"
LICENSE="LGPL-3"
SLOT="0"
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
NSS_DEPEND="
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
"
COMMON_DEPEND="
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
dev-cpp/libcmis
dev-db/unixODBC
dev-libs/expat
>=dev-libs/glib-2.28
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1
>=dev-lang/perl-5.0
>=dev-libs/openssl-1.0.0d
>=dev-libs/redland-1.0.14[ssl]
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
>=media-libs/libpng-1.4
media-libs/libvisio
>=net-misc/curl-7.21.4
sci-mathematics/lpsolve
>=sys-libs/db-4.8
virtual/jpeg
>=x11-libs/cairo-1.10.0[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
gnome? (
gnome-base/gconf:2
gnome-base/orbit
)
gtk? ( >=x11-libs/gtk+-2.24:2 )
graphite? ( media-gfx/graphite2 )
gstreamer? (
>=media-libs/gstreamer-0.10
>=media-libs/gst-plugins-base-0.10
)
java? (
>=dev-java/bsh-2.0_beta4
dev-java/lucene:2.9
dev-java/lucene-analyzers:2.3
)
jemalloc? ( dev-libs/jemalloc )
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
opengl? ( virtual/opengl )
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
postgres? ( >=dev-db/postgresql-base-8.4.0 )
svg? ( gnome-base/librsvg )
webdav? ( net-libs/neon )
xmlsec? ( ${NSS_DEPEND} )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice-bin
!app-office/openoffice
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
PDEPEND="
>=app-office/libreoffice-l10n-3.5.0
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.46
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
dev-util/mdds
virtual/pkgconfig
media-libs/sampleicc
net-misc/npapi-sdk
net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
>=sys-devel/make-3.82
sys-libs/zlib
x11-libs/libXt
x11-libs/libXtst
x11-proto/randrproto
x11-proto/xextproto
x11-proto/xineramaproto
x11-proto/xproto
java? (
=virtual/jdk-1.6*
>=dev-java/ant-core-1.7
test? ( dev-java/junit:4 )
)
"
PATCHES=(
# this can't be upstreamed :(
"${FILESDIR}/${PN}-system-pyuno.patch"
"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
"${FILESDIR}/${PN}-3.5-doublebuild.patch"
)
REQUIRED_USE="
nsplugin? ( gtk )
gnome? ( gtk )
eds? ( gnome )
nlpsolver? ( java )
"
S="${WORKDIR}/${PN}-core-${PV}"
RESTRICT="test"
pkg_pretend() {
local pgslot
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]]; then
eerror "Compilation with gcc older than 4.0 is not supported"
die "Too old gcc found."
fi
fi
# ensure pg version
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
}
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python_set_active_version 2
python_pkg_setup
if [[ ${MERGE_TYPE} != binary ]]; then
CHECKREQS_MEMORY="512M"
CHECKREQS_DISK_BUILD="6G"
check-reqs_pkg_pretend
fi
}
src_unpack() {
local mod dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
if use branding; then
unpack "${BRANDING}"
fi
if [[ ${PV} != *9999* ]]; then
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]] && ! use binfilter; then
continue
fi
unpack "${PN}-${mod}-${PV}.tar.xz"
if [[ ${mod} != core ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
else
for mod in ${MODULES}; do
if [[ ${mod} == binfilter ]] && ! use binfilter; then
continue
fi
mypv=${PV/.9999}
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
EGIT_PROJECT="${PN}/${mod}"
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
EGIT_NOUNPACK="true"
git-2_src_unpack
if [[ ${mod} != core ]]; then
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
# optimization flags
export ARCH_FLAGS="${CXXFLAGS}"
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
EPATCH_SUFFIX="patch" \
epatch
fi
base_src_prepare
# please no debug in binfilter, it blows up things insanely
if use binfilter && ! use binfilterdebug ; then
for name in $(find "${S}/binfilter" -name makefile.mk) ; do
sed -i -e '1i\CFLAGS+= -g0' $name || die
done
fi
eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
sed \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
-i pyuno/source/module/uno.py \
-i scripting/source/pyprov/officehelper.py || die
}
src_configure() {
local java_opts
local internal_libs
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
# recheck that there is some value in jobs
[[ -z ${jbs} ]] && jbs="1"
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
# it is serious pain in the ass for packaging
# should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
"
if use java; then
# hsqldb: system one is too new
# saxon: system one does not work properly
java_opts="
--without-system-hsqldb
--without-system-saxon
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
"
if use test; then
java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
else
java_opts+=" --without-junit"
fi
fi
if use branding; then
internal_libs+="
--with-about-bitmap="${WORKDIR}/branding-about.png"
--with-intro-bitmap="${WORKDIR}/branding-intro.png"
"
fi
# system headers/libs/...: enforce using system packages
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
# --enable-cairo: ensure that cairo is always required
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-gnome-vfs: old gnome virtual fs support
# --disable-kdeab: kde3 adressbook
# --disable-kde: kde3 support
# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
# --disable-mozilla: disable mozilla build that is used for adresbook, not
# affecting the nsplugin that is always ON
# --disable-pch: precompiled headers cause build crashes
# --disable-rpath: relative runtime path is not desired
# --disable-static-gtk: ensure that gtk is linked dynamically
# --disable-ugly: disable ugly pieces of code
# --disable-zenity: disable build icon
# --enable-extension-integration: enable any extension integration support
# --with-{max-jobs,num-cpus}: ensuring parallel building
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --without-stlport: disable deprecated extensions framework
# --disable-ext-report-builder: too much java packages pulled in
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-dicts \
--enable-cairo-canvas \
--enable-largefile \
--enable-python=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
--enable-unix-qstart-libpng \
--enable-mergelibs \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gnome-vfs \
--disable-ext-report-builder \
--disable-kdeab \
--disable-kde \
--disable-ldap \
--disable-mozilla \
--disable-online-update \
--disable-pch \
--disable-rpath \
--disable-systray \
--disable-static-gtk \
--disable-strip-solver \
--disable-ugly \
--disable-zenity \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="" \
--with-max-jobs=${jbs} \
--with-num-cpus=2 \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-afms \
--without-fonts \
--without-myspell-dicts \
--without-stlport \
--without-system-mozilla \
--without-help \
--with-helppack-integration \
--without-sun-templates \
$(use_enable binfilter) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \
$(use_enable gnome gio) \
$(use_enable gnome lockdown) \
$(use_enable graphite) \
$(use_enable gstreamer) \
$(use_enable gtk) \
--disable-gtk3 \
$(use_enable java ext-scripting-beanshell) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mysql-connector) \
$(use_enable nlpsolver ext-nlpsolver) \
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable pdfimport ext-pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable svg librsvg system) \
$(use_enable test linkoo) \
$(use_enable vba) \
$(use_enable vba activex-component) \
$(use_enable webdav neon) \
$(use_enable xmlsec) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
${internal_libs} \
${java_opts}
}
src_compile() {
# hack for offlinehelp, this needs fixing upstream at some point
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
source "${S}/Env.Host.sh" 2&> /dev/null
local path="${SOLARVER}/${INPATH}/res/img"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=default_images/res/helpimg \
> "${path}/helpimg.ilst"
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
)
# not a proper make script
make build || die
}
src_test() {
make check || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
# symlink the nsplugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
fi
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
use cups || \
ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
use java || \
ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.12 2012/05/03 20:20:56 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.13 2012/05/22 16:39:13 ssuominen Exp $
EAPI="3"
@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="boost doc gui"
RDEPEND="dev-libs/libusb:0
RDEPEND="virtual/libusb:0
dev-libs/openssl
sys-libs/zlib
boost? ( >=dev-libs/boost-1.33 )

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1.ebuild,v 1.2 2012/05/03 20:20:56 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1.ebuild,v 1.3 2012/05/22 16:39:13 ssuominen Exp $
EAPI="4"
@ -17,7 +17,7 @@ IUSE="boost doc gui opensync nls static-libs"
RDEPEND="
dev-libs/glib:2
dev-libs/libusb:0
virtual/libusb:0
dev-libs/openssl
sys-libs/zlib
>=dev-cpp/libxmlpp-2.6

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.3 2012/05/21 06:45:35 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r3.ebuild,v 1.4 2012/05/22 21:02:36 ranger Exp $
EAPI="2"
PYTHON_DEPEND="2:2.5"
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="bazaar cvs darcs git mercurial subversion test"
COMMON_DEPS="dev-lang/python"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p10.ebuild,v 1.2 2011/05/16 10:36:26 nyhm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p10.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
S=${WORKDIR}/${MY_P}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.2 2011/05/16 10:36:26 nyhm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
S=${WORKDIR}/${MY_P}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p7.ebuild,v 1.9 2011/05/16 10:36:26 nyhm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p7.ebuild,v 1.10 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
S=${WORKDIR}/${MY_P}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p9.ebuild,v 1.8 2011/05/16 10:36:26 nyhm Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p9.ebuild,v 1.9 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
S=${WORKDIR}/${MY_P}

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.5 2011/10/07 20:01:04 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.6 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.12 2012/03/28 18:13:09 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.13 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
>=sys-libs/readline-6.2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24-r1.ebuild,v 1.2 2012/04/26 13:22:12 aballier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24-r1.ebuild,v 1.3 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-6.2 )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.6 2012/04/03 18:22:36 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.7 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-6.2 )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p28.ebuild,v 1.1 2012/05/03 15:57:10 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p28.ebuild,v 1.2 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -41,7 +41,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2
readline? ( >=sys-libs/readline-6.2 )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p8-r1.ebuild,v 1.3 2011/08/11 02:23:47 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p8-r1.ebuild,v 1.4 2012/05/23 01:13:17 zmedico Exp $
EAPI="1"
@ -43,7 +43,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.7.16
!<sys-apps/portage-2.1.6.7_p1
!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.7.1.ebuild,v 1.4 2012/05/21 20:20:19 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.7.1.ebuild,v 1.5 2012/05/22 20:52:21 ranger Exp $
EAPI="2"
@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="libedit static"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"

@ -1,2 +1,3 @@
DIST docbook-xsl-ns-1.75.2.tar.bz2 1544464 RMD160 83a5b573481947e307419374bf83540ecae3501e SHA1 c3878afb9c1ebba94647b9d1f6d19d38885d2186 SHA256 e275fa1563d2eee6caa8b8c36f3a33ae0b8bb7c0738c2e611193465c21a827df
DIST docbook-xsl-ns-1.76.1.tar.bz2 3674367 RMD160 9c55cb9d754ec668cd416f0b53b353c249a08f97 SHA1 61920b636f247eee4551939876c3c35829b051fd SHA256 c40e756721f4a7a81d14442babceadca8122e623815b083ae0e8c97aea792d54
DIST docbook-xsl-ns-1.77.0.tar.bz2 4244660 RMD160 de9b9a4e5494e93aedb880ccc65fa16de11a2e02 SHA1 59ea11e06bb82f8d486713965496b37ff65d3ba2 SHA256 dd7a2d0d8f056a27f7c42f260945209c7f9537eb97b237027ce4fe63e222fb1b

@ -0,0 +1,80 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.0.ebuild,v 1.1 2012/05/23 04:16:21 flameeyes Exp $
EAPI=4
DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
MY_PN="${PN%-stylesheets}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="XSL Stylesheets for Docbook"
HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.4
ruby? ( || ( dev-lang/ruby dev-lang/ruby-enterprise ) )"
S="${WORKDIR}/${MY_P}"
# Makefile is broken since 1.76.0
RESTRICT=test
# The makefile runs tests, not builds.
src_compile() { :; }
src_test() {
emake check || die "test failed"
}
src_install() {
# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
# don't need to install it
dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
insinto ${DOCBOOKDIR}
doins VERSION
local i
for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
[[ "$i" == "epub" ]] && ! use ruby && continue
cd "${S}"/${i}
for doc in ChangeLog README; do
if [ -e "$doc" ]; then
mv ${doc} ${doc}.${i}
dodoc ${doc}.${i}
rm ${doc}.${i}
fi
done
doins -r "${S}"/${i}
done
if use ruby; then
local cmd="dbtoepub${MY_PN#docbook-xsl}"
# we can't use a symlink or it'll look for the library in the
# wrong path.
dodir /usr/bin
cat - > "${D}"/usr/bin/${cmd} <<EOF
#!/usr/bin/env ruby
load "${DOCBOOKDIR}/epub/bin/dbtoepub"
EOF
fperms 0755 /usr/bin/${cmd}
fi
}
pkg_postinst() {
build-docbook-catalog
}
pkg_postrm() {
build-docbook-catalog
}

@ -4,4 +4,10 @@
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
<use>
<flag name="ruby">
Install the Ruby-based dbtoepub script; requires an interpreter
compatible with <pkg>app-admin/eselect-ruby</pkg>.
</flag>
</use>
</pkgmetadata>

@ -1,2 +1,3 @@
DIST docbook-xsl-1.75.2.tar.bz2 1543130 RMD160 2e297bd1ce0d480b6f8ea03846a8f8c0100b72dd SHA1 cd146012c07f3c2c79c1cd927ad1faf5bee6cc74 SHA256 0dcc3aebd2ada8719e47b77c62ab986c4f2747f9a7cab6f629b6472e6d058e09
DIST docbook-xsl-1.76.1.tar.bz2 3682531 RMD160 83acc9ba6dc4df04cef98988cf007d8168301431 SHA1 dc9fa422c53e0a4f0e32b5c8ec896b39080bc14d SHA256 d6bdfd76f672c810299c71443e5127431ffb87d2c79d818aee72c86eaccd312c
DIST docbook-xsl-1.77.0.tar.bz2 4255710 RMD160 e5534357eeb1792bef66a851743caf1a19b1bf0f SHA1 36d261fbbae43b2478fa4f2241f9dac90d930ef8 SHA256 184e23813139cee4531dd475d983097c9dbce0e0a8790596f53a66c8e039eb56

@ -0,0 +1,80 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.0.ebuild,v 1.1 2012/05/23 04:21:28 flameeyes Exp $
EAPI=4
DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
MY_PN="${PN%-stylesheets}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="XSL Stylesheets for Docbook"
HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.1
ruby? ( || ( dev-lang/ruby dev-lang/ruby-enterprise ) )"
S="${WORKDIR}/${MY_P}"
# Makefile is broken since 1.76.0
RESTRICT=test
# The makefile runs tests, not builds.
src_compile() { :; }
src_test() {
emake check || die "test failed"
}
src_install() {
# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
# don't need to install it
dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
insinto ${DOCBOOKDIR}
doins VERSION
local i
for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
[[ "$i" == "epub" ]] && ! use ruby && continue
cd "${S}"/${i}
for doc in ChangeLog README; do
if [ -e "$doc" ]; then
mv ${doc} ${doc}.${i}
dodoc ${doc}.${i}
rm ${doc}.${i}
fi
done
doins -r "${S}"/${i}
done
if use ruby; then
local cmd="dbtoepub${MY_PN#docbook-xsl}"
# we can't use a symlink or it'll look for the library in the
# wrong path.
dodir /usr/bin
cat - > "${D}"/usr/bin/${cmd} <<EOF
#!/usr/bin/env ruby
load "${DOCBOOKDIR}/epub/bin/dbtoepub"
EOF
fperms 0755 /usr/bin/${cmd}
fi
}
pkg_postinst() {
build-docbook-catalog
}
pkg_postrm() {
build-docbook-catalog
}

@ -2,4 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sgml</herd>
<use>
<flag name="ruby">
Install the Ruby-based dbtoepub script; requires an interpreter
compatible with <pkg>app-admin/eselect-ruby</pkg>.
</flag>
</use>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0.ebuild,v 1.2 2012/05/22 13:14:41 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0.ebuild,v 1.3 2012/05/22 18:14:40 jdhore Exp $
EAPI=3
KDE_REQUIRED="never"
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc x86"
IUSE="kde"
RDEPEND="

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild,v 1.6 2012/05/16 15:25:02 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild,v 1.7 2012/05/22 21:22:24 ranger Exp $
EAPI="4"
@ -9,7 +9,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""

@ -0,0 +1,20 @@
--- qpdf-2.3.1/include/qpdf/QPDFExc.hh
+++ qpdf-2.3.1/include/qpdf/QPDFExc.hh
@@ -11,6 +11,7 @@
#include <qpdf/DLL.h>
#include <qpdf/Constants.h>
#include <stdexcept>
+#include <unistd.h>
class QPDFExc: public std::runtime_error
{
--- qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh
+++ qpdf-2.3.1/include/qpdf/QPDFObjectHandle.hh
@@ -8,6 +8,7 @@
#ifndef __QPDFOBJECTHANDLE_HH__
#define __QPDFOBJECTHANDLE_HH__
+#include <unistd.h>
#include <string>
#include <vector>
#include <set>

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-2.3.1.ebuild,v 1.2 2012/02/19 10:11:41 radhermit Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-2.3.1.ebuild,v 1.3 2012/05/23 01:14:06 radhermit Exp $
EAPI="4"
@ -32,6 +32,7 @@ src_prepare() {
sed -i -e "/docdir/d" make/libtool.mk || die
epatch "${FILESDIR}"/${P}-libpcre-8.30.patch
epatch "${FILESDIR}"/${P}-gcc47.patch
}
src_install() {

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.4 2012/05/20 21:32:05 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.5 2012/05/22 20:56:38 ranger Exp $
# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
# their indexes seem to be in a different format. So we'll keep them
@ -23,7 +23,7 @@ SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2
LICENSE="CPL-1.0 GPL-3 LGPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
IUSE="espeak gnome gucharmap qqwry pronounce spell tools"
COMMON_DEPEND=">=dev-libs/glib-2.16

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.2 2012/04/20 18:18:06 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.3 2012/05/22 23:43:06 vapier Exp $
EAPI="2"
inherit autotools eutils
@ -11,7 +11,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 arm x86"
IUSE="examples static-libs"
DEPEND="dev-lang/python"

@ -2,9 +2,12 @@ DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136
DIST sqlite-autoconf-3071000.tar.gz 1801640 RMD160 8932a5cd4b596632c63af30cbd94c2b6c9d45377 SHA1 0442d5a1bff50153039951b09db649864d8af0bb SHA256 9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3
DIST sqlite-autoconf-3071100.tar.gz 1807754 RMD160 09df3232f4eb7032c0a6081670b2bdcb6d80e865 SHA1 a768f76b10df84d6a2c66178544d42725a8fdaf0 SHA256 2badc75dc536249bcd68c44d2a655724285d054303251eaff9d355194cb3476b
DIST sqlite-autoconf-3071200.tar.gz 1827241 RMD160 395d8d137a8d5627bd85a91c4751b0a24933cee2 SHA1 30e6b0912f074cff5563697367c2ba9608d83bd3 SHA256 ca1735d13975be84cba87ea1b62ae0ab01fdc01ef21d7547982a2b118c9fc649
DIST sqlite-autoconf-3071201.tar.gz 1831193 RMD160 8b5f54564ff283532472d9c62ecafc4c7be69569 SHA1 295b9acdf9c0452017ca1af392c0e5db019e6874 SHA256 b4ce93881cb88e7d1d0f2ad50a206b600163b40fea6df9d0749ad152aaebf845
DIST sqlite-doc-3071000.zip 3630343 RMD160 6a75f7c10a8421a99e28c5430ab4f0a0ac09e6d6 SHA1 9957b9f2e955d82b2484cb44cc6fb4a53313d085 SHA256 f74c3681111d35a58449b0c1851a8f852b9cb8c4ec19a6f0ecaae9f2d1f7ca28
DIST sqlite-doc-3071100.zip 4069512 RMD160 388bbcccb69d458f48f044bd65d282d9cf48dbe2 SHA1 87cbed1918c2604daefd3588a8555067e55e53cf SHA256 78541dd7190208d604a933f522a86d775422df44262310212189015b4b0f26ca
DIST sqlite-doc-3071200.zip 4083373 RMD160 ad50b126669bb04b1a69b56d967201c7c716f52a SHA1 a5a71f0440816d731d30ad080429c971497b068d SHA256 cf2e244190802836f73b0ab2036a33ac430f17c489f70fe4a14280d6c7e64986
DIST sqlite-doc-3071201.zip 4088017 RMD160 05ce0e614c2e601d7c81f403b4da3da9c7fc9abf SHA1 0b917812c3c4cb9fdeaf918945aa5bbea2f2ed6b SHA256 e86542934b1d47780f9e1fe415b5b792feabc8d520a28f9f65b049922a8fa2e5
DIST sqlite-src-3071000.zip 4682084 RMD160 64f2fc871bcb129a2cedc92da02ef668bb95689a SHA1 23baab0a89d77e7b1a9a0ececd05dd629a2b098d SHA256 e976196a9c64bd152917760a134834a881c9eebc34f49125102a8918c5cd86a4
DIST sqlite-src-3071100.zip 4705421 RMD160 4dd380ef7f29f957e5504ca9f7c5d48aec5b0bea SHA1 4bcb60c0a79e42fe01c64108deac66473123f4e7 SHA256 939262fe70b5e4dcd04f29d6f1d8221542f24e71adf72f0d4a8c671d8b6d9441
DIST sqlite-src-3071200.zip 4648718 RMD160 e20b855c8348ce610705a600bc4bd5574df19151 SHA1 a0cd400fd9011972fb76f253ab7b6bb82259efe5 SHA256 cbdba7d03e24ca34550a9910036ccceb9e5173cb28c850c788a6da8d8b130725
DIST sqlite-src-3071201.zip 4672290 RMD160 56b1ec4729cd09eeb4cf5a6300e72506b543c620 SHA1 61a5aaacf5d82158f5a8ab69378834dd5e988b35 SHA256 dc4508930f54cc96c6f20a5b6db810b531f4af416e1df8dde2b85af5f316da2e

@ -0,0 +1,157 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.12.1.ebuild,v 1.1 2012/05/22 20:16:42 floppym Exp $
EAPI="4"
inherit autotools eutils flag-o-matic multilib versionator
SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
DOC_PV="${SRC_PV}"
DESCRIPTION="A SQL Database Engine in a C Library"
HOMEPAGE="http://sqlite.org/"
SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
tcl? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
!tcl? (
test? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
!test? ( http://sqlite.org/${PN}-autoconf-${SRC_PV}.tar.gz )
)"
LICENSE="as-is"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
RDEPEND="icu? ( dev-libs/icu )
readline? ( sys-libs/readline )
tcl? ( dev-lang/tcl )"
DEPEND="${RDEPEND}
doc? ( app-arch/unzip )
tcl? ( app-arch/unzip )
test? (
app-arch/unzip
dev-lang/tcl
)"
amalgamation() {
use !tcl && use !test
}
pkg_setup() {
if amalgamation; then
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
else
S="${WORKDIR}/${PN}-src-${SRC_PV}"
fi
}
src_prepare() {
# At least ppc-aix, x86-interix and *-solaris need newer libtool.
use prefix && eautoreconf
epunt_cxx
}
src_configure() {
# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
if amalgamation; then
if use debug; then
append-cppflags -DSQLITE_DEBUG
else
append-cppflags -DNDEBUG
fi
fi
# Support column metadata, bug #266651
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
# Support R-trees, bug #257646
append-cppflags -DSQLITE_ENABLE_RTREE
if use icu; then
append-cppflags -DSQLITE_ENABLE_ICU
if amalgamation; then
sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
else
sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
fi
fi
# Support FTS3, bug #207701
if use fts3; then
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
fi
# Enable secure_delete pragma by default
if use secure-delete; then
append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
fi
# Support soundex, bug #143794
if use soundex; then
append-cppflags -DSQLITE_SOUNDEX
fi
# Enable unlock notification
if use unlock-notify; then
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
fi
local extensions_option
if amalgamation; then
extensions_option="dynamic-extensions"
else
extensions_option="load-extension"
fi
# Starting from 3.6.23, SQLite has locking strategies that are specific to
# OSX. By default they are enabled, and use semantics that only make sense
# on OSX. However, they require gethostuuid() function for that, which is
# only available on OSX starting from 10.6 (Snow Leopard). For earlier
# versions of OSX we have to disable all this nifty locking options, as
# suggested by upstream.
if [[ "${CHOST}" == *-darwin[56789] ]]; then
append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
fi
if [[ "${CHOST}" == *-mint* ]]; then
append-cppflags -DSQLITE_OMIT_WAL
fi
# `configure` from amalgamation tarball doesn't support
# --with-readline-inc and --(enable|disable)-tcl options.
econf \
--disable-static \
$(use_enable extensions ${extensions_option}) \
$(use_enable readline) \
$(use_enable threadsafe) \
$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
$(amalgamation || use_enable debug) \
$(amalgamation || echo --enable-tcl)
}
src_compile() {
emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
}
src_test() {
if [[ "${EUID}" -eq 0 ]]; then
ewarn "Skipping tests due to root permissions"
return
fi
emake $(use debug && echo fulltest || echo test)
}
src_install() {
emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
find "${ED}" -name "*.la" -exec rm -f {} +
doman sqlite3.1
if use doc; then
dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
fi
}

@ -1,6 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.7 2012/04/03 03:12:04 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.8 2012/05/22 16:21:16 ssuominen Exp $
EAPI=1
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
@ -13,7 +15,7 @@ IUSE="doc"
RDEPEND="sys-libs/readline
sys-libs/ncurses
<dev-libs/libusb-1"
virtual/libusb:0"
DEPEND="doc? ( app-text/texi2html
virtual/latex-base
sys-apps/texinfo )

@ -1,6 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.6 2012/04/03 03:12:04 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.7 2012/05/22 16:21:16 ssuominen Exp $
EAPI=1
DESCRIPTION="AVR Downloader/UploaDEr"
HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
@ -15,7 +17,7 @@ SLOT="0"
KEYWORDS="arm amd64 ~ppc ~ppc64 x86"
IUSE="doc"
RDEPEND="<dev-libs/libusb-1"
RDEPEND="virtual/libusb:0"
DEPEND="${RDEPEND}
doc? ( app-text/texi2html
virtual/latex-base

@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild,v 1.1 2005/01/13 10:45:08 dragonheart Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild,v 1.2 2012/05/22 16:39:20 ssuominen Exp $
DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
HOMEPAGE="http://www.intra2net.com/opensource/ftdi/"
@ -12,7 +12,7 @@ KEYWORDS="x86"
IUSE=""
DEPEND="dev-libs/confuse
dev-libs/libusb
virtual/libusb
dev-embedded/libftdi"
src_install() {

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.2 2011/10/10 20:23:06 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.3 2012/05/22 16:28:29 ssuominen Exp $
EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
inherit eutils
@ -22,7 +22,7 @@ IUSE="ftd2xx ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="usb? ( dev-libs/libusb )
DEPEND="usb? ( virtual/libusb )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.2 2011/10/10 20:23:06 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.3 2012/05/22 16:28:29 ssuominen Exp $
EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
inherit eutils
@ -22,7 +22,7 @@ IUSE="ftd2xx ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="usb? ( dev-libs/libusb )
DEPEND="usb? ( virtual/libusb )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.5 2012/03/11 16:08:35 swegener Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.6 2012/05/22 16:28:29 ssuominen Exp $
EAPI="4"
@ -24,7 +24,7 @@ RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="dev-lang/jimtcl
usb? ( dev-libs/libusb )
usb? ( virtual/libusb )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.21 2012/03/31 08:58:53 swegener Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.22 2012/05/22 16:40:17 ssuominen Exp $
EAPI="4"
@ -24,7 +24,7 @@ RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="dev-lang/jimtcl
usb? ( dev-libs/libusb )
usb? ( virtual/libusb )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild,v 1.3 2010/09/16 02:42:52 josejx Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.12.0-r1.ebuild,v 1.4 2012/05/22 16:34:00 ssuominen Exp $
inherit eutils toolchain-funcs
@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE=""
DEPEND="dev-libs/libusb"
DEPEND="virtual/libusb"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}v${PV}LinuxMacSource"

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild,v 1.2 2010/09/16 02:42:52 josejx Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild,v 1.3 2012/05/22 16:34:00 ssuominen Exp $
inherit eutils toolchain-funcs
@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE=""
DEPEND="dev-libs/libusb"
DEPEND="virtual/libusb"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}v${PV}LinuxMacSource"

@ -5,3 +5,4 @@ DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 RMD160 6cb9ed6b279f82
DIST jdk-6u30-apidocs.zip 59086542 RMD160 3a3057cf0b9134863e5dc97f4a55616c826c5e31 SHA1 2bcfc13888a8a6183f7bc40068fa326ddb4a7f62 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab
DIST jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip 60393207 RMD160 95036337f5639816b0480d6a2129efebefa537a5 SHA1 9e1ac9b48af57fd01eb627e5c8b5b96cc35f854c SHA256 2220fbe8399f851672d37cf1451400db137d9c27a4a02976df625de21a13cc4e
DIST jdk-7u2-apidocs.zip 60351373 RMD160 fe2a3819a3dfb8f87380d1b561750e29fab15108 SHA1 1d009713386a88dc82cdbbc7a845d76f587f93de SHA256 85960d0d70ebf981bdb6e8e19b462821120f7d6735975b102c5d5bf26a9b3124
DIST jdk-7u4-apidocs.zip 60313792 RMD160 23e8ca1905b0740e650f984618b31b63888db1fe SHA1 b816ec16e30f4c687c36480ace186856b059726e SHA256 52db8b927396582319019e1c02b254ea5c3a113b17aca49f2fad286d64c35a0c

@ -0,0 +1,41 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild,v 1.1 2012/05/22 19:47:54 robbat2 Exp $
ORIG_NAME="jdk-7u4-apidocs.zip"
SRC_URI="${ORIG_NAME}"
DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
HOMEPAGE="http://download.oracle.com/javase/7/docs/"
LICENSE="oracle-java-documentation-7"
SLOT="1.7"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="app-arch/unzip"
RDEPEND=""
RESTRICT="fetch"
DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
S="${WORKDIR}/docs"
pkg_nofetch() {
einfo "Please download ${ORIG_NAME} from "
einfo "${DOWNLOAD_URL}"
einfo "(agree to the license) and place it in ${DISTDIR}"
einfo "If you find the file on the download page replaced with a higher"
einfo "version, please report to the bug 67266 (link below)."
einfo "If emerge fails because of a checksum error it is possible that"
einfo "the upstream release changed without renaming. Try downloading the file"
einfo "again (or a newer revision if available). Otherwise report this to"
einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
}
src_install(){
insinto /usr/share/doc/${P}/html
doins index.html
for i in *; do
[[ -d $i ]] && doins -r $i
done
}

@ -1,3 +1,4 @@
DIST v8-3.10.8.5.tar.bz2 10066260 RMD160 55bffa69bdb4aede9600b2f5ac58bb3300a2e8e0 SHA1 8460da03bb820662d710810400a833156281e644 SHA256 58d30662348b0eabf8a13aa96bbb881fae8b80f2d505bbc3ca63e6fc5f217008
DIST v8-3.10.8.7.tar.bz2 10063959 RMD160 b20ef13e5dfcd93d5d2d5d85138064338250ccb4 SHA1 7225a2d3bf8a27180d743a240785275b9d2948a0 SHA256 f411248f95de06297310eaf0d1195d913bb3dee92a0fbb8bc62193f00ff4ff08
DIST v8-3.11.3.tar.bz2 10069593 RMD160 dbf6ab21bafdc5a62751f16988615a33a9f74997 SHA1 d676bd5eb3785069d8d18842cca932143d54ed74 SHA256 52864dcceb50188331b6b6d472bda9988a0c4f3e7365f027b671cc54e78eb96e
DIST v8-3.9.24.21.tar.bz2 9976966 RMD160 17cc6f24c69ffec464d2a7b6fab8ba051821fa1c SHA1 048800284803bd355215b5446b819810f0003958 SHA256 9eb48fed13f5d230044b5a38d44455d1212aa28da797721fb9ba1bba870c64c8

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

@ -0,0 +1,41 @@
Upstream-Status: Pending
Add X32 support in gmp configure.
Patch Originator: H J Lu @ Intel
Patch modified for Yocto by Nitin Kamble
Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
--- gmp-5.0.5/configure
+++ gmp-5.0.5/configure
@@ -5189,6 +5189,21 @@
esac
;;
esac
+
+ # X32 support.
+ case x"$path_64" in
+ xx86_64*)
+ abilist="x32 64 32"
+ path_x32="$path_64"
+ limb_x32=longlong
+ cclist_x32="gcc"
+ gcc_x32_cflags="-O2 -mx32"
+ any_x32_testlist="sizeof-long-4"
+ CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
+ SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
+ cyclecounter_size_x32=2
+ ;;
+ esac
;;
@@ -3039,7 +3058,7 @@
;;
esac
;;
- 64)
+ 64|x32)
echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.1 2012/05/06 18:16:34 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.5.ebuild,v 1.2 2012/05/22 23:12:49 vapier Exp $
inherit flag-o-matic eutils libtool unpacker toolchain-funcs
@ -28,7 +28,7 @@ src_unpack() {
cd "${S}"
[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
epatch "${FILESDIR}"/${PN}-5.0.2-x32-support.patch
epatch "${FILESDIR}"/${PN}-5.0.5-x32-support.patch
# disable -fPIE -pie in the tests for x86 #236054
if use x86 && gcc-specs-pie ; then

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/libcec-1.6.2.ebuild,v 1.2 2012/05/14 15:57:17 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/libcec-1.6.2.ebuild,v 1.3 2012/05/22 22:53:41 jdhore Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="http://github.com/Pulse-Eight/${PN}/tarball/${P} -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="static-libs"
RDEPEND=">=sys-fs/udev-151"

@ -0,0 +1,17 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -59,8 +59,13 @@
DESTINATION lib${LIB_SUFFIX}/pkgconfig
)
+
+option(BUILD_TESTS "Build tests" ON)
+
add_subdirectory(src)
-add_subdirectory(tests)
+if(BUILD_TESTS)
+ add_subdirectory(tests)
+endif(BUILD_TESTS)
add_subdirectory(tools)
if(WITH_DOC)

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.2 2012/05/18 20:16:57 creffett Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.3 2012/05/22 16:36:38 kensington Exp $
EAPI=4
@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
)
"
DOCS=(NEWS README)
DOCS=( NEWS README )
PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
# tests fail due to missing conection to dbus
RESTRICT="test"

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.18.ebuild,v 1.6 2012/05/18 07:15:30 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.18.ebuild,v 1.7 2012/05/22 21:06:12 ranger Exp $
EAPI="2"
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+ssl static-libs test"
DEPEND="ssl? ( dev-libs/openssl )"

@ -1,2 +1,2 @@
DIST libgit2-0.15.0.tar.gz 978124 RMD160 0430461c227421299f5aa6bd62a1ee7e5a82e17d SHA1 3243c69134613d2c8de665a936ce08f6f18f91e2 SHA256 dc47e4fd498a39d1b90bcc5ba189e504140cb6db521dd54808b238b4662d1347
DIST libgit2-0.16.0.tar.gz 1042613 RMD160 43aef37fc34ef4c55ea3f14b2663564ac20a34c6 SHA1 cc97920c8f751ed70a815efa7b9bfbd15d252ef0 SHA256 b84e5353ebc41e785f777a4977da9fa3eaf19f71c07eb2a2c23c2ceafb811597
DIST libgit2-0.17.0.tar.gz 2096159 RMD160 2a8a83fc17d4d71792f34d63654a09c3b35efe9e SHA1 63cf5d19690c11d73e7951603ce8d933f88f2635 SHA256 068eed0b8fe852a7cc55aae46d2299e9c9e3e00badc1c293d72a9dd122226018

@ -0,0 +1,12 @@
--- libgit2-0.17.0/CMakeLists.txt
+++ libgit2-0.17.0/CMakeLists.txt
@@ -70,8 +70,7 @@
# Precompiled headers
ELSE ()
- SET(CMAKE_C_FLAGS "-O2 -g -D_GNU_SOURCE -fvisibility=hidden -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
+ SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
IF (NOT MINGW) # MinGW always does PIC and complains if we tell it to
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
ENDIF ()

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

Loading…
Cancel
Save