version bump for #72198, ebuild cleanup, marked 1.26-r1 stable on x86

Package-Manager: portage-2.0.51.22-r1

7 files changed, 64 insertions, 51 deletions

diff --git a/x11-misc/wdm/ChangeLog b/x11-misc/wdm/ChangeLog
index 1e4977c8031a..91be0b85e371 100644
--- a/x11-misc/wdm/ChangeLog
+++ b/x11-misc/wdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/wdm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.12 2005/06/13 23:23:09 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/ChangeLog,v 1.13 2005/06/14 13:19:48 smithj Exp $
+
+*wdm-1.28 (14 Jun 2005)
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> -wdm-1.26.ebuild,
+  wdm-1.26-r1.ebuild, +wdm-1.28.ebuild:
+  version bump for #72198, ebuild cleanup, marked 1.26-r1 stable on x86
 
   13 Jun 2005; Jonathan Smith <smithj@gentoo.org> wdm-1.26-r1.ebuild:
   trailing whitespace fix for wdm-1.26-r1.ebuild
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 8610a0cee1d9..fde65136814b 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -1,8 +1,18 @@
-MD5 2f7949f29b845f3a17b825d0724e89b8 ChangeLog 1423
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 23bd2bd2094fd7dc981e1493cb52cfcb ChangeLog 1629
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 4ceb90112ae1de0821379b86b0b50589 wdm-1.26.ebuild 1035
-MD5 01b9f4fcda8ece2eef9cafe64f260775 wdm-1.26-r1.ebuild 977
-MD5 4bede5980b6b67ab4393b2a1903464b2 files/digest-wdm-1.26 61
+MD5 9312845e110b8eb132cc5202d9a7a089 wdm-1.28.ebuild 907
+MD5 4f62e2e48f0c13b4a8fe2ecb4fd01ea4 wdm-1.26-r1.ebuild 978
 MD5 2d6e9593eae8b7cc30202c7a86074f5d files/wdm 381
 MD5 0473a4ba1eb62b9338c008266cb20a20 files/wdm-include 210
+MD5 b45993213f6bae57ce8b7f0970855ce9 files/digest-wdm-1.28 61
 MD5 4bede5980b6b67ab4393b2a1903464b2 files/digest-wdm-1.26-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrtmNl5AvwDPiUowRAtOAAJ9nPivTt6jxMXQ7kk/qE7wukR5NmQCg0nIv
+1NhC3Mn3SDWu98GCD1UNcWk=
+=nVBe
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/wdm/files/digest-wdm-1.26 b/x11-misc/wdm/files/digest-wdm-1.26
deleted file mode 100644
index 0adca20ef079..000000000000
--- a/x11-misc/wdm/files/digest-wdm-1.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88467fb7f4a8fb3a6cc4c04ea184bf98 wdm-1.26.tar.bz2 377001
diff --git a/x11-misc/wdm/files/digest-wdm-1.28 b/x11-misc/wdm/files/digest-wdm-1.28
new file mode 100644
index 000000000000..aeeb624f73ec
--- /dev/null
+++ b/x11-misc/wdm/files/digest-wdm-1.28
@@ -0,0 +1 @@
+MD5 4da8ffe3af233305786d9b6aab78b838 wdm-1.28.tar.bz2 381522
diff --git a/x11-misc/wdm/wdm-1.26-r1.ebuild b/x11-misc/wdm/wdm-1.26-r1.ebuild
index 037fc2091a93..d598d6cd7a0a 100644
--- a/x11-misc/wdm/wdm-1.26-r1.ebuild
+++ b/x11-misc/wdm/wdm-1.26-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/06/13 23:23:09 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wdm/wdm-1.26-r1.ebuild,v 1.4 2005/06/14 13:19:48 smithj Exp $
 
 inherit eutils pam
 
@@ -11,13 +11,14 @@ HOMEPAGE="http://voins.program.ru/wdm/"
 SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
+KEYWORDS="x86 ~amd64 ~alpha"
 LICENSE="GPL-2"
 
 RDEPEND=">=x11-wm/windowmaker-0.65.1
 	virtual/x11
 	truetype? ( virtual/xft )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
+
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
diff --git a/x11-misc/wdm/wdm-1.26.ebuild b/x11-misc/wdm/wdm-1.26.ebuild
deleted file mode 100644
index 78aac21aa410..000000000000
--- a/x11-misc/wdm/wdm-1.26.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.26.ebuild,v 1.5 2004/08/17 19:40:58 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 ~amd64 ~alpha"
-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.28.ebuild b/x11-misc/wdm/wdm-1.28.ebuild
new file mode 100644
index 000000000000..daf0e5179312
--- /dev/null
+++ b/x11-misc/wdm/wdm-1.28.ebuild
@@ -0,0 +1,38 @@
+# 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.28.ebuild,v 1.1 2005/06/14 13:19:48 smithj Exp $
+
+inherit eutils pam
+
+IUSE="truetype pam selinux"
+
+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.70.0
+	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 selinux) \
+		|| 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
+}