4 files changed, 24 insertions, 116 deletions

diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 7522f932a542..433569ab73a0 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,83 +1,9 @@
 # ChangeLog for x11-wm/pekwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.20 2005/05/22 00:43:16 fserb Exp $
-
-*pekwm-0.1.4_pre2 (22 May 2005)
-
-  22 May 2005; Fernando Serboncini <fserb@gentoo.org>
-  -files/pekwm-20050227-dialog_fix.patch, metadata.xml,
-  +pekwm-0.1.4_pre2.ebuild, -pekwm-20050129.2.ebuild,
-  -pekwm-20050227.ebuild, -pekwm-20050227-r1.ebuild:
-  Version bump.
-  Removed old development versions, to keep a more sane version numbering
-
-*pekwm-20050227-r1 (09 Apr 2005)
-
-  09 Apr 2005; Fernando Serboncini <fserb@gentoo.org>
-  +files/pekwm-20050227-dialog_fix.patch, +pekwm-20050227-r1.ebuild:
-  Added patch to fix decorations. Closes #86970.
-
-*pekwm-20050227 (01 Mar 2005)
-
-  01 Mar 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild, +pekwm-20050227.ebuild:
-  Version bump. Change theme pack filename.
-
-  08 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild:
-  ebuild cleanup
-
-  02 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild:
-  Forced imlib2 and themes
-
-*pekwm-20050129.2 (01 Feb 2005)
-
-  01 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  +pekwm-20050129.2.ebuild:
-  DEV Version bump. Added themes and imlib2 support
-
-  06 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -pekwm-0.1.2.ebuild,
-  -pekwm-0.1.3-r1.ebuild, -pekwm-0.1.3.ebuild:
-  Removed old ebuilds.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Remove S=
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Add inherit eutils
-
-  10 Dec 2003; Jon Portnoy <avenj@gentoo.org> pekwm-0.1.3-r2.ebuild :
-  AMD64 keyworded.
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> metadata.xml,
-  pekwm-0.1.3-r2.ebuild:
-  Marked 0.1.3-r2 stable on x86, added metadata
-
-*pekwm-0.1.3-r2 (30 Jul 2003)
-
-  13 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> pekwm-0.1.3-r2.ebuild,
-  files/pekwm-manpath-gentoo.diff:
-  Fixed man location and html docoment. Added truetype, xinerama and
-  perl IUSE flag.
-
-  30 Jul 2003; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Moved config files to /etc per upstream request.
-
-*pekwm-0.1.3-r1 (27 Jul 2003)
-
-  27 Jul 2003; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.3-r1.ebuild:
-  Fixes.
-
-  08 Jun 2003; Seemant Kulleen <seemant@gentoo.org> :
-  version bump
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.1 2002/11/19 09:50:29 bcowan Exp $
 
 *pekwm-0.1.2 (19 Nov 2002)
 
-  16 Feb 2002; Brad Cowan <bcowan@gentoo.org>:
-  
-  added pkgconfig dependency to check for xft bug# 14664.
-  
   19 Nov 2002; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.2.ebuild,
   ChangeLog, files/digest-pekwm-0.1.2 :
 
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 4fafb10aa8c6..e69de29bb2d1 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d64510f23c940f374f3494fab2633a3d ChangeLog 2638
-MD5 2a4c0e75ae56991a9c6b53b27c16ccf3 metadata.xml 666
-MD5 a2e45e5f38ce959b3e309193b7abc4b6 pekwm-0.1.3-r2.ebuild 1006
-MD5 0d196ab888bf1ddce88bdcc00c623807 pekwm-0.1.4_pre2.ebuild 1260
-MD5 feb34a062104c0c28685fa05192dc7be files/digest-pekwm-0.1.3-r2 64
-MD5 4eb560893fc98dbaba9b461b71a9df98 files/pekwm-manpath-gentoo.diff 455
-MD5 ecda2eccfb00e25051892b04e9b73efe files/digest-pekwm-0.1.4_pre2 133
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCj9W2xtZcznfol0URAnegAJ0YSHTMGsIipv1ZsunAodEg730eegCg/cVm
-C4T1I15plzMRK6+wNLepU8c=
-=3rCY
------END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 4b44a8ec64c8..5eb5bb96f844 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-wm</herd>
-	<maintainer><email>fserb@gentoo.org</email></maintainer>
 	<longdescription>
 		Pekwm is a window manager based on aewm++, but it no longer resembles 
 		it. It is highly configurable, rather fast, and aimed towards being 
diff --git a/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
index 9c85ac6e4b9b..c6029bdcd158 100644
--- a/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild,v 1.10 2005/02/01 23:28:38 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild,v 1.1 2003/07/30 13:58:56 bcowan Exp $
 
-inherit eutils
+IUSE=""
 
-IUSE="truetype perl xinerama"
+S="${WORKDIR}/${P}"
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://pekwm.pekdon.net/"
@@ -13,32 +13,32 @@ SRC_URI="http://pekwm.pekdon.net/files/source/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc amd64"
+KEYWORDS="~x86"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )
-	perl? ( dev-libs/libpcre )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-manpath-gentoo.diff
-}
+DEPEND="dev-util/pkgconfig
+	virtual/x11
+	perl? dev-libs/libpcre"
 
 src_compile() {
+	if pkg-config xft
+	    then
+		myconf="${myconf} --disable-xft"
+	    else
+		myconf="${myconf} --enable-xft"	
+	fi
+	use perl \
+		&& myconf="${myconf} --enable-pcre" \
+		|| myconf="${myconf} --disable-pcre"
 	econf \
-		`use_enable truetype xft` \
-		`use_enable xinerama` \
-		`use_enable perl pcre` \
-		--enable-harbour \
-		${myconf} || die
+	    --enable-xinerama \
+	    --enable-harbour \
+	    ${myconf} || die	
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install
 
 	cd ${S}
-	dodoc docs/pekwmdocs.txt AUTHORS ChangeLog* INSTALL LICENSE README* NEWS ROADMAP TODO
-	dohtml docs/pekwmdocs.html
+	dodoc docs/pekwmdocs.txt AUTHORS ChangeLog* INSTALL LICENSE README* NEWS ROADMAP TODO	
 }