luajit: finalizing prefix-compat

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