ebuild cleanup and fix to #93186

(Portage version: 2.0.51.22-r1)

9 files changed, 57 insertions, 94 deletions

diff --git a/x11-misc/wdm/ChangeLog b/x11-misc/wdm/ChangeLog
index 3448b98c292a..5359cbddacbc 100644
--- a/x11-misc/wdm/ChangeLog
+++ b/x11-misc/wdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/wdm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.9 2004/08/17 19:40:58 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.10 2005/06/13 23:11:25 smithj Exp $
+
+  13 Jun 2005; Jonathan Smith <smithj@gentoo.org> -wdm-1.22.ebuild:
+  ebuild cleanup and fix to #93186
 
   17 Aug 2004; Aron Griffis <agriffis@gentoo.org> wdm-1.26.ebuild:
   add ~alpha #60071
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 91f007a941dc..6c7eae46e06a 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -1,9 +1,8 @@
-MD5 664101e62f37c00f8659162927fee740 ChangeLog 1083
+MD5 db20fd2d79138de75605f2a17aa4011e ChangeLog 1187
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 d9eacb066bd968d34574b0c7d0af7c62 wdm-1.22.ebuild 1022
-MD5 949d9a44b538d571dc1b1c1e8aea64fd wdm-1.25.ebuild 1021
 MD5 4ceb90112ae1de0821379b86b0b50589 wdm-1.26.ebuild 1035
-MD5 ad9aca5a30f358cec9faf0040d5f956f files/digest-wdm-1.22 61
-MD5 14bbdbbf5672fc9f38817342c29a0f49 files/digest-wdm-1.25 61
+MD5 da92163bd04788fc85df96d318c5c5f0 wdm-1.26-r1.ebuild 973
 MD5 4bede5980b6b67ab4393b2a1903464b2 files/digest-wdm-1.26 61
 MD5 2d6e9593eae8b7cc30202c7a86074f5d files/wdm 381
+MD5 0473a4ba1eb62b9338c008266cb20a20 files/wdm-include 210
+MD5 4bede5980b6b67ab4393b2a1903464b2 files/digest-wdm-1.26-r1 61
diff --git a/x11-misc/wdm/files/digest-wdm-1.22 b/x11-misc/wdm/files/digest-wdm-1.22
deleted file mode 100644
index 5c338946e96c..000000000000
--- a/x11-misc/wdm/files/digest-wdm-1.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b58f968ae13733e2433fcf74b4912ade wdm-1.22.tar.bz2 433330
diff --git a/x11-misc/wdm/files/digest-wdm-1.25 b/x11-misc/wdm/files/digest-wdm-1.25
deleted file mode 100644
index d2bc7f3af9c1..000000000000
--- a/x11-misc/wdm/files/digest-wdm-1.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e9c6f1a9755529d4336b9212fb1b7de wdm-1.25.tar.bz2 450665
diff --git a/x11-misc/wdm/files/digest-wdm-1.26-r1 b/x11-misc/wdm/files/digest-wdm-1.26-r1
new file mode 100644
index 000000000000..0adca20ef079
--- /dev/null
+++ b/x11-misc/wdm/files/digest-wdm-1.26-r1
@@ -0,0 +1 @@
+MD5 88467fb7f4a8fb3a6cc4c04ea184bf98 wdm-1.26.tar.bz2 377001
diff --git a/x11-misc/wdm/files/wdm-include b/x11-misc/wdm/files/wdm-include
new file mode 100644
index 000000000000..24e3c29d39ba
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-include
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       include		system-auth
+auth       required		pam_nologin.so
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
+session    optional		pam_console.so
diff --git a/x11-misc/wdm/wdm-1.22.ebuild b/x11-misc/wdm/wdm-1.22.ebuild
deleted file mode 100644
index 2a313240d16e..000000000000
--- a/x11-misc/wdm/wdm-1.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.22.ebuild,v 1.8 2004/06/24 22:36:06 agriffis Exp $
-IUSE="truetype pam png jpeg gif tiff"
-
-DESCRIPTION="WINGs Display Manager"
-HOMEPAGE="http://voins.program.ru/wdm/"
-SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-RDEPEND=">=x11-wm/windowmaker-0.65.1"
-
-DEPEND="${RDEPEND}
-	virtual/x11
-	sys-devel/gettext
-	truetype? ( virtual/xft )"
-
-src_compile() {
-	local myconf=""
-	use pam && myconf="${myconf} --enable-pam"
-	use png || myconf="${myconf} --disable-png"
-	use jpeg || myconf="${myconf} --disable-jpeg"
-	use gif || myconf="${myconf} --disable-gif"
-	use tiff || myconf="${myconf} --disable-tiff"
-
-	econf \
-		--exec-prefix=/usr \
-		--with-wdmdir=/etc/X11/wdm \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	rm ${D}/etc/pam.d/wdm
-	insinto /etc/pam.d
-	doins ${FILESDIR}/wdm
-
-	make DESTDIR=${D} install || die
-}
diff --git a/x11-misc/wdm/wdm-1.25.ebuild b/x11-misc/wdm/wdm-1.25.ebuild
deleted file mode 100644
index 48e910cbc465..000000000000
--- a/x11-misc/wdm/wdm-1.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.25.ebuild,v 1.5 2004/06/24 22:36:06 agriffis Exp $
-
-IUSE="truetype pam png jpeg gif tiff"
-
-DESCRIPTION="WINGs Display Manager"
-HOMEPAGE="http://voins.program.ru/wdm/"
-SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-DEPEND="${RDEPEND}
-	virtual/x11
-	sys-devel/gettext
-	truetype? ( virtual/xft )"
-RDEPEND=">=x11-wm/windowmaker-0.65.1"
-
-src_compile() {
-	local myconf=""
-	use pam && myconf="${myconf} --enable-pam"
-	use png || myconf="${myconf} --disable-png"
-	use jpeg || myconf="${myconf} --disable-jpeg"
-	use gif || myconf="${myconf} --disable-gif"
-	use tiff || myconf="${myconf} --disable-tiff"
-
-	econf \
-		--exec-prefix=/usr \
-		--with-wdmdir=/etc/X11/wdm \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	rm ${D}/etc/pam.d/wdm
-	insinto /etc/pam.d
-	doins ${FILESDIR}/wdm
-
-	make DESTDIR=${D} install || die
-}
diff --git a/x11-misc/wdm/wdm-1.26-r1.ebuild b/x11-misc/wdm/wdm-1.26-r1.ebuild
new file mode 100644
index 000000000000..cc2f56f8156e
--- /dev/null
+++ b/x11-misc/wdm/wdm-1.26-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.26-r1.ebuild,v 1.1 2005/06/13 23:11:25 smithj Exp $
+
+inherit eutils
+
+IUSE="truetype pam png jpeg gif tiff"
+
+DESCRIPTION="WINGs Display Manager"
+HOMEPAGE="http://voins.program.ru/wdm/"
+SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~alpha"
+LICENSE="GPL-2"
+
+RDEPEND=">=x11-wm/windowmaker-0.65.1
+	virtual/x11
+	truetype? ( virtual/xft )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+	
+src_compile() {
+	econf \
+		--exec-prefix=/usr \
+		--with-wdmdir=/etc/X11/wdm \
+		$(use_enable pam)\
+		$(use_enable png)\
+		$(use_enable jpeg)\
+		$(use_enable gif)\
+		$(use_enable tiff) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	rm -f ${D}/etc/pam.d/wdm
+	newpamd "${FILESDIR}/wdm-include" wdm
+}