From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EB1B1396D9 for ; Wed, 1 Nov 2017 11:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8520E0844; Wed, 1 Nov 2017 11:43:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89A03E0844 for ; Wed, 1 Nov 2017 11:43:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 319DB3406D1 for ; Wed, 1 Nov 2017 11:43:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF2399113 for ; Wed, 1 Nov 2017 11:43:37 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1509536605.c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be.mva@gentoo> Subject: [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/ X-VCS-Repository: proj/lua X-VCS-Files: dev-lang/luajit/luajit-2.0.9999.ebuild dev-lang/luajit/luajit-2.1.9999.ebuild X-VCS-Directories: dev-lang/luajit/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be X-VCS-Branch: master Date: Wed, 1 Nov 2017 11:43:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a4b80b4-1c84-442f-a78c-12ede42492e0 X-Archives-Hash: 53e8e89bb094ebe5155d914371c8c721 commit: c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Wed Nov 1 11:43:25 2017 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Wed Nov 1 11:43:25 2017 +0000 URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=c51bb2d0 luajit: finalizing prefix-compat dev-lang/luajit/luajit-2.0.9999.ebuild | 34 +++++++--------------------------- dev-lang/luajit/luajit-2.1.9999.ebuild | 5 ++--- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild index cb14064..4d86ebb 100644 --- a/dev-lang/luajit/luajit-2.0.9999.ebuild +++ b/dev-lang/luajit/luajit-2.0.9999.ebuild @@ -30,7 +30,7 @@ PDEPEND=" virtual/lua[luajit] " -HTML_DOCS=( "doc/" ) +HTML_DOCS=( "doc/." ) MULTILIB_WRAPPED_HEADERS=( "/usr/include/luajit-${SLOT}/luaconf.h" @@ -53,42 +53,22 @@ pkg_setup() { src_prepare() { patches_src_prepare - # fixing prefix and version -# sed -r \ -# -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ -# -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ -# -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \ -# -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" sed -r \ -e 's|^(VERSION)=.*|\1=${PV}|' \ -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ -e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ - -e 's|( PREFIX)=.*|\1=${EPREFIX}/usr|' \ + -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \ -e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ -i Makefile || die "failed to fix prefix in Makefile" -# 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" - sed -r \ -e 's|^(#define LUA_LJDIR).*|\1 "/'${P}'/"|' \ -i src/luaconf.h || die "Failed to slotify" use debug && ( sed -r \ - -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \ + -e 's/#(CCDEBUG= -g)/\1 -OO/' \ -i src/Makefile || die "Failed to enable debug" ) mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1 @@ -98,7 +78,7 @@ src_prepare() { multilib_src_configure() { sed -r \ - -e "s|^(prefix)=.*|\1=${EPREFIX}/usr|" \ + -e "s|^(prefix)=.*|\1=${EROOT}usr|" \ -e "s|^(multilib)=.*|\1=$(get_libdir)|" \ -i "etc/${PN}.pc" || die "Failed to slottify" } @@ -125,7 +105,7 @@ multilib_src_compile() { } multilib_src_install() { - emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install + emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install einstalldocs @@ -136,10 +116,10 @@ multilib_src_install() { } pkg_postinst() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then + if [[ ! -n $(readlink "${EROOT}"usr/bin/luajit) ]] ; then eselect luajit set luajit-${PV} fi - if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then + if [[ ! -n $(readlink "${EROOT}"usr/bin/lua) ]] ; then eselect lua set jit-${PV} fi } diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index a241d93..f0d3866 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -69,12 +69,11 @@ src_prepare() { use debug && ( sed -r \ - -e 's/#(CCDEBUG= -g)/\1 -ggdb -O0/' \ + -e 's/#(CCDEBUG= -g)/\1 -O0/' \ -i src/Makefile || die "Failed to enable debug" ) mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1 - eapply_user multilib_copy_sources } @@ -112,7 +111,7 @@ multilib_src_compile() { } multilib_src_install() { - emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install + emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install einstalldocs