gentoo resync : 29.01.2021

3 files changed, 158 insertions, 29 deletions

diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index d68f5a06d844..0184e5130ec9 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -6,5 +6,6 @@ DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 426b31a868c8d9dc807eddc211ede8c54928077aef7eeb72e2f264a5d8da95f76f606829237701e383e3a14ec323586301ddd72539525bb9078d7101e32e5186 SHA512 37c1f9604e7811cb025e43054d1848cfa1103fc24921419ed66e17cd4e816c45ecaeffef2ea2a2c11373de35b4ca23124ec400bd60944479307d4dcb13644aa0
 EBUILD windowmaker-0.95.9-r1.ebuild 3079 BLAKE2B 333833e1b61ffe17dc37e19d768a8e29f254c038cfa8dc46c2bec04a8de420769d6b3ec40c669a78c231a72f0a26b270a982b2c3447bfcc43031ce403fd37133 SHA512 0bd1371818c59d3dd4861ad740aabc76e19cbb160acc9a2c56dbd0b1bede9170c29f5d6453e3141fc3c4381ddd4c3c7bb09a173bae58a9c87943b72f9d8bbce3
-EBUILD windowmaker-9999.ebuild 2906 BLAKE2B 2c34ae03201ba0ffce81ec94b337536aee7ffc6a165ca0c49068d2389fd12a20c54c46d28810798ab523c3b2843e90fadd0212e5f7a7592f51d0c910eb56ca60 SHA512 f7db50510fb3b9f6fc34f1bb84cc00a2928cf9af9fd7aad88aa4dab211f5586395f84c9c75ddde80def0ac0d4ad521c29850f81e948e2442f169ea683d5ae771
+EBUILD windowmaker-0.95.9-r2.ebuild 3207 BLAKE2B 39c6aaaf43499aaab9cd8c50d43ff9f7f5eddc7dab100156880bedc30a3e872d5881e7484c850d6f7b4f89a9c6a3eb7a8f974fac5dd8bb4883ff45ae032e3714 SHA512 2a8ac82d72efd524ff5af6f29f6d0d9f31119a4ad1e0ee421b5a1872acd36a33bd172ca088a6d7db562808269c87a0d4e570ddabb935533a908edbf71cc9439d
+EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
new file mode 100644
index 000000000000..169193220615
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="https://www.windowmaker.org/"
+SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch )
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+		fi
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
+
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
+
+	# NLS depends on whether LINGUAS is empty
+	if use nls; then
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
+	else
+		myeconfargs+=( LINGUAS= )
+	fi
+
+	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--disable-static \
+		--enable-usermenu \
+		--with-{incs,libs}-from= \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-x \
+		"${myeconfargs[@]}"
+
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	emake -C ../WindowMaker-extra-0.1
+}
+
+src_install() {
+	default
+
+	# WindowMaker Extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 9fabfa3d5f0b..5cc89fa45b5b 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils git-r3
+inherit autotools desktop git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="https://www.windowmaker.org/"
@@ -24,15 +24,16 @@ DEPEND="media-libs/fontconfig
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
+	nls? ( virtual/libintl )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
 	webp? ( media-libs/libwebp )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
 
-DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
 	NEWS README README.definable-cursor README.i18n TODO )
 
 src_unpack() {
@@ -49,38 +50,48 @@ src_prepare() {
 			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
 			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
 			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-		fi;
-	done;
+		fi
+	done
 
 	default
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
-
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
-
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
+
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
+
+	# NLS depends on whether LINGUAS is empty
 	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
 	else
-		myconf="${myconf} --disable-locale"
+		myeconfargs+=( LINGUAS= )
 	fi
 
-	# default settings with $myconf appended
 	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
 		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
+		--disable-static \
 		--enable-usermenu \
+		--with-{incs,libs}-from= \
 		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
+		--with-x \
+		"${myeconfargs[@]}"
 
-	pushd ../WindowMaker-extra-0.1 || die
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
 	econf
 }
 
@@ -88,18 +99,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	pushd ../WindowMaker-extra-0.1 || die
-	emake
+	emake -C ../WindowMaker-extra-0.1
 }
 
 src_install() {
 	default
 
 	# WindowMaker Extra
-	pushd ../WindowMaker-extra-0.1 || die
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
 
 	# create wmaker session shell script
 	echo "#!/usr/bin/env bash" > wmaker
@@ -110,4 +118,6 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/wmaker.desktop
 	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }