[gentoo-commits] repo/gentoo:master commit in: x11-misc/wdm/, x11-misc/wdm/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/wdm/, x11-misc/wdm/files/

[Jeroen Roovers]

commit:     e6973b8fd536b1d7e872265869026f5d6bb46ce3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 12:10:36 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 12:10:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6973b8f

x11-misc/wdm: Use pkg-config instead of get-wings-flags

Fixes: https://bugs.gentoo.org/659652
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/wdm/files/wdm-1.28-pkg_config.patch | 30 +++++++++++++++
 x11-misc/wdm/wdm-1.28-r5.ebuild              | 56 ++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/x11-misc/wdm/files/wdm-1.28-pkg_config.patch b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch
new file mode 100644
index 00000000000..3670830bf86
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-pkg_config.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_RANLIB
++PKG_PROG_PKG_CONFIG
+ 
+ AC_ARG_VAR(XRDB_PATH, [Path to xrdb program from X])
+ AC_PATH_PROG(XRDB_PATH, xrdb)
+@@ -153,15 +154,11 @@
+ 	],,[$XLDFLAGS $XLIBS])
+ fi
+ 
+-dnl		WINGs support
+-AC_CHECK_PROG(GETWINGSFLAGS,get-wings-flags,get-wings-flags,,[$PATH])
+-if test -z "$GETWINGSFLAGS"; then
+-	AC_MSG_ERROR(['get-wings-flags' command was not found in \$PATH, please upgrade your WindowMaker.])
+-fi
++PKG_CHECK_MODULES(WINGS, WINGs,,[AC_MSG_ERROR([WINGs not found])])
+ 
+-WCFLAGS=`get-wings-flags --cflags`
+-WLDFLAGS=`get-wings-flags --ldflags`
+-WLIBS=`get-wings-flags --libs`
++WCFLAGS="$WINGS_CFLAGS"
++WLDFLAGS="$WINGS_LDFLAGS"
++WLIBS="$WINGS_LIBS"
+ 
+ AC_SUBST(XLIBS)
+ AC_SUBST(XCFLAGS)

diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
new file mode 100644
index 00000000000..a5fe21ae25c
--- /dev/null
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools pam toolchain-funcs
+
+DESCRIPTION="WINGs Display Manager"
+HOMEPAGE="https://github.com/voins/wdm"
+SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam selinux truetype"
+
+COMMON_DEPEND="
+	>=x11-wm/windowmaker-0.70.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pam? ( virtual/pam )
+	truetype? ( x11-libs/libXft )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-terminateServer.patch
+	"${FILESDIR}"/${P}-remove-fakehome.patch
+	"${FILESDIR}"/${P}-pkg_config.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	tc-export AR
+	econf \
+		--with-wdmdir="${EPREFIX}"/etc/X11/wdm \
+		$(use_enable pam) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}"/etc/pam.d/wdm || die
+	pamd_mimic system-local-login wdm auth account password session
+}