Version bump thanks to kflirik and others (bug #316641).

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

7 files changed, 48 insertions, 450 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 90d661dad4b7..474898a2db5a 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.144 2010/11/02 02:56:36 ford_prefect Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.145 2011/07/19 13:17:01 jer Exp $
+
+*icewm-1.3.7 (19 Jul 2011)
+
+  19 Jul 2011; Jeroen Roovers <jer@gentoo.org> -icewm-1.2.30.ebuild,
+  -icewm-1.2.32.ebuild, -icewm-1.2.33.ebuild, -icewm-1.2.34.ebuild,
+  -icewm-1.2.35.ebuild, +icewm-1.3.7.ebuild:
+  Version bump thanks to kflirik and others (bug #316641).
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org> icewm-1.2.37.ebuild:
   Clarify gnome-desktop dep as being slot 2
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index b6219f3eca24..c5893b1a6edb 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,17 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX IceWM.desktop 200 RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f SHA1 8d12634a04634d228243c1fb3834c6d18088bc68 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1
 AUX icewm-1.2.37-gnome2.patch 1194 RMD160 e378782e1c4ede9e776f9b4e4189e6db47f40da3 SHA1 2fad6a6402bc34d94af5a3cccd6a5066d85b0d4e SHA256 c1f64007fe60a898b3f816b08b8ef03a8ed9607a4367aead176220ad0b56c3c9
 AUX icewm-uclibc.patch 708 RMD160 868be4c981dbcb8802d74321d77a43b91b0a3e7a SHA1 557a70d7a4d8193c7d8ca427c142edd9676e792e SHA256 3357b8d27e4979a59fc45298ded733c623832143b1c155da72cfb24aee6d3e95
-DIST icewm-1.2.30.tar.gz 809353 RMD160 6848ac22f6562a8e0bb43def621b26f66bef56a7 SHA1 f3cb31275b2d5fefd791711d1c7f113e7303a687 SHA256 4b802cf77ecf09bc44345f8fba3c11fd08dca0e8272e628b447ecf7289637e1d
-DIST icewm-1.2.32.tar.gz 821920 RMD160 8febcb1f0675e877c0040b732db9f509349ad4a7 SHA1 98714e22eaea0a677253a15361430968e9646161 SHA256 c2fe6ef0bdc0a9f841ae6fe214c06a15d666f90df027d105305f3e0dc109a667
-DIST icewm-1.2.33.tar.gz 829799 RMD160 1c3863beaa724727665354d03d3982abf6914216 SHA1 dce8cd65e9f6d1d692c93fb3dbba18a68f431ff8 SHA256 01ecb46d76dc24cc09eddfbf205111a31936602af72df0032f32611e97e91a39
-DIST icewm-1.2.34.tar.gz 830558 RMD160 f85a9332312134d22db19e806d9e7122ece76f07 SHA1 9cc7c47e47767eccf957561f1a166ffe631c3d42 SHA256 09db6549cbe1a59a01d0c83d193425fffa6513fad07bc5aa872d0a995deb20db
-DIST icewm-1.2.35.tar.gz 831087 RMD160 19b044d9f88f860d3e25a3f419404e106162f40b SHA1 a0174901ca89aa091a58efedfec1536c5e477210 SHA256 2dfab6ba731eca3035bd86369b9e0599fff2785983cdca7f4cd3a39290998ddd
 DIST icewm-1.2.37.tar.gz 841879 RMD160 1e28eb750fd07321cf66bcaa617fc782acbb82f1 SHA1 bee1ca66d2282888807551bc28a65b08e4108027 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595
-EBUILD icewm-1.2.30.ebuild 2446 RMD160 27a46978551f380bd44c9e41d004bf8ca47ba1e9 SHA1 351f63b7f61cf4603add5b4f091f0193c34be4ba SHA256 170ba301bd2bb1bcf3e89348157f79abbe8880eeb11786ba80d9623ef74624f7
-EBUILD icewm-1.2.32.ebuild 2510 RMD160 5106ba68874227775bc0c96ce624a90bce0ab51d SHA1 8b418c711beacb3bba496cea777c9ecbba6a8826 SHA256 cc67deda3986e95f0623e8b522204106972d5cb8c5f1f8c4da6f0e58f6d4bac9
-EBUILD icewm-1.2.33.ebuild 2509 RMD160 e25794f0f871c15741d14b14fdca82f21a76ee72 SHA1 496fa06c23a38848f22c858266f8ae11c37673e0 SHA256 ce614f0a27cc6f9e7dc27e157609a37ad6f3aced58be5d8ac5bbb0ba222da6c8
-EBUILD icewm-1.2.34.ebuild 2542 RMD160 5f01b34ae3a7d87f98437550eeef4e05defd89bd SHA1 5014e7df0f4317cc8016544969b44c676f45844a SHA256 c89588f2359e9bc55f5f76c6f61b1f653a1906aaa472de21856928002b0ae8d7
-EBUILD icewm-1.2.35.ebuild 2548 RMD160 0414de3a57b594f4809a2cbca11f6177c03e2277 SHA1 719724404af6a9420a7270f74e45773747c9466d SHA256 96cb86395ca5be9d38a8d1e23d68d79e0c78c0a9b556fc9a5ffe2d3d9935cff2
+DIST icewm-1.3.7.tar.gz 898197 RMD160 0b6682eff832b6b05200d5c9581d293b80af0ebb SHA1 ce8d86190e275dc7db2d8c28472a579264120803 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b
 EBUILD icewm-1.2.37.ebuild 2913 RMD160 c474cfda2755901be1d746730664b8020d33df1a SHA1 3e3d6a8265e84815cb8c18110a85cd7b12cf777b SHA256 97ee85df7dbb4a0967d185bae151f9ec0624830c058d1f5b30ef31516cd8c3a1
-MISC ChangeLog 21882 RMD160 0813772ee6493b3f9c7edf1cad1e853cac275e3a SHA1 9568aa9355c291f648ec791ca276c84a3767ceff SHA256 12f9c7a92943069a51acc11a8b5f5cffccb0e930dd8d729dc44c9b5f57a14a2b
+EBUILD icewm-1.3.7.ebuild 2603 RMD160 171b8f4c22185cecee6369f6401c39efc021ad74 SHA1 691a8b063aad646cf51ded1815d183580f7cc4dc SHA256 b2680a0a0b198b884da6ee06b569d60b3636f1e91bcbb0251b8173e7c684a993
+MISC ChangeLog 22143 RMD160 2d820de80772d67b46c9eb17ddbff99c175bf071 SHA1 0fad67f110bbcf290d1c371e4820ad6b3c1b18ee SHA256 befe2e6ed807b87974081b5def5783235ba5035c4bf069cf44fbda8a255ca053
 MISC metadata.xml 402 RMD160 8bade9b4bbf71a65376c80ba4492cff2acd9dd20 SHA1 d771e9460126efaeea2e7214f44a1e6ad9acaeee SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4lg9IACgkQVWmRsqeSphPL8ACfXd5r5XV+7Jei2kZNOdU5IZw2
+jFAAn0Grsx/LlRSAbJuJbZZP0c9qbIlU
+=V5YM
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/icewm-1.2.30.ebuild b/x11-wm/icewm/icewm-1.2.30.ebuild
deleted file mode 100644
index a1cda69f9cad..000000000000
--- a/x11-wm/icewm/icewm-1.2.30.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.30.ebuild,v 1.8 2009/08/03 10:46:18 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ppc sparc x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-
-	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
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--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 debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${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"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES 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.32.ebuild b/x11-wm/icewm/icewm-1.2.32.ebuild
deleted file mode 100644
index 374baffa4e1a..000000000000
--- a/x11-wm/icewm/icewm-1.2.32.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.32.ebuild,v 1.4 2009/08/03 10:46:18 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ppc sparc x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	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
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--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 debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${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"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES 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.33.ebuild b/x11-wm/icewm/icewm-1.2.33.ebuild
deleted file mode 100644
index b6faf6929e59..000000000000
--- a/x11-wm/icewm/icewm-1.2.33.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.33.ebuild,v 1.1 2007/12/18 15:06:41 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/src"
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	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
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--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 debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${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"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES 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.34.ebuild b/x11-wm/icewm/icewm-1.2.34.ebuild
deleted file mode 100644
index 1edd9f5a48bb..000000000000
--- a/x11-wm/icewm/icewm-1.2.34.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.34.ebuild,v 1.1 2008/01/24 20:30:40 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-
-HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libSM
-	x11-libs/libICE
-	xinerama? ( x11-libs/libXinerama )
-	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/src"
-
-	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
-
-	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
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--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 debug)"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${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"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS CHANGES 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.35.ebuild b/x11-wm/icewm/icewm-1.3.7.ebuild
index 28b0ed09b8ea..42880c1e789b 100644
--- a/x11-wm/icewm/icewm-1.2.35.ebuild
+++ b/x11-wm/icewm/icewm-1.3.7.ebuild
@@ -1,24 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.35.ebuild,v 1.2 2009/01/07 14:52:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.1 2011/07/19 13:17:01 jer Exp $
 
-inherit eutils
+EAPI="4"
 
 DESCRIPTION="Ice Window Manager with Themes"
-
 HOMEPAGE="http://www.icewm.org/"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
 LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug esd gnome minimal nls truetype uclibc xinerama"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="esd imlib nls spell truetype xinerama minimal debug uclibc"
+#fix for icewm preversion package names
+S=${WORKDIR}/${P/_}
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr
@@ -30,7 +25,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libICE
 	xinerama? ( x11-libs/libXinerama )
 	esd? ( media-sound/esound )
-	imlib? ( >=media-libs/imlib-1.9.10-r1 )
+	gnome? ( gnome-base/gnome-desktop:2 )
 	nls? ( sys-devel/gettext )
 	truetype? ( >=media-libs/freetype-2.0.9 )
 	media-libs/giflib"
@@ -49,21 +44,18 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${S}/src"
-
 	use uclibc && epatch "${FILESDIR}/icewm-uclibc.patch"
 
 	echo "#!/bin/sh" > "$T/icewm"
 	echo "/usr/bin/icewm-session" >> "$T/icewm"
 }
 
-src_compile() {
-
+src_configure() {
 	if use truetype
 	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
+		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
 	else
 		myconf="${myconf} --disable-xfreetype --enable-corefonts
 			$(use_enable minimal lite)"
@@ -73,25 +65,22 @@ src_compile() {
 		--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 debug)
+		$(use_enable gnome menus-gnome2)
 		$(use_enable nls i18n)
-		$(use_with imlib)
-		$(use_enable spell GtkSpell)
+		$(use_enable nls)
 		$(use_enable x86 x86-asm)
 		$(use_enable xinerama)
-		$(use_enable debug)"
+		$(use_with esd esd-config /usr/bin/esd-config)"
 
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf} || die "configure failed"
+	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
 
 	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"
 }
 
 src_install(){
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
 	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
 	dohtml -a html,sgml doc/*
@@ -102,3 +91,11 @@ src_install(){
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}/IceWM.desktop"
 }
+
+pkg_postinst() {
+	if use gnome; then
+		elog "You have enabled gnome USE flag which provides icewm-menu-gnome2 ."
+		elog "It is used internally and generates IceWM program menus from"
+		elog "FreeDesktop .desktop files"
+	fi
+}