Enabling support of icewm-menu-gnome2 bug 205133

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 45 insertions, 6 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 3c3638eec06c..ef292376c522 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.139 2009/11/11 21:25:27 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.140 2009/11/16 15:36:27 vostorga Exp $
+
+  16 Nov 2009; Víctor Ostorga <vostorga@gentoo.org> icewm-1.2.37.ebuild,
+  +files/icewm-1.2.37-gnome2.patch:
+  Enabling support of icewm-menu-gnome2 bug 205133
 
   11 Nov 2009; Víctor Ostorga <vostorga@gentoo.org> icewm-1.2.37.ebuild:
   Fixing unrecognized options provided to configure, bug #261728
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index dc15236d24a8..b142646dbab7 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,4 +1,5 @@
 AUX IceWM.desktop 200 RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f SHA1 8d12634a04634d228243c1fb3834c6d18088bc68 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1
+AUX icewm-1.2.37-gnome2.patch 839 RMD160 6d2e6af53f344c840239a6ef1eba2836ac8e75c1 SHA1 9bc16af6dd6945f44b894d19551e8013e8b5a262 SHA256 e63580ba60d1aa3547a68337cb90c9b111645a6c03e5481e0dc11c97f0a7fea8
 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
@@ -11,6 +12,6 @@ EBUILD icewm-1.2.32.ebuild 2510 RMD160 5106ba68874227775bc0c96ce624a90bce0ab51d
 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
-EBUILD icewm-1.2.37.ebuild 2499 RMD160 68646fa12c0ee5ec3c2d05d44a1ee00cf1660f46 SHA1 b76d30cf66f95e3476111b96ec1e203dd07f0945 SHA256 49c53ae63764bc70b4438f9b3dfc833515e3f582bfccc168156f6f9ab35faa59
-MISC ChangeLog 21277 RMD160 ee458c710bf4e1496460dd464c74166229e13433 SHA1 81909062657df85c283b02736022499ae8ef28fe SHA256 64c41dc8f3412877c2b37fc76a47891ac85bafcda198f9df15bfb8b50425b877
+EBUILD icewm-1.2.37.ebuild 2903 RMD160 acc899cad67a07e57103b826ee072f152e4cb494 SHA1 4c3da820571d809aec96a9d6f39daf547bc6bfeb SHA256 9ce9cf5334b16437102c57ab04f49ef996a60cacc990690d37ff71f428ae6298
+MISC ChangeLog 21439 RMD160 c65d0340fbb8cfcb67fec4d9ad669e1baeaee420 SHA1 965dbb9677acad4e9793e44fdaa611ed6f2ac08c SHA256 572af19df1f5a76a775bfb628d6e66d02c47bbc6bc68f9c02e5c1e7e6b29c14f
 MISC metadata.xml 402 RMD160 8bade9b4bbf71a65376c80ba4492cff2acd9dd20 SHA1 d771e9460126efaeea2e7214f44a1e6ad9acaeee SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde
diff --git a/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch b/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
new file mode 100644
index 000000000000..89e3d0ffb207
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.37-gnome2.patch
@@ -0,0 +1,18 @@
+diff -NrU5 icewm-1.2.37.original/configure.in icewm-1.2.37/configure.in
+--- icewm-1.2.37.original/configure.in	2009-11-16 15:16:24.000000000 -0600
++++ icewm-1.2.37/configure.in	2009-11-16 15:17:39.000000000 -0600
+@@ -818,12 +818,12 @@
+   [ if test "${enable_menus_gnome2}" = "yes"; then
+       AC_PATH_PROG(PKG_CONFIG, pkg-config)
+     
+       if test "${PKG_CONFIG}" != ""; then
+ 	GNOME_VER=2
+-	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
+-	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
++	GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
++	GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
+ 
+ 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+ 
+ 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
+ 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
diff --git a/x11-wm/icewm/icewm-1.2.37.ebuild b/x11-wm/icewm/icewm-1.2.37.ebuild
index f2e43e80f2e8..31c425f49016 100644
--- a/x11-wm/icewm/icewm-1.2.37.ebuild
+++ b/x11-wm/icewm/icewm-1.2.37.ebuild
@@ -1,8 +1,8 @@
 # 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.37.ebuild,v 1.3 2009/11/11 21:25:27 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.37.ebuild,v 1.4 2009/11/16 15:36:27 vostorga Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Ice Window Manager with Themes"
 
@@ -18,7 +18,7 @@ SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="esd imlib nls truetype xinerama minimal debug uclibc"
+IUSE="esd gnome imlib nls truetype xinerama minimal debug uclibc"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrandr
@@ -30,6 +30,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libICE
 	xinerama? ( x11-libs/libXinerama )
 	esd? ( media-sound/esound )
+	gnome? ( gnome-base/gnome-desktop )
 	imlib? ( >=media-libs/imlib-1.9.10-r1 )
 	nls? ( sys-devel/gettext )
 	truetype? ( >=media-libs/freetype-2.0.9 )
@@ -57,6 +58,12 @@ src_unpack() {
 
 	echo "#!/bin/sh" > "$T/icewm"
 	echo "/usr/bin/icewm-session" >> "$T/icewm"
+
+	cd "${S}"
+	#Fixing gnome2 support
+	epatch "${FILESDIR}/${P}-gnome2.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -74,6 +81,7 @@ src_compile() {
 		--with-cfgdir=/etc/icewm
 		--with-docdir=/usr/share/doc/${PF}/html
 		$(use_with esd esd-config /usr/bin/esd-config)
+		$(use_enable gnome menus-gnome2)
 		$(use_enable nls)
 		$(use_enable nls i18n)
 		$(use_with imlib)
@@ -101,3 +109,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
+}