Sync with portage [Tue Dec 8 16:39:51 MSK 2020].

akrasnyh 1821
Calculate Linux 3 years ago
parent bdf863c273
commit 92370c24c8

Binary file not shown.

Binary file not shown.

@ -13,9 +13,9 @@ if [[ -n $(ver_cut 4) ]]; then
fi fi
DESCRIPTION="Just-In-Time Compiler for the Lua programming language" DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/" HOMEPAGE="https://luajit.org/"
SRC_URI="http://luajit.org/download/${MY_P}.tar.gz SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
${HOTFIX:+http://luajit.org/download/${HOTFIX}}" ${HOTFIX:+https://luajit.org/download/${HOTFIX}}"
LICENSE="MIT" LICENSE="MIT"
# this should probably be pkgmoved to 2.0 for sake of consistency. # this should probably be pkgmoved to 2.0 for sake of consistency.
@ -50,7 +50,7 @@ _emake() {
TARGET_AR="$(tc-getAR) rcus" \ TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \ BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \ TARGET_STRIP="true" \
INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ INSTALL_LIB="${ED}/usr/$(get_libdir)" \
"$@" "$@"
} }
@ -61,7 +61,7 @@ src_compile() {
src_install() { src_install() {
_emake install _emake install
pax-mark m "${ED}usr/bin/luajit-${MY_PV}" pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
HTML_DOCS="doc/." einstalldocs HTML_DOCS="doc/." einstalldocs
} }

@ -5,13 +5,13 @@ EAPI=7
inherit pax-utils toolchain-funcs inherit pax-utils toolchain-funcs
MY_PV="$(ver_cut 1-4)" MY_PV="$(ver_cut 1-5)"
MY_PV="${MY_PV/_beta/-beta}" MY_PV="${MY_PV/_beta/-beta}"
MY_P="LuaJIT-${MY_PV}" MY_P="LuaJIT-${MY_PV}"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language" DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/" HOMEPAGE="https://luajit.org/"
SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" SRC_URI="https://luajit.org/download/${MY_P}.tar.gz"
LICENSE="MIT" LICENSE="MIT"
# this should probably be pkgmoved to 2.0 for sake of consistency. # this should probably be pkgmoved to 2.0 for sake of consistency.
@ -39,7 +39,7 @@ _emake() {
TARGET_AR="$(tc-getAR) rcus" \ TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \ BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \ TARGET_STRIP="true" \
INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ INSTALL_LIB="${ED}/usr/$(get_libdir)" \
"$@" "$@"
} }
@ -50,7 +50,7 @@ src_compile() {
src_install() { src_install() {
_emake install _emake install
pax-mark m "${ED}usr/bin/luajit-${MY_PV}" pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
HTML_DOCS="doc/." einstalldocs HTML_DOCS="doc/." einstalldocs
} }

Binary file not shown.

@ -1 +1 @@
Tue, 08 Dec 2020 12:38:30 +0000 Tue, 08 Dec 2020 13:08:31 +0000

@ -1 +1 @@
Tue, 08 Dec 2020 12:38:30 +0000 Tue, 08 Dec 2020 13:08:31 +0000

Binary file not shown.

@ -1,11 +1,11 @@
DEFINED_PHASES=compile install prepare DEFINED_PHASES=compile install prepare
DESCRIPTION=Just-In-Time Compiler for the Lua programming language DESCRIPTION=Just-In-Time Compiler for the Lua programming language
EAPI=7 EAPI=7
HOMEPAGE=http://luajit.org/ HOMEPAGE=https://luajit.org/
IUSE=lua52compat static-libs IUSE=lua52compat static-libs
KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux
LICENSE=MIT LICENSE=MIT
SLOT=2 SLOT=2
SRC_URI=http://luajit.org/download/LuaJIT-2.0.5.tar.gz SRC_URI=https://luajit.org/download/LuaJIT-2.0.5.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=7c2a9e98cdb15505120ecc19364dc388 _md5_=6e2c9cc9833df34159947273868def0a

@ -1,11 +1,11 @@
DEFINED_PHASES=compile install DEFINED_PHASES=compile install
DESCRIPTION=Just-In-Time Compiler for the Lua programming language DESCRIPTION=Just-In-Time Compiler for the Lua programming language
EAPI=7 EAPI=7
HOMEPAGE=http://luajit.org/ HOMEPAGE=https://luajit.org/
IUSE=lua52compat static-libs IUSE=lua52compat static-libs
KEYWORDS=~arm64 KEYWORDS=~arm64
LICENSE=MIT LICENSE=MIT
SLOT=2 SLOT=2
SRC_URI=http://luajit.org/download/LuaJIT-2.1.0-beta.tar.gz SRC_URI=https://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=0a892d5622b2798849b6c3280dc8da6b _md5_=fd67b8d745810c73fc45d8bf043c73d9

@ -1,6 +1,6 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 BDEPEND=sys-devel/bison:0 sys-devel/flex:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure install postinst prepare DEFINED_PHASES=configure install postinst prepare
DEPEND=acct-group/squid acct-user/squid || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ldap? ( net-nds/openldap:0 ) sys-devel/bison:0 sys-devel/flex:0 DEPEND=acct-group/squid acct-user/squid || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ldap? ( net-nds/openldap:0 )
DESCRIPTION=Combined filter, redirector and access controller plugin for Squid DESCRIPTION=Combined filter, redirector and access controller plugin for Squid
EAPI=7 EAPI=7
HOMEPAGE=http://www.squidguard.org HOMEPAGE=http://www.squidguard.org
@ -11,4 +11,4 @@ RDEPEND=acct-group/squid acct-user/squid || ( sys-libs/db:5.3 sys-libs/db:4.8 )
SLOT=0 SLOT=0
SRC_URI=mirror://debian/pool/main/s/squidguard/squidguard_1.6.0.orig.tar.gz -> squidguard-1.6.0.tar.gz SRC_URI=mirror://debian/pool/main/s/squidguard/squidguard_1.6.0.orig.tar.gz -> squidguard-1.6.0.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 db-use d0a68876efc79f37b39ecf3f48c48e7e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb _eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 db-use d0a68876efc79f37b39ecf3f48c48e7e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=73d4ecf4bca6a20bd663de5bd8655cb3 _md5_=70f9071a0fe155ce626db2b532ab3469

@ -1 +1 @@
Tue, 08 Dec 2020 12:38:30 +0000 Tue, 08 Dec 2020 13:08:31 +0000

@ -1 +1 @@
Tue Dec 8 12:38:30 PM UTC 2020 Tue Dec 8 01:08:31 PM UTC 2020

@ -1 +1 @@
Tue, 08 Dec 2020 13:00:01 +0000 Tue, 08 Dec 2020 13:30:01 +0000

@ -1 +1 @@
4359447ca234746d89c238f95fc0ada90998c4a7 1607429529 2020-12-08T12:12:09+00:00 8135845b8bc6721e7537e46f7033537cf9ac30f6 1607431743 2020-12-08T12:49:03+00:00

@ -1 +1 @@
1607430901 Tue 08 Dec 2020 12:35:01 PM UTC 1607432701 Tue 08 Dec 2020 01:05:01 PM UTC

@ -1 +1 @@
Tue, 08 Dec 2020 12:38:30 +0000 Tue, 08 Dec 2020 13:08:31 +0000

Binary file not shown.

@ -24,9 +24,12 @@ RDEPEND="
) )
ldap? ( net-nds/openldap:0 )" ldap? ( net-nds/openldap:0 )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}"
BDEPEND="
sys-devel/bison:0 sys-devel/bison:0
sys-devel/flex:0" sys-devel/flex:0
"
suitable_db_version() { suitable_db_version() {
local tested_slots="5.3 4.8" local tested_slots="5.3 4.8"
@ -45,8 +48,12 @@ src_prepare() {
"${FILESDIR}/${P}-gcc-10.patch" "${FILESDIR}/${P}-gcc-10.patch"
# Link only with specific BerkDB versions # Link only with specific BerkDB versions
# Do not inject default paths for library searching
db_version="$(suitable_db_version)" db_version="$(suitable_db_version)"
sed -i -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" configure.ac || die sed -i \
-e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" \
-e '/$LDFLAGS $db_lib $ldap_lib/d' \
configure.ac || die
eapply_user eapply_user
eautoreconf eautoreconf

Loading…
Cancel
Save