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

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

6 files changed, 89 insertions, 12 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/Manifest b/x11-plugins/mountapp/Manifest
index 65acd55c3875..546274284fb1 100644
--- a/x11-plugins/mountapp/Manifest
+++ b/x11-plugins/mountapp/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX mountapp-3.1-WINGs_path.patch 678 RMD160 50b37c870b38c5d7f9b4ef25bd7427e808bebf2f SHA1 bcd452038fd596cc6689b6b9379f84d373d10d31 SHA256 99a03188b34d0fcdda004e9c7a912b0e89b37db8733b8deb07c73c2146eb81d1
+AUX mountapp-3.1-wmaker-0.95.patch 512 RMD160 bfd73082b392cb734c99edbcf7a7409be54ad094 SHA1 b1b3fc4f755e603ad836b9a2d89b67e9d56a86f9 SHA256 8b9bf19dfb81a94e1a8d29efddc7e91e0122e93b455b3582fd5159729d24fb48
 DIST mountapp-3.0.tar.gz 129551 RMD160 2012f2b4e67387975f48b9cd2f0e824427e9825d SHA1 4570fd734d8783a451d97886230bab8396c32d8a SHA256 a05f33d89c5b86ea8b1303302b5dd8477f634ae16309b762ecf8805514e4122a
-EBUILD mountapp-3.0.ebuild 750 RMD160 4d9f9fb985e807caf85924238521dcebfcb8a5a7 SHA1 96bc5faf052c1820e3b157914a92760f6f9a59fe SHA256 47d0c779ced16af3499ccf3cd391833207dd8bce2aa134f4481b14752c50375b
-MISC ChangeLog 983 RMD160 9fb72f41da00d296367c616600bea68e4fbf44f2 SHA1 b0cf6ab0c6dc7fff8d622055e5c9a927826a9db1 SHA256 f131dbf633ec287c7ce585a2288660c5bfc76c56381b120447bfd9875d1b47e2
+DIST mountapp-3.1.tar.gz 137267 RMD160 3b43408bbde7cec613d963a966aa4638fe8f0ba2 SHA1 3b07cd6a70985bdebe2c9d02e2b0003447a0388f SHA256 1a6f34f91b5fc5101ae6e14076af312e831535728c2838bd4a2dbbe7eeb1b07f
+EBUILD mountapp-3.0.ebuild 747 RMD160 3a943e27c076920637e8613e0c3b8e4400245ce1 SHA1 d8cc1d045fe4966716ceffddd01809de84e13c77 SHA256 39efe5b3f5899ca72917aab64df4849dc869c4f728605f3c7d30b0924f927c4f
+EBUILD mountapp-3.1.ebuild 868 RMD160 9d9cf2d16f01d6787be64cdee26640da73153c56 SHA1 8c6176438244de5f21642be063ba3408fd66025a SHA256 391b0580021e840f003eb0c711b59ef5f46207b2d26846c8ca4146ae494978c3
+MISC ChangeLog 1340 RMD160 15a5764b5212fa0311b6a73a4f1547b0947d062e SHA1 05a8cb5bf36485bdccf6c9083ff42144ba470a11 SHA256 e7ad005b02cd1b32f7b677e1589f21e63d679dba28f3494e90707fa05da381a1
 MISC metadata.xml 519 RMD160 6112620554c5d9f985e572e5e90c2888890fd564 SHA1 41744a08ae038fc19e559d60d43af2da61e1617f SHA256 235383888d64e289fefa36b456782e518f1af8bfac5a7e36c80112ff4d17e837
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkjniwQACgkQcxLzpIGCsLSMQgCgiB/y6yKGpQOIdWcnligPheeN
-X94An2kmbc9z/2aXU7AIh3hztYWFUVXx
-=ZSFo
+iF4EAREIAAYFAk/0FcgACgkQFYEBGcdFJfJL/QEAnAEsOY1++HV7fvA+8Qa2WB4O
+2OSTEDIPVUkL+IDMAwMA/3eUH+3dFL27ptDBj65+ejJtf6rtNY5/LftFkgGIFIFb
+=/ojO
 -----END PGP SIGNATURE-----
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
+}