gentoo resync : 28.04.2021

3 files changed, 34 insertions, 39 deletions

diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index 1acf673b650e..e61c1a889b0a 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,4 +1,4 @@
-AUX wm2-4-gentoo.patch 4265 BLAKE2B d4ab8f91b01dd3fa0b0b7499adeebca04950131ace81f3d19cd3ac0e5c3392ecd4398139b4edb53b1d66e9e37bef0d3130df12873dea064db8c2e41eb4b442d2 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df
+AUX wm2-4-gentoo.patch 3114 BLAKE2B 6d01272e41172ee6b1033477e85853a65b6bf0b007bd9d1e798876ee04415d11238a9be333e3790abfe3894dbaa7eaf37972da28a76a6fe7124d316c139ce227 SHA512 c314a789ea09f20ec31b3dd13bd01ee6106e707f2ce90c3f4ed0cc991ca3dc5dd78bc654c4a3cd1f406f750a4711adc7f59fc920bedbcae0c6984b34acda2a23
 DIST wm2-4.tar.gz 32807 BLAKE2B 38598a8c47e3f8512ff75f79534ef97d9d54a47d243e2eeab15b84cfdaa412b25693843ae6266cbcaf4ce299a9e05f35d3a236fdde315a43df372984421515e9 SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
-EBUILD wm2-4-r1.ebuild 1384 BLAKE2B a2ebe33e6021899c6b432167a8d30e513c8c34df15618bc66c63ed3f9a723b6c871c85e97ed02797c3754f25bb0721313acb11ca427081cd672d105b03f1604c SHA512 9645791d5f7e1aec9b1b46daca632493b08fb1fe2e757bd4181150af7346930f72b0a6ec48b546a88b457b3ba1a850ca5e071d80c059e471c4da8f148a39df07
+EBUILD wm2-4-r1.ebuild 1414 BLAKE2B f58eee1ded3c6a857a20d49d51d33ce2d92a4afc8a18b0eb6fc0aaa172e72cb49ecf6e5b2d1151d310ac53d446fe48c8fdc8f831f907aa306db9ae4dec922ab4 SHA512 7d60cceb3a9fc686499a1aaa8ccae1f43c5626a2a1a9c43dc800ea1c2ce87629e724a47507598f1017f7148d206a555aa7b61b090700bea92b11eac7d3093ace
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/wm2/files/wm2-4-gentoo.patch b/x11-wm/wm2/files/wm2-4-gentoo.patch
index 88c78080c542..f8ff09c07780 100644
--- a/x11-wm/wm2/files/wm2-4-gentoo.patch
+++ b/x11-wm/wm2/files/wm2-4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ur wm2-4/Border.C wm2-4.new/Border.C
---- wm2-4/Border.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Border.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Border.C
++++ b/Border.C
 @@ -183,7 +183,7 @@
  
      if (m_label) free(m_label);
@@ -10,9 +9,8 @@ diff -ur wm2-4/Border.C wm2-4.new/Border.C
  
      int len = strlen(m_label);
      m_tabHeight = XRotTextWidth(m_tabFont, m_label, len) + 6 + m_tabWidth;
-diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
---- wm2-4/Buttons.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Buttons.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Buttons.C
++++ b/Buttons.C
 @@ -139,7 +139,11 @@
  		       (allowExit && ((n) > clients.count())) ? "[Exit wm2]" \
  		       : clients.item((n)-1)->label())
@@ -25,9 +23,8 @@ diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
  	clients.append(m_hiddenClients.item(i));
      }
      int nh = clients.count() + 1;
-diff -ur wm2-4/Client.C wm2-4.new/Client.C
---- wm2-4/Client.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Client.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Client.C
++++ b/Client.C
 @@ -4,7 +4,7 @@
  
  #include <X11/Xutil.h>
@@ -55,9 +52,8 @@ diff -ur wm2-4/Client.C wm2-4.new/Client.C
  }
  
  
-diff -ur wm2-4/Client.h wm2-4.new/Client.h
---- wm2-4/Client.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Client.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Client.h
++++ b/Client.h
 @@ -2,6 +2,8 @@
  #ifndef _CLIENT_H_
  #define _CLIENT_H_
@@ -76,9 +72,8 @@ diff -ur wm2-4/Client.h wm2-4.new/Client.h
      int getIntegerProperty(Atom);
  
      // accessors 
-diff -ur wm2-4/Config.h wm2-4.new/Config.h
---- wm2-4/Config.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Config.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Config.h
++++ b/Config.h
 @@ -39,6 +39,9 @@
  
  #define CONFIG_FRAME_THICKNESS    7
@@ -94,9 +89,8 @@ diff -ur wm2-4/Config.h wm2-4.new/Config.h
  
  #endif
 -
-diff -ur wm2-4/General.h wm2-4.new/General.h
---- wm2-4/General.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/General.h	2007-06-30 16:56:10.000000000 +0200
+--- a/General.h
++++ b/General.h
 @@ -32,7 +32,7 @@
  #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
  
@@ -106,9 +100,8 @@ diff -ur wm2-4/General.h wm2-4.new/General.h
  #endif
  
  #define signal(x,y)     \
-diff -ur wm2-4/Makefile wm2-4.new/Makefile
---- wm2-4/Makefile	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Makefile	2007-06-30 16:56:10.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,8 +1,8 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
@@ -120,9 +113,8 @@ diff -ur wm2-4/Makefile wm2-4.new/Makefile
  CFLAGS	= -O2
  OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
-diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
---- wm2-4/Manager.C	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Manager.C	2007-06-30 16:56:10.000000000 +0200
+--- a/Manager.C
++++ b/Manager.C
 @@ -368,7 +368,7 @@
      return m_currentTime;
  }
@@ -132,9 +124,8 @@ diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
  {
      m_signalled = True;
  }
-diff -ur wm2-4/Manager.h wm2-4.new/Manager.h
---- wm2-4/Manager.h	1997-03-21 12:12:30.000000000 +0100
-+++ wm2-4.new/Manager.h	2007-06-30 16:56:10.000000000 +0200
+--- a/Manager.h
++++ b/Manager.h
 @@ -85,7 +85,7 @@
  
      static Boolean m_initialising;
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index dff832f2a2ec..423d2be09b8c 100644
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
@@ -11,22 +12,26 @@ SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
 SLOT="0"
 LICENSE="wm2 HPND"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	default
+
 	sed -e "s/CFLAGS/CXXFLAGS/" \
 		-e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \
 		-i Makefile || die #334681
 
 	sed 's/^#//' Config.h > wm2.conf
-	if [ -e "/etc/wm2.conf" ]; then
-		echo "#undef _CONFIG_H_" >> Config.h
-		awk '/^[^/]/{print "#" $0}' /etc/wm2.conf >> Config.h
+	if [[ -e "${EPREFIX}"/etc/wm2.conf ]] ; then
+		echo "#undef _CONFIG_H_" >> Config.h || die
+		awk '/^[^/]/{print "#" $0}' "${EPREFIX}"/etc/wm2.conf >> Config.h || die
 	fi
 }
 
@@ -39,18 +44,17 @@ src_compile() {
 
 src_install() {
 	dobin wm2
+
 	insinto /etc
 	doins wm2.conf
 	dodoc README
 }
 
 pkg_postinst() {
-	echo
 	elog "wm2 is unconfigurable after you have installed. If you want to"
 	elog "change settings of wm2, please have a look at /etc/wm2.conf"
 	elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings"
 	elog "from that file automatically). If you think wm2 lacks some important"
 	elog "features that you want to use (such as background pixmaps),"
 	elog "consider using wmx, written by the same author."
-	echo
 }