From 0bae6858548a45e0a1171a0dca6907c52eb4d77f Mon Sep 17 00:00:00 2001
From: ILMostro <ilmostro7@gmail.com>
Date: Wed, 27 Jun 2018 07:31:50 -0500
Subject: fixed man-page version file conflict for luajit and eselect-luajit;

updated luajit-2.0.5-r1 to conform to others
---
 app-eselect/eselect-luajit/files/luajit.eselect-1 |  2 +-
 dev-lang/luajit/files/luajit-nosymlinks.patch     | 13 ++++++++++---
 dev-lang/luajit/luajit-2.0.5-r1.ebuild            |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app-eselect/eselect-luajit/files/luajit.eselect-1 b/app-eselect/eselect-luajit/files/luajit.eselect-1
index 57f976a..89d789a 100644
--- a/app-eselect/eselect-luajit/files/luajit.eselect-1
+++ b/app-eselect/eselect-luajit/files/luajit.eselect-1
@@ -28,7 +28,7 @@ set_symlinks() {
 		ln -s "${dir}"/lua/${do_show}/luajit-{$ver}/libluajit{$ver}.so "${dir}"/libluajit{$ver,}.so
 		ln -s "${dir}"/pkgconfig/luajit{$ver,}.pc
 	done
-	for orig in "${EROOT}"/usr/share/man/man1/lua*$ver.1* ; do
+	for orig in "${EROOT}"/usr/share/man/man1/luajit-$ver.1* ; do
 		ln -s "${orig}" "${orig//$ver}"
 	done
 	for f in $HEADER_FILES ; do
diff --git a/dev-lang/luajit/files/luajit-nosymlinks.patch b/dev-lang/luajit/files/luajit-nosymlinks.patch
index 290ce22..2a6f494 100644
--- a/dev-lang/luajit/files/luajit-nosymlinks.patch
+++ b/dev-lang/luajit/files/luajit-nosymlinks.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 85678ee..4d70d98 100644
+index 85678ee..1399d81 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -32,7 +32,7 @@ DPREFIX= $(DESTDIR)$(PREFIX)
@@ -56,7 +56,7 @@ index 85678ee..4d70d98 100644
  INSTALL_X= install -m 0755
  INSTALL_F= install -m 0644
  UNINSTALL= $(RM)
-@@ -109,19 +107,16 @@ install: $(INSTALL_DEP)
+@@ -109,24 +107,21 @@ install: $(INSTALL_DEP)
  	$(MKDIR) $(INSTALL_DIRS)
  	cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
  	cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :
@@ -67,8 +67,9 @@ index 85678ee..4d70d98 100644
 -	  $(LDCONFIG) $(INSTALL_LIB) && \
 -	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
 -	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
 +	  $(LDCONFIG) $(INSTALL_LIB) || :
- 	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
++	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(VERSION).1
  	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
  	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
  	  $(RM) $(FILE_PC).tmp
@@ -78,3 +79,9 @@ index 85678ee..4d70d98 100644
  	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
  
  uninstall:
+ 	@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
+-	$(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
++	$(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN)/luajit-$(VERSION).1 $(INSTALL_PC)
+ 	for file in $(FILES_JITLIB); do \
+ 	  $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
+ 	  done
diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index 19dd108..1db0ddd 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="http://luajit.org/"
 SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
 LICENSE="MIT"
-SLOT="2.0.5-r1"
+SLOT="2.0.5"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
-- 
cgit v1.2.3-65-gdbad