gentoo auto-resync : 21:02:2023 - 02:22:31

4 files changed, 72 insertions, 34 deletions

diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index a684158e82b9..5543123a8f35 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -1,5 +1,5 @@
-AUX aewm++-1.1.5-gcc43.patch 1011 BLAKE2B 8450e4a1028275196533a3d41450ef094bbd58c442fea8e8963e43155659a6e935ee612adecd8aa29654999c9599bfe1c1e800e749944faa724c9be0dd4756ca SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd
-AUX aewm++-1.1.5-makefile.patch 853 BLAKE2B d5f90e83b0c4e7b10c6afc057578ad5db820c5ac31840eff812a3ae482dd2609fb6657c45817318abace461577bbd4e973c3e67d5b6c8ad5b0df76ce60aace62 SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc
+AUX aewm++-1.1.5-gcc43.patch 1260 BLAKE2B adb4d6a2e427d7caf10bb9efe23566a4499309e8686d3ec88add54151324a6495b2334b6adb91ba4579c138a10f73ff6adbee5cdce358ad173dd73ea19a2915f SHA512 8c96af49e5ced1b0d4cad73f12abdc854ff70f990cdf95b4e2f82664196872ad6515848597ae24add06e9fab24562037b9517f3b06bee90a35b4f05a198f3b2d
+AUX aewm++-1.1.5-makefile.patch 1020 BLAKE2B 3c77d3ead1bb53efe6343034114ab9bcd0692bd253618fdf769a16ae8cba6c1420d69ccf2de115a89d2c73d1df585ced485c8ed75e1ffd2c5d6da18e2fcfe2c8 SHA512 fb0853fae776b5e12a2c002c1c982f0f02272652b150106c5e3333a9ce6f91d60f6c1a721386c9428f80e00310a2e3f63f737fead4db20a1235bfa6408b42dc2
 DIST aewm++-1.1.5.tar.gz 24553 BLAKE2B f6a013cbc33476a809623c434dd0d1dc38766d27beb42e042c39e8a51db03410ea5cbdfae0f2169df46722d72d25542d920fad4881d48f589a832847177e4961 SHA512 84fe2d51e82a2098a42ad405da705810e5d3b93513a30cd688f7bb8c717875b286b64bbd8e48ab799e4ee14ac27097fb98276f89bcfeb9301dc8187d0bcad370
-EBUILD aewm++-1.1.5-r2.ebuild 559 BLAKE2B a8f0797ebedb83b2dda511d9470c1b90e145f20854aec5d3e6e587239f9e11d04b16fd7c82cc54f8cae422450b16fea06cb15331d06f6f0c84767a143c8ecca0 SHA512 d59c6a9e1b1d4a5ebe673726b98c4e00a4f38d558f9cfc6455aea0169c92a4c7dbcffa5626b3be3857aeb65a98c95b828e985b8fd93d6d187edfc9bd3e335b6b
+EBUILD aewm++-1.1.5-r3.ebuild 545 BLAKE2B 69070d553a2a5bb023f174b3979a2f291838f97374004d602fd329a1da4565927b192be684aad932eb32777e2733fcf6f52b5daadf9105edab43d8edcab57dd8 SHA512 a3f2dfd7172bfa97858e6da88bb4f51c7a745ea5a252dd67743b81a40a891b6a4ff7fe7e9c4f5c9dbafd890046ddb41d8d849489b62b4e2f82cfcc5760e28402
 MISC metadata.xml 462 BLAKE2B ef4cf4ed751c2c988829df1344b61fd7c58e027e96bbae740856aea74e43c6e47d9367c838b66e6af116d0b2d7856015aa8b3e02bba059c9328e574e379032ea SHA512 1e1158e4b53be6cfba8522f57d0aa53df83797edaab9428bd14aa3011f67e4bd46a7e09317acf98ac3664f94e3b9666175ae76e8496ad34f5473cf986cf6b991
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r3.ebuild
index 47ceef425b86..1afc79dbe2dc 100644
--- a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
+++ b/x11-wm/aewm++/aewm++-1.1.5-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="A window manager with more modern features than aewm"
@@ -11,9 +12,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
@@ -23,6 +24,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
 )
 
-src_compile() {
-	emake CXX="$(tc-getCXX)"
+src_configure() {
+	tc-export CXX
 }
diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
index 23cacdc43a2b..1fab782112d2 100644
--- a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
+++ b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
@@ -1,6 +1,16 @@
-diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc
---- aewm++-1.1.5.orig/client.cc	2005-05-23 06:06:01.000000000 +0300
-+++ aewm++-1.1.5/client.cc	2008-05-03 23:50:02.000000000 +0300
+--- a/aewm.hh
++++ b/aewm.hh
+@@ -87,7 +87,7 @@
+ #define BW (has_border ? wm->getOptBW() : 0)
+ 
+ // defined in main.cc
+-void forkExec(char *);
++void forkExec(const char *);
+ int handleXError(Display *, XErrorEvent *);
+ 
+ class Client;
+--- a/client.cc
++++ b/client.cc
 @@ -6,6 +6,8 @@
   */
  #include "aewm.hh"
@@ -10,21 +20,22 @@ diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc
  Client::Client(Display *d, Window new_client)
  {
  	initialize(d);
-diff -ur aewm++-1.1.5.orig/main.cc aewm++-1.1.5/main.cc
---- aewm++-1.1.5.orig/main.cc	2005-02-12 05:38:32.000000000 +0200
-+++ aewm++-1.1.5/main.cc	2008-05-03 23:50:02.000000000 +0300
-@@ -6,6 +6,8 @@
+--- a/main.cc
++++ b/main.cc
+@@ -6,8 +6,10 @@
   */
   #include "aewm.hh"
  
 +#include <string.h>
 +
  // Dunno where I ripped this from. Kudos to the author whoever he is!
- void forkExec(char *cmd)
+-void forkExec(char *cmd)
++void forkExec(const char *cmd)
  {
-diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc
---- aewm++-1.1.5.orig/windowmanager.cc	2005-05-17 04:41:42.000000000 +0300
-+++ aewm++-1.1.5/windowmanager.cc	2008-05-03 23:50:02.000000000 +0300
+     if(! (strlen(cmd)>0)) return;
+     
+--- a/windowmanager.cc
++++ b/windowmanager.cc
 @@ -6,6 +6,8 @@
   */
  #include "aewm.hh"
@@ -34,3 +45,23 @@ diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc
  WindowManager* wm;
  
  #define AEWM_KEY_ALT_COUNT 4
+@@ -1020,7 +1022,7 @@
+ {
+ 	cleanup();
+ 	
+-	execl("/bin/sh", "sh", "-c", command_line.c_str(), 0);
++	execl("/bin/sh", "sh", "-c", command_line.c_str(), (const char*)NULL);
+ }
+ 
+ void WindowManager::quitNicely()
+--- a/windowmanager.hh
++++ b/windowmanager.hh
+@@ -46,7 +46,7 @@
+ 	string 	command_line;
+ 	int 	max_desktops;
+ 	int 	focus_model;	
+-	char 	*opt_display,	
++	const char 	*opt_display,
+ 		*opt_fc, 
+ 		*opt_fg,
+ 		*opt_fm, 
diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch
index 8b84a9963469..3066b0981a1f 100644
--- a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch
+++ b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch
@@ -1,29 +1,35 @@
-Respect CFLAGS, LDFLAGS, don't strip binaries
+* Respect CXX, CXXFLAGS, LDFLAGS, LIBS
+* Don't strip binaries
+https://bugs.gentoo.org/336099
 
-http://bugs.gentoo.org/show_bug.cgi?id=336099
-
---- aewm++-1.1.5/Makefile
-+++ aewm++-1.1.5/Makefile
-@@ -1,9 +1,6 @@
- CC       = g++
+--- a/Makefile
++++ b/Makefile
+@@ -1,14 +1,9 @@
+-CC       = g++
 -ADDITIONAL_CFLAGS   = -g -O2 -march=i686 -Wall
- 
+-
  prefix   = /usr
 -INCLUDES = -I$/usr/X11R6
 -LDPATH   = -L/usr/X11R6/lib
- LIBS     = -lXext -lX11
+-LIBS     = -lXext -lX11
++LIBS     += -lXext -lX11
  
  # SHAPE = Shape Extension
-@@ -28,14 +25,13 @@
+ # NEED_SETENV = Does your Unix not support the setenv function? Use this!
+-DEFINES  = -DSHAPE #-DNEED_SETENV 
++CPPFLAGS += -DSHAPE #-DNEED_SETENV
+ HEADERS  = aewm.hh 		\
+ 	   client.hh 		\
+ 	   windowmanager.hh  	\
+@@ -28,14 +23,10 @@
  all: aewm++
  
  aewm++: $(OBJS)
 -	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
-+	$(CXX) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
- 
- $(OBJS): %.o: %.cc $(HEADERS)
+-
+-$(OBJS): %.o: %.cc $(HEADERS)
 -	$(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
-+	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
  
  install: all
 -	mkdir -p $(DESTDIR)$(prefix)/bin