From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 20 Mar 2021 14:27:17 +0000
Subject: gentoo resync : 20.03.2021

---
 x11-libs/xpa/Manifest                        |  4 +--
 x11-libs/xpa/files/xpa-2.1.18-makefile.patch | 44 ++++++++++++++++++++++++----
 x11-libs/xpa/xpa-2.1.18.ebuild               | 22 +++++++++-----
 3 files changed, 54 insertions(+), 16 deletions(-)

(limited to 'x11-libs/xpa')

diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index c7e2dae224b5..0939594061f8 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,5 +1,5 @@
 AUX xpa-2.1.18-include.patch 249 BLAKE2B 9ddd35eefbcf2c2e538c78dd71047cd31ec384b9d4c394c0bb15a24e20baeed5d65c392fa430364d5ddd24b599d760869cfd45a1e72726b2434e60b5bb00056f SHA512 341980f141b4587e9ab6825976c302ec3d831cdd761fc52be13fec9736045532b7ff10dc9969d7cd2dbe631ba2e5d35dcfbfca5700c13e6a678df1c27ff7a540
-AUX xpa-2.1.18-makefile.patch 3382 BLAKE2B fda26e82e3179838cc79d97e469b85a576e9b43419de58238950ddbd10c34294cb84fe70f29d2a5bb7387d7c6677abf4f9a5504a47f48aae2bfa73cac7abcb96 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392
+AUX xpa-2.1.18-makefile.patch 4292 BLAKE2B 544ca028d44c5bc22ca90fc70d67b115b980535dfa4c15434bda5a021c1d35fe79b2000d64c23387e2b4595f46378f473e23a5283125044e01232057fcb7eaba SHA512 a416774e5d5ac329bf896fb1ead760b9c201e9385f6167f712730b991ce7a5cbf0b9622b4878f252c1524733012fc846bd824741fd170a3f0b2a95342dcbfdf5
 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19
-EBUILD xpa-2.1.18.ebuild 1221 BLAKE2B b89ecc8ef83feaada40d2ba2f8f65f225ba4bef9ac1498903f926a850aafcb3479615d0e94409f4d2c7a3a801603318eff8296ad98930dc4a540de18d4f49232 SHA512 f9a3717b05a948de728505db02d44b98904ea8d5dd898f0b59272dea986ca26bc84f5cf325d4c34f88430732c6ab9380edf9d3cbd675b629073443221893dc3a
+EBUILD xpa-2.1.18.ebuild 1247 BLAKE2B 5677baca53d968378dd5f01940a59eff6209675dff1671d8bb7954d8309c300ea097bed7ff25bc3666935e26d773d94ebf34edda4ad27ef190f6468360b4b6b1 SHA512 12c70596aff631bc9bcd788010c7a13ff67aead7beca75a83e368cb946c3ce30352012cacad521d46db136e3e0aa6c9e82cbfc7fe76dc027937f8c2a823ff543
 MISC metadata.xml 1072 BLAKE2B 41e28666089a2ea7fb726abcbd92cacee49dce705d193be11e172bf90072429a8d97059682ca5d8d40fc8ad36431e07ad5c2421f6c3d77b6d7861ce3e58e7875 SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7
diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
index 34aeed5b39dd..1ceb29dbfcb2 100644
--- a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
+++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in	2016-12-19 19:21:28.566222982 +0000
-+++ b/Makefile.in	2016-12-19 19:23:23.795246443 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -28,6 +28,11 @@
  
  prefix =		@prefix@
@@ -37,24 +37,33 @@
  
  # Platform-specific X compiler flags (include file specifications)
  X_CFLAGS = 		@X_CFLAGS@
-@@ -177,7 +182,7 @@
+@@ -173,12 +178,12 @@
+ 
+ $(LIB):		$(LIBOBJS)
+ 		$(RM) $(LIB)
+-		ar crv $(LIB) $(LIBOBJS)
++		$(AR) crv $(LIB) $(LIBOBJS)
  		$(RANLIB) $(LIB)
  
  shlib:		$(LIB)
 -		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+-		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
- 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
++		(cd lib$(PACKAGE).tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
-@@ -193,7 +198,7 @@
+ 		CC='$(CC)' CXX=$(CXX) \
+@@ -193,8 +198,8 @@
  		-lwsock32
  
  tclxpa:		$(LIB)
 -		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+-		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 +		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
- 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
++		(cd libtclxpa.tmp && $(AR) x ../lib$(PACKAGE).a); \
  		rm -f libtclxpa.tmp/xt*.o; \
  		CC='$(CC)' CXX=$(CXX) \
+ 		./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \
 @@ -275,7 +280,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
@@ -108,3 +117,26 @@
  		cp -p -R ./man/* $(DISTDIR)/man/.)
  
  release:	dist
+--- a/mklib
++++ b/mklib
+@@ -211,9 +211,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+ 
+@@ -248,7 +248,7 @@
+         elif [ $STATIC = 1 ] ; then
+             LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
+             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+-            LINK="ar"
++            LINK="${AR}"
+             OPTS="-ru"
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
index 623d26c31983..984f56d2241d 100644
--- a/x11-libs/xpa/xpa-2.1.18.ebuild
+++ b/x11-libs/xpa/xpa-2.1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Messaging system providing communication between programs"
 HOMEPAGE="https://github.com/ericmandel/xpa"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-lang/tcl:0=
@@ -26,12 +26,13 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \
-		-i mklib || die
+	sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" -i mklib || die
 	eautoconf
 }
 
 src_configure() {
+	tc-export AR CC
+
 	econf \
 		--enable-shared \
 		--enable-threaded-xpans \
@@ -47,11 +48,16 @@ src_compile() {
 src_install() {
 	dodir /usr/$(get_libdir)
 	emake INSTALL_ROOT="${D}" install
+
 	insinto /usr/$(get_libdir)/tclxpa
 	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
+
+	mv "${ED}"/usr/$(get_libdir)/libtclxpa* \
 		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
+
 	dodoc README
 	use doc && dodoc doc/*.pdf && dodoc doc/*.html
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+
+	# no static archives
+	rm "${ED}"/usr/$(get_libdir)/libxpa.a || die
 }
-- 
cgit v1.2.3