gentoo resync : 28.04.2021

6 files changed, 38 insertions, 29 deletions

diff --git a/dev-games/KXL/KXL-1.1.7-r2.ebuild b/dev-games/KXL/KXL-1.1.7-r3.ebuild
index ab0d291a05c8..7620b659e603 100644
--- a/dev-games/KXL/KXL-1.1.7-r2.ebuild
+++ b/dev-games/KXL/KXL-1.1.7-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Development Library for making games for X"
 HOMEPAGE="http://kxl.orz.hm/"
@@ -11,23 +12,31 @@ SRC_URI="http://kxl.hn.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
 DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-m4.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-m4.patch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-games/KXL/Manifest b/dev-games/KXL/Manifest
index ed450317e76d..aa56badf2cd9 100644
--- a/dev-games/KXL/Manifest
+++ b/dev-games/KXL/Manifest
@@ -1,7 +1,7 @@
-AUX KXL-1.1.7-amd64.patch 3207 BLAKE2B f215b32c48c60ed58da3064097bde7b00dc0d7e8df4690ac921da9be46527ef8cc5e2c807ce1b872b531ad1dded9efd6b9759fb919c5ac3bd1b91a7e700bcc19 SHA512 756cd90aca9c6ac1c9ac2c9229b8ae2904315fe29e59b842d963b72b2004c088f5b526ac00b97ed61763001a5e79f0e435c043ae54f4022ea392367a8f0c8142
-AUX KXL-1.1.7-as-needed.patch 308 BLAKE2B 7a07c561f300f3f58bc3e06f9bf6416b58432d14fa819c0f2885fb5e169ec949315094b6a1b94896811bc813beee7960344031f4111ccb5ec1e0318f534333f1 SHA512 8494ce4f631b82e798a0e4364252d35645544ed417bec11c5c7b6dcb179b5182187166f37562d6b40e393081112bb4d0787f8140464763b1482464c04fb9fd44
-AUX KXL-1.1.7-ldflags.patch 234 BLAKE2B f1cbe9b75b12b2d37911ec2a957b7624c679e6fcfb92e2db935ebed379aa0c7e7da7f0cb81a337295a48d7b75f4c4fe55c20f8b4efb1577ef59161b1e1942ac3 SHA512 b051fff9db4b353ad29479b3a08d2aadb49230800589337f13f34e4490330d1b683a42c2bdbac02dcbe0016e9755939e5f4a538167284011ad97502977d397a3
-AUX KXL-1.1.7-m4.patch 221 BLAKE2B bc3a010136208abe90ec266273580650214eb03a91308e1edc795ca71e86ecfeb22131552ec78c2c1e52ccf269b16331e28abc6eca04a0ff03ed0b5ddbb466ca SHA512 b9a0b71474c43cec838ab6fdadd183a80d409d935bc7b65a61cf87d2b777ef5b51cf86469aa8a0040d15a64b1a008ebd3eb9b1d0dc9e4e86160bda92612f2b6a
+AUX KXL-1.1.7-amd64.patch 2919 BLAKE2B ec36f0f9baea78190f352400fdd2e6f0e2b146e9ecd84e5fc3681ed365e33f819b611eac90c9fe133403910b814eca6a62935d85c66e3b2997a0750f70717772 SHA512 540e56fdb5d1e2bd9f57d8b80ee79fc332a2439addccafd1c59ffcfd42f34718cf5c792c7255cd499ceeccc88e7149ee8960442310f59b02c07e84536533118b
+AUX KXL-1.1.7-as-needed.patch 232 BLAKE2B dad2a56c93247bdaa43aca7ad0484a6f24df59538b2edcf1cc67ddf639c20f86ed437c281a3e62da8322160633d5780b3cadfb7c8e016809e9b668322a3d7f7a SHA512 507c90c292b9b3c53316be03cb6a4f1c3d7ab749382ae6daa463672fc98ce0b54cba4e5595821f259fbb94e243d35bb54205a32eb41595f89b4810b4edea42dd
+AUX KXL-1.1.7-ldflags.patch 162 BLAKE2B 61c7bd89e29c84ff9739dace1e6e8fa8c30b6cd3cf2f9e0fc1e1c9fdc86013aea28333a4ba343441e171e293603f351dbdc7e50e881b45428c98b27b1cc74127 SHA512 97a738ffe3a970b39172202f6d4f301fcc3705760b1cb1491484a95722edec88a7e7304cb9b17b34519bb56cab0881357d7783a02cc04a7ce823c995d07fa387
+AUX KXL-1.1.7-m4.patch 205 BLAKE2B a4ff3c1c5ab2fc159924248eb7c564b3b0c579ce03831d4b7601bf89b8d8205aa308d479d847fa4e66f3c025a8a182dfb4e4e1d224c42ab16bc763f30fbb6d9f SHA512 4c80ef4624ae37e3f8ddcef16ab7f84d2edb5ae0722b8737a08420ef718027dfa83c6b0c46333d7ebf1280fbcffc2e9a9b0161e71432b8fe8e545fc0c551c54b
 DIST KXL-1.1.7.tar.gz 192070 BLAKE2B 7f5256afaffe94cd5f6551d8f53b43e2d9512cf94dfaebb123205b55d83d4645e226bbed62bf5f0da909104d4e33d1da60c7e08c0ee527087a4793c79c117df2 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb
-EBUILD KXL-1.1.7-r2.ebuild 682 BLAKE2B 7573e4f4cbdeb866a143e0b58e2df0352c99698258a5291d7ae76ba3083f35f1fd635f4b72dea1fccfb9971572263d7bbfdb1d964bf12ed6892692e7c86afbf2 SHA512 f8c8cafed16b753fbcc8c2ad99f56b27021427a6c7976070d069f1ac62774b69351ec177399564337192aaa0f3526f5f0e30f3c9f85e71fe4a9ba3c651e1dc88
+EBUILD KXL-1.1.7-r3.ebuild 693 BLAKE2B 8c91e0e1598843010ba34cd0810c899e9399e5da325a402de9f69ed2d2804f791e982e1474da88a77a8575a73d341b6c5f32ca0e8a8c107a77ed5bbe7db0eaba SHA512 f798232c470fea8390179c28a625fee01facc05b66fe620e90a7a23853cd9e9a8558b48442262ae741a2c03cbfab28a1638043772583de3ffd5e8348356af9a9
 MISC metadata.xml 677 BLAKE2B 7a7bed86880706ee5ed39121c002f35d410e2cd13ab316bf59be425318d15eca661f6d1c1be602ccc59e7fd5500322f60be9bd14865c0abb01e1b111a1f9d731 SHA512 c0bdd55e9cce88c16b4ac1cc71f30fd89e9341956d87de5e70eae786d9a71b675af94052149ee77e0b18b385a6f96dfa999f821c0177788e94de01f626a5a36f
diff --git a/dev-games/KXL/files/KXL-1.1.7-amd64.patch b/dev-games/KXL/files/KXL-1.1.7-amd64.patch
index ec4b141d2a3e..245e714abb07 100644
--- a/dev-games/KXL/files/KXL-1.1.7-amd64.patch
+++ b/dev-games/KXL/files/KXL-1.1.7-amd64.patch
@@ -1,5 +1,5 @@
---- src/KXLsound.c.old	2007-05-13 21:59:27.000000000 +0200
-+++ src/KXLsound.c	2007-05-13 22:09:19.000000000 +0200
+--- a/src/KXLsound.c
++++ b/src/KXLsound.c
 @@ -4,6 +4,9 @@
  #include <sys/ioctl.h>
  #include <sys/time.h>
@@ -42,8 +42,8 @@
    // create pipe
    if (pipe(KXL_SoundData.Pipe) < 0) {
      fprintf(stderr, "KXL error message\npipe error\n");
---- src/KXL.h.old	2007-05-13 22:25:11.000000000 +0200
-+++ src/KXL.h	2007-05-13 22:25:47.000000000 +0200
+--- a/src/KXL.h
++++ b/src/KXL.h
 @@ -205,6 +205,7 @@
    KXL_Frame   *Frame;    // Pointer of frame structure
    GC           FontGC;   // GC of font
@@ -52,16 +52,16 @@
  } KXL_Window;
  // RGBE palette
  typedef struct {
---- src/KXLimage.c.old	2007-05-13 22:29:02.000000000 +0200
-+++ src/KXLimage.c	2007-05-13 22:29:33.000000000 +0200
+--- a/src/KXLimage.c
++++ b/src/KXLimage.c
 @@ -1,4 +1,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  #include "KXL.h"
  
  extern KXL_Window *KXL_Root;
---- src/KXLvisual.c.old	2007-05-13 22:22:34.000000000 +0200
-+++ src/KXLvisual.c	2007-05-13 22:28:39.000000000 +0200
+--- a/src/KXLvisual.c
++++ b/src/KXLvisual.c
 @@ -1,4 +1,6 @@
  #include <stdio.h>
 +#include <stdlib.h>
diff --git a/dev-games/KXL/files/KXL-1.1.7-as-needed.patch b/dev-games/KXL/files/KXL-1.1.7-as-needed.patch
index d99564202ecd..b4cb502a3803 100644
--- a/dev-games/KXL/files/KXL-1.1.7-as-needed.patch
+++ b/dev-games/KXL/files/KXL-1.1.7-as-needed.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old 2009-01-28 16:03:27.000000000 +0100
-+++ src/Makefile.am     2009-01-28 16:03:47.000000000 +0100
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -2,3 +2,4 @@
  libKXL_la_SOURCES = KXLmisc.c KXLsound.c KXLjoystick.c KXLvisual.c KXLimage.c
  include_HEADERS = KXL.h
diff --git a/dev-games/KXL/files/KXL-1.1.7-ldflags.patch b/dev-games/KXL/files/KXL-1.1.7-ldflags.patch
index e628b5d2170f..dd33debc718c 100644
--- a/dev-games/KXL/files/KXL-1.1.7-ldflags.patch
+++ b/dev-games/KXL/files/KXL-1.1.7-ldflags.patch
@@ -1,5 +1,5 @@
---- KXL.m4.old	2010-09-23 14:20:45.000000000 +0200
-+++ KXL.m4	2010-09-23 14:21:08.000000000 +0200
+--- a/KXL.m4
++++ b/KXL.m4
 @@ -29,7 +29,6 @@
  
  dnl add the KXL library
diff --git a/dev-games/KXL/files/KXL-1.1.7-m4.patch b/dev-games/KXL/files/KXL-1.1.7-m4.patch
index f039974e6f98..40b2147a49df 100644
--- a/dev-games/KXL/files/KXL-1.1.7-m4.patch
+++ b/dev-games/KXL/files/KXL-1.1.7-m4.patch
@@ -1,7 +1,7 @@
 Get rid of aclocal warning:
 /usr/share/aclocal/KXL.m4:6: warning: underquoted definition of AM_PATH_KXL
---- KXL-1.1.7/KXL.m4
-+++ KXL-1.1.7/KXL.m4
+--- a/KXL.m4
++++ b/KXL.m4
 @@ -5,3 +5,3 @@
  dnl
 -AC_DEFUN(AM_PATH_KXL,