root
7 years ago
parent
90ed3c5ebc
commit
30c9a91cde
@ -0,0 +1,346 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-21.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="23"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0=
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
net-libs/liblockfile
|
||||
hesiod? ( net-dns/hesiod )
|
||||
kerberos? ( virtual/krb5 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gpm? ( sys-libs/gpm )
|
||||
dbus? ( sys-apps/dbus )
|
||||
X? (
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
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? ( x11-libs/gtk+:2 )
|
||||
!gtk? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
alsa? ( virtual/pkgconfig )
|
||||
dbus? ( virtual/pkgconfig )
|
||||
X? ( virtual/pkgconfig )
|
||||
gzip-el? ( app-arch/gzip )
|
||||
pax_kernel? ( sys-apps/attr )"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# 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}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
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
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
eautoreconf
|
||||
touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -fstrict-aliasing -pie
|
||||
append-flags $(test-flags -fno-strict-aliasing)
|
||||
|
||||
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+=" --with-sound"
|
||||
else
|
||||
myconf+=" $(use_with sound)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
# GTK+ is the default toolkit if USE=gtk is chosen with other
|
||||
# possibilities. Emacs upstream thinks this should be standard
|
||||
# policy on all distributions
|
||||
local f
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
myconf+=" --with-x-toolkit=gtk"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
# Save version information in the Emacs binary. It will be available
|
||||
# in variable "system-configuration-options".
|
||||
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
|
||||
|
||||
# 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} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-crt-dir="${crtdir}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with gpm) \
|
||||
$(use_with dbus) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
emake CC="$(tc-getCC)" \
|
||||
AR="$(tc-getAR) cq" \
|
||||
RANLIB="$(tc-getRANLIB)"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
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
|
||||
mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
|
||||
mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving ${m} man page 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 -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# 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/Makefile.c
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
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
|
||||
fi
|
||||
|
||||
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
|
||||
through the Emacs eselect module, which also redirects man and info
|
||||
pages. Therefore, several Emacs versions can be installed at the
|
||||
same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from a previous major version of Emacs, then
|
||||
it is strongly recommended that you use app-admin/emacs-updater
|
||||
to rebuild all byte-compiled elisp files of the installed Emacs
|
||||
packages."
|
||||
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
|
||||
it into /Applications by yourself."
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
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() {
|
||||
elisp-site-regen
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
|
||||
# refresh symlinks in case any installed files have changed
|
||||
eselect emacs set ${EMACS_SUFFIX}
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -0,0 +1,344 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="24"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0=
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
net-libs/liblockfile
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
hesiod? ( net-dns/hesiod )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
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:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
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? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )
|
||||
pax_kernel? ( sys-apps/attr )"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# 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}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
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; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
# Save version information in the Emacs binary. It will be available
|
||||
# in variable "system-configuration-options".
|
||||
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
--without-compress-install \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with gpm) \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
emake
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# 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 -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
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
|
||||
fi
|
||||
|
||||
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
|
||||
through the Emacs eselect module, which also redirects man and info
|
||||
pages. Therefore, several Emacs versions can be installed at the
|
||||
same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
|
||||
strongly recommended that you use app-admin/emacs-updater to rebuild
|
||||
all byte-compiled elisp files of the installed Emacs packages."
|
||||
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
|
||||
it into /Applications by yourself."
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
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() {
|
||||
elisp-site-regen
|
||||
|
||||
local pvr
|
||||
for pvr in ${REPLACING_VERSIONS}; do
|
||||
[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
|
||||
done
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
|
||||
# refresh symlinks in case any installed files have changed
|
||||
eselect emacs set ${EMACS_SUFFIX}
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -0,0 +1,358 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="25"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0=
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
net-libs/liblockfile
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
hesiod? ( net-dns/hesiod )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
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:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
cairo? ( >=x11-libs/cairo-1.12.18 )
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
xwidgets? (
|
||||
x11-libs/gtk+:3
|
||||
net-libs/webkit-gtk:3=
|
||||
)
|
||||
!xwidgets? (
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( x11-libs/gtk+:2 )
|
||||
)
|
||||
)
|
||||
!gtk? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )
|
||||
pax_kernel? ( sys-apps/attr )"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# 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}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
#AT_M4DIR=m4 eautoreconf
|
||||
#touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
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; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with cairo)"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-cairo"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use cairo && ewarn \
|
||||
"USE flag \"cairo\" has no effect if \"xft\" is not set."
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
if use xwidgets; then
|
||||
myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
|
||||
else
|
||||
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
|
||||
myconf+=" --without-xwidgets"
|
||||
fi
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
! use gtk && use xwidgets && ewarn \
|
||||
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
# Save version information in the Emacs binary. It will be available
|
||||
# in variable "system-configuration-options".
|
||||
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
--without-compress-install \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with dynamic-loading modules) \
|
||||
$(use_with gpm) \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
emake
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# 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/{appdata,applications,icons}
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
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 CONTRIBUTE
|
||||
|
||||
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
|
||||
fi
|
||||
|
||||
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
|
||||
through the Emacs eselect module, which also redirects man and info
|
||||
pages. Therefore, several Emacs versions can be installed at the
|
||||
same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
|
||||
strongly recommended that you use app-admin/emacs-updater to rebuild
|
||||
all byte-compiled elisp files of the installed Emacs packages."
|
||||
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
|
||||
it into /Applications by yourself."
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
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() {
|
||||
elisp-site-regen
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
|
||||
# refresh symlinks in case any installed files have changed
|
||||
eselect emacs set ${EMACS_SUFFIX}
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST go-secbench-0.1.0.tar.gz 1281488 SHA256 6c0142c38722294d9b53436c8f0afd302ed0bd244db83490c607b2648d1902d8 SHA512 4712ef56385993ed1e660c1843a1d7e9cd807a3ca8bf935767e8d2965aef25c5b3a7a88d4ed7c072fe124a6b05900bd444cdbc0cee879e80844fb5f695732f2b WHIRLPOOL b12b392966580aea3f52145a3fc310369726ababeccf33f6c903554f2e0d67f2b8286a86da5583ea20d348f3d8040b9db12c1a19ac0f771c6746ade9ed562f19
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EGO_PN="github.com/qnib/go-secbench"
|
||||
inherit golang-build golang-vcs-snapshot
|
||||
|
||||
DESCRIPTION="run and evaluate the docker security benchmark"
|
||||
HOMEPAGE="https://github.com/qnib/go-secbench"
|
||||
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-lang/go"
|
||||
RDEPEND="app-emulation/docker"
|
||||
|
||||
src_compile() {
|
||||
GOPATH="${S}" go build -o bin/go-secbench src/${EGO_PN}/cmd/main.go || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
dodoc "src/${EGO_PN}/README.md"
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EGO_PN="github.com/qnib/go-secbench"
|
||||
inherit golang-build golang-vcs-snapshot
|
||||
|
||||
DESCRIPTION="run and evaluate the docker security benchmark"
|
||||
HOMEPAGE="https://github.com/qnib/go-secbench"
|
||||
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-lang/go"
|
||||
|
||||
src_compile() {
|
||||
GOPATH="${S}" go build -o bin/go-secbench src/${EGO_PN}/cmd/main.go || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
dodoc "src/${EGO_PN}/README.md"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
|
||||
DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
|
||||
|
||||
@ -0,0 +1,132 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit cmake-utils gnome2-utils xdg-utils
|
||||
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/fcitx/fcitx"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
|
||||
HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+ MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
|
||||
REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
sys-apps/dbus
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
x11-libs/libxkbcommon
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrender
|
||||
xml? ( x11-libs/libxkbfile )
|
||||
)
|
||||
cairo? (
|
||||
x11-libs/cairo[X]
|
||||
x11-libs/libXext
|
||||
pango? ( x11-libs/pango )
|
||||
!pango? ( media-libs/fontconfig )
|
||||
)
|
||||
enchant? ( app-text/enchant:0= )
|
||||
gtk2? ( x11-libs/gtk+:2 )
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
introspection? ( dev-libs/gobject-introspection )
|
||||
lua? ( dev-lang/lua:= )
|
||||
nls? ( sys-devel/gettext )
|
||||
opencc? ( app-i18n/opencc:= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtdbus:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
xml? (
|
||||
app-text/iso-codes
|
||||
dev-libs/libxml2
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
kde-frameworks/extra-cmake-modules:5
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-scripts.patch"
|
||||
)
|
||||
|
||||
DOCS=(AUTHORS ChangeLog THANKS)
|
||||
|
||||
src_prepare() {
|
||||
# https://github.com/fcitx/fcitx/issues/250
|
||||
sed \
|
||||
-e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
|
||||
-e "/find_package(XkbFile REQUIRED)/s/^/ /" \
|
||||
-e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
|
||||
-i CMakeLists.txt
|
||||
|
||||
cmake-utils_src_prepare
|
||||
xdg_environment_reset
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
|
||||
-DSYSCONFDIR="${EPREFIX}/etc"
|
||||
-DENABLE_CAIRO=$(usex cairo)
|
||||
-DENABLE_DEBUG=$(usex debug)
|
||||
-DENABLE_ENCHANT=$(usex enchant)
|
||||
-DENABLE_GETTEXT=$(usex nls)
|
||||
-DENABLE_GIR=$(usex introspection)
|
||||
-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
|
||||
-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
|
||||
-DENABLE_LIBXML2=$(usex xml)
|
||||
-DENABLE_LUA=$(usex lua)
|
||||
-DENABLE_OPENCC=$(usex opencc)
|
||||
-DENABLE_PANGO=$(usex pango)
|
||||
-DENABLE_QT=$(usex qt4)
|
||||
-DENABLE_QT_GUI=$(usex qt4)
|
||||
-DENABLE_QT_IM_MODULE=$(usex qt4)
|
||||
-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
|
||||
-DENABLE_STATIC=$(usex static-libs)
|
||||
-DENABLE_TABLE=$(usex table)
|
||||
-DENABLE_TEST=$(usex test)
|
||||
-DENABLE_X11=$(usex X)
|
||||
-DENABLE_XDGAUTOSTART=$(usex autostart)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
rm -r "${ED}usr/share/doc/${PN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
use gtk2 && gnome2_query_immodules_gtk2
|
||||
use gtk3 && gnome2_query_immodules_gtk3
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
use gtk2 && gnome2_query_immodules_gtk2
|
||||
use gtk3 && gnome2_query_immodules_gtk3
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
https://github.com/fcitx/fcitx/issues/342
|
||||
https://github.com/fcitx/fcitx/commit/de4bd3d535736afe061d9ac63fcc897e3ab3237e
|
||||
|
||||
--- /cmake/fcitx-cmake-helper.sh
|
||||
+++ /cmake/fcitx-cmake-helper.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env bash
|
||||
# Copyright (C) 2012~2013 by Yichao Yu
|
||||
# yyc1992@gmail.com
|
||||
#
|
||||
--- /cmake/fcitx-merge-config.sh
|
||||
+++ /cmake/fcitx-merge-config.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/usr/bin/env bash
|
||||
# Copyright (C) 2012~2012 by Yichao Yu
|
||||
# yyc1992@gmail.com
|
||||
#
|
||||
--- /data/icon/data/gen.sh
|
||||
+++ /data/icon/data/gen.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/usr/bin/env bash
|
||||
|
||||
a="$(find scabable/status/ -type f -name \*.svg)"
|
||||
echo $a
|
||||
--- /data/script/fcitx-configtool.sh
|
||||
+++ /data/script/fcitx-configtool.sh
|
||||
@@ -28,7 +28,7 @@
|
||||
}
|
||||
fi
|
||||
|
||||
-if type gettext > /dev/null 2>&1; then
|
||||
+if which gettext > /dev/null 2>&1; then
|
||||
_() {
|
||||
gettext "$@"
|
||||
}
|
||||
--- /src/lib/fcitx-utils/gen-hotkey.sh
|
||||
+++ /src/lib/fcitx-utils/gen-hotkey.sh
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
-function download_file()
|
||||
-{
|
||||
+download_file() {
|
||||
if [ "x$3" != "xf" ]; then
|
||||
if [ -f $1 ]; then
|
||||
return
|
||||
--- /src/ui/classic/fcitx-skin-installer.sh
|
||||
+++ /src/ui/classic/fcitx-skin-installer.sh
|
||||
@@ -25,7 +25,7 @@
|
||||
}
|
||||
fi
|
||||
|
||||
-if type gettext > /dev/null 2>&1; then
|
||||
+if which gettext > /dev/null 2>&1; then
|
||||
_() {
|
||||
gettext "$@"
|
||||
}
|
||||
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
||||
PYTHON_REQ_USE="sqlite(+)"
|
||||
|
||||
inherit autotools gnome2-utils python-single-r1
|
||||
|
||||
DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
|
||||
HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
|
||||
SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="boost lua opencc"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
app-i18n/ibus[python(+),${PYTHON_USEDEP}]
|
||||
>=app-i18n/libpinyin-2.1.0:=
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
boost? ( dev-libs/boost:= )
|
||||
lua? ( dev-lang/lua:0 )
|
||||
opencc? ( app-i18n/opencc:= )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/libintl
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-english-input-mode \
|
||||
$(use_enable boost) \
|
||||
$(use_enable lua lua-extension) \
|
||||
$(use_enable opencc)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- /trainer.cpp
|
||||
+++ /trainer.cpp
|
||||
@@ -103,7 +103,7 @@
|
||||
if (!fn) {
|
||||
return false;
|
||||
}
|
||||
- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
|
||||
+ x_.push_back(std::make_pair(y, fn));
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
Index: zinnia-0.06/configure.in
|
||||
===================================================================
|
||||
--- zinnia-0.06.orig/configure.in
|
||||
+++ zinnia-0.06/configure.in
|
||||
@@ -59,15 +59,6 @@ AC_ARG_WITH(pkgconfigdir,
|
||||
--- /configure.in
|
||||
+++ /configure.in
|
||||
@@ -59,15 +59,6 @@
|
||||
AC_SUBST([pkgconfigdir])
|
||||
AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/old/trainer.cpp b/zinnia-0.06/trainer.cpp
|
||||
index fdb044c..8b21e6c 100644
|
||||
--- a/old/trainer.cpp
|
||||
+++ b/zinnia-0.06/trainer.cpp
|
||||
@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer {
|
||||
if (!fn) {
|
||||
return false;
|
||||
}
|
||||
- x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
|
||||
+ x_.push_back(std::make_pair(y, fn));
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
Index: zinnia-0.06/perl/Makefile.PL
|
||||
===================================================================
|
||||
--- zinnia-0.06.orig/perl/Makefile.PL
|
||||
+++ zinnia-0.06/perl/Makefile.PL
|
||||
@@ -4,7 +4,7 @@ WriteMakefile(
|
||||
--- /perl/Makefile.PL
|
||||
+++ /perl/Makefile.PL
|
||||
@@ -4,7 +4,7 @@
|
||||
'CC' => 'c++',
|
||||
'LD' => 'c++',
|
||||
'INC' => '',
|
||||
@ -1 +0,0 @@
|
||||
DIST linuxsms-0.77.tar.gz 38708 SHA256 130e9a95adce842016d5279885ddafdc384a7bd5aa4fd7590ca43b68a9d58cd8 SHA512 58b4571acd84dd7e86266a779008164e46cb12c10c780a17c656c168bac2f483c5fa53ade7ef7648acc18e26a4685527e710ca518beedbbd4a16f91322be220c WHIRLPOOL 3e2f8dab7aacf01613ea1dfaaf7bdd823a5413eaedfa0309066812bcea54de60f861cf3a8fa12b43cfb23f6e2c215fe76e5bcdcce131104d3ed78942c6fa8f73
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="A console perl script for sending SMS to cell phones"
|
||||
HOMEPAGE="http://linuxsms.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 arm ppc s390 sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-lang/perl-5.6.1"
|
||||
DEPEND=""
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dobin ${PN}
|
||||
doman ${PN}.1
|
||||
dodoc BUGS CHANGES README README.ES TODO
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<longdescription>Linuxsms is a cool script in Perl for send SMS messages to mobile phones through a SMS gateway.</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">linuxsms</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1 +1,2 @@
|
||||
DIST smstools3-3.1.15.tar.gz 300088 SHA256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 SHA512 6a4cc852327fac27b00fc58def4bbc8caa395552586fe1b84f0f4a9f7f6b00008943b85c86de0821036629c58cf04840a189d711b4ac96f7ddaafd6b340b11fa WHIRLPOOL b394c4c620622dcfdf1d0b098a51f589ee59869fbd58c0b778e51f76335a396c3d4972423374f2ee191263cf7c350cf2432e0b120f594f77f17cdbbcc4b4e974
|
||||
DIST smstools3-3.1.21.tar.gz 356548 SHA256 a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084 SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31 WHIRLPOOL 44bba9f7c0e3c9eb73c27ae47d9ad57320eddd931393e4675e7160c66c1c17d587273ad090357842a88152ea3ca1009a9f0c4547d433cd796f46d15b0c8fb467
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
diff -uNr smstools3.ORIG/scripts/hex2bin smstools3/scripts/hex2bin
|
||||
--- smstools3.ORIG/scripts/hex2bin 2017-09-11 14:11:48.040928533 +0100
|
||||
+++ smstools3/scripts/hex2bin 2017-09-11 14:12:00.925927820 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/gawk -f
|
||||
+#!/usr/bin/gawk -f
|
||||
|
||||
# This script reads a hex-dump and converts it to a binary file.
|
||||
# The hex-dump must contain one or more hexadecimal numbers separated
|
||||
@ -0,0 +1,23 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
checkpath -q -d -m 0770 -o smsd:sms /run/smsd || return 1
|
||||
checkpath -q -f -o smsd:sms /var/log/smsd.log || return 1
|
||||
ebegin "Starting smsd"
|
||||
start-stop-daemon -b -u smsd:sms --start --exec /usr/bin/smsd -- \
|
||||
-c /etc/smsd.conf -p /run/smsd/smsd.pid \
|
||||
-i /run/smsd/smsd.working
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping smsd"
|
||||
start-stop-daemon --stop -n smsd
|
||||
eend ${?}
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST enchant-1.6.0.tar.gz 607018 SHA256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137 WHIRLPOOL f6677a11f1d05e210cbd6a7b13f3987ea93b3f1e73537b048093c14686b0310e75a89fdb8798ad0ed386a7e1cd793f60820006df8c1f7919c46c7245ee6a74c9
|
||||
DIST enchant-1.6.1.tar.gz 642124 SHA256 bef0d9c0fef2e4e8746956b68e4d6c6641f6b85bd2908d91731efb68eba9e3f5 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 WHIRLPOOL daffe1ee16e731d3d6ba56362f882c8f8bd7462a264fcf9caf05ed8093c0ca275977fb9c83c391d9e3287e6e98516b52e468c9bf9cc86532cf0b3eeba8f02fbd
|
||||
DIST enchant-2.1.0.tar.gz 962857 SHA256 2cdda2d9edb62ad895c34be35c598d56ac5b9b9298f3dfdaa2b40a1914d1db7e SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27 WHIRLPOOL 4bb340288fffae6f8c6bc7bf21127ea812b79698d8be0f275e638fe47d1cd1c2b6b96b15fb0a0cec983d8b3db6c3e973e9521d86247c1e1df31f3db4ee80cb8f
|
||||
DIST enchant-2.1.1.tar.gz 961821 SHA256 5fad0a1e82ddfed91647e93da5955fc76249760fd51865648a36074dc97d526c SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15 WHIRLPOOL 955b1d853233529198b3a487406b0c481273214b5c54c22fbc992ea63f66143e278082f3d17370e9140d6211cf36586881ff73dbd07c66b01346d36cd2f2f316
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test zemberek"
|
||||
REQUIRED_USE="|| ( hunspell aspell zemberek )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )
|
||||
zemberek? ( dev-libs/dbus-glib )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPENDS}
|
||||
zemberek? ( app-text/zemberek-server )
|
||||
"
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with zemberek) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
Gentoo-bug: 630682 (CVE-2017-14226)
|
||||
|
||||
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
|
||||
Reviewed-on: https://gerrit.libreoffice.org/42054
|
||||
Tested-by: Jenkins <ci@libreoffice.org>
|
||||
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
||||
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
||||
|
||||
--- a/src/lib/WP5StylesListener.cpp
|
||||
+++ b/src/lib/WP5StylesListener.cpp
|
||||
@@ -85,8 +85,9 @@
|
||||
m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
|
||||
m_currentPage.setPageSpan(1);
|
||||
|
||||
- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
|
||||
- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
|
||||
+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
|
||||
+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
|
||||
+ HFiter != headerFooterList.end(); ++HFiter)
|
||||
{
|
||||
if ((*HFiter).getOccurrence() != NEVER)
|
||||
{
|
||||
--- a/src/lib/WP42StylesListener.cpp
|
||||
+++ b/src/lib/WP42StylesListener.cpp
|
||||
@@ -84,8 +84,9 @@
|
||||
m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
|
||||
m_currentPage.setPageSpan(1);
|
||||
|
||||
- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
|
||||
- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
|
||||
+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
|
||||
+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
|
||||
+ HFiter != headerFooterList.end(); ++HFiter)
|
||||
{
|
||||
if ((*HFiter).getOccurrence() != NEVER)
|
||||
{
|
||||
--- a/src/lib/WP1StylesListener.cpp
|
||||
+++ b/src/lib/WP1StylesListener.cpp
|
||||
@@ -83,8 +83,9 @@
|
||||
m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
|
||||
m_currentPage.setPageSpan(1);
|
||||
|
||||
- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
|
||||
- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
|
||||
+ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
|
||||
+ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
|
||||
+ HFiter != headerFooterList.end(); ++HFiter)
|
||||
{
|
||||
if ((*HFiter).getOccurrence() != NEVER)
|
||||
{
|
||||
@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit alternatives
|
||||
|
||||
DESCRIPTION="WordPerfect Document import/export library"
|
||||
HOMEPAGE="http://libwpd.sf.net"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
|
||||
SLOT="0.10"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
|
||||
IUSE="doc +tools"
|
||||
|
||||
RDEPEND="dev-libs/librevenge"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-CVE-2017-14226.patch" )
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-static \
|
||||
--disable-werror \
|
||||
$(use_with doc docs) \
|
||||
$(use_enable tools) \
|
||||
--program-suffix=-${SLOT}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use tools; then
|
||||
alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
|
||||
alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
|
||||
alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
if use tools; then
|
||||
alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
|
||||
alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
|
||||
alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
|
||||
fi
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="C++ bindings for DirectFB"
|
||||
HOMEPAGE="http://www.directfb.org/dfb++.xml"
|
||||
SRC_URI="http://www.directfb.org/downloads/Extras/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/DirectFB-${PV}"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${P}-directfb-api.patch #235041
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
dodoc AUTHORS ChangeLog NEWS README
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST DFB++-1.2.0.tar.gz 369240 SHA256 d9281587e02ef288275d639a16abbe72ec0bc4e83f10b3308570f14f9126606a SHA512 8689e1037f5cd19fb7f8e9ebe3eee971e6e51338116fad11a1618df4646daabeab79fec90670f3dc4e227be9ede9821abe927ffbbd0e57511220d3a28a75d1da WHIRLPOOL 950218b861b524ab412429b8af7ea00a8568528e2577b86ff33877998b3474d6dddc678cfc4155e051261aeeef77183b3cf10f6106ea69e59526d3939908b890
|
||||
@ -1,28 +0,0 @@
|
||||
fix building with DirectFB-1.2.3
|
||||
|
||||
http://bugs.gentoo.org/235041
|
||||
|
||||
patch by Philippe Weibel
|
||||
|
||||
--- dfb++/idirectfbvideoprovider.cpp
|
||||
+++ dfb++/idirectfbvideoprovider.cpp
|
||||
@@ -165,7 +165,7 @@
|
||||
return level;
|
||||
}
|
||||
|
||||
-void IDirectFBVideoProvider::SetStreamAttributes (DFBStreamDescription attr)
|
||||
+void IDirectFBVideoProvider::SetStreamAttributes (DFBStreamAttributes attr)
|
||||
{
|
||||
DFBCHECK( iface->SetStreamAttributes (iface, attr) );
|
||||
}
|
||||
--- include/idirectfbvideoprovider.h
|
||||
+++ include/idirectfbvideoprovider.h
|
||||
@@ -68,7 +68,7 @@
|
||||
float GetVolume ();
|
||||
|
||||
|
||||
- void SetStreamAttributes (DFBStreamDescription attr);
|
||||
+ void SetStreamAttributes (DFBStreamAttributes attr);
|
||||
|
||||
void SetAudioOutputs (DFBVideoProviderAudioUnits *audioUnits);
|
||||
DFBVideoProviderAudioUnits GetAudioOutputs ();
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>graphics@gentoo.org</email>
|
||||
<name>Gentoo Graphics Project</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,3 +1,4 @@
|
||||
DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece
|
||||
DIST onig-5.9.6_p1.tar.gz 605920 SHA256 ac34ae0624296b59ff9ad9a2e93f2b1cdd775ca87057a42d27e551b7a76ff7b4 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48 WHIRLPOOL be0f030469cbaef0f196190a18725eb4f516b3b78c1a3484fe602462df1ada48fa848fc59f619f0089a352293825f809034c18e5964802fc964032d94e10f03b
|
||||
DIST onig-6.4.0.tar.gz 900425 SHA256 cf43ddc5167aea260c4297c76b0dd5e1e6d67aa39319db667347d4d0706ff695 SHA512 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa WHIRLPOOL bc89b0217a89c70234d2b167fbe68e7588104c812d4df18e64964511cf764786d53a50e87561438d317f435ab30f179990202fc8892b8ab4e85d1cbf8b21c6b9
|
||||
DIST onig-6.6.1.tar.gz 943490 SHA256 8f9731f9e48666236a1678e2b4ead69be682eefba3983a714b6b57cf5ee14372 SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc WHIRLPOOL c6ed29ca7b4f2ce83d4d17daf7292689b420dd5a5a82e0c1c6b2707dae5b5af4227ebcf4b495096a084c45c23b96df5c924e5cd0ea238ba5246d56d99c460cbf
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
https://github.com/kkos/oniguruma/issues/68
|
||||
https://github.com/kkos/oniguruma/commit/1337755c2758a62057ef95f1cff1b9466f533301
|
||||
|
||||
--- /sample/Makefile.am
|
||||
+++ /sample/Makefile.am
|
||||
@@ -4,7 +4,7 @@
|
||||
LDADD = $(lib_onig)
|
||||
|
||||
AM_LDFLAGS = -L$(prefix)/lib
|
||||
-AM_CPPFLAGS = -I../src -I$(includedir)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
|
||||
|
||||
TESTS = encode listcap names posix simple sql syntax user_property bug_fix
|
||||
|
||||
--- /test/Makefile.am
|
||||
+++ /test/Makefile.am
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
AM_LDFLAGS = -L$(prefix)/lib
|
||||
AM_CFLAGS =
|
||||
-AM_CPPFLAGS = -I../src -I$(includedir)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
|
||||
|
||||
TESTS = test_utf8 testc testp testcu
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools multilib-minimal
|
||||
|
||||
MY_P="onig-${PV}"
|
||||
|
||||
DESCRIPTION="Regular expression library for different character encodings"
|
||||
HOMEPAGE="https://github.com/kkos/oniguruma"
|
||||
SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0/4"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
|
||||
IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-build.patch"
|
||||
)
|
||||
|
||||
DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable combination-explosion-check) \
|
||||
$(use_enable crnl-as-line-terminator) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
find "${D}" -name "*.la" -delete || die
|
||||
}
|
||||
@ -1,2 +0,0 @@
|
||||
DIST Auth-1.6.4.tgz 56048 SHA256 5fb31a2f758474fd9a044afbc387d65fef38732b8f313837971b9a16104779e6 SHA512 670f77d0b68d4701ddb19093637ac341d75411bdacc527fc2fb1cf412d87cf9c78595f925a518e3b5b577635f59904c3c1f499cc8a357ee0c807652070e2961b WHIRLPOOL 22e01a2c7556eb409a0caee0320bfd8269e8f606d67286df658db1f63266faac385e732f63ede13386be22001bc293a1abcaa29fb20a26f85eec6c760f6db7fc
|
||||
DIST Auth-1.6.5_pre20150209.tar.gz 62733 SHA256 b1165facc7f133acbfe41e8def74acd0e864ff39de6d92f90b97f075ace86124 SHA512 4d3ebe3eaa8129ce205adcc3c2b8aadbf2f3a3624a597f901944b61bccc052c92b922e6762b9e061fdffd885c5b20e32b6dd1453e205f734f6eed0b40d0a8338 WHIRLPOOL a04b96d4a8e9c4a91fa85482eaa29542ed6d47daf7f1bb9273faa346e2868473ca18819f27019a23a76e0a747c45d7bbc502f7229a69b8073262edbbc8a795a2
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides methods for creating an authentication system using PHP"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
|
||||
IUSE="minimal"
|
||||
RDEPEND="!minimal? ( >=dev-php/PEAR-Log-1.9.10
|
||||
>=dev-php/PEAR-File_Passwd-1.1.0
|
||||
>=dev-php/PEAR-Net_POP3-1.3.0
|
||||
>=dev-php/PEAR-DB-1.7.6-r1
|
||||
dev-php/PEAR-MDB
|
||||
>=dev-php/PEAR-MDB2-2.0.0_rc1
|
||||
>=dev-php/PEAR-Crypt_CHAP-1.0.0
|
||||
>=dev-php/PEAR-SOAP-0.9.0
|
||||
>=dev-php/PEAR-File_SMBPasswd-1.0.0
|
||||
>=dev-php/PEAR-HTTP_Client-1.1.0 )"
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use minimal && ! has_version "dev-lang/php[imap,soap]" ; then
|
||||
elog "${PN} can optionally use php's imap and soap features."
|
||||
elog "If you want those, recompile dev-lang/php with these flags in USE."
|
||||
fi
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit php-pear-r2 vcs-snapshot
|
||||
|
||||
SRC_URI="https://github.com/pear/Auth/archive/9c6817a6ae4bfabf9d6ffa91cbcdca6ab2e31ce7.tar.gz -> ${PEAR_P}.tar.gz"
|
||||
DESCRIPTION="Provides methods for creating an authentication system using PHP"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="minimal"
|
||||
RDEPEND="!minimal? ( >=dev-php/PEAR-Log-1.9.10
|
||||
>=dev-php/PEAR-File_Passwd-1.1.0
|
||||
>=dev-php/PEAR-Net_POP3-1.3.0
|
||||
>=dev-php/PEAR-DB-1.7.6-r1
|
||||
dev-php/PEAR-MDB
|
||||
>=dev-php/PEAR-MDB2-2.0.0_rc1
|
||||
>=dev-php/PEAR-Crypt_CHAP-1.0.0
|
||||
>=dev-php/PEAR-SOAP-0.9.0
|
||||
>=dev-php/PEAR-File_SMBPasswd-1.0.0
|
||||
>=dev-php/PEAR-HTTP_Client-1.1.0 )"
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use minimal ; then
|
||||
elog "${PN} can optionally use php's imap and soap features."
|
||||
elog "If you want those, recompile dev-lang/php with these flags in USE."
|
||||
fi
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Auth_HTTP-2.1.8.tgz 8626 SHA256 bd3f37de04cbfd99c16fc2ca0ecf807611b0ceb5a943f6cedf359183c074e03c SHA512 e25686d289cd95b3ceea1d6836b1bd31ba36a755dc2ebf57d0d250d4169467bf5d313be3234e989557d4239f0ecb40150e561c087a34f228b0848190b98349b6 WHIRLPOOL e665a9a13907f7cb66c65a1ed76b1bbe814864ddffa20d86b18dc2c801ac2b203fcfb178b0a6d4b2a01a380c9b131d8b95f29c1bd6d06e0c4d2093a00c5a2dd8
|
||||
@ -1,15 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Create HTTP authentication systems like Apache's realm-based .htaccess mechanism"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
RDEPEND="dev-php/PEAR-Auth"
|
||||
DOCS=( docs/sample.sql )
|
||||
HTML_DOCS=( docs/test_digest_simple.php docs/test_digest_post.php docs/test_digest_get.php docs/test_basic_simple.php )
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST HTML_Template_IT-1.3.0.tgz 23309 SHA256 fe042e9fcc34b77cb6c008090257a25c39e3c1f5e3b0cac99e4eef142954fe70 SHA512 3174db25b09de3dd11e572c6f85b40ba8d6dd213175bcf9b308a52a6b3756ffa7870cfca5766f5692282b5788d6ae586003259e518f26fc263b25da12f99e168 WHIRLPOOL 6591343353dcd5ce09161d0afed1ebedaf6d92592ef467f11bb1126c733059a41d043675d8ed966d0cd949cfc22897cc659c5c229d85bd421221a11f6fb4cff4
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Integrated Templates"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="examples test"
|
||||
DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}/preg-callback.patch" \
|
||||
"${FILESDIR}/constructor.patch"
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use examples && HTML_DOCS=(
|
||||
examples/sample_it.php
|
||||
examples/sample_itx_addblockfile.php
|
||||
examples/templates/
|
||||
)
|
||||
php-pear-r2_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
phpunit tests/AllTests.php || die
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Integrated Templates"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
@ -1,62 +0,0 @@
|
||||
diff -aurN a/HTML/Template/IT_Error.php b/HTML/Template/IT_Error.php
|
||||
--- a/HTML/Template/IT_Error.php 2010-03-10 03:08:10.000000000 -0500
|
||||
+++ b/HTML/Template/IT_Error.php 2017-08-01 16:44:31.257269180 -0400
|
||||
@@ -58,8 +58,11 @@
|
||||
*/
|
||||
function IT_Error($msg, $file = __FILE__, $line = __LINE__)
|
||||
{
|
||||
+ $this->__construct($msg, $file, $line);
|
||||
+ }
|
||||
+ function __construct($msg, $file = __FILE__, $line = __LINE__)
|
||||
+ {
|
||||
$this->PEAR_Error(sprintf("%s [%s on line %d].", $msg, $file, $line));
|
||||
} // end func IT_Error
|
||||
|
||||
} // end class IT_Error
|
||||
-?>
|
||||
diff -aurN a/HTML/Template/IT.php b/HTML/Template/IT.php
|
||||
--- a/HTML/Template/IT.php 2017-08-01 16:40:29.822907534 -0400
|
||||
+++ b/HTML/Template/IT.php 2017-08-01 16:44:46.515860952 -0400
|
||||
@@ -409,6 +409,10 @@
|
||||
*/
|
||||
function HTML_Template_IT($root = '', $options = null)
|
||||
{
|
||||
+ $this->__construct($root, $options);
|
||||
+ }
|
||||
+ function __construct($root = '', $options = null)
|
||||
+ {
|
||||
if (!is_null($options)) {
|
||||
$this->setOptions($options);
|
||||
}
|
||||
@@ -1184,4 +1188,3 @@
|
||||
$errorMessages[$value] : $errorMessages[IT_ERROR];
|
||||
}
|
||||
} // end class IntegratedTemplate
|
||||
-?>
|
||||
diff -aurN a/HTML/Template/ITX.php b/HTML/Template/ITX.php
|
||||
--- a/HTML/Template/ITX.php 2010-03-10 03:08:10.000000000 -0500
|
||||
+++ b/HTML/Template/ITX.php 2017-08-01 16:44:41.185654236 -0400
|
||||
@@ -138,13 +138,17 @@
|
||||
*/
|
||||
function HTML_Template_ITX($root = '')
|
||||
{
|
||||
+ $this->__construct($root);
|
||||
+ }
|
||||
+ function __construct($root = '')
|
||||
+ {
|
||||
|
||||
$this->checkblocknameRegExp = '@' . $this->blocknameRegExp . '@';
|
||||
|
||||
$this->functionRegExp = '@' . $this->functionPrefix . '(' .
|
||||
$this->functionnameRegExp . ')\s*\(@sm';
|
||||
|
||||
- $this->HTML_Template_IT($root);
|
||||
+ parent::__construct($root);
|
||||
} // end func constructor
|
||||
|
||||
/**
|
||||
@@ -886,4 +890,3 @@
|
||||
} // end func warning
|
||||
|
||||
} // end class HTML_Template_ITX
|
||||
-?>
|
||||
@ -1,17 +0,0 @@
|
||||
diff -aurN a/HTML/Template/IT.php b/HTML/Template/IT.php
|
||||
--- a/HTML/Template/IT.php 2010-03-10 03:08:10.000000000 -0500
|
||||
+++ b/HTML/Template/IT.php 2017-08-01 15:12:31.161235223 -0400
|
||||
@@ -1088,9 +1088,10 @@
|
||||
$content = fread($fh, $fsize);
|
||||
fclose($fh);
|
||||
|
||||
- return preg_replace(
|
||||
- "#<!-- INCLUDE (.*) -->#ime",
|
||||
- "\$this->getFile('\\1')",
|
||||
+ return preg_replace_callback(
|
||||
+ "#<!-- INCLUDE (.*) -->#im",
|
||||
+ function($matches) {
|
||||
+ return $this->getFile($matches[1]); },
|
||||
$content
|
||||
);
|
||||
} // end func getFile
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST HTML_TreeMenu-1.2.2.tgz 55925 SHA256 bd57e97b9e1e84c97faec057f842452a5a1240798756d17ee959b1971def3d12 SHA512 653b9e82133a447f65feaf1e95f1948d889d5c97198b5bcc6fd2bf5f9eda89c087d77e863c8fbbd5da8083926716f63820cd8504751c29fbf45695a6b83b01b4 WHIRLPOOL def5ae0f77bfe773698cccecdaba1326c6cc3fdbd872dc1fc6175a7dd7a511a26e567fdb4f29269660560cc17283df7fc396673e96eda9f9dd92060bd00ccf20
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Provides an API to create a HTML tree"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
|
||||
PATCHES=( "${FILESDIR}/modern-syntax.patch" )
|
||||
|
||||
src_install() {
|
||||
php-pear-r2_src_install
|
||||
docinto html
|
||||
dodoc -r TreeMenu.js images imagesAlt imagesAlt2 imagesAlt3 docs/example.php
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Please copy the TreeMenu.js and the contents of one of the images"
|
||||
elog "directory from ${EROOT}usr/share/doc/${PF}/html to the same location"
|
||||
elog "in your website for this script to work properly"
|
||||
}
|
||||
@ -1,144 +0,0 @@
|
||||
diff -aurN a/HTML/TreeMenu.php b/HTML/TreeMenu.php
|
||||
--- a/HTML/TreeMenu.php 2010-10-25 05:10:46.000000000 -0400
|
||||
+++ b/HTML/TreeMenu.php 2017-08-04 15:25:16.730007135 -0400
|
||||
@@ -83,6 +83,9 @@
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
+ function __construct()
|
||||
+ {
|
||||
+ }
|
||||
function HTML_TreeMenu()
|
||||
{
|
||||
// Not much to do here :(
|
||||
@@ -206,7 +209,7 @@
|
||||
case 'heyes_array':
|
||||
// Need to create a HTML_TreeMenu object ?
|
||||
if (!isset($params['treeMenu'])) {
|
||||
- $treeMenu = &new HTML_TreeMenu();
|
||||
+ $treeMenu = new HTML_TreeMenu();
|
||||
$parentID = 0;
|
||||
} else {
|
||||
$treeMenu = &$params['treeMenu'];
|
||||
@@ -240,7 +243,7 @@
|
||||
default:
|
||||
// Need to create a HTML_TreeMenu object ?
|
||||
if (!isset($params['treeMenu'])) {
|
||||
- $treeMenu = &new HTML_TreeMenu();
|
||||
+ $treeMenu = new HTML_TreeMenu();
|
||||
} else {
|
||||
$treeMenu = &$params['treeMenu'];
|
||||
}
|
||||
@@ -312,7 +315,7 @@
|
||||
if (is_string($xml)) {
|
||||
// Supplied $xml is a string
|
||||
include_once 'XML/Tree.php';
|
||||
- $xmlTree = &new XML_Tree();
|
||||
+ $xmlTree = new XML_Tree();
|
||||
$xmlTree->getTreeFromString($xml);
|
||||
} else {
|
||||
// Supplied $xml is an XML_Tree object
|
||||
@@ -469,7 +472,7 @@
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
- function HTML_TreeNode($options = array(), $events = array())
|
||||
+ function __construct($options = array(), $events = array())
|
||||
{
|
||||
$this->text = '';
|
||||
$this->link = '';
|
||||
@@ -488,7 +491,10 @@
|
||||
$this->$option = $value;
|
||||
}
|
||||
}
|
||||
-
|
||||
+ function HTML_TreeNode($options = array(), $events = array())
|
||||
+ {
|
||||
+ self::__construct($options, $events);
|
||||
+ }
|
||||
/**
|
||||
* Allows setting of various parameters after the initial constructor call
|
||||
*
|
||||
@@ -585,11 +591,14 @@
|
||||
*
|
||||
* @param HTML_TreeMenu &$structure The menu structure
|
||||
*/
|
||||
- function HTML_TreeMenu_Presentation(&$structure)
|
||||
+ function __construct(&$structure)
|
||||
{
|
||||
$this->menu = &$structure;
|
||||
}
|
||||
-
|
||||
+ function HTML_TreeMenu_Presentation(&$structure)
|
||||
+ {
|
||||
+ self::__construct($structure);
|
||||
+ }
|
||||
/**
|
||||
* Prints the HTML generated by the toHTML() method.
|
||||
* toHTML() must therefore be defined by the derived
|
||||
@@ -715,7 +724,7 @@
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
- function HTML_TreeMenu_DHTML(&$structure, $options = array(), $isDynamic = true)
|
||||
+ function __construct(&$structure, $options = array(), $isDynamic = true)
|
||||
{
|
||||
$this->HTML_TreeMenu_Presentation($structure);
|
||||
$this->isDynamic = $isDynamic;
|
||||
@@ -733,7 +742,10 @@
|
||||
$this->$option = $value;
|
||||
}
|
||||
}
|
||||
-
|
||||
+ function HTML_TreeMenu_DHTML(&$structure, $options = array(), $isDynamic = true)
|
||||
+ {
|
||||
+ self::__construct($structure, $options, $isDynamic);
|
||||
+ }
|
||||
/**
|
||||
* Returns the HTML for the menu.
|
||||
*
|
||||
@@ -920,7 +932,7 @@
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
- function HTML_TreeMenu_Listbox($structure, $options = array())
|
||||
+ function __construct($structure, $options = array())
|
||||
{
|
||||
$this->HTML_TreeMenu_Presentation($structure);
|
||||
|
||||
@@ -934,7 +946,10 @@
|
||||
$this->$option = $value;
|
||||
}
|
||||
}
|
||||
-
|
||||
+ function HTML_TreeMenu_Listbox($structure, $options = array())
|
||||
+ {
|
||||
+ self::__construct($structure, $options);
|
||||
+ }
|
||||
/**
|
||||
* Returns the HTML generated
|
||||
*
|
||||
diff -aurN a/tests/testBug_9750.phpt b/tests/testBug_9750.phpt
|
||||
--- a/tests/testBug_9750.phpt 2010-10-25 05:10:46.000000000 -0400
|
||||
+++ b/tests/testBug_9750.phpt 2017-08-04 15:27:53.691108758 -0400
|
||||
@@ -44,17 +44,17 @@
|
||||
'nodeOptions' => $nodeOptions
|
||||
);
|
||||
|
||||
-$menu = &HTML_TreeMenu::createFromStructure($options);
|
||||
+$menu = HTML_TreeMenu::createFromStructure($options);
|
||||
|
||||
// Chose a generator. You can generate DHTML or a Listbox
|
||||
-$dhtml = &new HTML_TreeMenu_DHTML(
|
||||
+$dhtml = new HTML_TreeMenu_DHTML(
|
||||
$menu,
|
||||
array(
|
||||
'images' => 'images',
|
||||
'defaultClass' => 'treeMenuDefault'
|
||||
)
|
||||
);
|
||||
-$listbox = &new HTML_TreeMenu_ListBox(
|
||||
+$listbox = new HTML_TreeMenu_ListBox(
|
||||
$menu,
|
||||
array(
|
||||
'images' => 'images',
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST HTTP_Client-1.2.1.tgz 10202 SHA256 1c76e6748fe59270c5df058042c692aa00a0cc23f61f5cd64eb61673158e3e55 SHA512 9865a63b11362ef5397ed52e052e8b322e5132db674aa26720d6dbabd542415a640c9c9a5804025ee634d9b17fe4f14003c35f2f516c3674ca688a44e9a7958d WHIRLPOOL 2531d31c0cb4d71ea67601718f359fe2b44ed90259f5192ff4326b68ed17e1211310645080c6d671831b670ca8ccb9c7638b2b16b2cca74de5b75d60c1a57445
|
||||
@ -1,22 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Perform multiple HTTP requests and process their results"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2"
|
||||
|
||||
PATCHES=( "${FILESDIR}/modern-php.patch" )
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/php/HTTP
|
||||
doins -r Client.php Client
|
||||
php-pear-r2_install_packagexml
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Perform multiple HTTP requests and process their results"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2"
|
||||
@ -1,69 +0,0 @@
|
||||
diff -aurN a/Client/CookieManager.php b/Client/CookieManager.php
|
||||
--- a/Client/CookieManager.php 2008-10-25 13:08:26.000000000 -0400
|
||||
+++ b/Client/CookieManager.php 2017-08-07 10:17:04.495233973 -0400
|
||||
@@ -75,11 +75,14 @@
|
||||
* @access public
|
||||
* @see serializeSessionCookies()
|
||||
*/
|
||||
- function HTTP_Client_CookieManager($serializeSession = false)
|
||||
+ function __construct($serializeSession = false)
|
||||
{
|
||||
$this->serializeSessionCookies($serializeSession);
|
||||
}
|
||||
-
|
||||
+ function HTTP_Client_CookieManager($serializeSession = false)
|
||||
+ {
|
||||
+ self::__construct($serializeSession);
|
||||
+ }
|
||||
/**
|
||||
* Sets whether session cookies should be serialized when serializing object
|
||||
*
|
||||
@@ -264,4 +267,3 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-?>
|
||||
diff -aurN a/Client.php b/Client.php
|
||||
--- a/Client.php 2008-10-25 13:08:26.000000000 -0400
|
||||
+++ b/Client.php 2017-08-07 10:13:52.524610550 -0400
|
||||
@@ -171,12 +171,12 @@
|
||||
* @param array Default headers to send on every request
|
||||
* @param HTTP_Client_CookieManager Cookie manager object to use
|
||||
*/
|
||||
- function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
|
||||
+ function __construct($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
|
||||
{
|
||||
if (!empty($cookieManager) && is_a($cookieManager, 'HTTP_Client_CookieManager')) {
|
||||
$this->_cookieManager = $cookieManager;
|
||||
} else {
|
||||
- $this->_cookieManager =& new HTTP_Client_CookieManager();
|
||||
+ $this->_cookieManager = new HTTP_Client_CookieManager();
|
||||
}
|
||||
if (isset($defaultHeaders)) {
|
||||
$this->setDefaultHeader($defaultHeaders);
|
||||
@@ -185,7 +185,10 @@
|
||||
$this->setRequestParameter($defaultRequestParams);
|
||||
}
|
||||
}
|
||||
-
|
||||
+ function HTTP_Client($defaultRequestParams = null, $defaultHeaders = null, $cookieManager = null)
|
||||
+ {
|
||||
+ self::__construct($defaultRequestParams, $defaultHeaders, $cookieManager);
|
||||
+ }
|
||||
|
||||
/**
|
||||
* Sets the maximum redirects that will be processed.
|
||||
@@ -225,7 +228,7 @@
|
||||
*/
|
||||
function &_createRequest($url, $method = HTTP_REQUEST_METHOD_GET, $headers = array())
|
||||
{
|
||||
- $req =& new HTTP_Request($url, $this->_defaultRequestParams);
|
||||
+ $req = new HTTP_Request($url, $this->_defaultRequestParams);
|
||||
$req->setMethod($method);
|
||||
foreach ($this->_defaultHeaders as $name => $value) {
|
||||
$req->addHeader($name, $value);
|
||||
@@ -716,4 +719,3 @@
|
||||
return $this->_idx < count($this->_responses);
|
||||
}
|
||||
}
|
||||
-?>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST HTTP_Request-1.4.4.tgz 17109 SHA256 cb6050491a7b9583b3a74f89d14a9d49c4a5e51472a31126026e03fcabe84d19 SHA512 40923b47d47d8fb31e3a9aa07871a2010b16390a183a0835e77967249a57fff13bdb10c091bda1e10b970472ea387085e088b11b94c8566f734034e6753c617d WHIRLPOOL bbf792c299045500bb0e39de9b54bba960b6fd3c3311fbace977ce58df2d1a52e36d781a35d12fbd3e245634244eabd2ddf56330fc030c0992c40b944fb7d8f5
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Provides an easy way to perform HTTP requests"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-php/PEAR-Net_URL-1.0.14-r1
|
||||
>=dev-php/PEAR-Net_Socket-1.0.7"
|
||||
|
||||
src_install() {
|
||||
local HTML_DOCS=( docs/download-progress.php docs/example.php )
|
||||
insinto /usr/share/php/HTTP
|
||||
doins -r Request Request.php
|
||||
php-pear-r2_install_packagexml
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides an easy way to perform HTTP requests"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-php/PEAR-Net_URL-1.0.14-r1
|
||||
>=dev-php/PEAR-Net_Socket-1.0.7"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Numbers_Roman-1.0.2.tgz 6210 SHA256 788f8d3152dec07ff91fd3db49801ee3345fdfa8128f40517c15268270fd24d9 SHA512 b320675ebe221889065da7c56bccc5fefa209818f6691179a3846b84408f46e49d8f0749722bcad490abaab53b05f25ec703350c3d058e59c49ac909ebc97f52 WHIRLPOOL cb12ef534f5005f6ca4274a2e7d68a4fbe09b494306c85ecb5006f3cb3e7c36248f5583488e5b3f3ce66a1f1fc517b01317e45f66ca34c48fbd03622cfdb3699
|
||||
@ -1,21 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Provides methods for converting to and from Roman Numerals"
|
||||
|
||||
LICENSE="PHP-2.02"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HTML_DOCS=( docs/examples/example.php )
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/php/Numbers
|
||||
doins Roman.php
|
||||
php-pear-r2_install_packagexml
|
||||
einstalldocs
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides methods for converting to and from Roman Numerals"
|
||||
|
||||
LICENSE="PHP-2.02"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +0,0 @@
|
||||
DIST PEAR_Info-1.7.0.tgz 56638 SHA256 2e45b938db2df9621e56298ed46324621bbc498f3497380628125bc2e0ef02d6 SHA512 53781a5aa8d256e702ec77e67d49a9c37d05dfd90677f1b742fc37ba77a9209370aa0d9e69973839301fa46b93dc16df8871d6c3a2a43cd6957cfacc5d6f6fa1 WHIRLPOOL 936a9fc0ac5d058ee832a21b6d85dec952ce233433fd0a91528251c1e54f2e704ebdc49a77cb14757da33598bf8bfbaef68bdd0b737c7d065cf205fa41eb19df
|
||||
DIST PEAR_Info-1.9.2.tgz 60722 SHA256 6123482a21d0613e3911c71f999432eaf5d6369d615ae0f5b78a117fa1507733 SHA512 f0b2d389bc6b0c5dc43b16ef1fefc6db516a542ca3f012c82b666fb883abbb68032f9fd4d1dd331860d17f5fb45a89c54b64dc6ca610f5c49daca2de144ea407 WHIRLPOOL 852b271964f90ea8f5b249c60b47180c695cbca6b0d8658b7e4088d58015b9d040c177b17acb14bf46b3581f0ea64fef4a8ed69cb6dff565bcce2202706c5b51
|
||||
@ -1,10 +0,0 @@
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Show Information about your PEAR install and its packages"
|
||||
LICENSE="PHP-3 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
@ -1,15 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Show Information about your PEAR install and its packages"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="dev-lang/php:*[pcre(+)]
|
||||
dev-php/PEAR-Console_Getargs"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST SOAP-0.13.0.tgz 85945 SHA256 2ceda8d83dab8e9b8a23f6df443a2e33947d2b4bb0998bd47208771880c6e9fc SHA512 79cf5c760dd70527ac5d0b74db0a46a3df35dd57f5119942a2e5b92ed5eeb0e2773fc19c4df2224657d353f42d43250dcf80936677fb2efd1897954f8d8d2904 WHIRLPOOL 00dc6559d8e7633e4c51000dae774b31cf3b5a82617079c4e10ba2babd79fb672dd2896cfc93a71220c777b82511d1add13229a9140d9249d12b482f67e4c653
|
||||
@ -1,18 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="SOAP Client/Server for PHP 4"
|
||||
|
||||
LICENSE="PHP-2.02"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE="minimal"
|
||||
|
||||
RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2.4-r1
|
||||
!minimal? ( dev-php/PEAR-Mail
|
||||
>=dev-php/PEAR-Mail_Mime-1.3.1-r1
|
||||
>=dev-php/PEAR-Net_DIME-0.3-r1 )"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Services_Amazon-0.8.0.tgz 20992 SHA256 5f79d770e7d45da92c2b7985d0aaada6f9e4aca998723c4d2f969abcc808433f SHA512 7ce114cea0bed23a5301d9057278b35fe9bc4cd08304b29a615d91f4fdc8f8597bd50969db6cbcf82726354749d4a64757f911f47b3239aa8be2c8a759a45752 WHIRLPOOL 906e372c4febeee73c7f99f8f8edcab0f087e47c6608bd11071d93cb262981e34f7ac58619b6643d1dc7dc0a59b9b0fbd4d9c5b8e9f69101477bf9b9457e3a8b
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="Provides access to Amazon's retail and associate web services"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="minimal"
|
||||
RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2.4-r1
|
||||
>=dev-php/PEAR-XML_Serializer-0.17.0
|
||||
!minimal? ( dev-php/PEAR-Cache )"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Services_Weather-1.4.6.tgz 55639 SHA256 aaaaca7034efd56be892c36b747bae80566a2cd23c11d4a1d92dd9619ec36da1 SHA512 f70796909da0bb58afd1292485a467c61d0f12a2861550873fbe2cbed3cd4712b1765ae51202cbe1ef185043cda61df465bd5995daf317f065e5bf02ad43378b WHIRLPOOL 5d5982b34029c99f4eefd6fa56e86488e96caab92edaceadc8d6f242648d9b2eceabb91b3fc2fc9d3314f746fcf9669bfa5ec5321960e804e2fb8306ac8562db
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="This class acts as an interface to various online weather-services"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE="minimal"
|
||||
RDEPEND="dev-lang/php[ctype]
|
||||
>=dev-php/PEAR-HTTP_Request-1.2.4-r1
|
||||
!minimal? ( >=dev-php/PEAR-Cache-1.5.4-r1
|
||||
>=dev-php/PEAR-DB-1.7.6-r1
|
||||
>=dev-php/PEAR-SOAP-0.8.1-r1
|
||||
>=dev-php/PEAR-XML_Serializer-0.15.0-r1
|
||||
>=dev-php/PEAR-Net_FTP-1.3.1 )"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Testing_Selenium-0.4.4.tgz 2458334 SHA256 de9c7c056d8e60f11e305933ca87f9cfc7a6a56132391a101e2c637dd0a68689 SHA512 58b8c7443902acb7558c2a6f7ef26506d0bb8da82537c0959d55d790c275086fbc96e44df66690fb7487bc95f587cc897692857e2e445ff8355e3a78ad5017dc WHIRLPOOL 0ae39a1637f84d83d45dab59484d33ee91a798c1879279fb8b47c60bb79cd9f2093194d351941994d8c14c69b483520b4d5c342f2c34b4f414c64c1588d47559
|
||||
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit php-pear-r1
|
||||
|
||||
DESCRIPTION="PHP Client for Selenium Remote Control"
|
||||
LICENSE="PHP-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 hppa ~ia64 ~sparc x86"
|
||||
IUSE=""
|
||||
RDEPEND=">=dev-lang/php-5.1.0"
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1 +0,0 @@
|
||||
DIST Translation2-2.0.4.tgz 58272 SHA256 4cce7070e7ef556a8400745597dc8b5c8605848da42167b125ce8f559adddaf7 SHA512 f1c74f9409c15dbb5c955cc5f19b73cf11c424be28a5d6ef4066d8bf9176a26e63bc2e773712c1e1da636386778b467c965ce915f036ad5e91f3695062732f64 WHIRLPOOL 90509fc6efd44327a7bc357ba333f4f79475af8a3163e3136358e9e592bda0a2e04ce76fa7401b3ba3f144cb96dc3176233ea9698977a33a9bacfc2ed8a8afbc
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
inherit php-pear-r2
|
||||
|
||||
DESCRIPTION="Class for multilingual applications management"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
|
||||
IUSE="examples minimal xml"
|
||||
|
||||
RDEPEND="dev-lang/php:*[nls]
|
||||
!minimal? ( dev-php/PEAR-Cache_Lite
|
||||
dev-php/PEAR-DB
|
||||
dev-php/PEAR-DB_DataObject
|
||||
dev-php/PEAR-MDB
|
||||
dev-php/PEAR-MDB2
|
||||
dev-php/PEAR-File_Gettext
|
||||
>=dev-php/PEAR-I18Nv2-0.9.1 )
|
||||
xml? ( >=dev-php/PEAR-XML_Serializer-0.13.0 )"
|
||||
PATCHES=( "${FILESDIR}/modern-php.patch" )
|
||||
src_install() {
|
||||
local DOCS=( docs/gettext_readme.txt )
|
||||
php-pear-r2_src_install
|
||||
use examples && dodoc -r docs/examples
|
||||
# Fix this for PHP5
|
||||
# dobin scripts/t2xmlchk.php
|
||||
}
|
||||
@ -1,328 +0,0 @@
|
||||
diff -uarN a/docs/examples/gettext_admin.php b/docs/examples/gettext_admin.php
|
||||
--- a/docs/examples/gettext_admin.php 2010-12-05 17:56:30.000000000 -0500
|
||||
+++ b/docs/examples/gettext_admin.php 2017-08-04 09:22:31.277320045 -0400
|
||||
@@ -17,7 +17,7 @@
|
||||
$days = array();
|
||||
$months= array();
|
||||
|
||||
-$lc = &new I18Nv2_Locale;
|
||||
+$lc = new I18Nv2_Locale;
|
||||
|
||||
foreach ($langs as $lang) {
|
||||
$lc->setLocale($lang);
|
||||
diff -uarN a/docs/examples/gettext_prepare.php b/docs/examples/gettext_prepare.php
|
||||
--- a/docs/examples/gettext_prepare.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/docs/examples/gettext_prepare.php 2017-08-04 09:22:31.278320085 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
require_once 'File/Gettext.php';
|
||||
require_once 'I18Nv2/Locale.php';
|
||||
|
||||
-$l = &new I18Nv2_Locale('en');
|
||||
+$l = new I18Nv2_Locale('en');
|
||||
$g = &File_Gettext::factory('MO');
|
||||
|
||||
$g->meta = array('Content-Type' => 'text/plain; charset=iso-8859-1');
|
||||
diff -uarN a/scripts/t2xmlchk.php b/scripts/t2xmlchk.php
|
||||
--- a/scripts/t2xmlchk.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/scripts/t2xmlchk.php 2017-08-04 09:22:31.277320045 -0400
|
||||
@@ -39,7 +39,7 @@
|
||||
exit("\n");
|
||||
}
|
||||
|
||||
-$validator =& new XML_DTD_XmlValidator();
|
||||
+$validator =new XML_DTD_XmlValidator();
|
||||
|
||||
$dtd_file = tempnam('/tmp', 't2');
|
||||
$fp = fopen($dtd_file, 'w');
|
||||
@@ -63,7 +63,7 @@
|
||||
'string' => 'key',
|
||||
'tr' => 'lang'
|
||||
);
|
||||
-$unserializer = &new XML_Unserializer(array('keyAttribute' => $keyAttr));
|
||||
+$unserializer = new XML_Unserializer(array('keyAttribute' => $keyAttr));
|
||||
if (PEAR::isError($status = $unserializer->unserialize($xml_file, true))) {
|
||||
exit("FAILED : " . $status->getMessage() . "\n");
|
||||
} else {
|
||||
diff -uarN a/tests/admin_containers_tests.php b/tests/admin_containers_tests.php
|
||||
--- a/tests/admin_containers_tests.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_containers_tests.php 2017-08-04 09:22:31.272319845 -0400
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new AdminContainersTests();
|
||||
+ $test = new AdminContainersTests();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/admin_db_test.php b/tests/admin_db_test.php
|
||||
--- a/tests/admin_db_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_db_test.php 2017-08-04 09:22:31.274319925 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfAdminContainerDB();
|
||||
+ $test = new TestOfAdminContainerDB();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/admin_gettext_mo_test.php b/tests/admin_gettext_mo_test.php
|
||||
--- a/tests/admin_gettext_mo_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_gettext_mo_test.php 2017-08-04 09:22:31.274319925 -0400
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfAdminContainerGettextMO();
|
||||
+ $test = new TestOfAdminContainerGettextMO();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/admin_gettext_po_test.php b/tests/admin_gettext_po_test.php
|
||||
--- a/tests/admin_gettext_po_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_gettext_po_test.php 2017-08-04 09:22:31.273319885 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfAdminContainerGettextPO();
|
||||
+ $test = new TestOfAdminContainerGettextPO();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/admin_mdb2_test.php b/tests/admin_mdb2_test.php
|
||||
--- a/tests/admin_mdb2_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_mdb2_test.php 2017-08-04 09:22:31.274319925 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfAdminContainerMDB2();
|
||||
+ $test = new TestOfAdminContainerMDB2();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/admin_mdb_test.php b/tests/admin_mdb_test.php
|
||||
--- a/tests/admin_mdb_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/admin_mdb_test.php 2017-08-04 09:22:31.273319885 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfAdminContainerMDB();
|
||||
+ $test = new TestOfAdminContainerMDB();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/all_tests.php b/tests/all_tests.php
|
||||
--- a/tests/all_tests.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/all_tests.php 2017-08-04 09:22:31.275319965 -0400
|
||||
@@ -18,6 +18,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-$test = &new AllTests();
|
||||
+$test = new AllTests();
|
||||
$test->run(new HtmlReporter());
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/containers_tests.php b/tests/containers_tests.php
|
||||
--- a/tests/containers_tests.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/containers_tests.php 2017-08-04 09:22:31.274319925 -0400
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new ContainersTests();
|
||||
+ $test = new ContainersTests();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/db_test.php b/tests/db_test.php
|
||||
--- a/tests/db_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/db_test.php 2017-08-04 09:22:31.274319925 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfContainerDB();
|
||||
+ $test = new TestOfContainerDB();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/gettext_mo_test.php b/tests/gettext_mo_test.php
|
||||
--- a/tests/gettext_mo_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/gettext_mo_test.php 2017-08-04 09:22:31.273319885 -0400
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfGettextMO();
|
||||
+ $test = new TestOfGettextMO();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/gettext_po_test.php b/tests/gettext_po_test.php
|
||||
--- a/tests/gettext_po_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/gettext_po_test.php 2017-08-04 09:22:31.275319965 -0400
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfGettextPO();
|
||||
+ $test = new TestOfGettextPO();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/gettext_prepare.php b/tests/gettext_prepare.php
|
||||
--- a/tests/gettext_prepare.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/gettext_prepare.php 2017-08-04 09:22:31.275319965 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
require_once 'File/Gettext.php';
|
||||
require_once 'I18Nv2/Locale.php';
|
||||
|
||||
-$l = &new I18Nv2_Locale('en');
|
||||
+$l = new I18Nv2_Locale('en');
|
||||
|
||||
foreach (array('mo', 'po') as $fileType) {
|
||||
|
||||
diff -uarN a/tests/mdb2_test.php b/tests/mdb2_test.php
|
||||
--- a/tests/mdb2_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/mdb2_test.php 2017-08-04 09:22:31.273319885 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfContainerMDB2();
|
||||
+ $test = new TestOfContainerMDB2();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/tests/mdb_test.php b/tests/mdb_test.php
|
||||
--- a/tests/mdb_test.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/tests/mdb_test.php 2017-08-04 09:22:31.273319885 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
if (!defined('TEST_RUNNING')) {
|
||||
define('TEST_RUNNING', true);
|
||||
- $test = &new TestOfContainerMDB();
|
||||
+ $test = new TestOfContainerMDB();
|
||||
$test->run(new HtmlReporter());
|
||||
}
|
||||
?>
|
||||
\ No newline at end of file
|
||||
diff -uarN a/Translation2/Container/xml.php b/Translation2/Container/xml.php
|
||||
--- a/Translation2/Container/xml.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/Translation2/Container/xml.php 2017-08-04 09:22:31.277320045 -0400
|
||||
@@ -160,7 +160,7 @@
|
||||
return new PEAR_Error ("Can\'t read from the XML source: {$this->_filename}");
|
||||
}
|
||||
@flock($fp, LOCK_SH);
|
||||
- $unserializer = &new XML_Unserializer (array('keyAttribute' => $keyAttr));
|
||||
+ $unserializer = new XML_Unserializer (array('keyAttribute' => $keyAttr));
|
||||
if (PEAR::isError($status = $unserializer->unserialize($this->_filename, true))) {
|
||||
fclose($fp);
|
||||
return $status;
|
||||
diff -uarN a/Translation2/Container.php b/Translation2/Container.php
|
||||
--- a/Translation2/Container.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/Translation2/Container.php 2017-08-04 09:32:40.021575421 -0400
|
||||
@@ -80,6 +80,9 @@
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
+ function __construct()
|
||||
+ {
|
||||
+ }
|
||||
function Translation2_Container()
|
||||
{
|
||||
}
|
||||
@@ -357,4 +360,4 @@
|
||||
|
||||
// }}}
|
||||
}
|
||||
-?>
|
||||
\ No newline at end of file
|
||||
+?>
|
||||
diff -uarN a/Translation2/Decorator.php b/Translation2/Decorator.php
|
||||
--- a/Translation2/Decorator.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/Translation2/Decorator.php 2017-08-04 09:33:23.341206788 -0400
|
||||
@@ -35,7 +35,7 @@
|
||||
* @version CVS: $Id: Decorator.php 305985 2010-12-05 22:55:33Z clockwerx $
|
||||
* @link http://pear.php.net/package/Translation2
|
||||
*/
|
||||
-
|
||||
+require_once 'Translation2.php';
|
||||
/**
|
||||
* Translation2_Decorator. Base Decorator class for Translation2
|
||||
*
|
||||
@@ -88,7 +88,7 @@
|
||||
*
|
||||
* @param object &$translation2 Translation2 object to decorate
|
||||
*/
|
||||
- function Translation2_Decorator(& $translation2)
|
||||
+ function __construct(& $translation2)
|
||||
{
|
||||
$this->translation2 = & $translation2;
|
||||
//used for debug only
|
||||
@@ -96,7 +96,10 @@
|
||||
$this->currentPageID = & $translation2->currentPageID;
|
||||
$this->lang = & $translation2->lang;
|
||||
}
|
||||
-
|
||||
+ function Translation2_Decorator(& $translation2)
|
||||
+ {
|
||||
+ self::__construct($translation2);
|
||||
+ }
|
||||
// }}}
|
||||
// {{{ setOptions()
|
||||
|
||||
@@ -413,4 +416,4 @@
|
||||
|
||||
// }}}
|
||||
}
|
||||
-?>
|
||||
\ No newline at end of file
|
||||
+?>
|
||||
diff -uarN a/Translation2.php b/Translation2.php
|
||||
--- a/Translation2.php 2010-12-05 17:56:31.000000000 -0500
|
||||
+++ b/Translation2.php 2017-08-04 09:31:14.843367708 -0400
|
||||
@@ -122,7 +122,7 @@
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
- function Translation2()
|
||||
+ function __construct()
|
||||
{
|
||||
if (func_num_args()) {
|
||||
$msg = '<b>Translation2 error:</b>'
|
||||
@@ -130,7 +130,10 @@
|
||||
trigger_error($msg, E_USER_ERROR);
|
||||
}
|
||||
}
|
||||
-
|
||||
+ function Translation2()
|
||||
+ {
|
||||
+ self::__construct();
|
||||
+ }
|
||||
// }}}
|
||||
// {{{ factory()
|
||||
|
||||
@@ -595,4 +598,4 @@
|
||||
|
||||
// }}}
|
||||
}
|
||||
-?>
|
||||
\ No newline at end of file
|
||||
+?>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>php-bugs@gentoo.org</email>
|
||||
<name>PHP</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +0,0 @@
|
||||
DIST SMC_Music_4.1_high.zip 36605212 SHA256 0ab0e232bbdcde5c5e2391518593c5b3b2d152481946dd29d2ba7f6e22d83034 SHA512 e82e514fd2bcb0dad8973f91a40d13445498a8a0af237c83739da6b9f85d6829d9a68739677842519484cdb45e969d221cd9bb53042d0cf1981e2e5765a0da08 WHIRLPOOL c355b3440ba991f45dbda93f485282a665d8262aee00cca901807356d8cebab1deb64f6e7f79a603f8b70386a9bfa50ed41db8c9d49d995a1526db92b7c8b75a
|
||||
DIST smc-1.9.tar.bz2 49568474 SHA256 b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d SHA512 f7fdb3dd48e2c4503158e5237911906d1de23b9c8ac0f494affa6e79eb57620c61cc757e4ba6e83fdd556fc5ee061b42be0b27055deb96e9d6e5b3ea8199124e WHIRLPOOL 9bf6ea2a7db552200e57b10968ffa13ae524b91c868fc3c5d45f7ab2ee7c547563b5f337f536183538369bde86530b272befb1601b551739b62acc71305fc697
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue