commit: d5f82331bb7c9ded5c15afb2bfb6282081d32bcc Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> AuthorDate: Fri Apr 3 19:16:36 2015 +0000 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> CommitDate: Fri Apr 3 19:16:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=d5f82331
[dev-lang/luajit] A bit more slottify; [app-eselect/luajit] Fix; [dev-lang/lua-headers] Removed (unneded anymore) Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name> app-eselect/eselect-luajit/files/luajit-1.eselect | 42 +++++++++++++++++------ dev-lang/lua-headers/Manifest | 4 --- dev-lang/lua-headers/lua-headers-5.1.4.ebuild | 34 ------------------ dev-lang/lua-headers/lua-headers-5.1.5.ebuild | 34 ------------------ dev-lang/lua-headers/lua-headers-5.2.0.ebuild | 34 ------------------ dev-lang/lua-headers/lua-headers-5.2.1.ebuild | 34 ------------------ dev-lang/lua-headers/metadata.xml | 12 ------- dev-lang/luajit/luajit-2.0.9999.ebuild | 42 ++++++++++++++--------- dev-lang/luajit/luajit-2.1.9999.ebuild | 42 ++++++++++++++--------- 9 files changed, 84 insertions(+), 194 deletions(-) diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect index 722ae02..ac90226 100644 --- a/app-eselect/eselect-luajit/files/luajit-1.eselect +++ b/app-eselect/eselect-luajit/files/luajit-1.eselect @@ -3,6 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 or later # $Id: luajit.eselect mva $ +inherit config multilib + DESCRIPTION="Manage the LuaJIT symlink" MAINTAINER="[email protected]" VERSION="1" @@ -24,13 +26,30 @@ find_targets() { done | sort_luajit_versions } +get_libdirs() { + local dir libdirs + for dir in $(list_libdirs); do + [[ -L ${EROOT}/usr/${dir} ]] && continue + ls "${EROOT}"/usr/${dir}/libluajit*.* > /dev/null 2>&1 || continue + + libdirs+=' '/usr/${dir} + done + echo ${libdirs:-/usr/lib} +} + + # remove the luajit symlink -remove_symlink() { - rm "${EROOT}/usr/bin/luajit" +remove_symlinks() { + for dir in $(get_libdirs) ; do + [[ -L "${dir}/libluajit-5.1.so" ]] && rm "${dir}/libluajit-5.1.so" + [[ -L "${dir}/libluajit-5.1.a" ]] && rm "${dir}/libluajit-5.1.a" + done + [[ -L "${EROOT}/usr/bin/luajit" ]] && rm "${EROOT}/usr/bin/luajit" + rm -f "${EROOT}"/usr/share/man/man1/luajit.1{,.gz,.bz2,.lzma} &>/dev/null } # set the luajit symlink -set_symlink() { +set_symlinks() { local target=$1 if is_number "${target}"; then @@ -42,10 +61,13 @@ set_symlink() { die -q "Target \"$1\" doesn't appear to be valid!" elif [[ -f ${EROOT}/usr/bin/${target} ]]; then ln -s "${target}" "${EROOT}/usr/bin/luajit" - [[ -f "${EROOT}/usr/lib32/lib${target}.so" ]] && ln -s "lib${target}.so" "${EROOT}/usr/lib32/libluajit-5.1.so" - [[ -f "${EROOT}/usr/lib32/lib${target}.a" ]] && ln -s "lib${target}.a" "${EROOT}/usr/lib32/libluajit-5.1.a" - [[ -f "${EROOT}/usr/lib/lib${target}.so" ]] && ln -s "lib${target}.so" "${EROOT}/usr/lib/libluajit-5.1.so" - [[ -f "${EROOT}/usr/lib/lib${target}.a" ]] && ln -s "lib${target}.a" "${EROOT}/usr/lib/libluajit-5.1.a" + for dir in $(get_libdirs) ; do + [[ -f "${dir}/lib${target}.so" ]] && ln -s "lib${target}.so" "${dir}/libluajit-5.1.so" + [[ -f "${dir}/lib${target}.a" ]] && ln -s "lib${target}.a" "${dir}/libluajit-5.1.a" + done + for orig in "${EROOT}"/usr/share/man/man1/$target.1* ; do + ln -s "$(basename ${orig})" "${orig/$target/luajit}" + done else die -q "Target \"$1\" doesn't appear to be valid!" fi @@ -106,12 +128,12 @@ do_set() { if [[ -L ${EROOT}/usr/bin/luajit ]]; then # existing symlink - remove_symlink || die -q "Couldn't remove existing symlink" - set_symlink "$1" || die -q "Couldn't set a new symlink" + remove_symlinks || die -q "Couldn't remove existing symlink" + set_symlinks "$1" || die -q "Couldn't set a new symlink" elif [[ -e ${EROOT}/usr/bin/luajit ]]; then # we have something strange die -q "${EROOT}/usr/bin/luajit exists but is not a symlink" else - set_symlink "$1" || die -q "Couldn't set a new symlink" + set_symlinks "$1" || die -q "Couldn't set a new symlink" fi } diff --git a/dev-lang/lua-headers/Manifest b/dev-lang/lua-headers/Manifest deleted file mode 100644 index 75fc261..0000000 --- a/dev-lang/lua-headers/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd -DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75 -DIST lua-5.2.0.tar.gz 246377 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d SHA512 48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a WHIRLPOOL d14eeaa0322b611a65d698faf94e00611e3c4942363e2db068891838f6f7abab9b2ca509b6e3791b0f734ee69e41e07ac63a372d0bee60c9e8ffcc5a0f693909 -DIST lua-5.2.1.tar.gz 249882 SHA256 64304da87976133196f9e4c15250b70f444467b6ed80d7cfd7b3b982b5177be5 SHA512 d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb WHIRLPOOL 2a8d3d3c6ae37307bd667ab0619f7992f12ad4fb6c2709c2b4ee797b33d6eebee2d0298b7cb1b1a62d6140d3f9563ed7479c508da55234148981e57fe159e842 diff --git a/dev-lang/lua-headers/lua-headers-5.1.4.ebuild b/dev-lang/lua-headers/lua-headers-5.1.4.ebuild deleted file mode 100644 index 4550f63..0000000 --- a/dev-lang/lua-headers/lua-headers-5.1.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ - -EAPI="5" - -MY_P="lua-${PV}" - -DESCRIPTION="Lua public API headers." -HOMEPAGE="http://www.lua.org/"; -SRC_URI="http://www.lua.org/ftp/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ - -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - -i src/luaconf.h || die "failed patching luaconf.h" -} - -src_compile() { :; } - -src_install() { - has_version dev-lang/lua || { - insinto /usr/include - doins src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h etc/lua.hpp || die 'doins failed.' - } -} diff --git a/dev-lang/lua-headers/lua-headers-5.1.5.ebuild b/dev-lang/lua-headers/lua-headers-5.1.5.ebuild deleted file mode 100644 index 4550f63..0000000 --- a/dev-lang/lua-headers/lua-headers-5.1.5.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ - -EAPI="5" - -MY_P="lua-${PV}" - -DESCRIPTION="Lua public API headers." -HOMEPAGE="http://www.lua.org/"; -SRC_URI="http://www.lua.org/ftp/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ - -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - -i src/luaconf.h || die "failed patching luaconf.h" -} - -src_compile() { :; } - -src_install() { - has_version dev-lang/lua || { - insinto /usr/include - doins src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h etc/lua.hpp || die 'doins failed.' - } -} diff --git a/dev-lang/lua-headers/lua-headers-5.2.0.ebuild b/dev-lang/lua-headers/lua-headers-5.2.0.ebuild deleted file mode 100644 index 613dfe3..0000000 --- a/dev-lang/lua-headers/lua-headers-5.2.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ - -EAPI="5" - -MY_P="lua-${PV}" - -DESCRIPTION="Lua public API headers." -HOMEPAGE="http://www.lua.org/"; -SRC_URI="http://www.lua.org/ftp/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ - -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - -i src/luaconf.h || die "failed patching luaconf.h" -} - -src_compile() { :; } - -src_install() { - has_version dev-lang/lua || { - insinto /usr/include - doins src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h src/lua.hpp || die 'doins failed.' - } -} diff --git a/dev-lang/lua-headers/lua-headers-5.2.1.ebuild b/dev-lang/lua-headers/lua-headers-5.2.1.ebuild deleted file mode 100644 index 613dfe3..0000000 --- a/dev-lang/lua-headers/lua-headers-5.2.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ - -EAPI="5" - -MY_P="lua-${PV}" - -DESCRIPTION="Lua public API headers." -HOMEPAGE="http://www.lua.org/"; -SRC_URI="http://www.lua.org/ftp/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - sed \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ - -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - -i src/luaconf.h || die "failed patching luaconf.h" -} - -src_compile() { :; } - -src_install() { - has_version dev-lang/lua || { - insinto /usr/include - doins src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h src/lua.hpp || die 'doins failed.' - } -} diff --git a/dev-lang/lua-headers/metadata.xml b/dev-lang/lua-headers/metadata.xml deleted file mode 100644 index dc4b7b0..0000000 --- a/dev-lang/lua-headers/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer> - <email>[email protected]</email> - <name>Rafael Martins</name> - </maintainer> - <maintainer> - <email>[email protected]</email> - <name>Vadim A. Misbakh-Soloviov</name> - </maintainer> -</pkgmetadata> diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild index c663010..d3974bc 100644 --- a/dev-lang/luajit/luajit-2.0.9999.ebuild +++ b/dev-lang/luajit/luajit-2.0.9999.ebuild @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}" PDEPEND=" virtual/lua[luajit] + app-eselect/eselect-luajit " HTML_DOCS=( "doc/" ) @@ -35,9 +36,7 @@ MULTILIB_WRAPPED_HEADERS=( check_req() { if use optimization; then - CHECKREQS_MEMORY="200M" - ewarn "Optimized (amalgamated) build wants at least 200MB of RAM" - ewarn "If you have no such RAM - try to disable 'optimization' flag" + CHECKREQS_MEMORY="300M" check-reqs_pkg_${1} fi } @@ -53,34 +52,47 @@ pkg_setup() { src_prepare(){ # fixing prefix and version sed -r \ - -e 's|(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ - -e 's|(FILE_MAN)=.*|\1='${PN}'-$(VERSION).1|' \ + -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ + -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \ -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ - -e 's|(INSTALL_PCNAME)=.*|\1='${PN}'-$(VERSION).pc|' \ + -e 's|^(INSTALL_PCNAME)=.*|\1=${PN}-$(VERSION).pc|' \ + -e 's|^(INSTALL_SOSHORT)=.*|\1=lib${PN}-${SLOT}.so|' \ + -e 's|^(INSTALL_ANAME)=.*|\1=lib${PN}-${SLOT}.a|' \ + -e 's|^(INSTALL_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ -e 's|( PREFIX)=.*|\1=/usr|' \ + -e '/\$\(SYMLINK\)\ \$\(INSTALL_TNAME\)\ \$\(INSTALL_TSYM\)/d' \ -i Makefile || die "failed to fix prefix in Makefile" -# -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \ + sed -r \ + -e 's|^(libname=.*-)\$\{abiver\}|\1${majver}.${minver}|' \ + -i "etc/${PN}.pc" || die "Failed to slottify" + + sed -r \ + -e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ + -i src/Makefile || die "Failed to slottify" use debug && ( sed -r \ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \ -i src/Makefile || die "Failed to enable debug" - ) + ) mv "${S}"/etc/${PN}.1 "${S}"/etc/${PN}-${SLOT}.1 multilib_copy_sources } +multilib_src_configure() { + sed -r \ + -e "s|^(prefix)=.*|\1=/usr|" \ + -e "s|^(multilib)=.*|\1=$(get_libdir)|" \ + -i "etc/${PN}.pc" || die "Failed to slottify" +} + multilib_src_compile() { local opt xcflags; use optimization && opt="amalg"; tc-export CC -# STATIC_CC="$(tc-getCC)" \ -# DYNAMIC_CC="$(tc-getCC) -fPIC" \ -# TARGET_LD="$(tc-getCC)" \ -# TARGET_AR="$(tc-getAR) rcus" \ xcflags=( $(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "") @@ -98,14 +110,12 @@ multilib_src_compile() { } multilib_src_install() { - local lua_abi="5.1"; emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install base_src_install_docs host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}" - dosym "${PN}-${SLOT}" "/usr/bin/${PN}" - dosym "lib${PN}-${lua_abi}.so.${SLOT}" "/usr/$(get_libdir)/lib${PN}-${SLOT}.so" - dosym "${PN}-${SLOT}.1" "/usr/share/man/man1/luacjit-${SLOT}.1" + newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1" newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}" + [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${ED}usr/bin/${PN}" } diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index e1b6393..e479b08 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}" PDEPEND=" virtual/lua[luajit] + app-eselect/eselect-luajit " HTML_DOCS=( "doc/" ) @@ -35,9 +36,7 @@ MULTILIB_WRAPPED_HEADERS=( check_req() { if use optimization; then - CHECKREQS_MEMORY="200M" - ewarn "Optimized (amalgamated) build wants at least 200MB of RAM" - ewarn "If you have no such RAM - try to disable 'optimization' flag" + CHECKREQS_MEMORY="300M" check-reqs_pkg_${1} fi } @@ -53,34 +52,47 @@ pkg_setup() { src_prepare(){ # fixing prefix and version sed -r \ - -e 's|(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ - -e 's|(FILE_MAN)=.*|\1='${PN}'-$(VERSION).1|' \ + -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ + -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \ -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ - -e 's|(INSTALL_PCNAME)=.*|\1='${PN}'-$(VERSION).pc|' \ + -e 's|^(INSTALL_PCNAME)=.*|\1=${PN}-$(VERSION).pc|' \ + -e 's|^(INSTALL_SOSHORT)=.*|\1=lib${PN}-${SLOT}.so|' \ + -e 's|^(INSTALL_ANAME)=.*|\1=lib${PN}-${SLOT}.a|' \ + -e 's|^(INSTALL_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ -e 's|( PREFIX)=.*|\1=/usr|' \ + -e '/\$\(SYMLINK\)\ \$\(INSTALL_TNAME\)\ \$\(INSTALL_TSYM\)/d' \ -i Makefile || die "failed to fix prefix in Makefile" -# -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \ + sed -r \ + -e 's|^(libname=.*-)\$\{abiver\}|\1${majver}.${minver}|' \ + -i "etc/${PN}.pc" || die "Failed to slottify" + + sed -r \ + -e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ + -i src/Makefile || die "Failed to slottify" use debug && ( sed -r \ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \ -i src/Makefile || die "Failed to enable debug" - ) + ) mv "${S}"/etc/${PN}.1 "${S}"/etc/${PN}-${SLOT}.1 multilib_copy_sources } +multilib_src_configure() { + sed -r \ + -e "s|^(prefix)=.*|\1=/usr|" \ + -e "s|^(multilib)=.*|\1=$(get_libdir)|" \ + -i "etc/${PN}.pc" || die "Failed to slottify" +} + multilib_src_compile() { local opt xcflags; use optimization && opt="amalg"; tc-export CC -# STATIC_CC="$(tc-getCC)" \ -# DYNAMIC_CC="$(tc-getCC) -fPIC" \ -# TARGET_LD="$(tc-getCC)" \ -# TARGET_AR="$(tc-getAR) rcus" \ xcflags=( $(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "") @@ -98,14 +110,12 @@ multilib_src_compile() { } multilib_src_install() { - local lua_abi="5.1"; emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install base_src_install_docs host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}" - dosym "${PN}-${SLOT}" "/usr/bin/${PN}" - dosym "lib${PN}-${lua_abi}.so.${SLOT}" "/usr/$(get_libdir)/lib${PN}-${SLOT}.so" - dosym "${PN}-${SLOT}.1" "/usr/share/man/man1/luacjit-${SLOT}.1" + newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1" newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}" + [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${ED}usr/bin/${PN}" }
