Add libXpm to DEPEND (#204541), depend on =x11-libs/gtk+-1*, misc QA fixes.

(Portage version: 2.1.3.19)

3 files changed, 25 insertions, 25 deletions

diff --git a/x11-plugins/wmmaiload/ChangeLog b/x11-plugins/wmmaiload/ChangeLog
index 9cae5e8a6a04..8c4a9e128444 100644
--- a/x11-plugins/wmmaiload/ChangeLog
+++ b/x11-plugins/wmmaiload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmaiload
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.24 2007/02/21 23:39:18 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.25 2008/01/12 01:04:26 coldwind Exp $
+
+  12 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
+  wmmaiload-1.0.2.ebuild, wmmaiload-2.2.1.ebuild:
+  Add libXpm to DEPEND (#204541), depend on =x11-libs/gtk+-1*, misc QA fixes.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
index 22d3aa91366f..e5be5f106d18 100644
--- a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.5 2006/01/31 19:46:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.6 2008/01/12 01:04:26 coldwind Exp $
 
-DESCRIPTION="dockapp that monitors one or more mailboxes."
+DESCRIPTION="dockapp that monitors one or more mailboxes"
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
 HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
 
 SLOT="0"
-KEYWORDS="x86 amd64 ppc ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r11"
 IUSE=""
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
+DEPEND="=x11-libs/gtk+-1*
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
 
 src_install () {
 	einstall || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ THANKS
 }
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
index 05f6885f8413..72534821805c 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild,v 1.3 2006/08/05 08:16:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-2.2.1.ebuild,v 1.4 2008/01/12 01:04:26 coldwind Exp $
 
 DESCRIPTION="dockapp that monitors one or more mailboxes."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
@@ -10,9 +10,9 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
 
-RDEPEND=">=x11-libs/gtk+-1.2.10-r11"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.1.4-r1"
+RDEPEND="=x11-libs/gtk+-1*
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
 
 IUSE=""
 
@@ -20,14 +20,12 @@ src_compile() {
 	./configure -p /usr || die "configure failed"
 
 	# Let's wipe out those horrid defaults
-	for file in "wmmaiload/Makefile wmmaiload-config/Makefile"
-	do
-		sed -i 's/^CFLAGS/#CFLAGS/' ${file}
-		sed -i 's/^CPPFLAGS/#CPPFLAGS/' ${file}
-		sed -i 's/^DEBUG_CFLAGS/#DEBUG_CFLAGS/' ${file}
-		sed -i 's/^DEBUG_CPPFLAGS/#DEBUG_CPPFLAGS/' ${file}
-		sed -i 's/^DEBUG_LDFLAGS/#DEBUG_LDFLAGS/' ${file}
-	done
+	sed -e 's/^CFLAGS/#CFLAGS/' \
+		-e 's/^CPPFLAGS/#CPPFLAGS/' \
+		-e 's/^DEBUG_CFLAGS/#DEBUG_CFLAGS/' \
+		-e 's/^DEBUG_CPPFLAGS/#DEBUG_CPPFLAGS/' \
+		-e 's/^DEBUG_LDFLAGS/#DEBUG_LDFLAGS/' \
+		-i wmmaiload/Makefile wmmaiload-config/Makefile
 
 	emake || die "parallel make failed"
 }