[gentoo-commits] proj/lua:master commit in: dev-lang/luajit/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
Date: Wed,  1 Nov 2017 11:43:37 +0000 (UTC)	[thread overview]
Message-ID: <1509536605.c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be.mva@gentoo> (raw)

commit:     c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov  1 11:43:25 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> 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

next             reply	other threads:[~2017-11-01 11:43 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-01 11:43 Vadim A. Misbakh-Soloviov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-07-14 15:49 [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/ Vadim A. Misbakh-Soloviov
2017-11-02  7:21 Vadim A. Misbakh-Soloviov
2017-11-01  7:58 Vadim A. Misbakh-Soloviov
2016-04-30  6:51 Vadim A. Misbakh-Soloviov
2015-10-31 23:52 Vadim A. Misbakh-Soloviov
2015-06-08  6:52 Vadim A. Misbakh-Soloviov
2015-06-08  6:26 Vadim A. Misbakh-Soloviov
2015-04-07  3:45 Vadim A. Misbakh-Soloviov
2015-04-04 12:07 Vadim A. Misbakh-Soloviov
2015-04-04 12:02 Vadim A. Misbakh-Soloviov
2014-06-16 15:32 Vadim A. Misbakh-Soloviov
2014-01-21 20:15 Vadim A. Misbakh-Soloviov
2013-12-29 12:13 Vadim A. Misbakh-Soloviov
2013-12-18 18:27 Vadim A. Misbakh-Soloviov
2013-12-18 11:58 Vadim A. Misbakh-Soloviov
2013-05-27 20:30 Vadim A. Misbakh-Soloviov
2013-05-27 19:42 Vadim A. Misbakh-Soloviov
2013-05-27 18:49 Vadim A. Misbakh-Soloviov
2013-05-27 18:35 Vadim A. Misbakh-Soloviov
2013-05-27  7:52 Vadim A. Misbakh-Soloviov
2013-05-26 22:01 Vadim A. Misbakh-Soloviov
2013-05-26  8:31 Vadim A. Misbakh-Soloviov
2013-05-10  8:53 Vadim A. Misbakh-Soloviov
2013-03-19  7:31 Vadim A. Misbakh-Soloviov
2012-08-08 20:38 Misbakh-Soloviev Vadim A.
2012-08-08 13:01 Misbakh-Soloviev Vadim A.
2012-08-08 12:39 Misbakh-Soloviev Vadim A.
2012-08-08 12:32 Misbakh-Soloviev Vadim A.
2012-07-13 18:27 Misbakh-Soloviev Vadim A.
2012-07-13  2:31 Misbakh-Soloviev Vadim A.
2012-07-13  1:55 Misbakh-Soloviev Vadim A.
2012-07-12 22:46 Misbakh-Soloviev Vadim A.
2012-05-09  5:48 Misbakh-Soloviev Vadim A.

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:cb14064 dfblob:4d86ebb dfblob:a241d93 dfblob:f0d3866 )
 OR (
bs:"[gentoo-commits] proj/lua:master commit in: dev-lang/luajit/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1509536605.c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be.mva@gentoo \
    --to=mva@mva.name \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox