parent
9410faf628
commit
948e6d3f9d
@ -1,2 +0,0 @@
|
||||
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,368 +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.96.ebuild,v 1.3 2012/05/03 07:29:55 ulm Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
EBZR_PROJECT="emacs"
|
||||
EBZR_BRANCH="emacs-24"
|
||||
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() {
|
||||
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,368 +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.97.ebuild,v 1.4 2012/05/24 21:12:55 ulm Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
EBZR_PROJECT="emacs"
|
||||
EBZR_BRANCH="emacs-24"
|
||||
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
|
||||
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.
|
||||
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() {
|
||||
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 () {
|
||||
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
|
||||
local m
|
||||
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"
|
||||
elif [[ -d "${ED}"${infodir} ]]; then
|
||||
# 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,353 +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.9999-r4.ebuild,v 1.6 2012/05/24 21:12:55 ulm Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
EBZR_PROJECT="emacs"
|
||||
EBZR_BRANCH="emacs-24"
|
||||
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 ~x86-macos"
|
||||
IUSE="alsa 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"
|
||||
|
||||
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_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.
|
||||
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() {
|
||||
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."
|
||||
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 () {
|
||||
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
|
||||
local m
|
||||
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
|
||||
}
|
||||
|
||||
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"
|
||||
elif [[ -d "${ED}"${infodir} ]]; then
|
||||
# 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 +0,0 @@
|
||||
DIST beagle-xesam-0.2.tar.bz2 58125 RMD160 c5a03054c81b290fa1f3ad456c7b082fc2fdda0b SHA1 e92029ea5b5e985c8be9b4b942d022611263208b SHA256 3891fd820a3f7939829f97e08de738b0a19c771a495beef18a50cf213191c8a7
|
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle-xesam/beagle-xesam-0.2.ebuild,v 1.3 2011/03/12 11:52:22 angelos Exp $
|
||||
|
||||
inherit gnome.org mono
|
||||
|
||||
DESCRIPTION="Xesam search adaptor for Beagle"
|
||||
HOMEPAGE="http://beagle-project.org/"
|
||||
|
||||
LICENSE="MIT Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-dotnet/ndesk-dbus-0.6.0
|
||||
>=dev-dotnet/ndesk-dbus-glib-0.4.1"
|
||||
RDEPEND="${DEPEND}
|
||||
>=app-misc/beagle-0.2"
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "make install failed"
|
||||
dodoc AUTHORS README ISSUES
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>ford_prefect@gentoo.org</email>
|
||||
<name>Arun Raghavan</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
Beagle-Xesam is an "adaptor" which listens for clients that use
|
||||
the Xesam desktop search specification, and translates these to
|
||||
Beagle's (app-misc/beagle) native search method. For now, you need
|
||||
to run this manually.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
|
@ -1 +0,0 @@
|
||||
DIST beagle-0.3.9.tar.bz2 1895453 RMD160 f8e26ceeea50e33b04837e1d22f1a6f18fa84c1a SHA1 5fdba6ffd4a210076a954cc22f5b940705b71a6e SHA256 4252710247809df393f318450a391298fa57a3ad7b6043962734997035caf488
|
@ -1,205 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r5.ebuild,v 1.9 2012/06/01 00:24:39 zmedico Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit base gnome.org eutils mono mozextension multilib user autotools
|
||||
|
||||
DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
|
||||
HOMEPAGE="http://www.beagle-project.org/"
|
||||
LICENSE="MIT Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="avahi chm debug doc eds firefox +galago gtk +pdf +inotify +ole thunderbird +google +xscreensaver"
|
||||
|
||||
#See bug 248331 for blocker reason.
|
||||
RDEPEND="!!sci-libs/beagle
|
||||
>dev-lang/mono-2.4
|
||||
>=app-shells/bash-3.2
|
||||
app-arch/zip
|
||||
>=dev-db/sqlite-3.3.1
|
||||
>=dev-dotnet/ndesk-dbus-0.6.0
|
||||
>=dev-dotnet/ndesk-dbus-glib-0.4.1
|
||||
>=dev-dotnet/taglib-sharp-2.0
|
||||
gtk? (
|
||||
x11-libs/libX11
|
||||
>=gnome-base/librsvg-2.22.0:2
|
||||
sys-devel/gettext
|
||||
>=dev-dotnet/gtk-sharp-2.12.6:2
|
||||
>=dev-dotnet/gconf-sharp-2.24.0:2
|
||||
>=dev-dotnet/glade-sharp-2.12.6:2
|
||||
>=dev-dotnet/gnome-sharp-2.24.0:2
|
||||
>=dev-dotnet/gnomevfs-sharp-2.24.0:2
|
||||
x11-misc/xdg-utils
|
||||
>=x11-libs/gtk+-2.14.0:2
|
||||
>=dev-libs/atk-1.22.0
|
||||
)
|
||||
eds? (
|
||||
>=dev-dotnet/evolution-sharp-0.18.1
|
||||
>=dev-dotnet/gconf-sharp-2.24.0:2
|
||||
>=dev-dotnet/glib-sharp-2.12.6:2
|
||||
)
|
||||
ole? (
|
||||
>=app-text/wv-1.2.3
|
||||
>=dev-dotnet/gsf-sharp-0.8.1
|
||||
>=app-office/gnumeric-1.4.3-r3
|
||||
)
|
||||
|
||||
x11-misc/shared-mime-info
|
||||
>=dev-dotnet/glib-sharp-2.12.6:2
|
||||
dev-libs/gmime:2.4[mono]
|
||||
chm? ( dev-libs/chmlib )
|
||||
pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
|
||||
galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
|
||||
thunderbird? (
|
||||
|| (
|
||||
>=mail-client/thunderbird-1.5
|
||||
>=mail-client/thunderbird-bin-1.5
|
||||
)
|
||||
)
|
||||
firefox? (
|
||||
|| (
|
||||
>=www-client/firefox-1.5
|
||||
>=www-client/firefox-bin-1.5
|
||||
)
|
||||
)
|
||||
xscreensaver? ( x11-libs/libXScrnSaver )
|
||||
>=dev-libs/libbeagle-0.3.9
|
||||
avahi? ( >=net-dns/avahi-0.6.10[mono] )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( >=virtual/monodoc-1.2.4 )
|
||||
virtual/pkgconfig
|
||||
xscreensaver? ( x11-proto/scrnsaverproto )
|
||||
>=dev-util/intltool-0.35"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup beagleindex
|
||||
enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
|
||||
if use thunderbird
|
||||
then
|
||||
if ! use inotify
|
||||
then
|
||||
eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
|
||||
eerror "Please enable the inotify use-flag also."
|
||||
eerror "See http://bugs.gentoo.org/263781 for more information."
|
||||
die "Please enable the inotify use-flag."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Fix bugs.gnome.org/556243
|
||||
sed -i -e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
|
||||
search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
|
||||
|
||||
# Fix when using firefox 3.6
|
||||
epatch "${FILESDIR}/${P}-firefox-3.6.patch"
|
||||
|
||||
# Fix building against gmime-2.4, bug #311499
|
||||
epatch "${FILESDIR}/${P}-gmime24.patch"
|
||||
|
||||
# Remove bogus open check
|
||||
epatch "${FILESDIR}/${P}-openfix.patch"
|
||||
|
||||
# Port to mono-2.6
|
||||
epatch "${FILESDIR}/${P}-mono2.6.patch"
|
||||
|
||||
# Grow/shrink the number beagle-search results based on window size
|
||||
epatch "${FILESDIR}/${P}-grow-shrink.patch"
|
||||
|
||||
# Update tileIndex when removing a tile
|
||||
epatch "${FILESDIR}/${P}-update-tileindex.patch"
|
||||
|
||||
# Support mono-2.8, bug #341195
|
||||
epatch "${FILESDIR}/${P}-mono2.8.patch"
|
||||
|
||||
# Fix crash on second search, bug #353533
|
||||
epatch "${FILESDIR}/${P}-UnixConnectionHandler-exceptions.patch"
|
||||
|
||||
intltoolize --force --copy --automake || die "intltoolize failed"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-static \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epiphany-extension \
|
||||
$(use_enable debug xml-dump) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable thunderbird) \
|
||||
$(use_enable eds evolution) \
|
||||
$(use_enable gtk gui) \
|
||||
$(use_enable ole gsf-sharp wv1) \
|
||||
$(use_enable xscreensaver xss) \
|
||||
$(use_enable inotify) \
|
||||
$(use_enable avahi) \
|
||||
$(use_enable google googlebackends)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install || die "emake install failed."
|
||||
|
||||
dodoc AUTHORS NEWS README || die "dodoc failed"
|
||||
|
||||
declare MOZILLA_FIVE_HOME
|
||||
if use firefox; then
|
||||
xpi_unpack "${S}"/firefox-extension/beagle.xpi \
|
||||
|| die "Unable to find Beagle Firefox Extension"
|
||||
mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
|
||||
|
||||
if has_version '>=www-client/firefox-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
|
||||
xpi_install "${WORKDIR}"/firefox-beagle \
|
||||
|| die "xpi install for firefox failed!"
|
||||
fi
|
||||
if has_version '>=www-client/firefox-bin-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/opt/firefox"
|
||||
xpi_install "${WORKDIR}"/firefox-beagle \
|
||||
|| die "xpi install for firefox-bin failed!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use thunderbird; then
|
||||
xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
|
||||
|| die "Unable to find Beagle Thunderbird Extension"
|
||||
mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
|
||||
|
||||
if has_version '>=mail-client/thunderbird-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
|
||||
xpi_install "${WORKDIR}"/thunderbird-beagle \
|
||||
|| die "xpi install for thunderbird failed!"
|
||||
fi
|
||||
if has_version '>=mail-client/thunderbird-bin-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/opt/thunderbird"
|
||||
xpi_install "${WORKDIR}"/thunderbird-beagle \
|
||||
|| die "xpi install for thunderbird-bin failed!"
|
||||
fi
|
||||
fi
|
||||
|
||||
sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
|
||||
"${ED}"/etc/beagle/crawl-rules/crawl-*
|
||||
|
||||
insinto /etc/beagle/crawl-rules
|
||||
doins "${FILESDIR}/crawl-portage"
|
||||
|
||||
keepdir "/usr/$(get_libdir)/beagle/Backends"
|
||||
diropts -o beagleindex -g beagleindex
|
||||
keepdir "/var/lib/cache/beagle/indexes"
|
||||
|
||||
find "${ED}" -name "*.la" -delete || die "remove of la files failed"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "If available, Beagle greatly benefits from using certain operating"
|
||||
elog "system features such as Extended Attributes and inotify."
|
||||
elog
|
||||
elog "If you want static queryables such as the portage tree and system"
|
||||
elog "documentation you will need to edit the /etc/beagle/crawl-* files"
|
||||
elog "and change CRAWL_ENABLE from 'no' to 'yes'."
|
||||
elog
|
||||
elog "For more info on how to create the optimal beagle environment, and"
|
||||
elog "basic usage info, see the Gentoo page of the Beagle website:"
|
||||
elog "http://www.beagle-project.org/Gentoo_Installation"
|
||||
}
|
@ -1,204 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r6.ebuild,v 1.3 2012/06/01 00:24:39 zmedico Exp $
|
||||
|
||||
EAPI="4"
|
||||
GNOME_TARBALL_SUFFIX="bz2"
|
||||
|
||||
inherit base gnome.org eutils mono mozextension multilib user autotools
|
||||
|
||||
DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
|
||||
HOMEPAGE="http://www.beagle-project.org/"
|
||||
LICENSE="MIT Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="avahi chm debug doc eds firefox gtk +pdf +inotify +ole thunderbird +google +xscreensaver"
|
||||
|
||||
#See bug 248331 for blocker reason.
|
||||
RDEPEND="!!sci-libs/beagle
|
||||
>dev-lang/mono-2.4
|
||||
>=app-shells/bash-3.2
|
||||
app-arch/zip
|
||||
>=dev-db/sqlite-3.3.1
|
||||
>=dev-dotnet/ndesk-dbus-0.6.0
|
||||
>=dev-dotnet/ndesk-dbus-glib-0.4.1
|
||||
>=dev-dotnet/taglib-sharp-2.0
|
||||
gtk? (
|
||||
x11-libs/libX11
|
||||
>=gnome-base/librsvg-2.22.0:2
|
||||
sys-devel/gettext
|
||||
>=dev-dotnet/gtk-sharp-2.12.6:2
|
||||
>=dev-dotnet/gconf-sharp-2.24.0:2
|
||||
>=dev-dotnet/glade-sharp-2.12.6:2
|
||||
>=dev-dotnet/gnome-sharp-2.24.0:2
|
||||
>=dev-dotnet/gnomevfs-sharp-2.24.0:2
|
||||
x11-misc/xdg-utils
|
||||
>=x11-libs/gtk+-2.14.0:2
|
||||
>=dev-libs/atk-1.22.0
|
||||
)
|
||||
eds? (
|
||||
>=dev-dotnet/evolution-sharp-0.18.1
|
||||
>=dev-dotnet/gconf-sharp-2.24.0:2
|
||||
>=dev-dotnet/glib-sharp-2.12.6:2
|
||||
)
|
||||
ole? (
|
||||
>=app-text/wv-1.2.3
|
||||
>=dev-dotnet/gsf-sharp-0.8.1
|
||||
>=app-office/gnumeric-1.4.3-r3
|
||||
)
|
||||
|
||||
x11-misc/shared-mime-info
|
||||
>=dev-dotnet/glib-sharp-2.12.6:2
|
||||
dev-libs/gmime:2.4[mono]
|
||||
chm? ( dev-libs/chmlib )
|
||||
pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
|
||||
thunderbird? (
|
||||
|| (
|
||||
>=mail-client/thunderbird-1.5
|
||||
>=mail-client/thunderbird-bin-1.5
|
||||
)
|
||||
)
|
||||
firefox? (
|
||||
|| (
|
||||
>=www-client/firefox-1.5
|
||||
>=www-client/firefox-bin-1.5
|
||||
)
|
||||
)
|
||||
xscreensaver? ( x11-libs/libXScrnSaver )
|
||||
>=dev-libs/libbeagle-0.3.9
|
||||
avahi? ( >=net-dns/avahi-0.6.10[mono] )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( >=virtual/monodoc-1.2.4 )
|
||||
virtual/pkgconfig
|
||||
xscreensaver? ( x11-proto/scrnsaverproto )
|
||||
>=dev-util/intltool-0.35"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup beagleindex
|
||||
enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
|
||||
if use thunderbird
|
||||
then
|
||||
if ! use inotify
|
||||
then
|
||||
eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
|
||||
eerror "Please enable the inotify use-flag also."
|
||||
eerror "See http://bugs.gentoo.org/263781 for more information."
|
||||
die "Please enable the inotify use-flag."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Fix bugs.gnome.org/556243
|
||||
sed -i -e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
|
||||
search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
|
||||
|
||||
# Fix when using firefox 3.6
|
||||
epatch "${FILESDIR}/${P}-firefox-3.6.patch"
|
||||
|
||||
# Fix building against gmime-2.4, bug #311499
|
||||
epatch "${FILESDIR}/${P}-gmime24.patch"
|
||||
|
||||
# Remove bogus open check
|
||||
epatch "${FILESDIR}/${P}-openfix.patch"
|
||||
|
||||
# Port to mono-2.6
|
||||
epatch "${FILESDIR}/${P}-mono2.6.patch"
|
||||
|
||||
# Grow/shrink the number beagle-search results based on window size
|
||||
epatch "${FILESDIR}/${P}-grow-shrink.patch"
|
||||
|
||||
# Update tileIndex when removing a tile
|
||||
epatch "${FILESDIR}/${P}-update-tileindex.patch"
|
||||
|
||||
# Support mono-2.8, bug #341195
|
||||
epatch "${FILESDIR}/${P}-mono2.8.patch"
|
||||
|
||||
# Fix crash on second search, bug #353533
|
||||
epatch "${FILESDIR}/${P}-UnixConnectionHandler-exceptions.patch"
|
||||
|
||||
intltoolize --force --copy --automake || die "intltoolize failed"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-static \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epiphany-extension \
|
||||
$(use_enable debug xml-dump) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable thunderbird) \
|
||||
$(use_enable eds evolution) \
|
||||
$(use_enable gtk gui) \
|
||||
$(use_enable ole gsf-sharp wv1) \
|
||||
$(use_enable xscreensaver xss) \
|
||||
$(use_enable inotify) \
|
||||
$(use_enable avahi) \
|
||||
$(use_enable google googlebackends)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc AUTHORS NEWS README
|
||||
|
||||
declare MOZILLA_FIVE_HOME
|
||||
if use firefox; then
|
||||
xpi_unpack "${S}"/firefox-extension/beagle.xpi \
|
||||
|| die "Unable to find Beagle Firefox Extension"
|
||||
mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
|
||||
|
||||
if has_version '>=www-client/firefox-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
|
||||
xpi_install "${WORKDIR}"/firefox-beagle \
|
||||
|| die "xpi install for firefox failed!"
|
||||
fi
|
||||
if has_version '>=www-client/firefox-bin-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/opt/firefox"
|
||||
xpi_install "${WORKDIR}"/firefox-beagle \
|
||||
|| die "xpi install for firefox-bin failed!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use thunderbird; then
|
||||
xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
|
||||
|| die "Unable to find Beagle Thunderbird Extension"
|
||||
mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
|
||||
|
||||
if has_version '>=mail-client/thunderbird-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
|
||||
xpi_install "${WORKDIR}"/thunderbird-beagle \
|
||||
|| die "xpi install for thunderbird failed!"
|
||||
fi
|
||||
if has_version '>=mail-client/thunderbird-bin-1.5'; then
|
||||
MOZILLA_FIVE_HOME="/opt/thunderbird"
|
||||
xpi_install "${WORKDIR}"/thunderbird-beagle \
|
||||
|| die "xpi install for thunderbird-bin failed!"
|
||||
fi
|
||||
fi
|
||||
|
||||
sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
|
||||
"${ED}"/etc/beagle/crawl-rules/crawl-* || die
|
||||
|
||||
insinto /etc/beagle/crawl-rules
|
||||
doins "${FILESDIR}/crawl-portage"
|
||||
|
||||
keepdir "/usr/$(get_libdir)/beagle/Backends"
|
||||
diropts -o beagleindex -g beagleindex
|
||||
keepdir "/var/lib/cache/beagle/indexes"
|
||||
|
||||
find "${D}" -name "*.la" -delete || die "remove of la files failed"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "If available, Beagle greatly benefits from using certain operating"
|
||||
elog "system features such as Extended Attributes and inotify."
|
||||
elog
|
||||
elog "If you want static queryables such as the portage tree and system"
|
||||
elog "documentation you will need to edit the /etc/beagle/crawl-* files"
|
||||
elog "and change CRAWL_ENABLE from 'no' to 'yes'."
|
||||
elog
|
||||
elog "For more info on how to create the optimal beagle environment, and"
|
||||
elog "basic usage info, see the Gentoo page of the Beagle website:"
|
||||
elog "http://www.beagle-project.org/Gentoo_Installation"
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
From e4f2df4a6eedaf8038123f25b636580e4dfa04f3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gmail.com>
|
||||
Date: Mon, 14 Feb 2011 22:22:20 -0500
|
||||
Subject: [PATCH] Fix frequent beagled crashes under mono-2.8 (#641270)
|
||||
|
||||
Beagled frequently crashes under mono-2.8 due to uncaught exceptions
|
||||
in UnixConnectionHandler.WatchCallback() (see Gnome bug #641270 and
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=353533).
|
||||
These crashes have two origins.
|
||||
First, probably due to threading changes in mono, when WatchCallback()
|
||||
is called, client can be null, so we need to check for it.
|
||||
Second, presumably due to the exception policy changes in mono-2.8,
|
||||
client.GetStream().EndRead() legitimately - and fairly frequently -
|
||||
throws an IOException with Message "Not connected" and with a
|
||||
null InnerException (instead of a SocketException, as was the case
|
||||
under previous versions of mono); so we need to catch it.
|
||||
|
||||
Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
|
||||
---
|
||||
beagle/beagled/Server.cs | 5 +++--
|
||||
1 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/beagle/beagled/Server.cs b/beagle/beagled/Server.cs
|
||||
index 0892dd9..f2ad70f 100644
|
||||
--- a/beagle/beagled/Server.cs
|
||||
+++ b/beagle/beagled/Server.cs
|
||||
@@ -462,9 +462,10 @@ namespace Beagle.Daemon {
|
||||
int bytes_read = 0;
|
||||
|
||||
try {
|
||||
- bytes_read = this.client.GetStream ().EndRead (ar);
|
||||
+ if (this.client != null)
|
||||
+ bytes_read = this.client.GetStream ().EndRead (ar);
|
||||
} catch (IOException e) {
|
||||
- if (! (e.InnerException is SocketException))
|
||||
+ if (! (e.InnerException is SocketException) && e.Message != "Not connected")
|
||||
throw e;
|
||||
} catch (ObjectDisposedException) { }
|
||||
|
||||
--
|
||||
1.7.4.1
|
||||
|
@ -1,177 +0,0 @@
|
||||
Fix bug 283740
|
||||
Backport of:
|
||||
From a56102700eb77cc6563b99b68acdc699a6716e73 Mon Sep 17 00:00:00 2001
|
||||
From: Tao Fei <Filia.Tao@gmail.com>
|
||||
Date: Fri, 03 Jul 2009 11:20:56 +0000
|
||||
Subject: fix name confilct bug in beaglePrefs.js (for firefox 3.5)
|
||||
|
||||
remove some debug msg (break in firefox 3.5)
|
||||
update zh-cn locale for beagle search history sidebar
|
||||
update max firfox version to 3.5.*
|
||||
update version number to 1.1.2
|
||||
|
||||
From upstream git.
|
||||
Link: http://git.gnome.org/cgit/beagle/commit/?id=a56102700eb77cc6563b99b68acdc699a6716e73
|
||||
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -2,11 +2,11 @@
|
||||
* Beagle Extension: Index webpages you visit using the Beagle Indexing Engine.
|
||||
* An Extension for the Firefox Browser.
|
||||
*/
|
||||
|
||||
// Initiate a new preference instance.
|
||||
-var gPrefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
|
||||
+_prefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
|
||||
|
||||
var beaglePref = {
|
||||
|
||||
//some constant
|
||||
RULE_INCLUDE : 1,
|
||||
@@ -29,18 +29,18 @@
|
||||
|
||||
|
||||
//functions used to get/set pref
|
||||
func_factory:{
|
||||
'get':{
|
||||
- 'bool': Function.bind(gPrefService.getBoolPref,gPrefService),
|
||||
- 'int': Function.bind(gPrefService.getIntPref,gPrefService),
|
||||
- 'string' : Function.bind(gPrefService.getCharPref,gPrefService)
|
||||
+ 'bool': Function.bind(_prefService.getBoolPref,_prefService),
|
||||
+ 'int': Function.bind(_prefService.getIntPref,_prefService),
|
||||
+ 'string' : Function.bind(_prefService.getCharPref,_prefService)
|
||||
},
|
||||
'set':{
|
||||
- 'bool': Function.bind(gPrefService.setBoolPref,gPrefService),
|
||||
- 'int' : Function.bind(gPrefService.setIntPref,gPrefService),
|
||||
- 'string' : Function.bind(gPrefService.setCharPref,gPrefService)
|
||||
+ 'bool': Function.bind(_prefService.setBoolPref,_prefService),
|
||||
+ 'int' : Function.bind(_prefService.setIntPref,_prefService),
|
||||
+ 'string' : Function.bind(_prefService.setCharPref,_prefService)
|
||||
}
|
||||
},
|
||||
|
||||
prefObject : {},
|
||||
|
||||
@@ -318,8 +318,8 @@
|
||||
}
|
||||
catch(ex){
|
||||
log("first run import error");
|
||||
log(ex);
|
||||
}
|
||||
- },
|
||||
+ }
|
||||
}
|
||||
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -219,11 +219,11 @@
|
||||
" readDir(aDirPath);\n";
|
||||
|
||||
return help;
|
||||
});
|
||||
|
||||
-jslibDebug('*** load: '+JS_DIR_FILE+' OK');
|
||||
+//jslibDebug('*** load: '+JS_DIR_FILE+' OK');
|
||||
|
||||
} else {
|
||||
dump("JSLIB library not loaded:\n" +
|
||||
" \tTo load use: chrome://jslib/content/jslib.js\n" +
|
||||
" \tThen: include(jslib_dir);\n\n");
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -171,11 +171,11 @@
|
||||
return help;
|
||||
}
|
||||
|
||||
}; //END CLASS
|
||||
|
||||
-jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
|
||||
+//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
|
||||
|
||||
} // END BLOCK JS_LIB_LOADED CHECK
|
||||
|
||||
else {
|
||||
dump("JSLIB library not loaded:\n" +
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -756,11 +756,11 @@
|
||||
" help;\n";
|
||||
|
||||
return help;
|
||||
})
|
||||
|
||||
-jslibDebug('*** load: '+JS_FILE_FILE+' OK');
|
||||
+//jslibDebug('*** load: '+JS_FILE_FILE+' OK');
|
||||
|
||||
} // END BLOCK JS_LIB_LOADED CHECK
|
||||
|
||||
// If jslib base library is not loaded, dump this error.
|
||||
else
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -582,11 +582,11 @@
|
||||
return help;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
-jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
|
||||
+//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
|
||||
|
||||
} // END BLOCK JS_LIB_LOADED CHECK
|
||||
|
||||
// If jslib base library is not loaded, dump this error.
|
||||
else
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd
|
||||
--- beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -29,11 +29,13 @@
|
||||
<!ENTITY beagle.run.never.index.label "从不索引这个站点">
|
||||
<!ENTITY beagle.run.preferences.label "选项">
|
||||
<!ENTITY beagle.run.context.menu.label "Beagle">
|
||||
<!ENTITY beagle.run.index.link.label "索引链接">
|
||||
<!ENTITY beagle.run.index.image.label "索引图片">
|
||||
-
|
||||
<!ENTITY beagle.index.link.start.label "开始">
|
||||
<!ENTITY beagle.index.link.stop.label "停止">
|
||||
|
||||
<!ENTITY beagle.bookmark.index.modified.label "索引更改过的书签">
|
||||
|
||||
+<!ENTITY beagle.sidebar.title "Beagle 搜索历史侧边栏">
|
||||
+<!ENTITY beagle.sidebar.commandkey "B">
|
||||
+<!ENTITY beagle.sidebar.modifierskey "shift 键">
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/install.rdf.in beagle-0.3.9/firefox-extension/install.rdf.in
|
||||
--- beagle-0.3.9.orig/firefox-extension/install.rdf.in 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/install.rdf.in 2009-09-05 12:29:50.000000000 +0200
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
|
||||
<em:minVersion>0.8</em:minVersion>
|
||||
- <em:maxVersion>3.0.*</em:maxVersion>
|
||||
+ <em:maxVersion>3.6.*</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
</Description>
|
||||
|
||||
diff -NrU5 beagle-0.3.9.orig/firefox-extension/Makefile.am beagle-0.3.9/firefox-extension/Makefile.am
|
||||
--- beagle-0.3.9.orig/firefox-extension/Makefile.am 2009-09-05 12:28:10.000000000 +0200
|
||||
+++ beagle-0.3.9/firefox-extension/Makefile.am 2009-09-05 12:29:07.000000000 +0200
|
||||
@@ -1,8 +1,8 @@
|
||||
|
||||
PROJECT = beagle
|
||||
-VERSION = 1.1.0
|
||||
+VERSION = 1.1.2
|
||||
|
||||
INSTALL_RDF = install.rdf
|
||||
INSTALL_RDF_IN = $(INSTALL_RDF).in
|
||||
VERSION_SED = sed -e "s|\@VERSION\@|$(VERSION)|g"
|
||||
|
@ -1,512 +0,0 @@
|
||||
diff -p -up beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs.gmime24 beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
|
||||
--- beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs.gmime24 2008-04-25 20:17:04.000000000 +0200
|
||||
+++ beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2009-04-28 11:21:36.000000000 +0200
|
||||
@@ -333,28 +333,46 @@ namespace Beagle.Daemon.EvolutionMailQue
|
||||
indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name));
|
||||
|
||||
GMime.InternetAddressList addrs;
|
||||
-
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
|
||||
+
|
||||
+ if (this.folder_name == "Sent") {
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.To);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
}
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
|
||||
+
|
||||
+ if (this.folder_name == "Sent") {
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.Cc);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
}
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
|
||||
+
|
||||
+ if (this.folder_name != "Sent") {
|
||||
+ addrs = GMime.InternetAddressList.Parse (message.Sender);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
}
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
+
|
||||
if (this.folder_name == "Sent")
|
||||
indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
|
||||
|
||||
@@ -750,48 +768,54 @@ namespace Beagle.Daemon.EvolutionMailQue
|
||||
}
|
||||
|
||||
GMime.InternetAddressList addrs;
|
||||
- addrs = GMime.InternetAddressList.ParseString (messageInfo.to);
|
||||
+ addrs = GMime.InternetAddressList.Parse (messageInfo.to);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
if (!have_content) {
|
||||
indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.New ("fixme:to_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
|
||||
+
|
||||
indexable.AddProperty (Property.New ("fixme:to_name", ia.Name));
|
||||
}
|
||||
-
|
||||
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
|
||||
+
|
||||
+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = GMime.InternetAddressList.ParseString (messageInfo.cc);
|
||||
+ addrs = GMime.InternetAddressList.Parse (messageInfo.cc);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
if (!have_content) {
|
||||
indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
|
||||
+
|
||||
indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name));
|
||||
}
|
||||
-
|
||||
- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr));
|
||||
+
|
||||
+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = GMime.InternetAddressList.ParseString (messageInfo.from);
|
||||
+ addrs = GMime.InternetAddressList.Parse (messageInfo.from);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
if (!have_content) {
|
||||
indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.New ("fixme:from_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
|
||||
+
|
||||
indexable.AddProperty (Property.New ("fixme:from_name", ia.Name));
|
||||
}
|
||||
|
||||
- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr));
|
||||
+ if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox)
|
||||
+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
diff -p -up beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs.gmime24 beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs
|
||||
--- beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs.gmime24 2008-04-25 21:26:19.000000000 +0200
|
||||
+++ beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs 2009-04-28 11:21:36.000000000 +0200
|
||||
@@ -322,38 +322,47 @@ namespace Beagle.Daemon.GoogleBackend {
|
||||
hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
|
||||
|
||||
GMime.InternetAddressList addrs;
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.To);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- hit.AddProperty (Property.New ("fixme:to_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
hit.AddProperty (Property.New ("fixme:to_name", ia.Name));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.Cc);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- hit.AddProperty (Property.New ("fixme:cc_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
hit.AddProperty (Property.New ("fixme:cc_name", ia.Name));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
|
||||
+ addrs = GMime.InternetAddressList.Parse (message.Sender);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- hit.AddProperty (Property.New ("fixme:from_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
hit.AddProperty (Property.New ("fixme:from_name", ia.Name));
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
foreach (GMime.References refs in message.References)
|
||||
- hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
|
||||
+ hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
|
||||
|
||||
string list_id = message.GetHeader ("List-Id");
|
||||
if (list_id != null)
|
||||
diff -p -up beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs.gmime24 beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs
|
||||
--- beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs.gmime24 2008-02-10 21:24:19.000000000 +0100
|
||||
+++ beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs 2009-04-28 11:21:36.000000000 +0200
|
||||
@@ -407,28 +407,46 @@ namespace Beagle.Daemon.KMailQueryable {
|
||||
indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name));
|
||||
|
||||
GMime.InternetAddressList addrs;
|
||||
-
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.To);
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
|
||||
- }
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc);
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr));
|
||||
- }
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender));
|
||||
- foreach (GMime.InternetAddress ia in addrs) {
|
||||
- if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr));
|
||||
+
|
||||
+ if (folder_name == Queryable.SentMailFolderName) {
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.To);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
}
|
||||
- addrs.Dispose ();
|
||||
-
|
||||
+
|
||||
+ if (folder_name == Queryable.SentMailFolderName) {
|
||||
+ addrs = message.GetRecipients (GMime.RecipientType.Cc);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
+ }
|
||||
+
|
||||
+ if (folder_name != Queryable.SentMailFolderName) {
|
||||
+ addrs = GMime.InternetAddressList.Parse (message.Sender);
|
||||
+ foreach (GMime.InternetAddress ia in addrs) {
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", mailbox.Address));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ addrs.Dispose ();
|
||||
+ }
|
||||
+
|
||||
if (folder_name == Queryable.SentMailFolderName)
|
||||
indexable.AddProperty (Property.NewFlag ("fixme:isSent"));
|
||||
else {
|
||||
diff -p -up beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs.gmime24 beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs
|
||||
--- beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs.gmime24 2008-07-18 16:27:59.000000000 +0200
|
||||
+++ beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs 2009-04-28 11:21:36.000000000 +0200
|
||||
@@ -367,9 +367,14 @@ namespace Beagle.Daemon.ThunderbirdQuery
|
||||
message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject"));
|
||||
message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author"));
|
||||
message.MessageId = GetText (document, "MessageId");
|
||||
- message.SetDate (DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))), 0);
|
||||
- message.AddRecipientsFromString ("To", Mime.HeaderDecodePhrase (GetText (document, "Recipients")));
|
||||
-
|
||||
+ message.Date = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date")));
|
||||
+
|
||||
+ string str = GetText (document, "Recipients");
|
||||
+ GMime.InternetAddressList recipients = GMime.InternetAddressList.Parse (str);
|
||||
+ foreach (GMime.InternetAddress ia in recipients)
|
||||
+ message.To.Add (ia);
|
||||
+ recipients.Dispose ();
|
||||
+
|
||||
return message;
|
||||
}
|
||||
|
||||
@@ -434,7 +439,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
|
||||
|
||||
// We _know_ that the stream comes from a StreamReader, which uses UTF8 by
|
||||
// default. So we use that here when parsing our string.
|
||||
- return (str != null ? Encoding.UTF8.GetString (str, 0, pos) : string.Empty);
|
||||
+ return (str != null ? System.Text.Encoding.UTF8.GetString (str, 0, pos) : string.Empty);
|
||||
}
|
||||
|
||||
// This spell "charset="
|
||||
@@ -462,7 +467,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
|
||||
// instead of UTF-8 in some cases and that will really mess things up.
|
||||
byte[] buffer = null;
|
||||
int c, header_length = 0, newlines = 0, charset_pos = 0;
|
||||
- Encoding enc = Encoding.UTF8;
|
||||
+ System.Text.Encoding enc = System.Text.Encoding.UTF8;
|
||||
try {
|
||||
do {
|
||||
c = stream.BaseStream.ReadByte ();
|
||||
@@ -491,7 +496,7 @@ namespace Beagle.Daemon.ThunderbirdQuery
|
||||
stream.BaseStream.Read (buffer, 0, buffer.Length);
|
||||
|
||||
// We need to use correct encoding
|
||||
- enc = Encoding.GetEncoding (encoding_str);
|
||||
+ enc = System.Text.Encoding.GetEncoding (encoding_str);
|
||||
} catch {
|
||||
} finally {
|
||||
stream.Close ();
|
||||
diff -p -up beagle-0.3.9/Filters/FilterMail.cs.gmime24 beagle-0.3.9/Filters/FilterMail.cs
|
||||
--- beagle-0.3.9/Filters/FilterMail.cs.gmime24 2008-06-12 02:20:07.000000000 +0200
|
||||
+++ beagle-0.3.9/Filters/FilterMail.cs 2009-04-28 11:21:36.000000000 +0200
|
||||
@@ -126,7 +126,7 @@ namespace Beagle.Filters {
|
||||
|
||||
// Messages that are multipart/alternative shouldn't be considered as having
|
||||
// attachments. Unless of course they do.
|
||||
- if (mime_part is GMime.Multipart && mime_part.ContentType.Subtype.ToLower () != "alternative")
|
||||
+ if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative")
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@@ -140,34 +140,43 @@ namespace Beagle.Filters {
|
||||
AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ()));
|
||||
|
||||
GMime.InternetAddressList addrs;
|
||||
- addrs = this.message.GetRecipients (GMime.Message.RecipientType.To);
|
||||
+ addrs = this.message.GetRecipients (GMime.RecipientType.To);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- AddProperty (Property.New ("fixme:to_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ AddProperty (Property.New ("fixme:to_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
AddProperty (Property.New ("fixme:to_name", ia.Name));
|
||||
AddEmailLink (ia);
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = this.message.GetRecipients (GMime.Message.RecipientType.Cc);
|
||||
+ addrs = this.message.GetRecipients (GMime.RecipientType.Cc);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- AddProperty (Property.New ("fixme:cc_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ AddProperty (Property.New ("fixme:cc_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
AddProperty (Property.New ("fixme:cc_name", ia.Name));
|
||||
AddEmailLink (ia);
|
||||
}
|
||||
addrs.Dispose ();
|
||||
|
||||
- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (this.message.Sender));
|
||||
+ addrs = GMime.InternetAddressList.Parse (this.message.Sender);
|
||||
foreach (GMime.InternetAddress ia in addrs) {
|
||||
AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false)));
|
||||
- if (ia.AddressType != GMime.InternetAddressType.Group)
|
||||
- AddProperty (Property.New ("fixme:from_address", ia.Addr));
|
||||
-
|
||||
+ if (ia is GMime.InternetAddressMailbox) {
|
||||
+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox;
|
||||
+
|
||||
+ AddProperty (Property.New ("fixme:from_address", mailbox.Address));
|
||||
+ }
|
||||
+
|
||||
AddProperty (Property.New ("fixme:from_name", ia.Name));
|
||||
AddEmailLink (ia);
|
||||
}
|
||||
@@ -184,7 +193,7 @@ namespace Beagle.Filters {
|
||||
AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid)));
|
||||
|
||||
foreach (GMime.References refs in this.message.References)
|
||||
- AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid));
|
||||
+ AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId));
|
||||
|
||||
string list_id = this.message.GetHeader ("List-Id");
|
||||
if (list_id != null)
|
||||
@@ -345,16 +354,15 @@ namespace Beagle.Filters {
|
||||
}
|
||||
} else if (mime_part is GMime.Multipart) {
|
||||
GMime.Multipart multipart = (GMime.Multipart) mime_part;
|
||||
-
|
||||
- int num_parts = multipart.Number;
|
||||
+ int num_parts = multipart.Count;
|
||||
|
||||
// If the mimetype is multipart/alternative, we only want to index
|
||||
// one part -- the richest one we can filter.
|
||||
- if (mime_part.ContentType.Subtype.ToLower () == "alternative") {
|
||||
+ if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") {
|
||||
// The richest formats are at the end, so work from there
|
||||
// backward.
|
||||
for (int i = num_parts - 1; i >= 0; i--) {
|
||||
- GMime.Object subpart = multipart.GetPart (i);
|
||||
+ GMime.Object subpart = multipart[i];
|
||||
|
||||
if (IsMimeTypeHandled (subpart.ContentType.ToString ())) {
|
||||
part = subpart;
|
||||
@@ -370,7 +378,7 @@ namespace Beagle.Filters {
|
||||
// the parts, treat them like a bunch of attachments.
|
||||
if (part == null) {
|
||||
for (int i = 0; i < num_parts; i++) {
|
||||
- using (GMime.Object subpart = multipart.GetPart (i))
|
||||
+ using (GMime.Object subpart = multipart[i])
|
||||
this.OnEachPart (subpart);
|
||||
}
|
||||
}
|
||||
@@ -400,7 +408,7 @@ namespace Beagle.Filters {
|
||||
} else if (mime_type == "text/html") {
|
||||
no_child_needed = true;
|
||||
html_part = true;
|
||||
- string enc = part.GetContentTypeParameter ("charset");
|
||||
+ string enc = part.ContentType.GetParameter ("charset");
|
||||
// DataWrapper.Stream is a very limited stream
|
||||
// and does not allow Seek or Tell
|
||||
// HtmlFilter requires Stream.Position=0.
|
||||
@@ -473,7 +481,7 @@ namespace Beagle.Filters {
|
||||
if (length != -1)
|
||||
child.AddProperty (Property.NewUnsearched ("fixme:filesize", length));
|
||||
|
||||
- if (part.ContentType.Type.ToLower () == "text")
|
||||
+ if (part.ContentType.MediaType.ToLower () == "text")
|
||||
child.SetTextReader (new StreamReader (stream));
|
||||
else
|
||||
child.SetBinaryStream (stream);
|
||||
diff -p -up beagle-0.3.9/config.h.in~ beagle-0.3.9/config.h.in
|
||||
--- beagle-0.3.9/config.h.in~ 2008-07-19 13:30:38.000000000 +0200
|
||||
+++ beagle-0.3.9/config.h.in 2009-04-28 11:25:11.000000000 +0200
|
||||
@@ -69,6 +69,10 @@
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||
+ */
|
||||
+#undef LT_OBJDIR
|
||||
+
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
diff -p -up beagle-0.3.9/configure.in~ beagle-0.3.9/configure.in
|
||||
--- beagle-0.3.9/configure.in~ 2009-04-28 11:24:17.000000000 +0200
|
||||
+++ beagle-0.3.9/configure.in 2009-05-03 20:08:29.000000000 +0200
|
||||
@@ -17,7 +17,7 @@ MONODOC_REQUIRED=1.2.4
|
||||
NDESK_DBUS_REQUIRED=0.5.2
|
||||
NDESK_DBUS_GLIB_REQUIRED=0.3.0
|
||||
GTK_SHARP_REQUIRED=2.10.0
|
||||
-GMIME_SHARP_REQUIRED=2.2.0
|
||||
+GMIME_SHARP_REQUIRED=2.4.0
|
||||
EVOLUTION_SHARP_REQUIRED=0.13.3
|
||||
GSF_SHARP_REQUIRED=0.6
|
||||
GTK_REQUIRED=2.10.0
|
||||
@@ -223,7 +223,7 @@ if test "x$enable_gui" = "xyes"; then
|
||||
glade-sharp-2.0 >= $GTK_SHARP_REQUIRED
|
||||
gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED
|
||||
gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED
|
||||
- gmime-sharp >= $GMIME_SHARP_REQUIRED
|
||||
+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
|
||||
])
|
||||
AC_SUBST(BEAGLE_UI_LIBS)
|
||||
|
||||
@@ -270,7 +270,7 @@ PKG_CHECK_MODULES(EVO,
|
||||
evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \
|
||||
gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \
|
||||
glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
|
||||
- gmime-sharp >= $GMIME_SHARP_REQUIRED,
|
||||
+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED,
|
||||
have_evo_dependencies=yes, have_evo_dependencies=no)
|
||||
AC_SUBST(EVO_LIBS)
|
||||
|
||||
@@ -377,14 +377,14 @@ dnl ------------------------------------
|
||||
PKG_CHECK_MODULES(BEAGLED,
|
||||
[
|
||||
shared-mime-info
|
||||
- gmime-sharp >= $GMIME_SHARP_REQUIRED
|
||||
+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED
|
||||
glib-sharp-2.0 >= $GTK_SHARP_REQUIRED
|
||||
])
|
||||
BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_LIBS"
|
||||
AC_SUBST(BEAGLED_LIBS)
|
||||
|
||||
GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp`
|
||||
-GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp`
|
||||
+GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.4`
|
||||
|
||||
dnl ----------------------------------------------
|
||||
dnl Epiphany Extension
|
@ -1,372 +0,0 @@
|
||||
From 7cfcb26cd31f43ad93d32d3354787e6c2915b5e3 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rivera <crivera@novell.com>
|
||||
Date: Tue, 26 May 2009 21:07:24 +0000
|
||||
Subject: Grow/shrink the number beagle-search results based on window size
|
||||
|
||||
Rework the size requsitioning to always take all available window
|
||||
space for results, and to dynamically grow and shrink based on the
|
||||
size of the window. Fixes bgo #582354 and #328440.
|
||||
---
|
||||
diff --git a/beagle/search/Beagle.Search/Category.cs b/beagle/search/Beagle.Search/Category.cs
|
||||
index 3a920ab..06e8724 100644
|
||||
--- a/beagle/search/Beagle.Search/Category.cs
|
||||
+++ b/beagle/search/Beagle.Search/Category.cs
|
||||
@@ -18,17 +18,14 @@ namespace Beagle.Search {
|
||||
|
||||
public abstract class Category : Container {
|
||||
|
||||
- private SortedTileList tiles = null;
|
||||
- private int page = 0;
|
||||
-
|
||||
protected Gtk.HBox header;
|
||||
+ private SortedTileList tiles;
|
||||
private Gtk.Label position;
|
||||
private Gtk.Button prev, next;
|
||||
private Gtk.Expander headerExpander;
|
||||
- private int fewRows, manyRows, columns;
|
||||
- private int few, many;
|
||||
private bool extended, expanded;
|
||||
private ScopeType scope;
|
||||
+ private int columns, tileIndex, tileHeight;
|
||||
|
||||
public Category (Tiles.TileGroupInfo info, int columns)
|
||||
{
|
||||
@@ -60,14 +57,9 @@ namespace Beagle.Search {
|
||||
header.SizeRequested += HeaderSizeRequested;
|
||||
|
||||
tiles = new SortedTileList (Beagle.Search.SortType.Relevance);
|
||||
- page = 0;
|
||||
-
|
||||
- fewRows = info.Rows;
|
||||
- manyRows = info.Rows * 2;
|
||||
Columns = columns;
|
||||
|
||||
UpdateButtons ();
|
||||
- //headerExpander.Expanded = true;
|
||||
Expanded = true;
|
||||
}
|
||||
|
||||
@@ -91,7 +83,7 @@ namespace Beagle.Search {
|
||||
expanded = value;
|
||||
|
||||
if (expanded)
|
||||
- ShowTiles (false);
|
||||
+ ShowTiles ();
|
||||
else
|
||||
HideTiles ();
|
||||
|
||||
@@ -103,12 +95,10 @@ namespace Beagle.Search {
|
||||
get { return columns; }
|
||||
set {
|
||||
HideTiles ();
|
||||
-
|
||||
columns = value;
|
||||
- few = fewRows * columns;
|
||||
- many = manyRows * columns;
|
||||
|
||||
- ShowTiles (true);
|
||||
+ if (Expanded)
|
||||
+ ShowTiles ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,14 +117,9 @@ namespace Beagle.Search {
|
||||
args.Requisition = req;
|
||||
}
|
||||
|
||||
- void UpdateButtons ()
|
||||
+ private void UpdateButtons ()
|
||||
{
|
||||
- if (tiles.Count <= FirstVisible && page > 0) {
|
||||
- // The page we were viewing disappeared
|
||||
- page--;
|
||||
- }
|
||||
-
|
||||
- prev.Sensitive = (page != 0);
|
||||
+ prev.Sensitive = tileIndex != 0;
|
||||
next.Sensitive = (tiles.Count > LastVisible + 1);
|
||||
|
||||
if (tiles.Count > 0) {
|
||||
@@ -156,7 +141,7 @@ namespace Beagle.Search {
|
||||
tiles.Add ((Tiles.Tile)widget);
|
||||
|
||||
if (Expanded)
|
||||
- ShowTiles (true);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
|
||||
protected override void OnRemoved (Gtk.Widget widget)
|
||||
@@ -168,41 +153,31 @@ namespace Beagle.Search {
|
||||
tiles.Remove ((Tiles.Tile)widget);
|
||||
|
||||
if (Expanded)
|
||||
- ShowTiles (true);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
|
||||
private Tiles.Tile lastTarget;
|
||||
private bool hadFocus;
|
||||
|
||||
- void HideTiles ()
|
||||
+ private void HideTiles ()
|
||||
{
|
||||
lastTarget = null;
|
||||
- foreach (Tiles.Tile tile in VisibleTiles) {
|
||||
+ foreach (Tiles.Tile tile in AllTiles) {
|
||||
if (tile.HasFocus || lastTarget == null) {
|
||||
lastTarget = tile;
|
||||
hadFocus = tile.HasFocus;
|
||||
}
|
||||
tile.ChildVisible = false;
|
||||
}
|
||||
+
|
||||
QueueResize ();
|
||||
}
|
||||
|
||||
- void ShowTiles (bool recenter)
|
||||
+ private void ShowTiles ()
|
||||
{
|
||||
- if (recenter && lastTarget != null) {
|
||||
- int index = tiles.IndexOf (lastTarget);
|
||||
- if (hadFocus || page > 0) {
|
||||
- if (index < few)
|
||||
- page = 0;
|
||||
- else if (extended)
|
||||
- page = index / (manyRows * columns);
|
||||
- else
|
||||
- page = ((index - few) / (manyRows * columns)) + 1;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
foreach (Tiles.Tile tile in VisibleTiles) {
|
||||
tile.ChildVisible = true;
|
||||
+
|
||||
if (tile == lastTarget && hadFocus && !tile.HasFocus)
|
||||
tile.GrabFocus ();
|
||||
}
|
||||
@@ -211,33 +186,26 @@ namespace Beagle.Search {
|
||||
QueueResize ();
|
||||
}
|
||||
|
||||
- private bool showingMany {
|
||||
- get {
|
||||
- // Show extra tiles on every page after the first, unless
|
||||
- // there are only two pages and the second one only has
|
||||
- // enough tiles to fit the "fewer" size.
|
||||
- return (page > 0 && tiles.Count > 2 * few) || extended;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- void OnPrev (object obj, EventArgs args)
|
||||
+ private void OnPrev (object obj, EventArgs args)
|
||||
{
|
||||
HideTiles ();
|
||||
- page--;
|
||||
+ tileIndex = Math.Max (0, tileIndex - PageSize);
|
||||
+
|
||||
if (!Expanded)
|
||||
OnActivated (obj, args);
|
||||
else
|
||||
- ShowTiles (false);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
|
||||
- void OnNext (object obj, EventArgs args)
|
||||
+ private void OnNext (object obj, EventArgs args)
|
||||
{
|
||||
HideTiles ();
|
||||
- page++;
|
||||
+ tileIndex = Math.Min (tiles.Count - 1, tileIndex + PageSize);
|
||||
+
|
||||
if (!Expanded)
|
||||
OnActivated (obj, args);
|
||||
else
|
||||
- ShowTiles (false);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
|
||||
protected void OnActivated (object obj, EventArgs args)
|
||||
@@ -246,27 +214,56 @@ namespace Beagle.Search {
|
||||
CategoryToggle (scope);
|
||||
}
|
||||
|
||||
+ public void SetMaxDisplayHeight (int height)
|
||||
+ {
|
||||
+ if (tileHeight != height) {
|
||||
+ tileHeight = height;
|
||||
+ HideTiles ();
|
||||
+
|
||||
+ if (Expanded)
|
||||
+ ShowTiles ();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ public int GetPotentialDisplayHeight ()
|
||||
+ {
|
||||
+ if (tiles.Count == 0)
|
||||
+ return 0;
|
||||
+
|
||||
+ Requisition headerReq = header.SizeRequest ();
|
||||
+ Requisition tileReq = tiles[0].SizeRequest ();
|
||||
+ return headerReq.Height + (tiles.Count / Columns) * tileReq.Height;
|
||||
+ }
|
||||
+
|
||||
public delegate void CategoryToggleDelegate (ScopeType scope);
|
||||
public event CategoryToggleDelegate CategoryToggle;
|
||||
|
||||
protected int PageSize {
|
||||
get {
|
||||
- return Math.Min (showingMany ? many : few, tiles.Count);
|
||||
+ if (tiles.Count == 0)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (tileHeight == 0)
|
||||
+ return Math.Min (2 * Columns, tiles.Count);
|
||||
+
|
||||
+ Requisition sizeReq = tiles[0].SizeRequest ();
|
||||
+ int ps = Math.Min (tileHeight / sizeReq.Height * Columns, tiles.Count);
|
||||
+
|
||||
+ // Display at least two rows if we have the hits for it.
|
||||
+ if (ps < 2 * Columns)
|
||||
+ ps = Math.Min (2 * Columns, tiles.Count);
|
||||
+
|
||||
+ return ps;
|
||||
}
|
||||
}
|
||||
|
||||
- protected int FirstVisible {
|
||||
+ private int FirstVisible {
|
||||
get {
|
||||
- if (page == 0)
|
||||
- return 0;
|
||||
- else if (extended)
|
||||
- return page * many;
|
||||
- else
|
||||
- return few + (page - 1) * many;
|
||||
+ return tileIndex;
|
||||
}
|
||||
}
|
||||
|
||||
- protected int LastVisible {
|
||||
+ private int LastVisible {
|
||||
get {
|
||||
return Math.Min (FirstVisible + PageSize, tiles.Count) - 1;
|
||||
}
|
||||
@@ -337,7 +334,7 @@ namespace Beagle.Search {
|
||||
set {
|
||||
HideTiles ();
|
||||
tiles.SortType = value;
|
||||
- ShowTiles (true);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -346,7 +343,7 @@ namespace Beagle.Search {
|
||||
if (extended) {
|
||||
HideTiles ();
|
||||
this.extended = extended;
|
||||
- ShowTiles (false);
|
||||
+ ShowTiles ();
|
||||
}
|
||||
if (focus && !Empty)
|
||||
((Gtk.Widget)VisibleTiles[0]).GrabFocus ();
|
||||
diff --git a/beagle/search/Beagle.Search/GroupView.cs b/beagle/search/Beagle.Search/GroupView.cs
|
||||
index d9d6319..e0620da 100644
|
||||
--- a/beagle/search/Beagle.Search/GroupView.cs
|
||||
+++ b/beagle/search/Beagle.Search/GroupView.cs
|
||||
@@ -25,6 +25,9 @@ namespace Beagle.Search {
|
||||
private Gtk.SizeGroup tileSizeGroup;
|
||||
private Gtk.Widget selection;
|
||||
|
||||
+ private int[] maxHeight;
|
||||
+ private int[] displayHeight;
|
||||
+
|
||||
public event CategoryToggledDelegate CategoryToggled;
|
||||
public event TileHandler TileSelected;
|
||||
|
||||
@@ -47,8 +50,68 @@ namespace Beagle.Search {
|
||||
|
||||
categories [info.Group] = box;
|
||||
}
|
||||
+
|
||||
+ maxHeight = new int[Children.Length];
|
||||
+ displayHeight = new int[Children.Length];
|
||||
}
|
||||
|
||||
+ public void AdjustCategories (int height)
|
||||
+ {
|
||||
+ Category last = null;
|
||||
+ int visible = 0, totalHeight = height, childLen = Children.Length;
|
||||
+ ulong mask = ~0UL;
|
||||
+
|
||||
+ for (int i = 0; i < childLen; i++) {
|
||||
+ displayHeight[i] = maxHeight[i] = 0;
|
||||
+ Category c = (Category) Children[i];
|
||||
+ if (!c.Expanded || c.Count == 0) {
|
||||
+ mask ^= 1UL << i;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ last = c;
|
||||
+ visible++;
|
||||
+ maxHeight[i] = c.GetPotentialDisplayHeight ();
|
||||
+ }
|
||||
+
|
||||
+ if (visible == 0) {
|
||||
+ return;
|
||||
+ } else if (visible == 1) {
|
||||
+ last.SetMaxDisplayHeight (height);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // Split the available height among the visible categories
|
||||
+ for (int active = visible; active > 0 && totalHeight > active;) {
|
||||
+ int avg_height = totalHeight / active;
|
||||
+
|
||||
+ for (int i = 0; i < childLen; i++) {
|
||||
+ if ((mask & 1UL << i) == 0)
|
||||
+ continue;
|
||||
+
|
||||
+ int diff = maxHeight[i] - displayHeight[i];
|
||||
+ if (diff <= avg_height) {
|
||||
+ displayHeight[i] += diff;
|
||||
+ totalHeight -= diff;
|
||||
+ mask ^= 1UL << i;
|
||||
+ } else {
|
||||
+ displayHeight[i] += avg_height;
|
||||
+ totalHeight -= avg_height;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ for (int j = active = 0; j < childLen; j++)
|
||||
+ if ((mask & 1UL << j) != 0)
|
||||
+ active++;
|
||||
+ }
|
||||
+
|
||||
+ // Tell each category how much height it has to work with
|
||||
+ for (int i = 0; i < childLen; i++) {
|
||||
+ Category c = (Category) Children[i];
|
||||
+ c.SetMaxDisplayHeight (displayHeight[i]);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
public void AddHit (Tile tile)
|
||||
{
|
||||
tile.Show ();
|
||||
diff --git a/beagle/search/Beagle.Search/Panes.cs b/beagle/search/Beagle.Search/Panes.cs
|
||||
index 3ae5b7e..4b6a554 100644
|
||||
--- a/beagle/search/Beagle.Search/Panes.cs
|
||||
+++ b/beagle/search/Beagle.Search/Panes.cs
|
||||
@@ -92,6 +92,10 @@ namespace Beagle.Search {
|
||||
Gtk.Widget focusChild = mainChild.FocusChild;
|
||||
mainChild.FocusChild = null;
|
||||
mainChild.FocusChild = focusChild;
|
||||
+
|
||||
+ GroupView gv = mainChild as GroupView;
|
||||
+ if (gv != null)
|
||||
+ gv.AdjustCategories (args.Allocation.Height);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.8.3.1
|
@ -1,56 +0,0 @@
|
||||
diff -p -up beagle-0.3.9/beagled/SqliteUtils.cs.mono2.6 beagle-0.3.9/beagled/SqliteUtils.cs
|
||||
--- beagle-0.3.9/beagled/SqliteUtils.cs.mono2.6 2008-01-02 00:25:15.000000000 +0100
|
||||
+++ beagle-0.3.9/beagled/SqliteUtils.cs 2009-12-16 14:27:28.000000000 +0100
|
||||
@@ -55,7 +55,8 @@ namespace Beagle.Util {
|
||||
try {
|
||||
ret = command.ExecuteNonQuery ();
|
||||
break;
|
||||
- } catch (SqliteBusyException ex) {
|
||||
+ } catch (SqliteException ex) {
|
||||
+ if (ex.ErrorCode == SQLiteErrorCode.Busy)
|
||||
Thread.Sleep (50);
|
||||
} catch (Exception e) {
|
||||
Log.Error (e, "SQL that caused the exception: {0}", command_text);
|
||||
@@ -79,7 +80,8 @@ namespace Beagle.Util {
|
||||
try {
|
||||
ret = command.ExecuteNonQuery ();
|
||||
break;
|
||||
- } catch (SqliteBusyException ex) {
|
||||
+ } catch (SqliteException ex) {
|
||||
+ if (ex.ErrorCode == SQLiteErrorCode.Busy)
|
||||
Thread.Sleep (50);
|
||||
} catch (Exception e) {
|
||||
Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText);
|
||||
@@ -96,7 +98,8 @@ namespace Beagle.Util {
|
||||
while (reader == null) {
|
||||
try {
|
||||
reader = command.ExecuteReader ();
|
||||
- } catch (SqliteBusyException ex) {
|
||||
+ } catch (SqliteException ex) {
|
||||
+ if (ex.ErrorCode == SQLiteErrorCode.Busy)
|
||||
Thread.Sleep (50);
|
||||
}
|
||||
}
|
||||
@@ -108,7 +111,8 @@ namespace Beagle.Util {
|
||||
while (true) {
|
||||
try {
|
||||
return reader.Read ();
|
||||
- } catch (SqliteBusyException ex) {
|
||||
+ } catch (SqliteException ex) {
|
||||
+ if (ex.ErrorCode == SQLiteErrorCode.Busy)
|
||||
Thread.Sleep (50);
|
||||
}
|
||||
}
|
||||
diff -p -up beagle-0.3.9/Util/FSpotTools.cs.mono2.6 beagle-0.3.9/Util/FSpotTools.cs
|
||||
--- beagle-0.3.9/Util/FSpotTools.cs.mono2.6 2007-11-27 02:49:59.000000000 +0100
|
||||
+++ beagle-0.3.9/Util/FSpotTools.cs 2009-12-16 14:27:58.000000000 +0100
|
||||
@@ -85,7 +85,8 @@ namespace Beagle.Util {
|
||||
while (reader == null) {
|
||||
try {
|
||||
reader = command.ExecuteReader ();
|
||||
- } catch (SqliteBusyException) {
|
||||
+ } catch (SqliteException ex) {
|
||||
+ if (ex.ErrorCode == SQLiteErrorCode.Busy)
|
||||
Thread.Sleep (50);
|
||||
}
|
||||
}
|
@ -1,152 +0,0 @@
|
||||
Patch to enable compilation against mono-2.8
|
||||
|
||||
* Mono-2.8 uses mono-2.pc instead of mono.pc for setting cflags and libs.
|
||||
* Mono-2.8 disables direct access to struct MonoType fields; use accessors
|
||||
instead (mono_type_get_type and mono_field_get_flags have been present in
|
||||
the API since at least mono-1.2, so we do not need any version ifdefs).
|
||||
* Cast FSpot.MetadataStore to IEnumerable in foreach() to prevent CS1640
|
||||
errors (non-unique enumeration of the type) with mono-2.8's gmcs.
|
||||
|
||||
diff -ru beagle-0.3.9-orig/configure.in beagle-0.3.9/configure.in
|
||||
--- beagle-0.3.9-orig/configure.in 2010-10-16 01:30:03.807825004 -0400
|
||||
+++ beagle-0.3.9/configure.in 2010-10-16 01:30:10.385825003 -0400
|
||||
@@ -59,11 +59,20 @@
|
||||
AC_MSG_ERROR([You need to install the Mono gmcs compiler])
|
||||
fi
|
||||
|
||||
-AC_MSG_CHECKING([for mono.pc])
|
||||
-if test -z `$PKG_CONFIG --variable=prefix mono`; then
|
||||
- AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package])
|
||||
+# mono-2.8 and higher uses mono-2.pc instead of mono.pc for cflags and libs
|
||||
+AC_MSG_CHECKING([for mono-2.pc])
|
||||
+if test -z `$PKG_CONFIG --variable=prefix mono-2`; then
|
||||
+ AC_MSG_RESULT([not found])
|
||||
+ AC_MSG_CHECKING([for mono.pc])
|
||||
+ if test -z `$PKG_CONFIG --variable=prefix mono`; then
|
||||
+ AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package])
|
||||
+ else
|
||||
+ AC_MSG_RESULT([found])
|
||||
+ mono_pc=mono
|
||||
+ fi
|
||||
else
|
||||
AC_MSG_RESULT([found])
|
||||
+ mono_pc=mono-2
|
||||
fi
|
||||
|
||||
BEAGLE_DEFINES=""
|
||||
@@ -71,10 +80,10 @@
|
||||
# check that we have the require version of mono
|
||||
|
||||
# Temporary: check for mono-1.9
|
||||
-PKG_CHECK_MODULES(MONO, mono >= 1.9, mono_1_9=yes, mono_1_9=no)
|
||||
+PKG_CHECK_MODULES(MONO, $mono_pc >= 1.9, mono_1_9=yes, mono_1_9=no)
|
||||
if test "x$mono_1_9" = "xno"; then
|
||||
AC_MSG_RESULT([missing mono >= 1.9. Searching for mono >= 1.2.4])
|
||||
- PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED)
|
||||
+ PKG_CHECK_MODULES(MONO, $mono_pc >= $MONO_REQUIRED)
|
||||
else
|
||||
AC_MSG_RESULT([found mono >= 1.9])
|
||||
BEAGLE_DEFINES="$BEAGLE_DEFINES -define:MONO_1_9"
|
||||
@@ -84,7 +93,7 @@
|
||||
needed_dlls="Mono.Data.Sqlite Mono.Posix System.Data System.Web ICSharpCode.SharpZipLib"
|
||||
for i in $needed_dlls; do
|
||||
AC_MSG_CHECKING([for $i.dll])
|
||||
- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
|
||||
+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then
|
||||
AC_MSG_ERROR([missing required mono DLL: $i.dll])
|
||||
else
|
||||
AC_MSG_RESULT([found])
|
||||
@@ -195,7 +204,7 @@
|
||||
if test "x$enable_google" = "xyes"; then
|
||||
i="System.Security"
|
||||
AC_MSG_CHECKING([for $i.dll (needed by Google backends)])
|
||||
- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
|
||||
+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then
|
||||
AC_MSG_ERROR([missing required mono DLL: $i.dll])
|
||||
else
|
||||
AC_MSG_RESULT([found])
|
||||
@@ -560,7 +569,7 @@
|
||||
if test "x$enable_qt" != "xno" -a "x$has_qyoto" = "xno"; then
|
||||
i="qt-dotnet"
|
||||
AC_MSG_CHECKING([for $i.dll])
|
||||
- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
|
||||
+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then
|
||||
AC_MSG_ERROR([missing required mono DLL: $i.dll])
|
||||
else
|
||||
AC_MSG_RESULT([found])
|
||||
Only in beagle-0.3.9: configure.in.orig
|
||||
diff -ru beagle-0.3.9-orig/Filters/FilterImage.cs beagle-0.3.9/Filters/FilterImage.cs
|
||||
--- beagle-0.3.9-orig/Filters/FilterImage.cs 2008-04-13 15:24:13.000000000 -0400
|
||||
+++ beagle-0.3.9/Filters/FilterImage.cs 2010-10-16 02:08:10.755825005 -0400
|
||||
@@ -141,7 +141,7 @@
|
||||
Resource rights_anon = null;
|
||||
Resource title_anon = null;
|
||||
|
||||
- foreach (Statement stmt in xmp.Store) {
|
||||
+ foreach (Statement stmt in (IEnumerable)xmp.Store) {
|
||||
if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) {
|
||||
//Console.WriteLine ("found subject");
|
||||
subject_anon = stmt.Object;
|
||||
@@ -163,7 +163,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- foreach (Statement stmt in xmp.Store) {
|
||||
+ foreach (Statement stmt in (IEnumerable)xmp.Store) {
|
||||
if (stmt.Subject == subject_anon &&
|
||||
stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) {
|
||||
AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value));
|
||||
diff -ru beagle-0.3.9-orig/Filters/FilterPdf.cs beagle-0.3.9/Filters/FilterPdf.cs
|
||||
--- beagle-0.3.9-orig/Filters/FilterPdf.cs 2008-04-13 15:31:18.000000000 -0400
|
||||
+++ beagle-0.3.9/Filters/FilterPdf.cs 2010-10-16 02:22:09.528825003 -0400
|
||||
@@ -8,6 +8,7 @@
|
||||
//
|
||||
|
||||
using System;
|
||||
+using System.Collections;
|
||||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
|
||||
@@ -220,7 +221,7 @@
|
||||
Resource rights_anon = null;
|
||||
Resource title_anon = null;
|
||||
|
||||
- foreach (Statement stmt in xmp.Store) {
|
||||
+ foreach (Statement stmt in (IEnumerable)xmp.Store) {
|
||||
if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) {
|
||||
//Console.WriteLine ("found subject");
|
||||
subject_anon = stmt.Object;
|
||||
@@ -239,7 +240,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- foreach (Statement stmt in xmp.Store) {
|
||||
+ foreach (Statement stmt in (IEnumerable)xmp.Store) {
|
||||
if (stmt.Subject == subject_anon &&
|
||||
stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) {
|
||||
AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value));
|
||||
diff -ru beagle-0.3.9-orig/glue/mono-glue.c beagle-0.3.9/glue/mono-glue.c
|
||||
--- beagle-0.3.9-orig/glue/mono-glue.c 2007-11-26 20:50:05.000000000 -0500
|
||||
+++ beagle-0.3.9/glue/mono-glue.c 2010-10-16 01:04:19.839825010 -0400
|
||||
@@ -79,18 +79,18 @@
|
||||
type = mono_class_get_type (klass);
|
||||
|
||||
/* This is an array, so drill down into it */
|
||||
- if (type->type == MONO_TYPE_SZARRAY)
|
||||
+ if (mono_type_get_type (type) == MONO_TYPE_SZARRAY)
|
||||
total += memory_usage_array ((MonoArray *) obj, visited);
|
||||
|
||||
while ((field = mono_class_get_fields (klass, &iter)) != NULL) {
|
||||
MonoType *ftype = mono_field_get_type (field);
|
||||
gpointer value;
|
||||
|
||||
- if ((ftype->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0)
|
||||
+ if ((mono_field_get_flags (field) & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0)
|
||||
continue;
|
||||
|
||||
/* FIXME: There are probably other types we need to drill down into */
|
||||
- switch (ftype->type) {
|
||||
+ switch (mono_type_get_type (ftype)) {
|
||||
|
||||
case MONO_TYPE_CLASS:
|
||||
case MONO_TYPE_OBJECT:
|
@ -1,14 +0,0 @@
|
||||
diff -upNr beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs
|
||||
--- beagle-0.3.9.orign/search/Beagle.Search.Tiles/Tile.cs 2008-07-17 01:54:15.000000000 +0200
|
||||
+++ beagle-0.3.9/search/Beagle.Search.Tiles/Tile.cs 2009-07-06 20:50:41.227254947 +0200
|
||||
@@ -348,10 +348,6 @@ namespace Beagle.Search.Tiles {
|
||||
#else
|
||||
MimeApplication app;
|
||||
app = Mime.GetDefaultApplication (mimetype);
|
||||
- if (app == null) {
|
||||
- Console.WriteLine ("Can't open MimeType '{0}'", mimetype);
|
||||
- return;
|
||||
- }
|
||||
|
||||
bool expect_uris = app.SupportsUris ();
|
||||
path = hit.Path;
|
@ -1,24 +0,0 @@
|
||||
From 1f2e02c9f1e47b747d281510ab7bbd7950c568ee Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Fri, 14 Aug 2009 11:31:59 +0000
|
||||
Subject: Update tileIndex when removing a tile
|
||||
|
||||
The bug was introduced with 7cfcb26c.
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=582354
|
||||
---
|
||||
diff --git a/beagle/search/Beagle.Search/Category.cs b/beagle/search/Beagle.Search/Category.cs
|
||||
index 06e8724..a008ef4 100644
|
||||
--- a/beagle/search/Beagle.Search/Category.cs
|
||||
+++ b/beagle/search/Beagle.Search/Category.cs
|
||||
@@ -152,6 +152,8 @@ namespace Beagle.Search {
|
||||
|
||||
tiles.Remove ((Tiles.Tile)widget);
|
||||
|
||||
+ tileIndex = Math.Min( Math.Max( tiles.Count - 1, 0), tileIndex);
|
||||
+
|
||||
if (Expanded)
|
||||
ShowTiles ();
|
||||
}
|
||||
--
|
||||
cgit v0.8.3.1
|
@ -1,18 +0,0 @@
|
||||
# Beagle Portage Crawl Setup
|
||||
|
||||
source /etc/make.globals
|
||||
source /etc/make.conf
|
||||
|
||||
CRAWL_ENABLED="no"
|
||||
|
||||
CRAWL_INDEX_NAME="portage"
|
||||
|
||||
CRAWL_PATHS="${PORTDIR} /var/db/pkg"
|
||||
|
||||
CRAWL_ALLOW_PATTERNS="*.ebuild,ChangeLog,metadata.xml"
|
||||
|
||||
CRAWL_RECURSIVE="yes"
|
||||
|
||||
CRAWL_DISABLE_FILTERING="no"
|
||||
|
||||
CRAWL_CACHE_TEXT="no"
|
@ -1,43 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>dotnet</herd>
|
||||
<use>
|
||||
<flag name='google'>Enables google (gmail etc.) indexing support.</flag>
|
||||
<flag name='chm'>Enables support for indexing of the MS CHM (Compressed HTML)
|
||||
file format using <pkg>app-doc/chmlib</pkg>.</flag>
|
||||
<flag name='doc'>Builds programmer documentation for Beagle using
|
||||
<pkg>app-doc/monodoc</pkg>.</flag>
|
||||
<flag name='debug'>Enables debug XML dumps of all messages passed between
|
||||
the daemons and the UIs. WARNING, this option will fill up your Beagle
|
||||
Log directory very quickly.</flag>
|
||||
<flag name='eds'>Enables Beagle to index the Addressbook and Calendar from
|
||||
<pkg>mail-client/evolution</pkg> stored in
|
||||
<pkg>gnome-extra/evolution-data-server</pkg>. The information is
|
||||
accessed using <pkg>dev-dotnet/evolution-sharp</pkg>.</flag>
|
||||
<flag name='firefox'>Compiles and installs the extension for either
|
||||
<pkg>www-client/firefox</pkg> or
|
||||
<pkg>www-client/firefox-bin</pkg>. This extension helps
|
||||
Beagle index the websites you visit.</flag>
|
||||
<flag name='galago'>Allows Beagle to get status information from
|
||||
applications such as Pidgin to show in the search results.</flag>
|
||||
<flag name='gtk'>Enables the GTK+ Beagle Search UI for showing search
|
||||
results. This is the default GUI for Beagle.</flag>
|
||||
<flag name='inotify'>Enable inotify filesystem monitoring support
|
||||
</flag>
|
||||
<flag name='pdf'>Enables support for indexing of the PDF (Portable Document
|
||||
Format) file format using `pdfinfo` and `pdftotext` from
|
||||
<pkg>app-text/poppler</pkg></flag>
|
||||
<flag name='ole'>Enables OLE (Object Linking and Editing) support via
|
||||
<pkg>dev-dotnet/gsf-sharp</pkg>, <pkg>app-text/wv</pkg>, and
|
||||
<pkg>app-office/gnumeric</pkg>(ssindex). These allow Beagle to index
|
||||
MS Powerpoint, Word, and Spreadsheet Documents.</flag>
|
||||
<flag name='thunderbird'>Compiles and installs the extension for either
|
||||
<pkg>mail-client/thunderbird</pkg> or
|
||||
<pkg>mail-client/thunderbird-bin</pkg>. This extension helps
|
||||
Beagle index your mails.</flag>
|
||||
<flag name='xscreensaver'>Allow Beagle to detect when the screensaver is
|
||||
switched on. This allows Beagle to use more resources and index faster
|
||||
when the computer is not in use.</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
@ -1,87 +0,0 @@
|
||||
From ba3550bc82b8fb697b905c9913e399e1835b7cc0 Mon Sep 17 00:00:00 2001
|
||||
From: Eike Rathke <erack@redhat.com>
|
||||
Date: Tue, 03 Apr 2012 14:15:48 +0000
|
||||
Subject: as of ICU 4.9 RBBI the Prepend property is empty
|
||||
|
||||
Backport of 43084e8b30c101a44510b7a8267d5c2b316a17bb
|
||||
* config_host.mk doesn't exist, instead changes to set_soenv.in
|
||||
* i18npool/CustomTarget_breakiterator.mk doesn't exist, instead same changes
|
||||
to i18npool/source/breakiterator/Makefile
|
||||
* char.txt and char_in.txt unchanged
|
||||
|
||||
Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com>
|
||||
---
|
||||
diff --git a/configure.in b/configure.in
|
||||
index ea959e6..8e45756 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -6162,6 +6162,7 @@ ICU_MAJOR=
|
||||
ICU_MINOR=
|
||||
ICU_MICRO=
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
|
||||
+ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
|
||||
AC_MSG_CHECKING([which icu to use])
|
||||
if test "$with_system_icu" = "yes"; then
|
||||
AC_MSG_RESULT([external])
|
||||
@@ -6207,6 +6208,9 @@ if test "$with_system_icu" = "yes"; then
|
||||
if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
|
||||
fi
|
||||
+ if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
|
||||
+ ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll"
|
||||
@@ -6214,6 +6218,7 @@ else
|
||||
AC_MSG_RESULT([internal])
|
||||
SYSTEM_ICU="NO"
|
||||
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
|
||||
+ # ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2
|
||||
BUILD_TYPE="$BUILD_TYPE ICU"
|
||||
fi
|
||||
AC_SUBST(SYSTEM_ICU)
|
||||
@@ -6224,6 +6229,7 @@ AC_SUBST(ICU_MAJOR)
|
||||
AC_SUBST(ICU_MINOR)
|
||||
AC_SUBST(ICU_MICRO)
|
||||
AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
|
||||
+AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Graphite
|
||||
diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
|
||||
index b34217a..6aed8b2 100644
|
||||
--- a/i18npool/source/breakiterator/Makefile
|
||||
+++ b/i18npool/source/breakiterator/Makefile
|
||||
@@ -83,10 +83,16 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES))
|
||||
%.brk : %.txt.p
|
||||
$(GENBRK) -r $< -o $@
|
||||
|
||||
-# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
|
||||
+# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
|
||||
+# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used.
|
||||
+# NOTE: strips every line with _word_ 'Prepend', including $Prepend
|
||||
%.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt
|
||||
ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
|
||||
+ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
|
||||
+ sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@
|
||||
+else
|
||||
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
|
||||
+endif
|
||||
else
|
||||
cp $< $@
|
||||
endif
|
||||
diff --git a/set_soenv.in b/set_soenv.in
|
||||
index 3dc9cfa..a8561cd 100755
|
||||
--- a/set_soenv.in
|
||||
+++ b/set_soenv.in
|
||||
@@ -1881,6 +1881,7 @@ ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
|
||||
ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
|
||||
ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
|
||||
ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
|
||||
+ToFile( "ICU_RECLASSIFIED_PREPEND_SET_EMPTY", "@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@", "e" );
|
||||
ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
|
||||
ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
|
||||
ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
@ -1,37 +0,0 @@
|
||||
From b8ec5464300a0c909166197a09a80c837b90fef5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
|
||||
Date: Tue, 3 Apr 2012 14:21:23 +0200
|
||||
Subject: [PATCH] always pass --headless to cppunits
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
They should not need any actual UI anyway, and most of them already
|
||||
pass the option manually.
|
||||
http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html
|
||||
|
||||
This is partial code grab as cherry-pick had the test-mk files collisions
|
||||
all over the place. I pick only the additional define which results in some
|
||||
tests adding --headless twice, which does no harm.
|
||||
|
||||
Author: Luboš Luňák <l.lunak@suse.cz>
|
||||
Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
|
||||
---
|
||||
solenv/gbuild/CppunitTest.mk | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
|
||||
index 0d8959e..826d3f5 100644
|
||||
--- a/solenv/gbuild/CppunitTest.mk
|
||||
+++ b/solenv/gbuild/CppunitTest.mk
|
||||
@@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(1)
|
||||
gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
|
||||
define gb_CppunitTest__make_args
|
||||
$(ARGS) \
|
||||
+--headless \
|
||||
$(if $(strip $(UNO_TYPES)),\
|
||||
"-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
|
||||
$(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \
|
||||
--
|
||||
1.7.7
|
||||
|
@ -1,29 +0,0 @@
|
||||
From bf277a00e352733bf52720fe4f9a1a91dcfb2e93 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Chvatal <tchvatal@suse.cz>
|
||||
Date: Sun, 29 Apr 2012 08:45:59 +0000
|
||||
Subject: Fix buildissue in svtools with missing include.
|
||||
|
||||
cpp: line 33, Fatal error: Cannot open include file
|
||||
"svtools/svtools.hrc"
|
||||
|
||||
Change-Id: Ic7bd1af8f14cc0e44328c9f149c5dc45f04e5afb
|
||||
(cherry picked from commit 3534e99d18952fc87f98cf60eb7767374a1371c4)
|
||||
|
||||
Conflicts:
|
||||
|
||||
svtools/AllLangResTarget_svt.mk
|
||||
---
|
||||
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
|
||||
index e5d0a5b..d65a45b 100644
|
||||
--- a/svtools/AllLangResTarget_svt.mk
|
||||
+++ b/svtools/AllLangResTarget_svt.mk
|
||||
@@ -40,6 +40,7 @@ $(eval $(call gb_SrsTarget_set_include,svt/res,\
|
||||
$$(INCLUDE) \
|
||||
-I$(WORKDIR)/inc \
|
||||
-I$(realpath $(SRCDIR)/svtools/source/inc) \
|
||||
+ -I$(realpath $(SRCDIR)/svtools/inc) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_SrsTarget_add_files,svt/res,\
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
@ -1,524 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.18 2012/06/05 15:43:40 scarabeus 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.4.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 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.gentooexperimental.org/~scarabeus/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs
|
||||
# Core MUST be first!
|
||||
MODULES="core binfilter"
|
||||
# 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 +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"
|
||||
"${FILESDIR}/${PN}-3.5.2-icu-49.patch"
|
||||
#"${FILESDIR}/${PN}-3.5.2-icu-49-part2.patch"
|
||||
"${FILESDIR}/${PN}-3.5.2-tests-headless.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
|
||||
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() {
|
||||
# this is not a proper make script and the jobs are passed during configure
|
||||
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/main_transform.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.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
DIST gtkpod-2.0.2.tar.gz 2982482 RMD160 0810947c013c137f57599a999f63d07d6710b6c7 SHA1 d93e7618653d00a8bc845fd070305c5b38eea1e8 SHA256 2c5dd3d193cd73ba107ccb158e48198768f1dd26724834f8f5ab804281ea4648
|
||||
DIST gtkpod-2.1.1.tar.gz 3120542 RMD160 5f30795cf7cda5744181f56875c7648d430d76fc SHA1 aa0bd06395f878bdf9578f8e4350536216fcd2b6 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a
|
||||
DIST gtkpod-2.1.2-beta2.tar.gz 3674227 RMD160 82ff90395128182b352bfecde6009c8c208f94b7 SHA1 bcdeecbe6ea4126990e962b4beb582c9bad7cb33 SHA256 d91f77ab5a05854af520492ab1f31bc6ccbbbea0f770c1de119d7247d84572c4
|
||||
|
@ -0,0 +1,170 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.2.0_beta2.ebuild,v 1.1 2012/06/06 14:02:33 titanofold Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib prefix versionator
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
|
||||
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# Comment the following five lines when not a beta or rc.
|
||||
MY_PV="${PV//_}"
|
||||
MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
|
||||
S="${WORKDIR}/postgresql-${MY_FILE_PV}"
|
||||
SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_FILE_PV}.tar.bz2
|
||||
http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_FILE_PV}.tbz2"
|
||||
|
||||
# Comment the following three lines when a beta or rc.
|
||||
#S="${WORKDIR}/postgresql-${PV}"
|
||||
#SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
|
||||
# http://dev.gentoo.org/~titanofold/postgresql-patches-${PV}.tbz2"
|
||||
|
||||
LICENSE="POSTGRESQL"
|
||||
DESCRIPTION="PostgreSQL libraries and clients"
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
|
||||
# No tests to be done for clients and libraries
|
||||
RESTRICT="test"
|
||||
|
||||
LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
|
||||
IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
|
||||
|
||||
for lingua in ${LINGUAS} ; do
|
||||
IUSE+=" linguas_${lingua}"
|
||||
done
|
||||
|
||||
wanted_languages() {
|
||||
local enable_langs
|
||||
|
||||
for lingua in ${LINGUAS} ; do
|
||||
use linguas_${lingua} && enable_langs+="${lingua} "
|
||||
done
|
||||
|
||||
echo -n ${enable_langs}
|
||||
}
|
||||
|
||||
RDEPEND="!!dev-db/libpq
|
||||
!!dev-db/postgresql
|
||||
!!dev-db/postgresql-client
|
||||
!!dev-db/postgresql-libs
|
||||
sys-apps/less
|
||||
>=app-admin/eselect-postgresql-1.0.10
|
||||
virtual/libintl
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( net-nds/openldap )
|
||||
pam? ( virtual/pam )
|
||||
readline? ( sys-libs/readline )
|
||||
ssl? ( >=dev-libs/openssl-0.9.6-r1 )
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
!!<sys-apps/sandbox-2.0
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
|
||||
|
||||
# Support /var/run or /run for the socket directory
|
||||
[[ ! -d /run ]] && RUNDIR=/var
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}/autoconf.patch" \
|
||||
"${WORKDIR}/base.patch" \
|
||||
"${WORKDIR}/bool.patch"
|
||||
|
||||
eprefixify src/include/pg_config_manual.h
|
||||
|
||||
# to avoid collision - it only should be installed by server
|
||||
rm "${S}/src/backend/nls.mk"
|
||||
|
||||
# because psql/help.c includes the file
|
||||
ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
|
||||
|
||||
sed -e "s|@RUNDIR@|${RUNDIR}|g" \
|
||||
-i src/include/pg_config_manual.h || \
|
||||
die "RUNDIR sed failed"
|
||||
|
||||
eautoconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
case ${CHOST} in
|
||||
*-darwin*|*-solaris*)
|
||||
use nls && append-libs intl
|
||||
;;
|
||||
esac
|
||||
|
||||
export LDFLAGS_SL="${LDFLAGS}"
|
||||
export LDFLAGS_EX="${LDFLAGS}"
|
||||
|
||||
local PO="${EPREFIX%/}"
|
||||
|
||||
econf \
|
||||
--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
|
||||
--datadir="${PO}/usr/share/postgresql-${SLOT}" \
|
||||
--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
|
||||
--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
|
||||
--includedir="${PO}/usr/include/postgresql-${SLOT}" \
|
||||
--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
|
||||
--without-tcl \
|
||||
--without-perl \
|
||||
--without-python \
|
||||
$(use_with readline) \
|
||||
$(use_with kerberos krb5) \
|
||||
$(use_with kerberos gssapi) \
|
||||
"$(use_enable nls nls "$(wanted_languages)")" \
|
||||
$(use_with pam) \
|
||||
$(use_enable !pg_legacytimestamp integer-datetimes) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable threads thread-safety) \
|
||||
$(use_with zlib) \
|
||||
$(use_with ldap)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
cd "${S}/contrib"
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
insinto /usr/include/postgresql-${SLOT}/postmaster
|
||||
doins "${S}"/src/include/postmaster/*.h
|
||||
|
||||
dodir /usr/share/postgresql-${SLOT}/man/
|
||||
cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
|
||||
rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
|
||||
docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
|
||||
dodoc README HISTORY doc/{TODO,bug.template}
|
||||
|
||||
cd "${S}/contrib"
|
||||
emake DESTDIR="${D}" install
|
||||
cd "${S}"
|
||||
|
||||
dodir /etc/eselect/postgresql/slots/${SLOT}
|
||||
echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
|
||||
"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
|
||||
|
||||
keepdir /etc/postgresql-${SLOT}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
postgresql-config update
|
||||
|
||||
elog "If you need a global psqlrc-file, you can place it in:"
|
||||
elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
postgresql-config update
|
||||
}
|
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.2.0_beta2.ebuild,v 1.1 2012/06/06 14:01:50 titanofold Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit versionator
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
|
||||
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# Comment the following four lines when not a beta or rc.
|
||||
MY_PV="${PV//_}"
|
||||
MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
|
||||
S="${WORKDIR}/postgresql-${MY_FILE_PV}"
|
||||
SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_FILE_PV}.tar.bz2"
|
||||
|
||||
# Comment the following two lines when a beta or rc.
|
||||
#S="${WORKDIR}/postgresql-${PV}"
|
||||
# SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="POSTGRESQL"
|
||||
DESCRIPTION="PostgreSQL documentation"
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/doc/${PF}/html
|
||||
|
||||
cd "${S}/doc"
|
||||
|
||||
docinto sgml
|
||||
dodoc src/sgml/*.{sgml,dsl}
|
||||
|
||||
docinto sgml/ref
|
||||
dodoc src/sgml/ref/*.sgml
|
||||
|
||||
docinto html
|
||||
dodoc src/sgml/html/*.html
|
||||
dodoc src/sgml/html/stylesheet.css
|
||||
|
||||
docinto
|
||||
dodoc TODO
|
||||
|
||||
dodir /etc/eselect/postgresql/slots/${SLOT}
|
||||
echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
|
||||
"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
|
||||
}
|
@ -0,0 +1,357 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.0_beta2.ebuild,v 1.1 2012/06/06 14:03:13 titanofold Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="python? 2"
|
||||
|
||||
WANT_AUTOMAKE="none"
|
||||
inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
|
||||
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# Comment the following six lines when not a beta or rc.
|
||||
MY_PV="${PV//_}"
|
||||
MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
|
||||
S="${WORKDIR}/postgresql-${MY_FILE_PV}"
|
||||
SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_FILE_PV}.tar.bz2
|
||||
http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_FILE_PV}.tbz2
|
||||
http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2"
|
||||
|
||||
# Comment the following four lines when a beta or rc.
|
||||
#S="${WORKDIR}/postgresql-${PV}"
|
||||
#SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
|
||||
# http://dev.gentoo.org/~titanofold/postgresql-patches-${PV}.tbz2
|
||||
# http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
|
||||
|
||||
LICENSE="POSTGRESQL"
|
||||
DESCRIPTION="PostgreSQL server"
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
|
||||
LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
|
||||
IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
|
||||
|
||||
for lingua in ${LINGUAS}; do
|
||||
IUSE+=" linguas_${lingua}"
|
||||
done
|
||||
|
||||
wanted_languages() {
|
||||
local enable_langs
|
||||
|
||||
for lingua in ${LINGUAS} ; do
|
||||
use linguas_${lingua} && enable_langs+="${lingua} "
|
||||
done
|
||||
|
||||
echo -n ${enable_langs}
|
||||
}
|
||||
|
||||
RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
|
||||
perl? ( >=dev-lang/perl-5.8 )
|
||||
selinux? ( sec-policy/selinux-postgresql )
|
||||
tcl? ( >=dev-lang/tcl-8 )
|
||||
uuid? ( dev-libs/ossp-uuid )
|
||||
xml? ( dev-libs/libxml2 dev-libs/libxslt )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/flex
|
||||
xml? ( virtual/pkgconfig )"
|
||||
PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
|
||||
|
||||
# Support /var/run or /run for the socket directory
|
||||
[[ ! -d /run ]] && RUNDIR=/var
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup postgres 70
|
||||
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
|
||||
|
||||
use python && python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}/autoconf.patch" \
|
||||
"${WORKDIR}/bool.patch" \
|
||||
"${WORKDIR}/server.patch"
|
||||
|
||||
eprefixify src/include/pg_config_manual.h
|
||||
|
||||
if use test ; then
|
||||
epatch "${WORKDIR}/regress.patch"
|
||||
sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
|
||||
# sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
|
||||
# -i src/test/regress/{input,output}/tablespace.source
|
||||
else
|
||||
echo "all install:" > "${S}/src/test/regress/GNUmakefile"
|
||||
fi
|
||||
|
||||
sed -e "s|@RUNDIR@|${RUNDIR}|g" \
|
||||
-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
|
||||
die "RUNDIR sed failed"
|
||||
sed -e "s|@SLOT@|${SLOT}|g" \
|
||||
-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
|
||||
die "SLOT sed failed"
|
||||
|
||||
eautoconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
case ${CHOST} in
|
||||
*-darwin*|*-solaris*)
|
||||
use nls && append-libs intl
|
||||
;;
|
||||
esac
|
||||
|
||||
local PO="${EPREFIX%/}"
|
||||
|
||||
# eval is needed to get along with pg_config quotation of space-rich entities.
|
||||
eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
|
||||
$(use_with perl) \
|
||||
$(use_with python) \
|
||||
$(use_with tcl) \
|
||||
$(use_with xml libxml) \
|
||||
$(use_with xml libxslt) \
|
||||
$(use_with uuid ossp-uuid) \
|
||||
--with-system-tzdata="${PO}/usr/share/zoneinfo" \
|
||||
--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
|
||||
--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
|
||||
"$(use_enable nls nls "$(wanted_languages)")"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local bd
|
||||
for bd in . contrib $(use xml && echo contrib/xml2); do
|
||||
PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
|
||||
emake -C $bd || die "emake in $bd failed"
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use perl ; then
|
||||
mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
|
||||
sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
|
||||
"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
|
||||
fi
|
||||
|
||||
local bd
|
||||
for bd in . contrib $(use xml && echo contrib/xml2) ; do
|
||||
PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
|
||||
emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
|
||||
done
|
||||
|
||||
dodoc README HISTORY doc/{TODO,bug.template}
|
||||
|
||||
dodir /etc/eselect/postgresql/slots/${SLOT}
|
||||
echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
|
||||
"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
|
||||
|
||||
newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
|
||||
die "Inserting conf failed"
|
||||
newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
|
||||
die "Inserting conf failed"
|
||||
|
||||
use pam && pamd_mimic system-auth postgresql auth account session
|
||||
|
||||
if use prefix ; then
|
||||
keepdir ${RUNDIR}/run/postgresql
|
||||
fperms 0770 ${RUNDIR}/run/postgresql
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
postgresql-config update
|
||||
|
||||
elog "Gentoo specific documentation:"
|
||||
elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
|
||||
elog
|
||||
elog "Official documentation:"
|
||||
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
|
||||
elog
|
||||
elog "The default location of the Unix-domain socket is:"
|
||||
elog " ${EROOT%/}${RUNDIR}/run/postgresql/"
|
||||
elog
|
||||
elog "If you have users and/or services that you would like to utilize the"
|
||||
elog "socket, you must add them to the 'postgres' system group:"
|
||||
elog " usermod -a -G postgres <user>"
|
||||
elog
|
||||
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
|
||||
elog "so that it contains your preferred locale in:"
|
||||
elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
elog
|
||||
elog "Then, execute the following command to setup the initial database"
|
||||
elog "environment:"
|
||||
elog " emerge --config =${CATEGORY}/${PF}"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ -z ${REPLACED_BY_VERSION} ]] ; then
|
||||
ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
|
||||
ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
|
||||
|
||||
ebegin "Resuming removal 10 seconds. Control-C to cancel"
|
||||
sleep 10
|
||||
eend 0
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
postgresql-config update
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
|
||||
[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
|
||||
|
||||
# environment.bz2 may not contain the same locale as the current system
|
||||
# locale. Unset and source from the current system locale.
|
||||
if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
|
||||
unset LANG
|
||||
unset LC_CTYPE
|
||||
unset LC_NUMERIC
|
||||
unset LC_TIME
|
||||
unset LC_COLLATE
|
||||
unset LC_MONETARY
|
||||
unset LC_MESSAGES
|
||||
unset LC_ALL
|
||||
source "${EROOT%/}/etc/env.d/02locale"
|
||||
[ -n "${LANG}" ] && export LANG
|
||||
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
|
||||
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
|
||||
[ -n "${LC_TIME}" ] && export LC_TIME
|
||||
[ -n "${LC_COLLATE}" ] && export LC_COLLATE
|
||||
[ -n "${LC_MONETARY}" ] && export LC_MONETARY
|
||||
[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
|
||||
[ -n "${LC_ALL}" ] && export LC_ALL
|
||||
fi
|
||||
|
||||
einfo "You can modify the paths and options passed to initdb by editing:"
|
||||
einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
einfo
|
||||
einfo "Information on options that can be passed to initdb are found at:"
|
||||
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
|
||||
einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
|
||||
einfo
|
||||
einfo "PG_INITDB_OPTS is currently set to:"
|
||||
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
|
||||
einfo " (none)"
|
||||
else
|
||||
einfo " ${PG_INITDB_OPTS}"
|
||||
fi
|
||||
einfo
|
||||
einfo "Configuration files will be installed to:"
|
||||
einfo " ${PGDATA}"
|
||||
einfo
|
||||
einfo "The database cluster will be created in:"
|
||||
einfo " ${DATA_DIR}"
|
||||
einfo
|
||||
while [ "$correct" != "true" ] ; do
|
||||
einfo "Are you ready to continue? (y/n)"
|
||||
read answer
|
||||
if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
|
||||
correct="true"
|
||||
elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
|
||||
die "Aborting initialization."
|
||||
else
|
||||
echo "Answer not recognized"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
|
||||
eerror "The given directory, '${DATA_DIR}', is not empty."
|
||||
eerror "Modify DATA_DIR to point to an empty directory."
|
||||
die "${DATA_DIR} is not empty."
|
||||
fi
|
||||
|
||||
[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
|
||||
einfo "Checking system parameters..."
|
||||
|
||||
if ! use kernel_linux ; then
|
||||
einfo "Skipped."
|
||||
einfo " Tests not supported on this OS (yet)"
|
||||
else
|
||||
if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
|
||||
einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
|
||||
|
||||
local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
|
||||
local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
|
||||
local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
|
||||
local SHMMAX=$(sysctl -n kernel.shmmax)
|
||||
|
||||
local SEMMSL_MIN=17
|
||||
local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
|
||||
local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
|
||||
local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
|
||||
|
||||
for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
|
||||
if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
|
||||
eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
|
||||
eerror "You have now several options:"
|
||||
eerror " - Change the mentioned system parameter"
|
||||
eerror " - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
|
||||
eerror " value lower than ${PG_MAX_CONNECTIONS}"
|
||||
eerror " - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
|
||||
eerror "More information can be found here:"
|
||||
eerror " http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
|
||||
die "System test failed."
|
||||
fi
|
||||
done
|
||||
einfo "Passed."
|
||||
else
|
||||
ewarn "SKIP_SYSTEM_TESTS set, so skipping."
|
||||
fi
|
||||
fi
|
||||
|
||||
einfo "Creating the data directory ..."
|
||||
if [[ ${EUID} == 0 ]] ; then
|
||||
mkdir -p "${DATA_DIR}"
|
||||
chown -Rf postgres:postgres "${DATA_DIR}"
|
||||
chmod 0700 "${DATA_DIR}"
|
||||
fi
|
||||
|
||||
einfo "Initializing the database ..."
|
||||
|
||||
if [[ ${EUID} == 0 ]] ; then
|
||||
su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
|
||||
else
|
||||
"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
|
||||
fi
|
||||
|
||||
mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
|
||||
|
||||
einfo "The autovacuum function, which was in contrib, has been moved to the main"
|
||||
einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
|
||||
einfo "by default. You can disable it in the cluster's:"
|
||||
einfo " ${PGDATA%/}/postgresql.conf"
|
||||
einfo
|
||||
einfo "The PostgreSQL server, by default, will log events to:"
|
||||
einfo " ${DATA_DIR%/}/postmaster.log"
|
||||
einfo
|
||||
if use prefix ; then
|
||||
einfo "The location of the configuration files have moved to:"
|
||||
einfo " ${PGDATA}"
|
||||
einfo "To start the server:"
|
||||
einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
|
||||
einfo "To stop:"
|
||||
einfo " pg_ctl stop -D ${DATA_DIR}"
|
||||
einfo
|
||||
einfo "Or move the configuration files back:"
|
||||
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
|
||||
else
|
||||
einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
|
||||
einfo "instead of 'pg_ctl'."
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
|
||||
|
||||
if [ ${UID} -ne 0 ] ; then
|
||||
emake check || die "Make check failed. See above for details."
|
||||
|
||||
einfo "If you think other tests besides the regression tests are necessary, please"
|
||||
einfo "submit a bug including a patch for this ebuild to enable them."
|
||||
else
|
||||
ewarn "Tests cannot be run as root. Skipping."
|
||||
ewarn "HINT: FEATURES=\"userpriv\""
|
||||
fi
|
||||
}
|
@ -1,391 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.13 2012/03/06 08:05:46 olemarkus Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
|
||||
|
||||
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
|
||||
|
||||
SUHOSIN_VERSION="5.3.9-0.9.10"
|
||||
FPM_VERSION="builtin"
|
||||
EXPECTED_TEST_FAILURES=""
|
||||
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
|
||||
|
||||
function php_get_uri ()
|
||||
{
|
||||
case "${1}" in
|
||||
"php-pre")
|
||||
echo "http://downloads.php.net/johannes/${2}"
|
||||
;;
|
||||
"php")
|
||||
echo "http://www.php.net/distributions/${2}"
|
||||
;;
|
||||
"suhosin")
|
||||
echo "http://download.suhosin.org/${2}"
|
||||
;;
|
||||
"olemarkus")
|
||||
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
|
||||
;;
|
||||
"gentoo")
|
||||
echo "mirror://gentoo/${2}"
|
||||
;;
|
||||
*)
|
||||
die "unhandled case in php_get_uri"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
PHP_MV="$(get_major_version)"
|
||||
|
||||
# alias, so we can handle different types of releases (finals, rcs, alphas,
|
||||
# betas, ...) w/o changing the whole ebuild
|
||||
PHP_PV="${PV/_rc/RC}"
|
||||
PHP_RELEASE="php"
|
||||
PHP_P="${PN}-${PHP_PV}"
|
||||
|
||||
PHP_PATCHSET_LOC="gentoo"
|
||||
|
||||
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
|
||||
|
||||
PHP_PATCHSET="0"
|
||||
PHP_PATCHSET_URI="
|
||||
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
|
||||
|
||||
PHP_FPM_INIT_VER="4"
|
||||
PHP_FPM_CONF_VER="1"
|
||||
|
||||
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
|
||||
# in some cases we use our own suhosin patch (very recent version,
|
||||
# patch conflicts, etc.)
|
||||
SUHOSIN_TYPE="olemarkus"
|
||||
else
|
||||
SUHOSIN_TYPE="suhosin"
|
||||
fi
|
||||
|
||||
if [[ -n ${SUHOSIN_VERSION} ]]; then
|
||||
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
|
||||
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
|
||||
fi
|
||||
|
||||
SRC_URI="
|
||||
${PHP_SRC_URI}
|
||||
${PHP_PATCHSET_URI}"
|
||||
|
||||
if [[ -n ${SUHOSIN_VERSION} ]]; then
|
||||
SRC_URI="${SRC_URI}
|
||||
suhosin? ( ${SUHOSIN_URI} )"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
|
||||
HOMEPAGE="http://php.net/"
|
||||
LICENSE="PHP-3"
|
||||
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
S="${WORKDIR}/${PHP_P}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2"
|
||||
|
||||
# Gentoo-specific, common features
|
||||
IUSE="kolab"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
|
||||
crypt +ctype curl curlwrappers debug doc
|
||||
enchant exif frontbase +fileinfo +filter firebird
|
||||
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
|
||||
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
|
||||
mssql mysql mysqlnd mysqli nls
|
||||
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
|
||||
readline recode +session sharedmem
|
||||
+simplexml snmp soap sockets spell sqlite sqlite3 ssl
|
||||
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
|
||||
|
||||
# Enable suhosin if available
|
||||
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
|
||||
|
||||
DEPEND="!dev-lang/php:5
|
||||
>=app-admin/eselect-php-0.6.2
|
||||
>=dev-libs/libpcre-8.12[unicode]
|
||||
<dev-libs/libpcre-8.30
|
||||
apache2? ( www-servers/apache[threads=] )
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
cjk? ( !gd? (
|
||||
virtual/jpeg
|
||||
media-libs/libpng
|
||||
sys-libs/zlib
|
||||
) )
|
||||
crypt? ( >=dev-libs/libmcrypt-2.4 )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( app-text/enchant )
|
||||
exif? ( !gd? (
|
||||
virtual/jpeg
|
||||
media-libs/libpng
|
||||
sys-libs/zlib
|
||||
) )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0 )
|
||||
gmp? ( >=dev-libs/gmp-4.1.2 )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( virtual/imap-c-client[ssl=] )
|
||||
intl? ( dev-libs/icu )
|
||||
iodbc? ( dev-db/libiodbc )
|
||||
kerberos? ( virtual/krb5 )
|
||||
kolab? ( >=net-libs/c-client-2004g-r1 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
|
||||
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
!mysqlnd? (
|
||||
mysql? ( virtual/mysql )
|
||||
mysqli? ( >=virtual/mysql-4.1 )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
|
||||
odbc? ( >=dev-db/unixODBC-1.8.13 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline )
|
||||
recode? ( app-text/recode )
|
||||
sharedmem? ( dev-libs/mm )
|
||||
simplexml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
soap? ( >=dev-libs/libxml2-2.6.8 )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) )
|
||||
sqlite3? ( >=dev-db/sqlite-3.7.7.1 )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7 )
|
||||
sybase-ct? ( dev-db/freetds )
|
||||
tidy? ( app-text/htmltidy )
|
||||
truetype? (
|
||||
=media-libs/freetype-2*
|
||||
>=media-libs/t1lib-5.0.0
|
||||
!gd? (
|
||||
virtual/jpeg media-libs/libpng sys-libs/zlib )
|
||||
)
|
||||
unicode? ( dev-libs/oniguruma )
|
||||
wddx? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
|
||||
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xpm? (
|
||||
x11-libs/libXpm
|
||||
virtual/jpeg
|
||||
media-libs/libpng sys-libs/zlib
|
||||
)
|
||||
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
|
||||
zip? ( sys-libs/zlib )
|
||||
zlib? ( sys-libs/zlib )
|
||||
virtual/mta
|
||||
"
|
||||
|
||||
php="=${CATEGORY}/${PF}"
|
||||
|
||||
REQUIRED_USE="
|
||||
truetype? ( gd )
|
||||
cjk? ( gd )
|
||||
exif? ( gd )
|
||||
|
||||
xpm? ( gd )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
wddx? ( xml )
|
||||
xmlrpc? ( || ( xml iconv ) )
|
||||
xmlreader? ( xml )
|
||||
xsl? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
kolab? ( imap )
|
||||
mhash? ( hash )
|
||||
phar? ( hash )
|
||||
mysqlnd? ( || (
|
||||
mysql
|
||||
mysqli
|
||||
pdo
|
||||
) )
|
||||
|
||||
qdbm? ( !gdbm )
|
||||
readline? ( !libedit )
|
||||
recode? ( !imap !mysql !mysqli )
|
||||
sharedmem? ( !threads )
|
||||
|
||||
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
enchant? ( !dev-php5/pecl-enchant )
|
||||
fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
|
||||
filter? ( !dev-php5/pecl-filter )
|
||||
json? ( !dev-php5/pecl-json )
|
||||
phar? ( !dev-php5/pecl-phar )
|
||||
zip? ( !dev-php5/pecl-zip )"
|
||||
|
||||
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
|
||||
=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-devel/m4-1.4.3
|
||||
>=sys-devel/libtool-1.5.18"
|
||||
|
||||
# They are in PDEPEND because we need PHP installed first!
|
||||
PDEPEND="doc? ( app-doc/php-docs )"
|
||||
|
||||
# No longer depend on the extension. The suhosin USE flag only installs the
|
||||
# patch
|
||||
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
|
||||
|
||||
# Allow users to install production version if they want to
|
||||
|
||||
case "${PHP_INI_VERSION}" in
|
||||
production|development)
|
||||
;;
|
||||
*)
|
||||
PHP_INI_VERSION="development"
|
||||
;;
|
||||
esac
|
||||
|
||||
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
|
||||
PHP_INI_FILE="php.ini"
|
||||
|
||||
want_apache
|
||||
|
||||
# eblit-core
|
||||
# Usage: <function> [version] [eval]
|
||||
# Main eblit engine
|
||||
eblit-core() {
|
||||
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
|
||||
local e v func=$1 ver=$2 eval_=$3
|
||||
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
|
||||
e="${FILESDIR}/eblits/${func}${v}.eblit"
|
||||
if [[ -e ${e} ]] ; then
|
||||
. "${e}"
|
||||
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# eblit-include
|
||||
# Usage: [--skip] <function> [version]
|
||||
# Includes an "eblit" -- a chunk of common code among ebuilds in a given
|
||||
# package so that its functions can be sourced and utilized within the
|
||||
# ebuild.
|
||||
eblit-include() {
|
||||
local skipable=false r=0
|
||||
[[ $1 == "--skip" ]] && skipable=true && shift
|
||||
[[ $1 == pkg_* ]] && skipable=true
|
||||
|
||||
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
|
||||
eblit-core $1 $2
|
||||
r="$?"
|
||||
${skipable} && return 0
|
||||
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
|
||||
}
|
||||
|
||||
# eblit-run-maybe
|
||||
# Usage: <function>
|
||||
# Runs a function if it is defined in an eblit
|
||||
eblit-run-maybe() {
|
||||
[[ $(type -t "$@") == "function" ]] && "$@"
|
||||
}
|
||||
|
||||
# eblit-run
|
||||
# Usage: <function> [version]
|
||||
# Runs a function defined in an eblit
|
||||
eblit-run() {
|
||||
eblit-include --skip common "v2"
|
||||
eblit-include "$@"
|
||||
eblit-run-maybe eblit-$1-pre
|
||||
eblit-${PN}-$1
|
||||
eblit-run-maybe eblit-$1-post
|
||||
}
|
||||
|
||||
# eblit-pkg
|
||||
# Usage: <phase> [version]
|
||||
# Includes the given functions AND evals them so they're included in the binpkgs
|
||||
eblit-pkg() {
|
||||
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
|
||||
eblit-core $1 $2 1
|
||||
}
|
||||
|
||||
eblit-pkg pkg_setup v3
|
||||
|
||||
src_prepare() { eblit-run src_prepare v3 ; }
|
||||
src_configure() { eblit-run src_configure v53 ; }
|
||||
src_compile() { eblit-run src_compile v1 ; }
|
||||
src_install() { eblit-run src_install v3 ; }
|
||||
src_test() { eblit-run src_test v1 ; }
|
||||
|
||||
#Do not use eblit for this because it will not get sourced when installing from
|
||||
#binary package (bug #380845)
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
APACHE2_MOD_DEFINE="PHP5"
|
||||
APACHE2_MOD_CONF="70_mod_php5"
|
||||
apache-module_pkg_postinst
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT}
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
|
||||
elog "to compile extensions for the ${SLOT} ABI"
|
||||
elog
|
||||
if ! use readline && use cli ; then
|
||||
ewarn "Note that in order to use php interactivly, you need to enable"
|
||||
ewarn "the readline USE flag or php -a will hang"
|
||||
fi
|
||||
elog
|
||||
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
|
||||
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
|
||||
elog "'production' or 'development' in /etc/make.conf"
|
||||
ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
|
||||
|
||||
# check for not yet migrated old style config dirs
|
||||
ls "${ROOT}"/etc/php/*-php5 &>/dev/null
|
||||
if [[ $? -eq 0 ]]; then
|
||||
ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
|
||||
ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
|
||||
fi
|
||||
elog
|
||||
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
|
||||
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
|
||||
elog
|
||||
|
||||
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
|
||||
ewarn "The suhosin USE flag now only installs the suhosin patch!"
|
||||
ewarn "If you want the suhosin extension, make sure you install"
|
||||
ewarn " dev-php5/suhosin"
|
||||
ewarn
|
||||
fi
|
||||
}
|
@ -1,6 +1,5 @@
|
||||
DIST v8-3.10.8.10.tar.bz2 10063797 RMD160 4e35009c04fc2cd510b60d9af122caa61a943c1a SHA1 565174c7cffbfd02e7c0b9e6b91f12b02bcf36fa SHA256 412b90e52b2ba3373b3ca59b63857ff6371c216e0a763ffc49c60e7c190b1b3b
|
||||
DIST v8-3.10.8.11.tar.bz2 10063581 RMD160 4cc0c3b5b6cd7103c7e7d200fb832600b0f66cee SHA1 338108c0d82aac8c7de8ebf2aefffef8bd500626 SHA256 dc1bf6ff00dc0f530f208d5ad3dccce3ad297ba2f93814d6a762e5c4e10d7d18
|
||||
DIST v8-3.10.8.7.tar.bz2 10063959 RMD160 b20ef13e5dfcd93d5d2d5d85138064338250ccb4 SHA1 7225a2d3bf8a27180d743a240785275b9d2948a0 SHA256 f411248f95de06297310eaf0d1195d913bb3dee92a0fbb8bc62193f00ff4ff08
|
||||
DIST v8-3.10.8.13.tar.bz2 10063660 RMD160 5601591b0ad66fe89f0bd62b5241591d018fd695 SHA1 bc9fda97a98324dc45294b663d49ef611c37cbb5 SHA256 5d9447fef9c6421b0f11501ba1303e7bee41ea08659e19d321d93bdeb9c58e3f
|
||||
DIST v8-3.11.3.tar.bz2 10069593 RMD160 dbf6ab21bafdc5a62751f16988615a33a9f74997 SHA1 d676bd5eb3785069d8d18842cca932143d54ed74 SHA256 52864dcceb50188331b6b6d472bda9988a0c4f3e7365f027b671cc54e78eb96e
|
||||
DIST v8-3.11.6.2.tar.bz2 10070265 RMD160 296d898bc13f86482a07fc6721e1743bacce3de5 SHA1 621aa12f9fc2cd579aea05b84b859da7e257853f SHA256 f648b24296ba326be26d65f99027fbd9bc473c0156291fcd318f5f611bb02ea3
|
||||
DIST v8-3.9.24.28.tar.bz2 9975177 RMD160 444565b92e7cce55f0792f2a643f425413e994ea SHA1 6dc38d96ede2a84c9bb9982e99674df1a5254374 SHA256 054f4fc90fc0e1960520058321925272812164b9e9dfd661636d7a4d74d127cd
|
||||
|
@ -1,118 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.10.8.7.ebuild,v 1.2 2012/05/26 10:10:50 grobian 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"
|
||||
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
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
DIST icu4c-49_1_1-docs.zip 4243474 RMD160 c4fe4b580ef4f3f2bdba171550efb2a6d508a338 SHA1 c9fcd1571cdfe5848d1336841624b3b92d259cb6 SHA256 0cd59f0782b1330aa1b7c520dba315a8da48262639336f12bb123995dadcd80f
|
||||
DIST icu4c-49_1_1-src.tgz 19001722 RMD160 ad47b292be561398b25d198a35c025670432c3f1 SHA1 f407d7e2808b76e3a6ca316aab896aef74bf6722 SHA256 e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1
|
||||
DIST icu4c-4_8_1_1-docs.zip 4078464 RMD160 ee07a9042714ff306de6e086a1510c9f884551ed SHA1 2b1cec2d684919c89b61a37aa845ecf68197beeb SHA256 03bd6dd2f3a2482af471840462512af4217984688e6ff2a2686a97c3a1980c2a
|
||||
DIST icu4c-4_8_1_1-src.tgz 18675781 RMD160 c1ac8098b3815604da9e278d752051fb861bea63 SHA1 7146ee269b39273fa98d750f73136b14f781758a SHA256 0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1
|
||||
DIST icu4c-49_1_2-docs.zip 4245617 RMD160 e0ffe7d2ff35480dcefb5dace1b21d5ac557a3af SHA1 4534bc25493038c5527fd657066e68c739a5a29e SHA256 50fcc81a797b20ebaf12167479f24eac323bad21d012ca366701f62eccdabb94
|
||||
DIST icu4c-49_1_2-src.tgz 19010646 RMD160 e34aa54f4387ae4c195c72427a2bd25933456e94 SHA1 d8cee6d2b2a91a0da7464acd97a5b7b462d93225 SHA256 cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3
|
||||
|
@ -1,68 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=380827
|
||||
http://bugs.icu-project.org/trac/ticket/8561
|
||||
http://bugs.icu-project.org/trac/changeset/30689
|
||||
http://code.google.com/p/chromium/issues/detail?id=92847
|
||||
|
||||
--- source/i18n/digitlst.cpp.orig 2011-07-19 23:16:00.000000000 +0200
|
||||
+++ source/i18n/digitlst.cpp 2011-10-12 23:47:08.000000000 +0200
|
||||
@@ -60,6 +60,18 @@
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
+static void
|
||||
+loadDecimalChar() {
|
||||
+ if (gDecimal == 0) {
|
||||
+ char rep[MAX_DIGITS];
|
||||
+ // For machines that decide to change the decimal on you,
|
||||
+ // and try to be too smart with localization.
|
||||
+ // This normally should be just a '.'.
|
||||
+ sprintf(rep, "%+1.1f", 1.0);
|
||||
+ gDecimal = rep[2];
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
// -------------------------------------
|
||||
// default constructor
|
||||
|
||||
@@ -408,15 +420,6 @@
|
||||
}
|
||||
DigitList *nonConstThis = const_cast<DigitList *>(this);
|
||||
|
||||
- if (gDecimal == 0) {
|
||||
- char rep[MAX_DIGITS];
|
||||
- // For machines that decide to change the decimal on you,
|
||||
- // and try to be too smart with localization.
|
||||
- // This normally should be just a '.'.
|
||||
- sprintf(rep, "%+1.1f", 1.0);
|
||||
- gDecimal = rep[2];
|
||||
- }
|
||||
-
|
||||
if (isZero()) {
|
||||
nonConstThis->fDouble = 0.0;
|
||||
if (decNumberIsNegative(fDecNumber)) {
|
||||
@@ -451,6 +454,7 @@
|
||||
}
|
||||
U_ASSERT(uprv_strlen(&s[0]) < MAX_DBL_DIGITS+18);
|
||||
|
||||
+ loadDecimalChar();
|
||||
if (gDecimal != '.') {
|
||||
char *decimalPt = strchr(s, '.');
|
||||
if (decimalPt != NULL) {
|
||||
@@ -741,6 +745,17 @@
|
||||
sprintf(rep, "%+1.*e", MAX_DBL_DIGITS - 1, source);
|
||||
U_ASSERT(uprv_strlen(rep) < sizeof(rep));
|
||||
|
||||
+ // uprv_decNumberFromString() will parse the string expecting '.' as a
|
||||
+ // decimal separator, however sprintf() can use ',' in certain locales.
|
||||
+ // Overwrite a different decimal separator with '.' here before proceeding.
|
||||
+ loadDecimalChar();
|
||||
+ if (gDecimal != '.') {
|
||||
+ char *decimalPt = strchr(rep, gDecimal);
|
||||
+ if (decimalPt != NULL) {
|
||||
+ *decimalPt = '.';
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
// Create a decNumber from the string.
|
||||
uprv_decNumberFromString(fDecNumber, rep, &fContext);
|
||||
uprv_decNumberTrim(fDecNumber);
|
@ -1 +0,0 @@
|
||||
DIST libbeagle-0.3.9.tar.bz2 339828 RMD160 1188399ef90d6fc74f74c3bf78b7727142d89fa2 SHA1 7adda6938c757811de83af2e97fee96af51a9414 SHA256 198f50a8ba474f28937afff88ea58872a8d5f214c38242e2bf133ad4ce8ec18c
|
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbeagle/libbeagle-0.3.9-r1.ebuild,v 1.2 2011/12/30 19:25:53 floppym Exp $
|
||||
|
||||
EAPI=3
|
||||
PYTHON_DEPEND="python? 2"
|
||||
inherit gnome.org python
|
||||
|
||||
DESCRIPTION="C and Python bindings for Beagle"
|
||||
HOMEPAGE="http://beagle-project.org/"
|
||||
|
||||
LICENSE="MIT Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug doc +python"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.6
|
||||
>=dev-libs/libxml2-2.6.19
|
||||
python? ( >=dev-python/pygtk-2.6 )
|
||||
!<=app-misc/beagle-0.2.18"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-util/gtk-doc )"
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-dependency-tracking \
|
||||
$(use_enable python) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable debug xml-dump)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Install failed!"
|
||||
}
|
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbeagle/libbeagle-0.3.9.ebuild,v 1.3 2009/04/04 14:51:54 maekke Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
inherit gnome.org
|
||||
|
||||
DESCRIPTION="C and Python bindings for Beagle"
|
||||
HOMEPAGE="http://beagle-project.org/"
|
||||
|
||||
LICENSE="MIT Apache-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="debug doc +python"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.6
|
||||
>=dev-libs/libxml2-2.6.19
|
||||
python? ( >=dev-lang/python-2.3
|
||||
>=dev-python/pygtk-2.6 )
|
||||
!<=app-misc/beagle-0.2.18"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-util/gtk-doc )"
|
||||
|
||||
src_compile() {
|
||||
econf --disable-dependency-tracking \
|
||||
$(use_enable python) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable debug xml-dump)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Install failed!"
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>maintainer-needed@gentoo.org</email>
|
||||
<name>Default assignee for orphaned packages</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
|
@ -1,3 +1,4 @@
|
||||
DIST libnl-1.1.tar.gz 288932 RMD160 ebfc660302f31e5a94f03683f1ba85a3e057cf30 SHA1 54c7d02f93b09b43338e5cbf42f1373e83566577 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
|
||||
DIST libnl-3.2.10.tar.gz 1147936 RMD160 cf2c06895d67f0d2be5a7f5923141a7410c7406f SHA1 b51dce18e71c7e90546680048c409b8558a0d240 SHA256 a790220fa5d2749abed5837fa1e46a6ae62f2db055a6c8c9f484230aad56bd03
|
||||
DIST libnl-3.2.7.tar.gz 1124758 RMD160 0919933eacf6d40e619362710cd696b305cb25e6 SHA1 a7bfc9c1d7ba798338327171f6ab8ad4b1c62e14 SHA256 1141f3229ebf65f6cee43a898d4832b8c17cb942e23adeccb365e75708a2b08e
|
||||
DIST libnl-3.2.9.tar.gz 1137028 RMD160 a5474dd2955c4ca32059c23b8c080edca7eba428 SHA1 3f8f5226f08d22352e5b6056beafa2a05db2aeb4 SHA256 9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63
|
||||
|
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.10.ebuild,v 1.2 2012/06/06 21:03:57 jer Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils multilib
|
||||
|
||||
DESCRIPTION="A library for applications dealing with netlink socket"
|
||||
HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
|
||||
SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="3"
|
||||
KEYWORDS="~amd64 ~s390 ~sh ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
|
||||
IUSE="doc static-libs utils"
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
virtual/yacc
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
<app-doc/doxygen-1.8.0[latex]
|
||||
media-gfx/mscgen
|
||||
)
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable static-libs static) $(use_enable utils cli)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake -C doc api_ref
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
if use doc; then
|
||||
dohtml doc/api/*
|
||||
fi
|
||||
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"/usr/lib*/lib*.la
|
||||
fi
|
||||
|
||||
dodoc ChangeLog
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
DIST nspr-4.8.8.tar.gz 1246068 RMD160 a058982a067fb3348b908eaf6f06f0ba17385c55 SHA1 f5fd346b0f5f6ceac3677ce18cb94490992717ad SHA256 92f3f4ded2ee313e396c180d5445cc3c718ff347d86c06b7bf14a1b5e049d4c9
|
||||
DIST nspr-4.8.9.tar.gz 1235265 RMD160 6c7089a9d798367b8d559e5dea8e732e73b47df2 SHA1 509785e68f52542778c770445329cc4db15c749b SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce
|
||||
DIST nspr-4.9.1.tar.gz 1172951 RMD160 e541d6ead14dbf0145061c75d176f6391fc186cd SHA1 1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
|
||||
DIST nspr-4.9.tar.gz 1218528 RMD160 35298a4752aa657196b9d2f41ad46f1bef7e22a2 SHA1 57a6bb09ccb90d14303c3d9a6ec2592d8a5c0752 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a
|
||||
|
@ -0,0 +1,107 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1.ebuild,v 1.1 2012/06/06 12:50:51 anarchy Exp $
|
||||
|
||||
EAPI=3
|
||||
WANT_AUTOCONF="2.1"
|
||||
|
||||
inherit autotools eutils multilib toolchain-funcs versionator
|
||||
|
||||
MIN_PV="$(get_version_component_range 2)"
|
||||
|
||||
DESCRIPTION="Netscape Portable Runtime"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/nspr/"
|
||||
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug"
|
||||
|
||||
src_prepare() {
|
||||
mkdir build inst
|
||||
epatch "${FILESDIR}"/${PN}-4.8-config.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
|
||||
# Patch needs updating
|
||||
#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
|
||||
|
||||
# We must run eautoconf to regenerate configure
|
||||
cd "${S}"/mozilla/nsprpub
|
||||
eautoconf
|
||||
|
||||
# make sure it won't find Perl out of Prefix
|
||||
sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
|
||||
"${S}"/mozilla/nsprpub/config/rules.mk || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
cd "${S}"/build
|
||||
|
||||
echo > "${T}"/test.c
|
||||
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
|
||||
case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in
|
||||
ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";;
|
||||
ELFCLASS32*|POWERPC*|I386*|ARM*) ;;
|
||||
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
|
||||
myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
|
||||
|
||||
LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \
|
||||
$(use_enable debug) \
|
||||
$(use_enable !debug optimize) \
|
||||
${myconf} || die "econf failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "${S}"/build
|
||||
if tc-is-cross-compiler; then
|
||||
emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \
|
||||
-C config nsinstall || die "failed to build"
|
||||
mv config/{,native-}nsinstall
|
||||
sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
|
||||
rm config/nsinstall.o
|
||||
fi
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
# Their build system is royally confusing, as usual
|
||||
MINOR_VERSION=${MIN_PV} # Used for .so version
|
||||
cd "${S}"/build
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
cd "${ED}"/usr/$(get_libdir)
|
||||
for file in *.a; do
|
||||
einfo "removing static libraries as upstream has requested!"
|
||||
rm -f ${file} || die "failed to remove static libraries."
|
||||
done
|
||||
|
||||
local n=
|
||||
# aix-soname.patch does this already
|
||||
[[ ${CHOST} == *-aix* ]] ||
|
||||
for file in *$(get_libname); do
|
||||
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
|
||||
mv ${file} ${n} || die "failed to mv files around"
|
||||
ln -s ${n} ${file} || die "failed to symlink files."
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
|
||||
fi
|
||||
done
|
||||
|
||||
# install nspr-config
|
||||
dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
|
||||
|
||||
# Remove stupid files in /usr/bin
|
||||
rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
|
||||
}
|
@ -0,0 +1,208 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.5.ebuild,v 1.1 2012/06/06 12:55:07 anarchy Exp $
|
||||
|
||||
EAPI=3
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
NSPR_VER="4.9.1"
|
||||
RTM_NAME="NSS_${PV//./_}_RTM"
|
||||
|
||||
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
|
||||
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support"
|
||||
|
||||
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="utils"
|
||||
|
||||
DEPEND="virtual/pkgconfig"
|
||||
RDEPEND=">=dev-libs/nspr-${NSPR_VER}
|
||||
>=dev-db/sqlite-3.5
|
||||
sys-libs/zlib"
|
||||
|
||||
src_setup() {
|
||||
export LC_ALL="C"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Custom changes for gentoo
|
||||
epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.13.3_pem.support"
|
||||
|
||||
cd "${S}"/mozilla/security/coreconf || die
|
||||
# hack nspr paths
|
||||
echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \
|
||||
>> headers.mk || die "failed to append include"
|
||||
|
||||
# modify install path
|
||||
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
|
||||
-i source.mk || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die
|
||||
|
||||
# Ensure we stay multilib aware
|
||||
sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib"
|
||||
|
||||
# Fix pkgconfig file for Prefix
|
||||
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
|
||||
"${S}"/mozilla/security/nss/config/Makefile || die
|
||||
|
||||
epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch"
|
||||
|
||||
# dirty hack
|
||||
cd "${S}"/mozilla/security/nss || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
|
||||
lib/ssl/config.mk || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
|
||||
cmd/platlibs.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
strip-flags
|
||||
|
||||
echo > "${T}"/test.c || die
|
||||
$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
|
||||
case $(file "${T}"/test.o) in
|
||||
*64-bit*|*ppc64*|*x86_64*) export USE_64=1;;
|
||||
*32-bit*|*ppc*|*i386*) ;;
|
||||
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
|
||||
export NSPR_INCLUDE_DIR=`nspr-config --includedir`
|
||||
export NSPR_LIB_DIR=`nspr-config --libdir`
|
||||
export BUILD_OPT=1
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSDISTMODE=copy
|
||||
export NSS_ENABLE_ECC=1
|
||||
export XCFLAGS="${CFLAGS}"
|
||||
export FREEBL_NO_DEPEND=1
|
||||
export ASFLAGS=""
|
||||
|
||||
cd "${S}"/mozilla/security/coreconf || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
|
||||
cd "${S}"/mozilla/security/dbm || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
|
||||
cd "${S}"/mozilla/security/nss || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "nss make failed"
|
||||
}
|
||||
|
||||
# Altering these 3 libraries breaks the CHK verification.
|
||||
# All of the following cause it to break:
|
||||
# - stripping
|
||||
# - prelink
|
||||
# - ELF signing
|
||||
# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
|
||||
# Either we have to NOT strip them, or we have to forcibly resign after
|
||||
# stripping.
|
||||
#local_libdir="$(get_libdir)"
|
||||
#export STRIP_MASK="
|
||||
# */${local_libdir}/libfreebl3.so*
|
||||
# */${local_libdir}/libnssdbm3.so*
|
||||
# */${local_libdir}/libsoftokn3.so*"
|
||||
|
||||
export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
|
||||
|
||||
generate_chk() {
|
||||
local shlibsign="$1"
|
||||
local libdir="$2"
|
||||
einfo "Resigning core NSS libraries for FIPS validation"
|
||||
shift 2
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libname=lib${i}.so
|
||||
local chkname=lib${i}.chk
|
||||
"${shlibsign}" \
|
||||
-i "${libdir}"/${libname} \
|
||||
-o "${libdir}"/${chkname}.tmp \
|
||||
&& mv -f \
|
||||
"${libdir}"/${chkname}.tmp \
|
||||
"${libdir}"/${chkname} \
|
||||
|| die "Failed to sign ${libname}"
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_chk() {
|
||||
local libdir="$1"
|
||||
shift 1
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libfname="${libdir}/lib${i}.so"
|
||||
# If the major version has changed, then we have old chk files.
|
||||
[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
|
||||
&& rm -f "${libfname}.chk"
|
||||
done
|
||||
}
|
||||
|
||||
src_install () {
|
||||
MINOR_VERSION=12
|
||||
cd "${S}"/mozilla/security/dist || die
|
||||
|
||||
dodir /usr/$(get_libdir) || die
|
||||
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
|
||||
# We generate these after stripping the libraries, else they don't match.
|
||||
#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
|
||||
cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
|
||||
|
||||
# Install nss-config and pkgconfig file
|
||||
dodir /usr/bin || die
|
||||
cp -L */bin/nss-config "${ED}"/usr/bin || die
|
||||
dodir /usr/$(get_libdir)/pkgconfig || die
|
||||
cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
|
||||
|
||||
# all the include files
|
||||
insinto /usr/include/nss
|
||||
doins public/nss/*.h || die
|
||||
cd "${ED}"/usr/$(get_libdir) || die
|
||||
local n=
|
||||
for file in *$(get_libname); do
|
||||
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
|
||||
mv ${file} ${n} || die
|
||||
ln -s ${n} ${file} || die
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
|
||||
fi
|
||||
done
|
||||
|
||||
local nssutils
|
||||
# Always enabled because we need it for chk generation.
|
||||
nssutils="shlibsign"
|
||||
if use utils; then
|
||||
# The tests we do not need to install.
|
||||
#nssutils_test="bltest crmftest dbtest dertimetest
|
||||
#fipstest remtest sdrtest"
|
||||
nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
|
||||
cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
|
||||
nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
|
||||
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
|
||||
symkeyutil tstclnt vfychain vfyserv"
|
||||
fi
|
||||
cd "${S}"/mozilla/security/dist/*/bin/ || die
|
||||
for f in $nssutils; do
|
||||
dobin ${f} || die
|
||||
done
|
||||
|
||||
# Prelink breaks the CHK files. We don't have any reliable way to run
|
||||
# shlibsign after prelink.
|
||||
declare -a libs
|
||||
for l in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
|
||||
done
|
||||
OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
|
||||
echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die
|
||||
unset libs liblist
|
||||
doenvd "${T}/90nss" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# We must re-sign the libraries AFTER they are stripped.
|
||||
generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
cleanup_chk "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
@ -0,0 +1 @@
|
||||
DIST milk-0.4.2.tar.gz 80508 RMD160 428b2b7425b9e3203e9b281f278a26ee95417db9 SHA1 a5c4c383904c845082851c209a0ea55afb3057cb SHA256 055b32d22d31cb83dc76092c3db5f339d3ce795a6061747d39fa13948c82fbbb
|
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sci</herd>
|
||||
<longdescription lang="en">
|
||||
Milk is a machine learning toolkit in Python.
|
||||
Its focus is on supervised classification with several classifiers
|
||||
available: SVMs (based on libsvm), k-NN, random forests, decision
|
||||
trees. It also performs feature selection. These classifiers can be
|
||||
combined in many ways to form different classification systems.
|
||||
For unsupervised learning, milk supports k-means clustering and
|
||||
affinity propagation.
|
||||
Milk is flexible about its inputs. It optimised for numpy arrays, but
|
||||
can often handle anything (for example, for SVMs, you can use any
|
||||
dataype and any kernel and it does the right thing).
|
||||
There is a strong emphasis on speed and low memory usage. Therefore,
|
||||
most of the performance sensitive code is in C++. This is behind
|
||||
Python-based interfaces for convenience.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/milk/milk-0.4.2.ebuild,v 1.1 2012/06/06 22:39:06 bicatali Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# python cruft
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
DISTUTILS_SRC_TEST="setup.py"
|
||||
RESTRICT_PYTHON_ABIS="3.*"
|
||||
|
||||
inherit distutils
|
||||
|
||||
DESCRIPTION="Machine learning toolkit in Python"
|
||||
HOMEPAGE="http://luispedro.org/software/milk"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
RDEPEND="dev-python/numpy"
|
||||
DEPEND="dev-python/setuptools
|
||||
test? ( dev-python/milksets sci-libs/scipy )"
|
@ -0,0 +1 @@
|
||||
DIST milksets-0.1.3.tar.gz 10438190 RMD160 ef6419576ef1a9597adc6b6f184582f1d1aae559 SHA1 970173b71746763bc836dbfe6f28fdbb38029d48 SHA256 90fa729a6993ba856e3fe3d02e2a0b08172a91599f122bf17e1b2d48d99ef7b5
|
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sci</herd>
|
||||
<longdescription lang="en">
|
||||
This packages contains some U.C.I. datasets in a common Pythonic
|
||||
interface, which makes them easy to use with milk.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/milksets/milksets-0.1.3.ebuild,v 1.1 2012/06/06 22:37:42 bicatali Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
# python cruft
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="3.*"
|
||||
|
||||
inherit distutils
|
||||
|
||||
DESCRIPTION="Datasets in a common Pythonic interface to use with milk"
|
||||
HOMEPAGE="http://luispedro.org/software/milksets"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
@ -1,2 +1,2 @@
|
||||
DIST pyds9-1.2.tar.gz 1994576 RMD160 0c505661d7c002f6571d577c3d2b7475440fe1f0 SHA1 67ee460908e1bb164bb001b16acbaaa10bfd63ba SHA256 73b52df8133f3efbef8281b38f9cf3e370920cca4ed3f3c15c037c9f516c1383
|
||||
DIST pyds9-1.3.tar.gz 2001273 RMD160 03cdabd49021a2e890ee5786d5db16f6fc0c4079 SHA1 8c7c43e8daf67514bdc934172529addc6641ff53 SHA256 350f362898f3637a9b7bd5075518edaf16660894012039f644ca5125b70d5136
|
||||
DIST pyds9-1.4.tar.gz 876726 RMD160 6768581daa7f029c43ee64ff2497cfe504a83a67 SHA1 d0cbc8bc80079e1e87f33fe39bf080cd080afb99 SHA256 1e69de510edf71b34f81723581504a8621cb39875456e67146d8295bf0b9f5ee
|
||||
|
@ -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-python/pyds9/pyds9-1.2.ebuild,v 1.3 2012/02/23 07:19:29 patrick Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds9/pyds9-1.4.ebuild,v 1.1 2012/06/06 20:20:36 bicatali Exp $
|
||||
|
||||
EAPI=3
|
||||
|
@ -1 +1,2 @@
|
||||
DIST vo-0.7.2.tar.gz 4773427 RMD160 ea8c6e4d032b0094d2e9d2a5d5b9d08a10003389 SHA1 63c154b73a87863e0fde6785d501b3b85041e9bd SHA256 33a79a6b5b31c7bda8025361b09a003821a4af35c29361774a05dd3ba86091f8
|
||||
DIST vo-0.8.tar.gz 1245366 RMD160 4d8a7d39a9e867939dd9214bd48fb519765cd581 SHA1 ca8aa70ebb1a04ba6818bca6e1268fc5f8b8fd62 SHA256 440a22bd1c805d5e0bbd0a75b26a4247d41200d9e4dc4a72621304ccaa488837
|
||||
|
@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/vo/vo-0.8.ebuild,v 1.1 2012/06/06 22:48:41 bicatali Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
DESCRIPTION="Python module to read VOTABLE into a Numpy recarray"
|
||||
HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
|
||||
SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz"
|
||||
|
||||
IUSE="examples"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LICENSE="BSD"
|
||||
|
||||
RDEPEND="dev-libs/expat"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
|
||||
|
||||
# missing data to perform tests
|
||||
RESTRICT="test"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.6-expat.patch
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd test
|
||||
testing() {
|
||||
PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" \
|
||||
"$(PYTHON)" benchmarks.py
|
||||
}
|
||||
python_execute_function testing
|
||||
}
|
||||
|
||||
src_install() {
|
||||
distutils_src_install
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue