cleaned up old version, fixed giflib dependency

Package-Manager: portage-2.0.51.19

6 files changed, 21 insertions, 117 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index e77946b62fc8..68d37d8e99d0 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.94 2005/04/07 17:21:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.95 2005/04/23 20:31:23 morfic Exp $
+
+  23 Apr 2005; Daniel Goller <morfic@gentoo.org>
+  -files/icewm-1.2.19.ybutton.cc.patch, -icewm-1.2.19.ebuild,
+  icewm-1.2.20.ebuild:
+  cleaned up old version, fixed giflib dependency
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> icewm-1.2.20.ebuild:
   stable on amd64
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index c03fc0c1154b..3cc68ed885aa 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,9 +1,16 @@
-MD5 f19a3f0ea1799bec2e91eb418ae15b67 ChangeLog 15089
-MD5 741bfa27a2e0b5d98f590b9d182b6904 icewm-1.2.19.ebuild 2149
-MD5 9648c1510d1aa9faef6ad85ad2949726 icewm-1.2.20.ebuild 2160
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44fbd0412baf4837f98937fbabc16928 icewm-1.2.20.ebuild 2226
+MD5 86294b27b87235a9922af83efe427b9d ChangeLog 15275
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 c57345927d676af33427279528157a2e files/digest-icewm-1.2.19 64
 MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.19.ybutton.cc.patch 591
+MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCaqvdUpKYMelfdYERAhmdAJ9PrkJd5XlICCYfhMu9nuhBT5FmnQCeNAuT
+1M4bhlDuIRnzYWEhu5dfApU=
+=b4VA
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.19 b/x11-wm/icewm/files/digest-icewm-1.2.19
deleted file mode 100644
index a07c499f9296..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b41ed20d1e0f22d456b909d59cbea74e icewm-1.2.19.tar.gz 948416
diff --git a/x11-wm/icewm/files/icewm-1.2.19.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.19.ybutton.cc.patch
deleted file mode 100644
index 2eeb379ecb41..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.19.ybutton.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ybutton.cc.orig	2004-11-07 13:49:19.926827944 -0600
-+++ ybutton.cc	2004-11-07 13:49:30.113279368 -0600
-@@ -103,8 +103,7 @@
-         g.setColor(surface.color);
- 
-         if (wmLook == lookMetal) {
--            g.drawBorderM(x, y, w - 1, h - 1, !d);
--            d = 0; x += 2; y += 2; w -= 4; h -= 4;
-+	    d=0;
-         } else if (wmLook == lookGtk) {
-             g.drawBorderG(x, y, w - 1, h - 1, !d);
-             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
-@@ -114,7 +113,6 @@
-         }
- 
-         paint(g, d, YRect(x, y, w, h));
--        paintFocus(g, YRect(x, y, w, h));
-     }
- }
- 
diff --git a/x11-wm/icewm/icewm-1.2.19.ebuild b/x11-wm/icewm/icewm-1.2.19.ebuild
deleted file mode 100644
index 1caef3f4954f..000000000000
--- a/x11-wm/icewm/icewm-1.2.19.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.19.ebuild,v 1.6 2005/03/19 01:48:48 morfic Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager"
-
-HOMEPAGE="http://www.icewm.org/
-	http://sourceforge.net/projects/icewmsilverxp/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="ppc x86 sparc amd64"
-
-IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
-
-RDEPEND="virtual/x11
-	esd? ( media-sound/esound )
-	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop dev-util/pkgconfig )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-fonts/artwiz-fonts
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	if use silverxp ; then
-		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
-	fi
-
-	echo "#!/bin/sh" > $T/icewm
-	echo "/usr/bin/icewm-session" >> $T/icewm
-
-}
-
-src_compile(){
-
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts"
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf \
-		--with-libdir=/usr/share/icewm \
-		--with-cfgdir=/etc/icewm \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		$(use_with esd esd-config /usr/bin/esd-config) \
-		$(use_enable nls) \
-		$(use_enable nls i18n) \
-		$(use_with imlib) \
-		$(use_enable spell GtkSpell) \
-		$(use_enable x86 x86-asm) \
-		$(use_enable xinerama) \
-		$(use_enable gnome menus-gnome1) \
-		$(use_enable gnome menus-gnome2) \
-		${myconf} || die "configure failed"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-
-	emake || die "emake failed"
-}
-
-src_install(){
-	make DESTDIR=${D} install || die  "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe $T/icewm
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/IceWM.desktop
-}
diff --git a/x11-wm/icewm/icewm-1.2.20.ebuild b/x11-wm/icewm/icewm-1.2.20.ebuild
index 30c630f8809e..325eda59677c 100644
--- a/x11-wm/icewm/icewm-1.2.20.ebuild
+++ b/x11-wm/icewm/icewm-1.2.20.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-wm/icewm/icewm-1.2.20.ebuild,v 1.5 2005/04/07 17:21:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.6 2005/04/23 20:31:23 morfic Exp $
 
 inherit eutils
 
@@ -70,6 +70,7 @@ src_compile(){
 		${myconf} || die "configure failed"
 
 	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
 
 	emake || die "emake failed"
 }