root
4 years ago
parent
8f11272fe1
commit
8549b53bbd
Binary file not shown.
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
|
||||
DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
|
||||
DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
|
||||
DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
|
||||
DIST mongo-tools-3.6.16.tar.gz 4990806 BLAKE2B 743c24fe55a0353e3ce31a82a53c94560408725f9fa35d93d5bc136d2b6e465e081c8ad4b00d63826ea45db4431124cdf2b66341eba9be24db890fd80941b728 SHA512 ebb356690c2aeb7d47435ea05f977e9319c915e1af48b89fc9941f72871baabb5faac238b59281330fb46e7340ee354f56f438ea3d0abd97b859e2321b719038
|
||||
DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
|
||||
DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
|
||||
DIST mongo-tools-4.2.0.tar.gz 14402906 BLAKE2B 535a9a0e49f4288e63c905f7bd98c1f1b8e38eef562cb5c40a0c09500a18eb7fd401f05df2261c92db3e8a126cc03902fa3c61177b50a3e18f2d33bee7590f52 SHA512 f937a9f2b4ccfe262ca1a09e7bd103ffbdd45eae7c6deed8c1453f4499935f526f513749422e3215071ef465291c3f0544bf1e9510bbaf8dd9fa1edcf22f887a
|
||||
DIST mongo-tools-4.0.14.tar.gz 11134659 BLAKE2B 9caf119901d528079bb9aefce78d702dc3196cb105ac623137f8ffceffef4f8f6e61c8134470abe11f0bd422df9a6bef0e15331ee71065450b97220431458fc1 SHA512 6a0c39cbca0d51cd42518bb68a36fb7f0ed1e7b1ecf4dcd41256c8ab5c23505ca189b81a88c2a783ad81788bcab81d7e3c69f4788366e10dea744a03a2f3cf1e
|
||||
DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
|
||||
DIST mongo-tools-4.2.2.tar.gz 14433618 BLAKE2B 7610bd6b386684836e91b6bb7f73e24267fac56ce975263ac2aaeebe51d37123baa8eb2009cf4478af89e6dcc596c9c07126224ad4bd80aee47d03fde9413eca SHA512 661813c70bf891f0a834ac9970cbe390a8616f9e89e4f33918e479ba3f3ce3851edecd63c1e35e65a4dee47419e3ce0fa3186c7ee2326bef11fce3bac8bed0c7
|
||||
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
|
||||
DIST ncompress-4.2.4.6.tar.gz 36006 BLAKE2B 1460fe803ed621e5e6e5ab506d8909acbfb1d3b91421cf7c7bc10b6b03b0cb6bb4ea616240a7aa500813d5fbf0a958e1e981da8a5f752d985ddcbf7fe9280d9c SHA512 03dd9670c48548d6f7a028dd307758ce7ac61997297c1075d65457ac849e8f2d710bc38fa9eb42e4b2cac163c1b93b7cf7eb197e90cbd689a1274df3de2a3ed8
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
|
||||
HOMEPAGE="https://vapier.github.io/ncompress/"
|
||||
SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i 's:\bln :ln -s :' Makefile.def || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install_core DESTDIR="${ED}" PREFIX="/usr"
|
||||
dodoc Acknowleds Changes LZW.INFO README.md
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
|
||||
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
|
||||
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
|
||||
DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
|
||||
|
||||
@ -0,0 +1,370 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
VIM_VERSION="8.2"
|
||||
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby24 ruby25 ruby26"
|
||||
|
||||
inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="GUI version of the Vim text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXext
|
||||
x11-libs/libXt
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
!aqua? (
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk? (
|
||||
gtk2? (
|
||||
>=x11-libs/gtk+-2.6:2
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk2? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
neXt? ( x11-libs/neXtaw )
|
||||
!neXt? ( x11-libs/libXaw )
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
cscope? ( dev-util/cscope )
|
||||
lua? (
|
||||
luajit? ( dev-lang/luajit:2= )
|
||||
!luajit? ( dev-lang/lua:0[deprecated] )
|
||||
)
|
||||
nls? ( virtual/libintl )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
session? ( x11-libs/libSM )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/autoconf
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
|
||||
PDEPEND="~app-editors/vim-core-${PV}"
|
||||
|
||||
# various failures (bugs #630042 and #682320)
|
||||
RESTRICT="test"
|
||||
|
||||
S=${WORKDIR}/vim-${PV}
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die
|
||||
export HOME="${T}"/home
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]]; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i -e \
|
||||
's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm -v src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
local file
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e ${file} ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
--disable-gpm
|
||||
--with-gnome=no
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable cscope)
|
||||
$(use_enable lua luainterp)
|
||||
$(use_with luajit)
|
||||
$(use_enable netbeans)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python pythoninterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python-command $(type -P $(eselect python show --python2)))
|
||||
$(use_with python python3-command $(type -P $(eselect python show --python3)))
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable session xsmp)
|
||||
$(use_enable tcl tclinterp)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
|
||||
fi
|
||||
|
||||
# gvim's GUI preference order is as follows:
|
||||
# aqua CARBON (not tested)
|
||||
# -aqua gtk GTK3
|
||||
# -aqua -gtk gtk2 GTK2
|
||||
# -aqua -gtk -gtk motif MOTIF
|
||||
# -aqua -gtk -gtk -motif neXt NEXTAW
|
||||
# -aqua -gtk -gtk -motif -neXt ATHENA
|
||||
echo ; echo
|
||||
if use aqua; then
|
||||
einfo "Building gvim with the Carbon GUI"
|
||||
myconf+=(
|
||||
--enable-darwin
|
||||
--enable-gui=carbon
|
||||
)
|
||||
elif use gtk; then
|
||||
myconf+=( --enable-gtk3-check )
|
||||
einfo "Building gvim with the gtk+-3 GUI"
|
||||
myconf+=( --enable-gui=gtk3 )
|
||||
elif use gtk2; then
|
||||
myconf+=( --enable-gtk2-check )
|
||||
einfo "Building gvim with the gtk+-2 GUI"
|
||||
myconf+=( --enable-gui=gtk2 )
|
||||
elif use motif; then
|
||||
einfo "Building gvim with the MOTIF GUI"
|
||||
myconf+=( --enable-gui=motif )
|
||||
elif use neXt; then
|
||||
einfo "Building gvim with the neXtaw GUI"
|
||||
myconf+=( --enable-gui=nextaw )
|
||||
else
|
||||
einfo "Building gvim with the Athena GUI"
|
||||
myconf+=( --enable-gui=athena )
|
||||
fi
|
||||
echo ; echo
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
if [[ ${CHOST} == *-interix* ]]; then
|
||||
# avoid finding of this function, to avoid having to patch either
|
||||
# configure or the source, which would be much more hackish.
|
||||
# after all vim does it right, only interix is badly broken (again)
|
||||
export ac_cv_func_sigaction=no
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--with-vim-name=gvim \
|
||||
--with-x \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
|
||||
# this evil trickery works.
|
||||
ln -s "${S}"/src/gvim "${S}"/src/testvim || die
|
||||
|
||||
# Make sure our VIMPROG is used.
|
||||
sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
|
||||
|
||||
# Don't do additional GUI tests.
|
||||
emake -j1 VIMPROG=../testvim -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug 187449)
|
||||
eselect_vi_update() {
|
||||
einfo "Calling eselect vi update..."
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dobin src/gvim
|
||||
dosym gvim /usr/bin/gvimdiff
|
||||
dosym gvim /usr/bin/evim
|
||||
dosym gvim /usr/bin/eview
|
||||
dosym gvim /usr/bin/gview
|
||||
dosym gvim /usr/bin/rgvim
|
||||
dosym gvim /usr/bin/rgview
|
||||
|
||||
emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
|
||||
|
||||
dodir /usr/share/man/man1
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
|
||||
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
|
||||
die "echo failed"
|
||||
|
||||
insinto /etc/vim
|
||||
newins "${FILESDIR}"/gvimrc-r1 gvimrc
|
||||
eprefixify "${ED}"/etc/vim/gvimrc
|
||||
|
||||
# bash completion script, bug #79018.
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# don't install vim desktop file
|
||||
rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# Update icon cache
|
||||
gnome2_icon_cache_update
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# Update icon cache
|
||||
gnome2_icon_cache_update
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
|
||||
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
|
||||
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
|
||||
DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
|
||||
|
||||
@ -0,0 +1,225 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
VIM_VERSION="8.1"
|
||||
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="vim and gvim shared files"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="nls acl minimal"
|
||||
|
||||
DEPEND="sys-devel/autoconf"
|
||||
# avoid icon file collision bug #673880
|
||||
RDEPEND="!!<app-editors/gvim-8.1.0648"
|
||||
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
|
||||
|
||||
S=${WORKDIR}/vim-${PV}
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir -p failed"
|
||||
export HOME="${T}"/home
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i \
|
||||
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "sed failed"
|
||||
|
||||
# See #77841. We remove this file after the tarball extraction.
|
||||
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
|
||||
# Remove src/auto/configure file.
|
||||
rm -v src/auto/configure || die "rm configure failed"
|
||||
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
# Let Portage do the stripping. Some people like that.
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# Keep Gentoo Prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=" --without-local-dir"
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--enable-gui=no \
|
||||
--without-x \
|
||||
--disable-darwin \
|
||||
--disable-perlinterp \
|
||||
--disable-pythoninterp \
|
||||
--disable-rubyinterp \
|
||||
--disable-gpm \
|
||||
--disable-selinux \
|
||||
$(use_enable nls) \
|
||||
$(use_enable acl) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
emake tools
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dodir /usr/{bin,share/{man/man1,vim}}
|
||||
emake -C src \
|
||||
installruntime \
|
||||
installmanlinks \
|
||||
installmacros \
|
||||
installtutor \
|
||||
installtutorbin \
|
||||
installtools \
|
||||
install-languages \
|
||||
DESTDIR="${D}" \
|
||||
BINDIR="${EPREFIX}"/usr/bin \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
DATADIR="${EPREFIX}"/usr/share
|
||||
|
||||
keepdir ${vimfiles}/keymap
|
||||
|
||||
# default vimrc is installed by vim-core since it applies to
|
||||
# both vim and gvim
|
||||
insinto /etc/vim/
|
||||
newins "${FILESDIR}"/vimrc-r5 vimrc
|
||||
eprefixify "${ED}"/etc/vim/vimrc
|
||||
|
||||
if use minimal; then
|
||||
# To save space, install only a subset of the files.
|
||||
# Helps minimalize the livecd, bug 65144.
|
||||
eshopts_push -s extglob
|
||||
|
||||
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
|
||||
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
|
||||
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
|
||||
|
||||
local keep_colors="default"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
|
||||
|
||||
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
|
||||
# tinkering with the next line might make bad things happen ...
|
||||
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
|
||||
|
||||
eshopts_pop
|
||||
fi
|
||||
|
||||
newbashcomp "${FILESDIR}"/xxd-completion xxd
|
||||
|
||||
# install gvim icon since both vim/gvim desktop files reference it
|
||||
doicon -s scalable "${FILESDIR}"/gvim.svg
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
|
||||
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
|
||||
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
|
||||
DIST vim-8.2.0055.tar.gz 14655766 BLAKE2B 73703f4f08cd78f75c53cd446e3edc171805a19bce37bcc4f420f4800d50b515a265ceb885947668e8654666cfca52a189f2abc407d2db0f520a6ceb124e20ec SHA512 ccbf0bb4cd294292ef69c2b7f4539ed87aa3cbdb5e638dbcc3e86b8e3986c96419c033685a7b2293382ace0599457a523e3bf25815882cec74f6ecec87139d92
|
||||
|
||||
@ -0,0 +1,320 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
VIM_VERSION="8.2"
|
||||
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby24 ruby25 ruby26"
|
||||
|
||||
inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Vim, an improved vi-style text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="vim"
|
||||
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
vim-pager? ( !minimal )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
nls? ( virtual/libintl )
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
cscope? ( dev-util/cscope )
|
||||
gpm? ( >=sys-libs/gpm-1.19.3 )
|
||||
lua? (
|
||||
luajit? ( dev-lang/luajit:2= )
|
||||
!luajit? ( dev-lang/lua:0[deprecated] )
|
||||
)
|
||||
!minimal? ( ~app-editors/vim-core-${PV} )
|
||||
vim-pager? ( app-editors/vim-core[-minimal] )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
X? ( x11-libs/libXt )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
sys-devel/autoconf
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir failed"
|
||||
export HOME="${T}"/home
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# conditionally make the manpager.sh script
|
||||
if use vim-pager; then
|
||||
cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
|
||||
#!/bin/sh
|
||||
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
|
||||
vim \\
|
||||
-c 'let no_plugin_maps = 1' \\
|
||||
-c 'set nolist nomod ft=man ts=8' \\
|
||||
-c 'let g:showmarks_enable=0' \\
|
||||
-c 'runtime! macros/less.vim' -
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
if use minimal; then
|
||||
myconf=(
|
||||
--with-features=tiny
|
||||
--disable-nls
|
||||
--disable-canberra
|
||||
--disable-acl
|
||||
--enable-gui=no
|
||||
--without-x
|
||||
--disable-darwin
|
||||
--disable-luainterp
|
||||
--disable-perlinterp
|
||||
--disable-pythoninterp
|
||||
--disable-mzschemeinterp
|
||||
--disable-rubyinterp
|
||||
--disable-selinux
|
||||
--disable-tclinterp
|
||||
--disable-gpm
|
||||
)
|
||||
else
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable cscope)
|
||||
$(use_enable gpm)
|
||||
$(use_enable lua luainterp)
|
||||
$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
|
||||
$(use_with luajit)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python pythoninterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python-command $(type -P $(eselect python show --python2)))
|
||||
$(use_with python python3-command $(type -P $(eselect python show --python3)))
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcl tclinterp)
|
||||
$(use_enable terminal)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
|
||||
fi
|
||||
|
||||
# don't test USE=X here ... see bug #19115
|
||||
# but need to provide a way to link against X ... see bug #20093
|
||||
myconf+=(
|
||||
--enable-gui=no
|
||||
--disable-darwin
|
||||
$(use_with X x)
|
||||
)
|
||||
fi
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
emake -j1 -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug 187449)
|
||||
eselect_vi_update() {
|
||||
einfo "Calling eselect vi update..."
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
|
||||
# managed by eselect-vi
|
||||
dobin src/vim
|
||||
dosym vim /usr/bin/vimdiff
|
||||
dosym vim /usr/bin/rvim
|
||||
dosym vim /usr/bin/rview
|
||||
if use vim-pager ; then
|
||||
dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
|
||||
dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
|
||||
insinto ${vimfiles}/macros
|
||||
doins runtime/macros/manpager.sh
|
||||
fperms a+x ${vimfiles}/macros/manpager.sh
|
||||
fi
|
||||
|
||||
domenu runtime/vim.desktop
|
||||
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# keep in sync with 'complete ... -F' list
|
||||
bashcomp_alias vim ex vi view rvim rview vimdiff
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
Binary file not shown.
@ -1,50 +0,0 @@
|
||||
diff -Naurd magicrescue-1.1.9/Makefile.in magicrescue-1.1.9.new//Makefile.in
|
||||
--- magicrescue-1.1.9/Makefile.in 2008-06-27 00:24:06.000000000 +0400
|
||||
+++ magicrescue-1.1.9.new//Makefile.in 2012-05-13 07:57:59.000000000 +0400
|
||||
@@ -21,7 +21,7 @@
|
||||
$(CC) -o $@ $(LDFLAGS) $(MAGICRESCUE_OBJS)
|
||||
|
||||
dupemap: $(DUPEMAP_OBJS)
|
||||
- $(CC) -o $@ $(LDFLAGS) $(DBM_LDFLAGS) $(DUPEMAP_OBJS)
|
||||
+ $(CC) -o $@ $(LDFLAGS) $(DUPEMAP_OBJS) $(DBM_LDFLAGS)
|
||||
|
||||
tools/inputseek: $(INPUTSEEK_OBJS)
|
||||
$(CC) -o $@ $(LDFLAGS) $(INPUTSEEK_OBJS)
|
||||
diff -Naurd magicrescue-1.1.9/config.d/50dbm magicrescue-1.1.9.new//config.d/50dbm
|
||||
--- magicrescue-1.1.9/config.d/50dbm 2008-06-27 00:24:05.000000000 +0400
|
||||
+++ magicrescue-1.1.9.new//config.d/50dbm 2012-05-13 07:56:16.000000000 +0400
|
||||
@@ -14,18 +14,14 @@
|
||||
flag="`echo $flag|sed 's/./-l&/'`"
|
||||
echo "trying to link with flags [$flag]" >&5
|
||||
|
||||
- bak_LDFLAGS="$LDFLAGS"
|
||||
- LDFLAGS="$LDFLAGS $flag"
|
||||
+ LIBS="$flag"
|
||||
if conftest_link; then
|
||||
# we found it!
|
||||
- LDFLAGS="$bak_LDFLAGS"
|
||||
DBM_LDFLAGS="$flag"
|
||||
env_vars="$env_vars DBM_LDFLAGS"
|
||||
echo "#define $dbmdef" >> config.h
|
||||
echo "#define HAVE_NDBM" >> config.h
|
||||
return 0
|
||||
- else
|
||||
- LDFLAGS="$bak_LDFLAGS"
|
||||
fi
|
||||
done
|
||||
|
||||
diff -Naurd magicrescue-1.1.9/configure magicrescue-1.1.9.new//configure
|
||||
--- magicrescue-1.1.9/configure 2008-06-27 00:24:06.000000000 +0400
|
||||
+++ magicrescue-1.1.9.new//configure 2012-05-13 07:56:16.000000000 +0400
|
||||
@@ -63,9 +63,9 @@
|
||||
}
|
||||
|
||||
conftest_link() {
|
||||
- echo "$CC -o conftest $LDFLAGS conftest.o" >&5
|
||||
+ echo "$CC -o conftest $LDFLAGS conftest.o $LIBS" >&5
|
||||
echo >&5
|
||||
- $CC -o conftest $LDFLAGS conftest.o >&5 2>&5 \
|
||||
+ $CC -o conftest $LDFLAGS conftest.o $LIBS >&5 2>&5 \
|
||||
&& [ -x conftest ] && ./conftest 2>&5
|
||||
}
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
--- magicrescue-1.1.9/Makefile.in.orig
|
||||
+++ magicrescue-1.1.9/Makefile.in
|
||||
@@ -57,34 +57,31 @@
|
||||
maintainer-clean: distclean docs-clean
|
||||
|
||||
install: all
|
||||
- [ -d $(PREFIX) ]
|
||||
+ mkdir -p $(DESTDIR)$(PREFIX)/share/magicrescue/tools \
|
||||
+ $(DESTDIR)$(PREFIX)/share/magicrescue/recipes \
|
||||
+ $(DESTDIR)$(PREFIX)/share/man/man1 \
|
||||
+ $(DESTDIR)$(PREFIX)/bin
|
||||
|
||||
- mkdir -p $(PREFIX)/share/magicrescue/tools \
|
||||
- $(PREFIX)/share/magicrescue/recipes \
|
||||
- $(PREFIX)/man/man1 \
|
||||
- $(PREFIX)/bin
|
||||
-
|
||||
- cp magicrescue$(EXE) dupemap$(EXE) magicsort $(PREFIX)/bin/
|
||||
- cp recipes/* $(PREFIX)/share/magicrescue/recipes/
|
||||
- cp $(DOCS) $(PREFIX)/man/man1
|
||||
+ cp magicrescue$(EXE) dupemap$(EXE) magicsort $(DESTDIR)$(PREFIX)/bin
|
||||
+ cp recipes/* $(DESTDIR)$(PREFIX)/share/magicrescue/recipes/
|
||||
+ cp $(DOCS) $(DESTDIR)$(PREFIX)/share/man/man1
|
||||
|
||||
for f in tools/*; do \
|
||||
if [ -x "$$f" ]; then \
|
||||
- cp -f "$$f" $(PREFIX)/share/magicrescue/tools/; \
|
||||
+ cp -f "$$f" $(DESTDIR)$(PREFIX)/share/magicrescue/tools/; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
- [ -d $(PREFIX) ]
|
||||
- rm -f $(PREFIX)/bin/magicrescue$(EXE)
|
||||
- rm -f $(PREFIX)/bin/dupemap$(EXE)
|
||||
- rm -f $(PREFIX)/bin/magicsort
|
||||
+ rm -f $(DESTDIR)$(PREFIX)/bin/magicrescue$(EXE)
|
||||
+ rm -f $(DESTDIR)$(PREFIX)/bin/dupemap$(EXE)
|
||||
+ rm -f $(DESTDIR)$(PREFIX)/bin/magicsort
|
||||
for f in $(DOCS); do \
|
||||
- rm -f "$(PREFIX)/man/man1/`basename $$f`"; \
|
||||
+ rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/`basename $$f`"; \
|
||||
done
|
||||
- rm -rf $(PREFIX)/share/magicrescue/tools
|
||||
- rm -rf $(PREFIX)/share/magicrescue/recipes
|
||||
- -rmdir $(PREFIX)/share/magicrescue
|
||||
+ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/tools
|
||||
+ rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/recipes
|
||||
+ -rmdir $(DESTDIR)$(PREFIX)/share/magicrescue
|
||||
|
||||
.PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
https://github.com/rime/librime/issues/316
|
||||
https://github.com/rime/librime/commit/90839b0b3d47cbfef715ea5f061c7505666ff75d
|
||||
|
||||
--- /src/rime/setup.cc
|
||||
+++ /src/rime/setup.cc
|
||||
@@ -35,6 +35,8 @@
|
||||
|
||||
RIME_API void SetupLogging(const char* app_name) {
|
||||
#ifdef RIME_ENABLE_LOGGING
|
||||
+ // Do not allow other users to read/write log files created by current process.
|
||||
+ FLAGS_logfile_mode = 0600;
|
||||
google::InitGoogleLogging(app_name);
|
||||
#endif // RIME_ENABLE_LOGGING
|
||||
}
|
||||
@ -0,0 +1,132 @@
|
||||
https://github.com/google/mozc/issues/470
|
||||
|
||||
--- /src/base/system_util.cc
|
||||
+++ /src/base/system_util.cc
|
||||
@@ -208,28 +208,39 @@
|
||||
dir_ = "/";
|
||||
return;
|
||||
#else // MOZC_USE_PEPPER_FILE_IO
|
||||
+ const char *configuration_directory_env;
|
||||
string dir;
|
||||
|
||||
#ifdef OS_WIN
|
||||
- DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
|
||||
- dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
|
||||
+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
|
||||
+ if (configuration_directory_env) {
|
||||
+ dir = configuration_directory_env;
|
||||
+ } else {
|
||||
+ DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result()));
|
||||
+ dir = Singleton<LocalAppDataDirectoryCache>::get()->path();
|
||||
#ifdef GOOGLE_JAPANESE_INPUT_BUILD
|
||||
- dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
|
||||
- FileUtil::CreateDirectory(dir);
|
||||
+ dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
|
||||
+ FileUtil::CreateDirectory(dir);
|
||||
#endif // GOOGLE_JAPANESE_INPUT_BUILD
|
||||
- dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
|
||||
+ dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
|
||||
+ }
|
||||
|
||||
#elif defined(OS_MACOSX)
|
||||
- dir = MacUtil::GetApplicationSupportDirectory();
|
||||
+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
|
||||
+ if (configuration_directory_env) {
|
||||
+ dir = configuration_directory_env;
|
||||
+ } else {
|
||||
+ dir = MacUtil::GetApplicationSupportDirectory();
|
||||
#ifdef GOOGLE_JAPANESE_INPUT_BUILD
|
||||
- dir = FileUtil::JoinPath(dir, "Google");
|
||||
- // The permission of ~/Library/Application Support/Google seems to be 0755.
|
||||
- // TODO(komatsu): nice to make a wrapper function.
|
||||
- ::mkdir(dir.c_str(), 0755);
|
||||
- dir = FileUtil::JoinPath(dir, "JapaneseInput");
|
||||
+ dir = FileUtil::JoinPath(dir, "Google");
|
||||
+ // The permission of ~/Library/Application Support/Google seems to be 0755.
|
||||
+ // TODO(komatsu): nice to make a wrapper function.
|
||||
+ ::mkdir(dir.c_str(), 0755);
|
||||
+ dir = FileUtil::JoinPath(dir, "JapaneseInput");
|
||||
#else // GOOGLE_JAPANESE_INPUT_BUILD
|
||||
- dir = FileUtil::JoinPath(dir, "Mozc");
|
||||
+ dir = FileUtil::JoinPath(dir, "Mozc");
|
||||
#endif // GOOGLE_JAPANESE_INPUT_BUILD
|
||||
+ }
|
||||
|
||||
#elif defined(OS_ANDROID)
|
||||
// For android, we do nothing here because user profile directory,
|
||||
@@ -237,14 +248,24 @@
|
||||
// is injected from Java layer.
|
||||
|
||||
#else // !OS_WIN && !OS_MACOSX && !OS_ANDROID
|
||||
- char buf[1024];
|
||||
- struct passwd pw, *ppw;
|
||||
- const uid_t uid = geteuid();
|
||||
- CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
|
||||
- << "Can't get passwd entry for uid " << uid << ".";
|
||||
- CHECK_LT(0, strlen(pw.pw_dir))
|
||||
- << "Home directory for uid " << uid << " is not set.";
|
||||
- dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
|
||||
+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
|
||||
+ if (configuration_directory_env) {
|
||||
+ dir = configuration_directory_env;
|
||||
+ } else {
|
||||
+ const char *home_env = ::getenv("HOME");
|
||||
+ if (home_env) {
|
||||
+ dir = FileUtil::JoinPath(home_env, ".mozc");
|
||||
+ } else {
|
||||
+ char buf[1024];
|
||||
+ struct passwd pw, *ppw;
|
||||
+ const uid_t uid = geteuid();
|
||||
+ CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw))
|
||||
+ << "Can't get passwd entry for uid " << uid << ".";
|
||||
+ CHECK_LT(0, strlen(pw.pw_dir))
|
||||
+ << "Home directory for uid " << uid << " is not set.";
|
||||
+ dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
|
||||
+ }
|
||||
+ }
|
||||
#endif // !OS_WIN && !OS_MACOSX && !OS_ANDROID
|
||||
|
||||
FileUtil::CreateDirectory(dir);
|
||||
@@ -356,6 +377,10 @@
|
||||
#endif // OS_WIN
|
||||
|
||||
string SystemUtil::GetServerDirectory() {
|
||||
+ const char *server_directory_env = ::getenv("MOZC_SERVER_DIRECTORY");
|
||||
+ if (server_directory_env) {
|
||||
+ return server_directory_env;
|
||||
+ }
|
||||
#ifdef OS_WIN
|
||||
DCHECK(SUCCEEDED(Singleton<ProgramFilesX86Cache>::get()->result()));
|
||||
#if defined(GOOGLE_JAPANESE_INPUT_BUILD)
|
||||
@@ -409,6 +434,10 @@
|
||||
}
|
||||
|
||||
string SystemUtil::GetDocumentDirectory() {
|
||||
+ const char *documents_directory_env = ::getenv("MOZC_DOCUMENTS_DIRECTORY");
|
||||
+ if (documents_directory_env) {
|
||||
+ return documents_directory_env;
|
||||
+ }
|
||||
#if defined(OS_MACOSX)
|
||||
return GetServerDirectory();
|
||||
#elif defined(MOZC_DOCUMENT_DIRECTORY)
|
||||
--- /src/handwriting/zinnia_handwriting.cc
|
||||
+++ /src/handwriting/zinnia_handwriting.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "handwriting/zinnia_handwriting.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
@@ -48,6 +49,10 @@
|
||||
|
||||
// static
|
||||
string ZinniaHandwriting::GetModelFileName() {
|
||||
+ const char *zinnia_model_file_env = ::getenv("MOZC_ZINNIA_MODEL_FILE");
|
||||
+ if (zinnia_model_file_env) {
|
||||
+ return zinnia_model_file_env;
|
||||
+ }
|
||||
#if defined(MOZC_BUILD)
|
||||
return MOZC_ZINNIA_MODEL_FILE;
|
||||
#else
|
||||
@ -0,0 +1,95 @@
|
||||
https://github.com/google/mozc/issues/471
|
||||
|
||||
--- /src/ipc/ipc_path_manager.cc
|
||||
+++ /src/ipc/ipc_path_manager.cc
|
||||
@@ -332,9 +332,21 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
+ // Expand symbolic links in the expected server path to avoid false negatives
|
||||
+ // during comparisons of the expected server path and the actual server path.
|
||||
+ string real_server_path = server_path;
|
||||
+#ifndef OS_WIN
|
||||
+ char real_server_path_[PATH_MAX];
|
||||
+ if (realpath(server_path.c_str(), real_server_path_) == NULL) {
|
||||
+ LOG(ERROR) << "realpath failed: " << strerror(errno);
|
||||
+ return false;
|
||||
+ }
|
||||
+ real_server_path = real_server_path_;
|
||||
+#endif
|
||||
+
|
||||
// compare path name
|
||||
if (pid == server_pid_) {
|
||||
- return (server_path == server_path_);
|
||||
+ return (real_server_path == server_path_);
|
||||
}
|
||||
|
||||
server_pid_ = 0;
|
||||
@@ -344,17 +356,17 @@
|
||||
{
|
||||
std::wstring expected_server_ntpath;
|
||||
const std::map<string, std::wstring>::const_iterator it =
|
||||
- expected_server_ntpath_cache_.find(server_path);
|
||||
+ expected_server_ntpath_cache_.find(real_server_path);
|
||||
if (it != expected_server_ntpath_cache_.end()) {
|
||||
expected_server_ntpath = it->second;
|
||||
} else {
|
||||
std::wstring wide_server_path;
|
||||
- Util::UTF8ToWide(server_path, &wide_server_path);
|
||||
+ Util::UTF8ToWide(real_server_path, &wide_server_path);
|
||||
if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) {
|
||||
- // Caches the relationship from |server_path| to
|
||||
- // |expected_server_ntpath| in case |server_path| is renamed later.
|
||||
+ // Caches the relationship from |real_server_path| to
|
||||
+ // |expected_server_ntpath| in case |real_server_path| is renamed later.
|
||||
// (This can happen during the updating).
|
||||
- expected_server_ntpath_cache_[server_path] = expected_server_ntpath;
|
||||
+ expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -371,9 +383,9 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
- // Here we can safely assume that |server_path| (expected one) should be
|
||||
+ // Here we can safely assume that |real_server_path| (expected one) should be
|
||||
// the same to |server_path_| (actual one).
|
||||
- server_path_ = server_path;
|
||||
+ server_path_ = real_server_path;
|
||||
server_pid_ = pid;
|
||||
}
|
||||
#endif // OS_WIN
|
||||
@@ -399,7 +411,7 @@
|
||||
#ifdef OS_LINUX
|
||||
// load from /proc/<pid>/exe
|
||||
char proc[128];
|
||||
- char filename[512];
|
||||
+ char filename[PATH_MAX];
|
||||
snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid);
|
||||
const ssize_t size = readlink(proc, filename, sizeof(filename) - 1);
|
||||
if (size == -1) {
|
||||
@@ -412,18 +424,18 @@
|
||||
server_pid_ = pid;
|
||||
#endif // OS_LINUX
|
||||
|
||||
- VLOG(1) << "server path: " << server_path << " " << server_path_;
|
||||
- if (server_path == server_path_) {
|
||||
+ VLOG(1) << "server path: " << real_server_path << " " << server_path_;
|
||||
+ if (real_server_path == server_path_) {
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef OS_LINUX
|
||||
- if ((server_path + " (deleted)") == server_path_) {
|
||||
- LOG(WARNING) << server_path << " on disk is modified";
|
||||
+ if ((real_server_path + " (deleted)") == server_path_) {
|
||||
+ LOG(WARNING) << real_server_path << " on disk is modified";
|
||||
// If a user updates the server binary on disk during the server is running,
|
||||
// "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix.
|
||||
// We allow the special case.
|
||||
- server_path_ = server_path;
|
||||
+ server_path_ = real_server_path;
|
||||
return true;
|
||||
}
|
||||
#endif // OS_LINUX
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
|
||||
DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
|
||||
DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{5,6} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
|
||||
HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="app-text/poppler[introspection]
|
||||
dev-python/distro[${PYTHON_USEDEP}]
|
||||
dev-python/natsort[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
dev-python/pycairo[${PYTHON_USEDEP}]
|
||||
dev-python/pycountry[${PYTHON_USEDEP}]
|
||||
dev-python/pyenchant[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
dev-python/python-levenshtein[${PYTHON_USEDEP}]
|
||||
dev-python/simplebayes[${PYTHON_USEDEP}]
|
||||
dev-python/termcolor[${PYTHON_USEDEP}]
|
||||
dev-python/whoosh[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,2 +1,3 @@
|
||||
DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
|
||||
DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
|
||||
DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{5,6} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
|
||||
HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
|
||||
dev-python/libpillowfight[${PYTHON_USEDEP}]
|
||||
dev-python/pillow[${PYTHON_USEDEP}]
|
||||
dev-python/pycairo[${PYTHON_USEDEP}]
|
||||
dev-python/pyenchant[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
|
||||
dev-python/python-dateutil[${PYTHON_USEDEP}]
|
||||
dev-python/pyxdg[${PYTHON_USEDEP}]
|
||||
dev-python/simplebayes[${PYTHON_USEDEP}]
|
||||
media-libs/libinsane
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/libnotify[introspection]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,49 +0,0 @@
|
||||
From 39ed30ad834a43cf403f88158c6db7a96f1bed29 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Weil <sw@weilnetz.de>
|
||||
Date: Fri, 1 Feb 2019 19:47:46 +0100
|
||||
Subject: Fix build rule for manpages
|
||||
|
||||
This is similar to commit 2106cba0a98a90451df835f3ab7b2aaf54826442
|
||||
which fixed doc/generate_manpages.sh.
|
||||
|
||||
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
||||
---
|
||||
doc/Makefile.am | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index a218aca3..c0eeda84 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -2,9 +2,6 @@
|
||||
|
||||
if ASCIIDOC
|
||||
|
||||
-asciidoc=asciidoc -d manpage
|
||||
-
|
||||
-
|
||||
man_MANS = \
|
||||
combine_lang_model.1 \
|
||||
combine_tessdata.1 \
|
||||
@@ -29,6 +26,8 @@ man_MANS += \
|
||||
unicharset.5
|
||||
endif
|
||||
|
||||
+man_xslt = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
|
||||
+
|
||||
EXTRA_DIST = $(man_MANS) Doxyfile
|
||||
|
||||
.PHONY: html
|
||||
@@ -36,7 +35,8 @@ EXTRA_DIST = $(man_MANS) Doxyfile
|
||||
html: $(patsubst %,%.html,$(man_MANS))
|
||||
|
||||
%: %.asc
|
||||
- $(asciidoc) -o $@ $<
|
||||
+ asciidoc -b docbook -d manpage -o - $< | \
|
||||
+ xsltproc --nonet $(man_xslt) -
|
||||
|
||||
%.html: %.asc
|
||||
asciidoc -b html5 -o $@ $<
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
MY_PN="tesseract-ocr"
|
||||
LANGPACKV="3.04.00"
|
||||
URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
|
||||
JAVA_PKG_OPT_USE="scrollview"
|
||||
|
||||
inherit autotools java-pkg-opt-2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
|
||||
HOMEPAGE="https://github.com/tesseract-ocr"
|
||||
SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
|
||||
math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
|
||||
l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
|
||||
l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
|
||||
l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
|
||||
l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
|
||||
l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
|
||||
l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
|
||||
${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
|
||||
l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
|
||||
${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
|
||||
l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
|
||||
l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
|
||||
l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
|
||||
l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
|
||||
l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
|
||||
l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
|
||||
l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
|
||||
l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
|
||||
l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
|
||||
l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
|
||||
l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
|
||||
l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
|
||||
l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
|
||||
l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
|
||||
l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
|
||||
l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
|
||||
l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
|
||||
l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
|
||||
l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
|
||||
l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
|
||||
${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
|
||||
l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
|
||||
l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
|
||||
l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
|
||||
l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
|
||||
l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
|
||||
l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
|
||||
l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
|
||||
l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
|
||||
l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
|
||||
l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
|
||||
osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
|
||||
|
||||
IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
|
||||
|
||||
# With opencl USE=tiff is necessary in leptonica
|
||||
CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
|
||||
opencl? (
|
||||
virtual/opencl
|
||||
media-libs/tiff:0=
|
||||
media-libs/leptonica:=[tiff]
|
||||
)
|
||||
scrollview? (
|
||||
>=dev-java/piccolo2d-3.0:0
|
||||
)
|
||||
training? (
|
||||
dev-libs/icu:=
|
||||
x11-libs/pango:=
|
||||
x11-libs/cairo:=
|
||||
)"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
doc? ( app-doc/doxygen )
|
||||
scrollview? ( >=virtual/jdk-1.7 )"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
scrollview? ( >=virtual/jre-1.7 )"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
|
||||
"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
for file in ${A}; do
|
||||
if [[ "${file}" == *traineddata* ]]; then
|
||||
cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--enable-shared
|
||||
$(use_enable opencl)
|
||||
$(use_enable scrollview graphics)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake doc
|
||||
use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
|
||||
use training && emake training
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && HTML_DOCS=( doc/html/. )
|
||||
default
|
||||
prune_libtool_files
|
||||
|
||||
if use training; then
|
||||
emake DESTDIR="${D}" training-install
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins testing/eurotext.tif testing/phototest.tif
|
||||
fi
|
||||
|
||||
insinto /usr/share/tessdata
|
||||
doins tessdata/*traineddata* # language files
|
||||
use scrollview && doins java/ScrollView.jar # scrollview
|
||||
}
|
||||
@ -1,129 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
MY_PN="tesseract-ocr"
|
||||
LANGPACKV="4.00"
|
||||
URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
|
||||
|
||||
inherit autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
|
||||
HOMEPAGE="https://github.com/tesseract-ocr"
|
||||
SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
|
||||
math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
|
||||
osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
|
||||
|
||||
# List of supported Gentoo linguas and their upstream mapping
|
||||
# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
|
||||
# "old" variants were regrouped in the matching modern locale
|
||||
LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
|
||||
# Missing matches:
|
||||
# ceb Cebuano
|
||||
# chr Cherokee
|
||||
# hat Haitian; Haitian Creole
|
||||
# iku Inuktitut
|
||||
# jav Javanese
|
||||
# mlt Maltese
|
||||
# pus Pushto; Pashto
|
||||
# tir Tigrinya
|
||||
# urd Urdu
|
||||
# yid Yiddish
|
||||
# l10n_en provides the additional data:
|
||||
# enm English, Middle (1100-1500)
|
||||
|
||||
for lang in ${LANGUAGES}; do
|
||||
gentoo_lang=${lang%:*}
|
||||
tess_langs=${lang#*:}
|
||||
for tess_lang in ${tess_langs//,/ }; do
|
||||
SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
|
||||
done
|
||||
IUSE+=" l10n_${gentoo_lang}"
|
||||
done
|
||||
|
||||
# With opencl USE=tiff is necessary in leptonica
|
||||
RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
|
||||
opencl? (
|
||||
virtual/opencl
|
||||
media-libs/tiff:0=
|
||||
media-libs/leptonica:=[tiff]
|
||||
)
|
||||
training? (
|
||||
dev-libs/icu:=
|
||||
x11-libs/pango:=
|
||||
x11-libs/cairo:=
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/asciidoc
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-manpages.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
for file in ${A}; do
|
||||
if [[ "${file}" == *traineddata* ]]; then
|
||||
cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# scrollview disabled for now, see bug #686944
|
||||
local myeconfargs=(
|
||||
--enable-shared
|
||||
--disable-graphics
|
||||
$(use_enable opencl)
|
||||
$(use_enable openmp)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake doc
|
||||
use training && emake training
|
||||
}
|
||||
|
||||
src_install() {
|
||||
use doc && HTML_DOCS=( doc/html/. )
|
||||
default
|
||||
|
||||
find "${D}" -name '*.la' -type f -delete || die
|
||||
|
||||
if use training; then
|
||||
emake DESTDIR="${D}" training-install
|
||||
fi
|
||||
|
||||
insinto /usr/share/tessdata
|
||||
doins tessdata/*traineddata* # language files
|
||||
}
|
||||
Binary file not shown.
@ -1,13 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<maintainer type="person">
|
||||
<email>arfrever.fta@gmail.com</email>
|
||||
<name>Arfrever Frehtes Taifersar Arahesis</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>floppym@gentoo.org</email>
|
||||
<name>Mike Gilbert</name>
|
||||
<description>Proxy</description>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
|
||||
<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="google-code">google-glog</remote-id>
|
||||
<remote-id type="github">google/glog</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
|
||||
DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 3cfe2aedd11a67a01ddee9eba36d99bad5fe8c7891e953cbdae9200427638e1acc1555c8d39df0217a48a95428838d573c90381698361f954d9aab860449cfcd SHA512 2bdc0ee86625724f64b7af2962b19b13cefb21d58d45c7b22fe2e01bd021f2427236c279c89785ede7c6986742127160b032294fbb652c55ce42f8d941a18cfe
|
||||
DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
|
||||
DIST mongodb-src-r4.0.10.tar.gz 49870574 BLAKE2B 1babbfa1a6d8fae390ec37042feff896c402772e832cc5b0b82fc4d531a6487ac2bd8d407c37ca75a76d78bc91cc665bfc3b7b223e6ceaaea2d921b337ef4d19 SHA512 891bfdc0d415515d7aa36aeb0618055ac6815c7d704537b88293226cecc1b677134db621fd90dee3913f4ff8174a888bcf68adee0a243d0f55ef6c0033a4f4b9
|
||||
DIST mongodb-src-r3.6.16.tar.gz 40927975 BLAKE2B bcd129d43eea24da3afe69c887bcd22116e0eb7e1f3f274fb8f51260625d17607b0d1eb31fb23a4f97c88e2c86b3d7a880cb05b0e77385d115cf9486d66f1249 SHA512 eb00f3a612942ad5f947583e92fca5b877b40d75132fa5a97989d81dd55925f5a112400eec8a43b2043bb0236b3228a670a888c41a374b0a60e8a3c26076b1e8
|
||||
DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
|
||||
DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
|
||||
DIST mongodb-src-r4.2.0.tar.gz 60781115 BLAKE2B 75531f69647c84f71127d4cdccf13bc21e50586240c767b4c1aa1efbf56cf008bf4f32b3a2011120ad9099da0f97be934375b8dd3d012670034327175c454f0e SHA512 be2f4e00364ac49b1a0490fa859640680a4d10d861252d200bd3db535c770a3b97cee9de6d2b0b6b3622502d055ba92b6c1d88cb1134d251aa2cf50a8951b64c
|
||||
DIST mongodb-src-r4.0.14.tar.gz 50088053 BLAKE2B af7dc930dd7a469c06cf26201e3329967a664585b9964732c57ed283f323d4dc7fde3ea62ad4f1e8ca763360aeb614c2f77f98867031083d83808acd19e97539 SHA512 3d5d73a816a00887a8851e2e79919b2646f6cc34fd9b8acb255a52e2e71407a4728a80a81112bdbe0a92ba9f71e856ac7a2229741273e8485806cda2cb018d8d
|
||||
DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
|
||||
DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
|
||||
|
||||
Binary file not shown.
@ -1,21 +0,0 @@
|
||||
--- vector-algorithms-0.5.4.1-orig/vector-algorithms.cabal 2012-08-16 06:39:54.000000000 +1000
|
||||
+++ vector-algorithms-0.5.4.1/vector-algorithms.cabal 2012-08-17 17:05:37.875993915 +1000
|
||||
@@ -52,9 +52,15 @@
|
||||
FlexibleContexts,
|
||||
CPP
|
||||
|
||||
- GHC-Options:
|
||||
- -Odph
|
||||
- -funbox-strict-fields
|
||||
+ if impl(ghc >= 7.4.0)
|
||||
+ GHC-Options:
|
||||
+ -Odph
|
||||
+ -funbox-strict-fields
|
||||
+ -fsimpl-tick-factor=153
|
||||
+ else
|
||||
+ GHC-Options:
|
||||
+ -Odph
|
||||
+ -funbox-strict-fields
|
||||
|
||||
Include-Dirs:
|
||||
include
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
|
||||
DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
|
||||
DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
|
||||
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
|
||||
DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
|
||||
DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,36 @@
|
||||
Description: Set DT_SONAME when building dylibs
|
||||
In Rust, library filenames include a version-specific hash to help
|
||||
the run-time linker find the correct version. Unlike in C/C++, the
|
||||
compiler looks for all libraries matching a glob that ignores the
|
||||
hash and reads embedded metadata to work out versions, etc.
|
||||
.
|
||||
The upshot is that there is no need for the usual "libfoo.so ->
|
||||
libfoo-1.2.3.so" symlink common with C/C++ when building with Rust,
|
||||
and no need to communicate an alternate filename to use at run-time
|
||||
vs compile time. If linking to a Rust dylib from C/C++ however, a
|
||||
"libfoo.so -> libfoo-$hash.so" symlink may well be useful and in
|
||||
this case DT_SONAME=libfoo-$hash.so would be required. More
|
||||
mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't
|
||||
find DT_SONAME on shared libraries in public directories.
|
||||
.
|
||||
This patch passes -Wl,-soname=$outfile when building dylibs (and
|
||||
using a GNU linker).
|
||||
Author: Angus Lees <gus@debian.org>
|
||||
Forwarded: no
|
||||
|
||||
--- a/src/librustc_codegen_ssa/back/link.rs
|
||||
+++ b/src/librustc_codegen_ssa/back/link.rs
|
||||
@@ -1034,6 +1034,13 @@
|
||||
cmd.args(&rpath::get_rpath_flags(&mut rpath_config));
|
||||
}
|
||||
|
||||
+ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib)
|
||||
+ && t.options.linker_is_gnu {
|
||||
+ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap());
|
||||
+ let soname = [String::from("-Wl,-soname=") + &filename];
|
||||
+ cmd.args(&soname);
|
||||
+ }
|
||||
+
|
||||
// Finally add all the linker arguments provided on the command line along
|
||||
// with any #[link_args] attributes found inside the crate
|
||||
if let Some(ref args) = sess.opts.cg.link_args {
|
||||
@ -0,0 +1,340 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
|
||||
|
||||
inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
|
||||
|
||||
if [[ ${PV} = *beta* ]]; then
|
||||
betaver=${PV//*beta}
|
||||
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
|
||||
MY_P="rustc-beta"
|
||||
SLOT="beta/${PV}"
|
||||
SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
|
||||
else
|
||||
ABI_VER="$(ver_cut 1-2)"
|
||||
SLOT="stable/${ABI_VER}"
|
||||
MY_P="rustc-${PV}"
|
||||
SRC="${MY_P}-src.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
|
||||
|
||||
DESCRIPTION="Systems programming language from Mozilla"
|
||||
HOMEPAGE="https://www.rust-lang.org/"
|
||||
|
||||
SRC_URI="
|
||||
https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
|
||||
!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
|
||||
"
|
||||
|
||||
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
|
||||
NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
|
||||
ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
|
||||
LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
|
||||
|
||||
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
|
||||
|
||||
IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
|
||||
|
||||
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
|
||||
# we need to *really* make sure we're not pulling more than one slot
|
||||
# simultaneously.
|
||||
|
||||
# How to use it:
|
||||
# 1. List all the working slots (with min versions) in ||, newest first.
|
||||
# 2. Update the := to specify *max* version, e.g. < 10.
|
||||
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
|
||||
LLVM_DEPEND="
|
||||
|| (
|
||||
sys-devel/llvm:9[llvm_targets_WebAssembly?]
|
||||
wasm? ( =sys-devel/lld-9* )
|
||||
)
|
||||
<sys-devel/llvm-10:=
|
||||
"
|
||||
LLVM_MAX_SLOT=9
|
||||
|
||||
# FIXME:
|
||||
# this should be '>=virtual/rust-1.$(($(ver_cut 2) - 1))', but we can't do it yet
|
||||
# as the first gentoo-built rust that can bootstap new compiler is 1.40.0-r1
|
||||
BOOTSTRAP_DEPEND="|| ( =dev-lang/rust-${PVR} =dev-lang/rust-bin-${PV}* )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
sys-libs/zlib
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
net-libs/libssh2
|
||||
net-libs/http-parser:=
|
||||
net-misc/curl[ssl]
|
||||
system-llvm? (
|
||||
${LLVM_DEPEND}
|
||||
dev-util/cmake
|
||||
dev-util/ninja
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
|| (
|
||||
>=sys-devel/gcc-4.7
|
||||
>=sys-devel/clang-3.5
|
||||
)
|
||||
system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=app-eselect/eselect-rust-20190311
|
||||
"
|
||||
|
||||
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
|
||||
parallel-compiler? ( nightly )
|
||||
wasm? ( llvm_targets_WebAssembly )
|
||||
x86? ( cpu_flags_x86_sse2 )
|
||||
"
|
||||
|
||||
QA_FLAGS_IGNORED="
|
||||
usr/bin/*-${PV}
|
||||
usr/lib*/lib*.so
|
||||
usr/lib/rurstlib/*/codegen-backends/librustc_codegen_llvm-llvm.so
|
||||
usr/lib/rustlib/*/lib/lib*.so
|
||||
"
|
||||
|
||||
QA_SONAME="usr/lib*/librustc_macros*.so"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/1.36.0-libressl.patch
|
||||
"${FILESDIR}"/1.40.0-add-soname.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
toml_usex() {
|
||||
usex "$1" true false
|
||||
}
|
||||
|
||||
pre_build_checks() {
|
||||
CHECKREQS_DISK_BUILD="9G"
|
||||
eshopts_push -s extglob
|
||||
if is-flagq '-g?(gdb)?([1-9])'; then
|
||||
CHECKREQS_DISK_BUILD="14G"
|
||||
fi
|
||||
eshopts_pop
|
||||
check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
pre_build_checks
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
pre_build_checks
|
||||
python-any-r1_pkg_setup
|
||||
use system-llvm && llvm_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if ! use system-bootstrap; then
|
||||
local rust_stage0_root="${WORKDIR}"/rust-stage0
|
||||
local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
|
||||
|
||||
"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
|
||||
--destdir="${rust_stage0_root}" --prefix=/ || die
|
||||
fi
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local rust_target="" rust_targets="" arch_cflags
|
||||
|
||||
# Collect rust target names to compile standard libs for all ABIs.
|
||||
for v in $(multilib_get_enabled_abi_pairs); do
|
||||
rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
|
||||
done
|
||||
if use wasm; then
|
||||
rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
|
||||
fi
|
||||
rust_targets="${rust_targets#,}"
|
||||
|
||||
local extended="true" tools="\"cargo\","
|
||||
if use clippy; then
|
||||
tools="\"clippy\",$tools"
|
||||
fi
|
||||
if use rls; then
|
||||
tools="\"rls\",\"analysis\",\"src\",$tools"
|
||||
fi
|
||||
if use rustfmt; then
|
||||
tools="\"rustfmt\",$tools"
|
||||
fi
|
||||
|
||||
local rust_stage0_root
|
||||
if use system-bootstrap; then
|
||||
rust_stage0_root="$(rustc --print sysroot)"
|
||||
else
|
||||
rust_stage0_root="${WORKDIR}"/rust-stage0
|
||||
fi
|
||||
|
||||
rust_target="$(rust_abi)"
|
||||
|
||||
cat <<- EOF > "${S}"/config.toml
|
||||
[llvm]
|
||||
optimize = $(toml_usex !debug)
|
||||
release-debuginfo = $(toml_usex debug)
|
||||
assertions = $(toml_usex debug)
|
||||
targets = "${LLVM_TARGETS// /;}"
|
||||
experimental-targets = ""
|
||||
link-shared = $(toml_usex system-llvm)
|
||||
[build]
|
||||
build = "${rust_target}"
|
||||
host = ["${rust_target}"]
|
||||
target = [${rust_targets}]
|
||||
cargo = "${rust_stage0_root}/bin/cargo"
|
||||
rustc = "${rust_stage0_root}/bin/rustc"
|
||||
docs = $(toml_usex doc)
|
||||
compiler-docs = $(toml_usex doc)
|
||||
submodules = false
|
||||
python = "${EPYTHON}"
|
||||
locked-deps = true
|
||||
vendor = true
|
||||
extended = ${extended}
|
||||
tools = [${tools}]
|
||||
verbose = 2
|
||||
[install]
|
||||
prefix = "${EPREFIX}/usr"
|
||||
libdir = "lib"
|
||||
docdir = "share/doc/${PF}"
|
||||
mandir = "share/man"
|
||||
[rust]
|
||||
optimize = $(toml_usex !debug)
|
||||
debug = $(toml_usex debug)
|
||||
debug-assertions = $(toml_usex debug)
|
||||
default-linker = "$(tc-getCC)"
|
||||
parallel-compiler = $(toml_usex parallel-compiler)
|
||||
channel = "$(usex nightly nightly stable)"
|
||||
rpath = false
|
||||
lld = $(usex system-llvm false $(toml_usex wasm))
|
||||
[dist]
|
||||
src-tarball = false
|
||||
EOF
|
||||
|
||||
for v in $(multilib_get_enabled_abi_pairs); do
|
||||
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
|
||||
arch_cflags="$(get_abi_CFLAGS ${v##*.})"
|
||||
|
||||
cat <<- EOF >> "${S}"/config.env
|
||||
CFLAGS_${rust_target}=${arch_cflags}
|
||||
EOF
|
||||
|
||||
cat <<- EOF >> "${S}"/config.toml
|
||||
[target.${rust_target}]
|
||||
cc = "$(tc-getBUILD_CC)"
|
||||
cxx = "$(tc-getBUILD_CXX)"
|
||||
linker = "$(tc-getCC)"
|
||||
ar = "$(tc-getAR)"
|
||||
EOF
|
||||
if use system-llvm; then
|
||||
cat <<- EOF >> "${S}"/config.toml
|
||||
llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
|
||||
if use wasm; then
|
||||
cat <<- EOF >> "${S}"/config.toml
|
||||
[target.wasm32-unknown-unknown]
|
||||
linker = "$(usex system-llvm lld rust-lld)"
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
env $(cat "${S}"/config.env)\
|
||||
"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
|
||||
--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
|
||||
}
|
||||
|
||||
src_install() {
|
||||
env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
|
||||
--exclude src/tools/miri || die
|
||||
|
||||
# bug #689562, #689160
|
||||
rm "${D}/etc/bash_completion.d/cargo" || die
|
||||
rmdir "${D}"/etc{/bash_completion.d,} || die
|
||||
dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
|
||||
|
||||
mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
|
||||
mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
|
||||
mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
|
||||
mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
|
||||
mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
|
||||
mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
|
||||
if use clippy; then
|
||||
mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
|
||||
mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
|
||||
fi
|
||||
if use rls; then
|
||||
mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
|
||||
fi
|
||||
if use rustfmt; then
|
||||
mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
|
||||
mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
|
||||
fi
|
||||
|
||||
# Move public shared libs to abi specific libdir
|
||||
# Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
|
||||
if [[ $(get_libdir) != lib ]]; then
|
||||
dodir /usr/$(get_libdir)
|
||||
mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
|
||||
fi
|
||||
|
||||
dodoc COPYRIGHT
|
||||
|
||||
# note: eselect-rust adds EROOT to all paths below
|
||||
cat <<-EOF > "${T}/provider-${P}"
|
||||
/usr/bin/rustdoc
|
||||
/usr/bin/rust-gdb
|
||||
/usr/bin/rust-gdbgui
|
||||
/usr/bin/rust-lldb
|
||||
EOF
|
||||
echo /usr/bin/cargo >> "${T}/provider-${P}"
|
||||
if use clippy; then
|
||||
echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
|
||||
echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
|
||||
fi
|
||||
if use rls; then
|
||||
echo /usr/bin/rls >> "${T}/provider-${P}"
|
||||
fi
|
||||
if use rustfmt; then
|
||||
echo /usr/bin/rustfmt >> "${T}/provider-${P}"
|
||||
echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
|
||||
fi
|
||||
dodir /etc/env.d/rust
|
||||
insinto /etc/env.d/rust
|
||||
doins "${T}/provider-${P}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect rust update --if-unset
|
||||
|
||||
elog "Rust installs a helper script for calling GDB and LLDB,"
|
||||
elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
|
||||
|
||||
ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
|
||||
ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
|
||||
ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
|
||||
|
||||
if has_version app-editors/emacs; then
|
||||
elog "install app-emacs/rust-mode to get emacs support for rust."
|
||||
fi
|
||||
|
||||
if has_version app-editors/gvim || has_version app-editors/vim; then
|
||||
elog "install app-vim/rust-vim to get vim support for rust."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect rust cleanup
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
|
||||
DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed
|
||||
DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
|
||||
DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
|
||||
DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/chartype.h b/src/chartype.h
|
||||
index c35825c..be5aac0 100644
|
||||
--- a/src/chartype.h
|
||||
+++ b/src/chartype.h
|
||||
@@ -44,7 +44,7 @@
|
||||
* supports non-BMP code points without requiring UTF-16, but nothing
|
||||
* seems to actually advertise this properly, despite Unicode 3.1 having
|
||||
* been around since 2001... */
|
||||
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
|
||||
+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__)
|
||||
#ifndef __STDC_ISO_10646__
|
||||
/* In many places it is assumed that the first 127 code points are ASCII
|
||||
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other
|
||||
@ -1,20 +0,0 @@
|
||||
--- libedit-20110709-3.0/src/vi.c.old 2011-07-11 18:21:16.000000000 +0000
|
||||
+++ libedit-20110709-3.0/src/vi.c 2011-07-11 18:24:29.000000000 +0000
|
||||
@@ -918,7 +918,7 @@
|
||||
* NB: posix implies that we should enter insert mode, however
|
||||
* this is against historical precedent...
|
||||
*/
|
||||
-#ifdef __weak_reference
|
||||
+#if defined(__weak_reference) && defined(__NetBSD__)
|
||||
__weakref_visible char *my_get_alias_text(const char *)
|
||||
__weak_reference(get_alias_text);
|
||||
#endif
|
||||
@@ -926,7 +926,7 @@
|
||||
/*ARGSUSED*/
|
||||
vi_alias(EditLine *el, Int c)
|
||||
{
|
||||
-#ifdef __weak_reference
|
||||
+#if defined(__weak_reference) && defined(__NetBSD__)
|
||||
char alias_name[3];
|
||||
char *alias_text;
|
||||
|
||||
@ -1,258 +0,0 @@
|
||||
Port the el_fn_sh_complete from FreeBSD.
|
||||
This function is required by FreeBSD-9.0's sh.
|
||||
So that we can drop the bundled version in FreeBSD-9.0
|
||||
|
||||
diff -uNr libedit-20120311-3.0/src/filecomplete.c libedit-20120311-3.0.freebsd/src/filecomplete.c
|
||||
--- libedit-20120311-3.0/src/filecomplete.c 2012-03-11 09:54:58.000000000 +0000
|
||||
+++ libedit-20120311-3.0.freebsd/src/filecomplete.c 2012-04-23 12:14:25.000000000 +0000
|
||||
@@ -56,6 +56,9 @@
|
||||
|
||||
static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
|
||||
'$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
|
||||
+/* Tilde is deliberately omitted here, we treat it specially. */
|
||||
+static const Char extra_quote_chars[] = { ')', '}', '*', '?', '[', '$', '\0' };
|
||||
+
|
||||
|
||||
|
||||
/********************************/
|
||||
@@ -411,10 +414,14 @@
|
||||
char **(*attempted_completion_function)(const char *, int, int),
|
||||
const Char *word_break, const Char *special_prefixes,
|
||||
const char *(*app_func)(const char *), size_t query_items,
|
||||
- int *completion_type, int *over, int *point, int *end)
|
||||
+ int *completion_type, int *over, int *point, int *end,
|
||||
+ const char *(*find_word_start_func)(const char *, const char *),
|
||||
+ char *(*dequoting_func)(const char *),
|
||||
+ char *(*quoting_func)(const char *))
|
||||
{
|
||||
const TYPE(LineInfo) *li;
|
||||
Char *temp;
|
||||
+ char *dequoted_temp;
|
||||
char **matches;
|
||||
const Char *ctemp;
|
||||
size_t len;
|
||||
@@ -435,17 +442,28 @@
|
||||
|
||||
/* We now look backwards for the start of a filename/variable word */
|
||||
li = FUN(el,line)(el);
|
||||
+ if (find_word_start_func)
|
||||
+ ctemp = ct_decode_string(find_word_start_func(ct_encode_string(li->buffer,&el->el_scratch), ct_encode_string(li->cursor,&el->el_scratch)),&el->el_scratch);
|
||||
+ else {
|
||||
ctemp = li->cursor;
|
||||
while (ctemp > li->buffer
|
||||
&& !Strchr(word_break, ctemp[-1])
|
||||
&& (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
|
||||
ctemp--;
|
||||
+ }
|
||||
|
||||
len = (size_t)(li->cursor - ctemp);
|
||||
temp = el_malloc((len + 1) * sizeof(*temp));
|
||||
(void)Strncpy(temp, ctemp, len);
|
||||
temp[len] = '\0';
|
||||
|
||||
+ if (dequoting_func) {
|
||||
+ dequoted_temp = dequoting_func(ct_encode_string(temp,&el->el_scratch));
|
||||
+ if (dequoted_temp == NULL)
|
||||
+ return retval;
|
||||
+ } else
|
||||
+ dequoted_temp = NULL;
|
||||
+
|
||||
/* these can be used by function called in completion_matches() */
|
||||
/* or (*attempted_completion_function)() */
|
||||
if (point != 0)
|
||||
@@ -456,14 +474,14 @@
|
||||
if (attempted_completion_function) {
|
||||
int cur_off = (int)(li->cursor - li->buffer);
|
||||
matches = (*attempted_completion_function)(
|
||||
- ct_encode_string(temp, &el->el_scratch),
|
||||
+ dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch),
|
||||
cur_off - (int)len, cur_off);
|
||||
} else
|
||||
matches = 0;
|
||||
if (!attempted_completion_function ||
|
||||
(over != NULL && !*over && !matches))
|
||||
matches = completion_matches(
|
||||
- ct_encode_string(temp, &el->el_scratch), complet_func);
|
||||
+ dequoted_temp? dequoted_temp : ct_encode_string(temp, &el->el_scratch), complet_func);
|
||||
|
||||
if (over != NULL)
|
||||
*over = 0;
|
||||
@@ -478,9 +496,19 @@
|
||||
* possible matches if there is possible completion.
|
||||
*/
|
||||
if (matches[0][0] != '\0') {
|
||||
+ char *quoted_match;
|
||||
+ if (quoting_func) {
|
||||
+ quoted_match = quoting_func(matches[0]);
|
||||
+ if (quoted_match == NULL)
|
||||
+ goto free_matches;
|
||||
+ } else
|
||||
+ quoted_match = NULL;
|
||||
+
|
||||
el_deletestr(el, (int) len);
|
||||
FUN(el,insertstr)(el,
|
||||
- ct_decode_string(matches[0], &el->el_scratch));
|
||||
+ ct_decode_string(quoted_match? quoted_match : matches[0], &el->el_scratch));
|
||||
+
|
||||
+ free(quoted_match);
|
||||
}
|
||||
|
||||
if (what_to_do == '?')
|
||||
@@ -553,12 +581,14 @@
|
||||
retval = CC_NORM;
|
||||
}
|
||||
|
||||
+free_matches:
|
||||
/* free elements of array and the array itself */
|
||||
for (i = 0; matches[i]; i++)
|
||||
el_free(matches[i]);
|
||||
el_free(matches);
|
||||
matches = NULL;
|
||||
}
|
||||
+ el_free(dequoted_temp);
|
||||
el_free(temp);
|
||||
return retval;
|
||||
}
|
||||
@@ -572,5 +602,102 @@
|
||||
{
|
||||
return (unsigned char)fn_complete(el, NULL, NULL,
|
||||
break_chars, NULL, NULL, (size_t)100,
|
||||
- NULL, NULL, NULL, NULL);
|
||||
+ NULL, NULL, NULL, NULL,
|
||||
+ NULL, NULL, NULL);
|
||||
+}
|
||||
+
|
||||
+static const char *
|
||||
+sh_find_word_start(const char *buffer, const char *cursor)
|
||||
+{
|
||||
+ const char *word_start = buffer;
|
||||
+
|
||||
+ while (buffer < cursor) {
|
||||
+ if (*buffer == '\\')
|
||||
+ buffer++;
|
||||
+ else if (Strchr(break_chars, *buffer))
|
||||
+ word_start = buffer + 1;
|
||||
+
|
||||
+ buffer++;
|
||||
+ }
|
||||
+
|
||||
+ return word_start;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static char *
|
||||
+sh_quote(const char *str)
|
||||
+{
|
||||
+ const char *src;
|
||||
+ int extra_len = 0;
|
||||
+ char *quoted_str, *dst;
|
||||
+
|
||||
+ if (*str == '-' || *str == '+')
|
||||
+ extra_len += 2;
|
||||
+ for (src = str; *src != '\0'; src++)
|
||||
+ if (Strchr(break_chars, *src) ||
|
||||
+ Strchr(extra_quote_chars, *src))
|
||||
+ extra_len++;
|
||||
+
|
||||
+ quoted_str = malloc(sizeof(*quoted_str) *
|
||||
+ (strlen(str) + extra_len + 1));
|
||||
+ if (quoted_str == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ dst = quoted_str;
|
||||
+ if (*str == '-' || *str == '+')
|
||||
+ *dst++ = '.', *dst++ = '/';
|
||||
+ for (src = str; *src != '\0'; src++) {
|
||||
+ if (Strchr(break_chars, *src) ||
|
||||
+ Strchr(extra_quote_chars, *src))
|
||||
+ *dst++ = '\\';
|
||||
+ *dst++ = *src;
|
||||
+ }
|
||||
+ *dst = '\0';
|
||||
+
|
||||
+ return quoted_str;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static char *
|
||||
+sh_dequote(const char *str)
|
||||
+{
|
||||
+ char *dequoted_str, *dst;
|
||||
+
|
||||
+ /* save extra space to replace \~ with ./~ */
|
||||
+ dequoted_str = malloc(sizeof(*dequoted_str) * (strlen(str) + 1 + 1));
|
||||
+ if (dequoted_str == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ dst = dequoted_str;
|
||||
+
|
||||
+ /* dequote \~ at start as ./~ */
|
||||
+ if (*str == '\\' && str[1] == '~') {
|
||||
+ str++;
|
||||
+ *dst++ = '.';
|
||||
+ *dst++ = '/';
|
||||
+ }
|
||||
+
|
||||
+ while (*str) {
|
||||
+ if (*str == '\\')
|
||||
+ str++;
|
||||
+ if (*str)
|
||||
+ *dst++ = *str++;
|
||||
+ }
|
||||
+ *dst = '\0';
|
||||
+
|
||||
+ return dequoted_str;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * completion function using sh quoting rules; for key binding
|
||||
+ */
|
||||
+/* ARGSUSED */
|
||||
+unsigned char
|
||||
+_el_fn_sh_complete(EditLine *el, int ch __attribute__((__unused__)))
|
||||
+{
|
||||
+ return (unsigned char)fn_complete(el, NULL, NULL,
|
||||
+ break_chars, NULL, NULL, 100,
|
||||
+ NULL, NULL, NULL, NULL,
|
||||
+ sh_find_word_start, sh_dequote, sh_quote);
|
||||
}
|
||||
diff -uNr libedit-20120311-3.0/src/filecomplete.h libedit-20120311-3.0.freebsd/src/filecomplete.h
|
||||
--- libedit-20120311-3.0/src/filecomplete.h 2010-04-22 19:13:17.000000000 +0000
|
||||
+++ libedit-20120311-3.0.freebsd/src/filecomplete.h 2012-04-23 12:04:12.000000000 +0000
|
||||
@@ -35,7 +35,10 @@
|
||||
char *(*)(const char *, int),
|
||||
char **(*)(const char *, int, int),
|
||||
const Char *, const Char *, const char *(*)(const char *), size_t,
|
||||
- int *, int *, int *, int *);
|
||||
+ int *, int *, int *, int *,
|
||||
+ const char *(*)(const char *, const char *),
|
||||
+ char *(*)(const char *),
|
||||
+ char *(*)(const char *));
|
||||
|
||||
void fn_display_match_list(EditLine *, char **, size_t, size_t);
|
||||
char *fn_tilde_expand(const char *);
|
||||
Binary files libedit-20120311-3.0/src/filecomplete.o and libedit-20120311-3.0.freebsd/src/filecomplete.o differ
|
||||
diff -uNr libedit-20120311-3.0/src/histedit.h libedit-20120311-3.0.freebsd/src/histedit.h
|
||||
--- libedit-20120311-3.0/src/histedit.h 2011-08-02 06:52:08.000000000 +0000
|
||||
+++ libedit-20120311-3.0.freebsd/src/histedit.h 2012-04-23 11:44:33.000000000 +0000
|
||||
@@ -113,6 +113,7 @@
|
||||
int el_set(EditLine *, int, ...);
|
||||
int el_get(EditLine *, int, ...);
|
||||
unsigned char _el_fn_complete(EditLine *, int);
|
||||
+unsigned char _el_fn_sh_complete(EditLine *, int);
|
||||
|
||||
/*
|
||||
* el_set/el_get parameters
|
||||
diff -ur libedit-20120311-3.0/src/readline.c libedit-20120311-3.0.freebsd/src/readline.c
|
||||
--- libedit-20120311-3.0/src/readline.c 2012-03-11 09:54:58.000000000 +0000
|
||||
+++ libedit-20120311-3.0.freebsd/src/readline.c 2012-04-23 12:20:11.000000000 +0000
|
||||
@@ -1773,7 +1773,7 @@
|
||||
_rl_completion_append_character_function,
|
||||
(size_t)rl_completion_query_items,
|
||||
&rl_completion_type, &rl_attempted_completion_over,
|
||||
- &rl_point, &rl_end);
|
||||
+ &rl_point, &rl_end, NULL, NULL, NULL);
|
||||
|
||||
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
Index: libedit-20110709-3.0/libedit.pc.in
|
||||
===================================================================
|
||||
--- libedit-20110709-3.0.orig/libedit.pc.in
|
||||
+++ libedit-20110709-3.0/libedit.pc.in
|
||||
@@ -7,6 +7,7 @@ Name: libedit
|
||||
Description: command line editor library provides generic line editing, history, and tokenization functions.
|
||||
Version: @VERSION@
|
||||
Requires:
|
||||
-Libs: -L${libdir} -ledit @LIBS@
|
||||
+Libs: -L${libdir} -ledit
|
||||
+Libs.private: @LIBS@
|
||||
Cflags: -I${includedir} -I${includedir}/editline
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils toolchain-funcs versionator base multilib-minimal usr-ldscript
|
||||
|
||||
MY_PV=$(get_major_version)-$(get_after_major_version)
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="BSD replacement for libreadline"
|
||||
HOMEPAGE="https://thrysoee.dk/editline/"
|
||||
SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="static-libs"
|
||||
|
||||
DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
|
||||
!<=sys-freebsd/freebsd-lib-6.2_rc1"
|
||||
|
||||
RDEPEND=${DEPEND}
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-ncursesprivate.patch"
|
||||
"${FILESDIR}/${PN}-20100424.3.0-bsd.patch"
|
||||
"${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch"
|
||||
"${FILESDIR}/${PN}-20120311-3.0-el_fn_sh_complete.patch"
|
||||
)
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
$(use_enable static-libs static) \
|
||||
--enable-widec \
|
||||
--enable-fast-install
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
gen_usr_ldscript -a edit
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
prune_libtool_files --all
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit git-r3 multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
|
||||
HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
|
||||
EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="1.1"
|
||||
KEYWORDS=""
|
||||
IUSE="doc static-libs"
|
||||
|
||||
DEPEND="doc? ( app-doc/doxygen )"
|
||||
DOCS=( ChangeLog )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.1-vlan-header.patch
|
||||
"${FILESDIR}"/${PN}-1.1-flags.patch
|
||||
"${FILESDIR}"/${PN}-1.1.3-offsetof.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e '/@echo/d' \
|
||||
Makefile.rules {lib,src,tests}/Makefile || die
|
||||
sed -i \
|
||||
-e 's|-g ||g' \
|
||||
Makefile.opts.in || die
|
||||
|
||||
if ! use static-libs; then
|
||||
sed -i lib/Makefile -e '/OUT_AR/d' || die
|
||||
fi
|
||||
|
||||
rm -f lib/libnl.a
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR=$(tc-getAR)
|
||||
|
||||
if use doc ; then
|
||||
cd "${S}/doc"
|
||||
emake gendoc
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use doc ; then
|
||||
cd "${S}/doc"
|
||||
docinto html
|
||||
dodoc -r html/*
|
||||
fi
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
|
||||
DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
|
||||
DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
|
||||
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
|
||||
DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
|
||||
DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib-minimal toolchain-funcs
|
||||
|
||||
# Different date format used upstream.
|
||||
RE2_VER=${PV#0.}
|
||||
RE2_VER=${RE2_VER//./-}
|
||||
|
||||
DESCRIPTION="An efficient, principled regular expression library"
|
||||
HOMEPAGE="https://github.com/google/re2"
|
||||
SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
# NOTE: Always run libre2 through abi-compliance-checker!
|
||||
# https://abi-laboratory.pro/tracker/timeline/re2/
|
||||
SONAME="gentoo-2019-01-01"
|
||||
SLOT="0/${SONAME}"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
|
||||
IUSE="icu"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="icu? ( virtual/pkgconfig )"
|
||||
|
||||
S="${WORKDIR}/re2-${RE2_VER}"
|
||||
|
||||
DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
|
||||
HTML_DOCS=( doc/syntax.html )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
|
||||
if use icu; then
|
||||
sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
|
||||
fi
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export AR CXX NM
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake SONAME="${SONAME}"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue