Bump, add support for newer windowmaker, fix WINGs library detection, ebuild cleanup. Limit stable version to old windowmaker. Fixes bug #424677

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

5 files changed, 78 insertions, 5 deletions

diff --git a/x11-plugins/mountapp/ChangeLog b/x11-plugins/mountapp/ChangeLog
index a171a82ecd32..497090353fc4 100644
--- a/x11-plugins/mountapp/ChangeLog
+++ b/x11-plugins/mountapp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/mountapp
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/ChangeLog,v 1.9 2008/10/04 15:25:45 betelgeuse Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/ChangeLog,v 1.10 2012/07/04 10:06:52 voyageur Exp $
+
+*mountapp-3.1 (04 Jul 2012)
+
+  04 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> mountapp-3.0.ebuild,
+  +mountapp-3.1.ebuild, +files/mountapp-3.1-WINGs_path.patch,
+  +files/mountapp-3.1-wmaker-0.95.patch:
+  Bump, add support for newer windowmaker, fix WINGs library detection, ebuild
+  cleanup. Limit stable version to old windowmaker. Fixes bug #424677
 
   04 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> mountapp-3.0.ebuild:
   Add missing X11 deps. Fixes bug #204566.
diff --git a/x11-plugins/mountapp/files/mountapp-3.1-WINGs_path.patch b/x11-plugins/mountapp/files/mountapp-3.1-WINGs_path.patch
new file mode 100644
index 000000000000..ad16d35a45d6
--- /dev/null
+++ b/x11-plugins/mountapp/files/mountapp-3.1-WINGs_path.patch
@@ -0,0 +1,18 @@
+ configure.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2573590..d9796ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -102,8 +102,8 @@ dnl        Check for libWINGs (replaces libPropList)
+ dnl =====================================================
+ 
+ AC_CHECK_LIB(WINGs, WMGetFromPLString,
+-    [LIBPL_LIBS=-lWINGs LIBPL_INC_PATH="" missing=no],
+-    [missing=yes])
++    [LIBPL_LIBS="`get-wings-flags --libs`" LIBPL_INC_PATH="`get-wings-flags --cflags`" missing=no],
++    [missing=yes], $XLFLAGS $XLIBS `get-wings-flags --libs`)
+ 
+ if test "$missing" = yes; then
+     echo "********** WARNING *************"
diff --git a/x11-plugins/mountapp/files/mountapp-3.1-wmaker-0.95.patch b/x11-plugins/mountapp/files/mountapp-3.1-wmaker-0.95.patch
new file mode 100644
index 000000000000..497c4c0c06b5
--- /dev/null
+++ b/x11-plugins/mountapp/files/mountapp-3.1-wmaker-0.95.patch
@@ -0,0 +1,12 @@
+diff -Naur mountapp-3.1.orig/src/properties.c mountapp-3.1/src/properties.c
+--- mountapp-3.1.orig/src/properties.c	2012-07-04 11:36:00.177181490 +0200
++++ mountapp-3.1/src/properties.c	2012-07-04 11:36:57.007572387 +0200
+@@ -448,7 +448,7 @@
+         WMReleasePropList(mpProp);
+     }
+ 
+-    if (WMWritePropListToFile(props, getFileName(), FALSE) == FALSE)
++    if (WMWritePropListToFile(props, getFileName()) == FALSE)
+         printf("Error occurred synchronizing proplist\n");
+ 
+     WMReleasePropList(props);
diff --git a/x11-plugins/mountapp/mountapp-3.0.ebuild b/x11-plugins/mountapp/mountapp-3.0.ebuild
index 831f60813bfe..a3c844a43191 100644
--- a/x11-plugins/mountapp/mountapp-3.0.ebuild
+++ b/x11-plugins/mountapp/mountapp-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/mountapp-3.0.ebuild,v 1.12 2008/10/04 15:25:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/mountapp-3.0.ebuild,v 1.13 2012/07/04 10:06:52 voyageur Exp $
 
 DESCRIPTION="mount filesystems via an easy-to-use windowmaker applet"
 HOMEPAGE="http://mountapp.sourceforge.net"
@@ -15,7 +15,7 @@ RDEPEND="
 	=x11-libs/gtk+-1.2*
 	x11-libs/libX11
 	>=x11-libs/libXpm-3.5.7
-	>=x11-wm/windowmaker-0.80"
+	<x11-wm/windowmaker-0.95"
 DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
diff --git a/x11-plugins/mountapp/mountapp-3.1.ebuild b/x11-plugins/mountapp/mountapp-3.1.ebuild
new file mode 100644
index 000000000000..5630a4ca3f1d
--- /dev/null
+++ b/x11-plugins/mountapp/mountapp-3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/mountapp/mountapp-3.1.ebuild,v 1.1 2012/07/04 10:06:52 voyageur Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="mount filesystems via an easy-to-use windowmaker applet"
+HOMEPAGE="http://mountapp.sourceforge.net"
+SRC_URI="http://mountapp.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	=x11-libs/gtk+-1.2*
+	x11-libs/libX11
+	>=x11-libs/libXpm-3.5.7
+	>=x11-wm/windowmaker-0.95"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wmaker-0.95.patch
+	epatch "${FILESDIR}"/${P}-WINGs_path.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+}