gentoo resync : 25.08.2020

4 files changed, 160 insertions, 72 deletions

diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index d43dc98e7999..66998de06564 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,4 +1,5 @@
-AUX libjsw-1.5.8-build.patch 3093 BLAKE2B c7e36fb40808241f5c64e8d9d28824f7f9a6824cd74bd4d9d5dd87a2dccb6d2469fdaddfe072a44a4d026ac78a3ec7024fd7e88d8ee9069a2845a63c8631fd84 SHA512 be2933152b4f47637c744364218a00e36dd39efe8a15e2641940ce12dec1cc0a7e4a103f2fec6431c986b357bde2f500d33ba64d649e827ea5cf6d1cb00d824f
+AUX libjsw-1.5.8-build.patch 4628 BLAKE2B 87ec8de6e4c59648dd53c425a7936af8fccd98f0eabd166752b08ba1c5c6f004a40060730ec92be8c8e55ff11387ca68b77ce2d870d74895907152bb3b89b0fc SHA512 928d086db70a35ba8af7b9dd3a6cd4216e8139dadbdae28db540bfa319b13cfa6c14777c3011469fedb8f9b2c3dfa65944d55c65c3354fac942939f4f1b1878e
+AUX libjsw-1.5.8-musl.patch 250 BLAKE2B e68307555f16f53db5e193a41dbe3d38260dfbaf54d1d13168bbbd498d37ec5a76949ede71d2da2939ba0ed82128ba685834faababcaa456d5c0b66792254d36 SHA512 4fa36034e04721edc328eaf45093bcac81ba69e5a297eed346ecd0b974890ba1b3e79d85ca2c896bd4df1741159034df63553c2fdef545dd30801f5a0c4e81b8
 DIST libjsw-1.5.8.tar.bz2 348121 BLAKE2B 5619c32657105eede8fefbd8cba51c1e193853517dfb7642fb9f97888ecd99a753934d30f9c1a3bb689a77607cc1eaf518d2112f7ba5ce2d198b7800642b8c8d SHA512 b858ed124366bd2df6710c07d82a447cc7227f1e442b3a3652d50734d97edef45b42b5a8bf84d4675c0130ab4da080a8409bfb6e1c80cb747930ac431dbf1226
-EBUILD libjsw-1.5.8.ebuild 921 BLAKE2B f096eade3b0ddaf617424f6b5fa829a04c9727f8538381df50681e4afbfa279fdcabe5b8c42bf6007b977ad901f62723df7d4511e20579e1188a288074b46ed3 SHA512 d20b905cc26221cf9e8a561c3635371bef51dde2937fa811bda98c4a8c53efdcc28ec7229b3ea6bce183a242cbc200752568a1c7d36455fb73526a7e1c3f3f9a
+EBUILD libjsw-1.5.8.ebuild 950 BLAKE2B 02c04eae9d27885e36d4f8ac4ab0d0e638f3a26ad467debc71ed03128a3d3b1abc2e61f149dbba386bf7e72b26115b137644c813715e6badf0e315e262dca5ad SHA512 668e5103f995a292030a793657d363efdad05322133c260477de7ce91020bf4724d1d8195a21000277940c3f0408af66a75245e3a5dd066a80cfac865754ad7b
 MISC metadata.xml 327 BLAKE2B 80a44a6643e998cbffdeebefff28dc9f6f3729b82f9d2c88ffb73cd68f6e68926f24f4d3ec30d4f9e6fc94fa511130e6dde1f92cf95a31e542b28dd3879442b9 SHA512 4650cad04ddc9be998c7d9560dfb0732fed12908c288751c256e351444a3c596401ba81eb43fe8679881d660c89bcc5d08dbcd80c5130a8d5aae5f4c2eac7fa1
diff --git a/media-libs/libjsw/files/libjsw-1.5.8-build.patch b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
index d786195058c1..ebe7dfc93ef7 100644
--- a/media-libs/libjsw/files/libjsw-1.5.8-build.patch
+++ b/media-libs/libjsw/files/libjsw-1.5.8-build.patch
@@ -1,60 +1,17 @@
---- libjsw/Makefile.old	2010-03-22 17:03:21.000000000 +0100
-+++ libjsw/Makefile	2010-03-22 17:07:02.000000000 +0100
-@@ -51,10 +51,10 @@
- #                               to debug the program.
- #
- 
--CFLAGS = -Wall -O2 -g
--CFLAGS += -ffast-math
-+CFLAGS += -fPIC
-+CXXFLAGS += -fPIC
- 
--CPPFLAGS = -D__cplusplus
-+CPPFLAGS += -D__cplusplus
- 
- 
- # ########################################################################
-@@ -82,11 +82,9 @@
- OBJ_C   = $(SRC_C:.c=.o)
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
--	@echo "Compiling module $*.o"
--	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
- .cpp.o:
--	@echo "Compiling module $*.o"
--	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
- 
- 
- # ########################################################################
-@@ -95,13 +93,7 @@
- $(LIB): prebuild modules postbuild
- 
- modules: $(OBJ_C) $(OBJ_CPP)
--	@echo  -n "Linking modules..."
--	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
--	@echo -n "   "
--	@$(RM) $(RMFLAGS) $(LIBPFX).so
--	@$(LINK) -s $(LIB) $(LIBPFX).so
--	@$(LINK) -s $(LIB) $(LIBPFX).so.1
--	@-$(LS) $(LSFLAGS) $(LIB)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS)
- 
- prebuild:
- 	@echo "Building library \"$(LIB)\"..."
---- jscalibrator/Makefile.old	2010-03-22 17:08:07.000000000 +0100
-+++ jscalibrator/Makefile	2010-03-22 17:11:26.000000000 +0100
-@@ -59,9 +59,6 @@
+--- a/jscalibrator/Makefile
++++ b/jscalibrator/Makefile
+@@ -59,10 +59,7 @@
  #CFLAGS = -Wall -O -g \
  #         `gtk-config --cflags`
  
 -CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops -ffast-math \
 -         `gtk-config --cflags`
 -
- CPPFLAGS = -D__cplusplus
+-CPPFLAGS = -D__cplusplus
++CPPFLAGS = 
  
  
+ # ########################################################################
 @@ -76,7 +73,7 @@
  #   to the LIB line depending on what you have set in the CFLAGS line
  #   farther above.
@@ -82,21 +39,27 @@
  
  
  # ########################################################################
-@@ -117,11 +114,9 @@
+@@ -111,17 +108,13 @@
+ RM      = rm
+ RMFLAGS = -f
+ 
+-CC  = cc
+-CPP = c++
+ BIN = jscalibrator
  OBJ_C   = $(SRC_C:.c=.o)
  OBJ_CPP = $(SRC_CPP:.cpp=.o)
  .c.o:
 -	@echo "Compiling module $*.o"
 -	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
  .cpp.o:
 -	@echo "Compiling module $*.o"
 -	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	$(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
  
  
  # ########################################################################
-@@ -130,10 +125,7 @@
+@@ -130,10 +123,7 @@
  $(BIN): prebuild modules postbuild
  
  modules: $(OBJ_C) $(OBJ_CPP)
@@ -104,7 +67,115 @@
 -	@$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
 -	@echo -n "   "
 -	@-$(LS) $(LSFLAGS) $(BIN)
-+	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LDFLAGS) $(LIB_DIRS) $(LIBS)
++	$(CC) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS)
  
  prebuild:
  	@echo "Building program \"$(BIN)\"..."
+--- a/jswdemos/Makefile
++++ b/jswdemos/Makefile
+@@ -1,5 +1,5 @@
+ # Compiler flags
+-CFLAGS = -g -O2 -Wall
++CFLAGS += -Wall
+ 
+ # Libraries to link to
+ LIB = -ljsw
+@@ -10,10 +10,6 @@
+ # Include paths
+ INC_DIRS =
+ 
+-# Compiler
+-CC = gcc
+-CPP = g++
+-
+ # Utilities
+ RM      = rm
+ RMFLAGS = -f
+@@ -25,22 +21,23 @@
+ 
+ axis:
+ 	@echo "Compiling program \"axis\""
+-	@$(CC) axis.c -o axis $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) axis.c -o axis $(LIB) $(LIB_DIRS)
+ 
+ basic:
+ 	@echo "Compiling program \"basic\""
+-	@$(CC) basic.c -o basic $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) basic.c -o basic $(LIB) $(LIB_DIRS)
+ 
+ button:
+ 	@echo "Compiling program \"button\""
+-	@$(CC) button.c -o button $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) button.c -o button $(LIB) $(LIB_DIRS)
+ 
+ listing:
+ 	@echo "Compiling program \"listing\""
+-	@$(CC) listing.c -o listing $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) listing.c -o listing $(LIB) $(LIB_DIRS)
++
+ waitbtn:
+ 	@echo "Compiling program \"waitbtn\""
+-	@$(CC) waitbtn.c -o waitbtn $(CFLAGS) $(LIB) $(LIB_DIRS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) waitbtn.c -o waitbtn $(LIB) $(LIB_DIRS)
+ 
+ # Clean up intermediate files
+ clean:
+--- a/libjsw/Makefile
++++ b/libjsw/Makefile
+@@ -51,17 +51,15 @@
+ #                               to debug the program.
+ #
+ 
+-CFLAGS = -Wall -O2 -g
+-CFLAGS += -ffast-math
+-
+-CPPFLAGS = -D__cplusplus
++CFLAGS += -fPIC
++CXXFLAGS += -fPIC
+ 
+ 
+ # ########################################################################
+ # Dependant Libraries:
+ #
+ INC_DIRS =
+-LIBS     = -shared
++LIBS     = -shared -Wl,-soname,libjsw.so.1
+ LIB_DIRS =
+ 
+ 
+@@ -76,18 +74,13 @@
+ LS      = ls
+ LSFLAGS = -s -h -c --color=auto
+ 
+-CC  = cc
+-CPP = c++
+ LIB = $(LIBPFX).so.$(LIBVER)
+ OBJ_C   = $(SRC_C:.c=.o)
+ OBJ_CPP = $(SRC_CPP:.cpp=.o)
+ .c.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
+ .cpp.o:
+-	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+-
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INC_DIRS) -c $< -o $@
+ 
+ # ########################################################################
+ # Build Rules:
+@@ -95,13 +88,7 @@
+ $(LIB): prebuild modules postbuild
+ 
+ modules: $(OBJ_C) $(OBJ_CPP)
+-	@echo  -n "Linking modules..."
+-	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+-	@echo -n "   "
+-	@$(RM) $(RMFLAGS) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so
+-	@$(LINK) -s $(LIB) $(LIBPFX).so.1
+-	@-$(LS) $(LSFLAGS) $(LIB)
++	$(CXX) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LIBS) $(LIB_DIRS)
+ 
+ prebuild:
+ 	@echo "Building library \"$(LIB)\"..."
diff --git a/media-libs/libjsw/files/libjsw-1.5.8-musl.patch b/media-libs/libjsw/files/libjsw-1.5.8-musl.patch
new file mode 100644
index 000000000000..9a6f116e8302
--- /dev/null
+++ b/media-libs/libjsw/files/libjsw-1.5.8-musl.patch
@@ -0,0 +1,11 @@
+--- a/include/os.h
++++ b/include/os.h
+@@ -254,7 +254,7 @@
+ typedef int                     int32_t;
+ typedef unsigned int            u_int32_t;
+ 
+-# if __GNUC__ >= 2
++# if __GLIBC__ >= 2
+ 
+ #  ifndef int64_t
+ typedef long long               int64_t;
diff --git a/media-libs/libjsw/libjsw-1.5.8.ebuild b/media-libs/libjsw/libjsw-1.5.8.ebuild
index c025a7f50f9f..92ca06fcddb4 100644
--- a/media-libs/libjsw/libjsw-1.5.8.ebuild
+++ b/media-libs/libjsw/libjsw-1.5.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers"
 HOMEPAGE="http://freshmeat.net/projects/libjsw/"
@@ -11,34 +12,38 @@ SRC_URI="http://wolfsinger.com/~wolfpack/packages/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
 
-DEPEND=""
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch # 724664
+	"${FILESDIR}"/${P}-musl.patch # 713792
+)
 
 src_prepare() {
-	cp include/jsw.h libjsw/
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
+
+	cp include/jsw.h libjsw/ || die
 	bunzip2 libjsw/man/* || die
 }
 
+src_configure() {
+	tc-export CC CXX
+}
+
 src_compile() {
-	LDFLAGS+=" -Wl,-soname,libjsw.so.1"
-	cd libjsw
-	emake
-	ln -s libjsw.so.${PV} libjsw.so
+	emake -C libjsw
 }
 
 src_install() {
-	insinto /usr/include
-	doins include/jsw.h
+	doheader include/jsw.h
 
 	dodoc README
-	docinto jswdemos
-	dodoc jswdemos/*
+	dodoc -r jswdemos
+	docompress -x /usr/share/doc/${PF}/jswdemos
 
-	cd "${S}"/libjsw
+	cd libjsw || die
 	dolib.so libjsw.so.${PV}
 	dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so
 	dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so.1
+
 	doman man/*
 }