Fix ~arch version to support new windowmaker

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

5 files changed, 68 insertions, 25 deletions

diff --git a/x11-plugins/fsviewer/ChangeLog b/x11-plugins/fsviewer/ChangeLog
index 98e8c1e7473c..4a2bcea1ec92 100644
--- a/x11-plugins/fsviewer/ChangeLog
+++ b/x11-plugins/fsviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/fsviewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.20 2012/06/14 15:43:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.21 2012/07/11 22:06:05 voyageur Exp $
+
+  11 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> fsviewer-0.2.5.ebuild,
+  fsviewer-0.2.6.ebuild, +files/fsviewer-0.2.6-wmaker-0.95_support.patch:
+  Fix ~arch version to support new windowmaker
 
   14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> fsviewer-0.2.5.ebuild:
   x11-libs/libPropList rename to x11-libs/libproplist
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
index 164f7cc8b6fb..1cafb858d50e 100644
--- a/x11-plugins/fsviewer/Manifest
+++ b/x11-plugins/fsviewer/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX fsviewer-0.2.5-windowmaker.patch 10838 RMD160 23e49dc9c280ab76ee7aa190fedd402a304f33b2 SHA1 05665a59581a4ca5c9c88ceb9158dcf3ddaed83a SHA256 7672ad43c4997d97528aaf48ba936f1636e446670af189d7f3abb972139ae049
-DIST FSViewer.app-0.2.5.tar.gz 858696 RMD160 6e11d8c950c4c4b6020b2af33a32d31f7bca371d SHA1 0df2e5c6317f13b2c867c4d07c9840e455134f7d SHA256 12bbf02df5d8561c26a2934403fade8a1fca6efa4a00f15addaaf2d0c3d3aea8
-DIST fsviewer-app-0.2.6.tar.bz2 785422 RMD160 2c1ef34733b6bf614054c3c22bee4323d49dee58 SHA1 f643d550d0897130d63aba6e792b4f71e5652727 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b
-EBUILD fsviewer-0.2.5.ebuild 1229 RMD160 7791042cf5a357571209d851db13695c7f45edef SHA1 2745e625edd370567da06c867b14982b88be243a SHA256 92117e5e3974774db3031a4953d46497dd4b8ef3f3b620a8d1e5e80a5a23197c
-EBUILD fsviewer-0.2.6.ebuild 918 RMD160 522559d01a3e581034291c7df1e0ff8604e878c5 SHA1 c58b79c24ea1060174cf7f25d86a83c23a96b51c SHA256 2033ae58fcf587c8c6fd93975df37ed1dbf6168861bf40fde855be2389622851
-MISC ChangeLog 2404 RMD160 4eabe87796ea8445ad67727d686904971825ccaf SHA1 fe0cea5e6e23f6d0bb036def93acfca5ceb63b17 SHA256 66f5a8d2b9f0f1de5cfee5b7f7d53fd69efda4a714309cc5e4a06ca03c133403
-MISC metadata.xml 166 RMD160 329a26a7a3c988ec21889890b9cc64d0e23ce80b SHA1 92f1b1e68efc3b934ff7bcbeca7593b0f89c6a6a SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941
+AUX fsviewer-0.2.5-windowmaker.patch 10838 SHA256 7672ad43c4997d97528aaf48ba936f1636e446670af189d7f3abb972139ae049 SHA512 1fb3d78abb0f6b8ea4a9b73a459d8060284a5b1b6bd1d3f1cee2299d9131278498a47779e748d3b184703bcb03d911dc2eac685fdd9d711001c2cb63e0038d27 WHIRLPOOL 3a47747ca62efe7a39eaed007932109f24ddf5e99c4d48af1965f3aaba5fc9fd1a8eac47fd28f31bcba08880397898043f3e5a089cdf78c2b5e3b4c6a194fe1f
+AUX fsviewer-0.2.6-wmaker-0.95_support.patch 1624 SHA256 33446814da6bfc8b35f6ff79630de1cfe83319edb8356bba4e9775720aba01aa SHA512 d9cde107c34f13e4041d8c20d98e2051acf7c518f60454b891b4fe3a83995eb65e4db51f1699911f480fe09ea1d938750f620a85a9b71bc6f5f48affbe3c4dd9 WHIRLPOOL 0c47b8b8488ed8114953717ea530d1c82460ac491bbb6ab94532c5aecf0217b606a8a8def9f401312b78d91b1049cff12c7257a430776f328acb7d86d75481e3
+DIST FSViewer.app-0.2.5.tar.gz 858696 SHA256 12bbf02df5d8561c26a2934403fade8a1fca6efa4a00f15addaaf2d0c3d3aea8
+DIST fsviewer-app-0.2.6.tar.bz2 785422 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b WHIRLPOOL b3304d65687dd1444787caadfd31164cd67535adad99e5d8d6c6b221187130d44653276ffb3048961db87d2e877f76adf25b635a9c8fa98b427224ce2e012e76
+EBUILD fsviewer-0.2.5.ebuild 1254 SHA256 a471f7f8b2ec2cc61a0a3cc11681922154aa820a0ab53b4d58f3557c664e100a SHA512 63671d6215780e3c78d73709e5ef431ffa517011818c2f96130b036664fcbfde88c181638e2a41e7a8231da705c88f9588b7045b5fcb5b8bbb7a79e3e5bf3857 WHIRLPOOL 16da6e878b8e6a79137bf45ef2d1783b0ea08c592410bf21827fbed9093887b6ef47eee074acbc0a94c4bcc950dd2771b9745abef22e866ba83b1d6ccddbf7c3
+EBUILD fsviewer-0.2.6.ebuild 1061 SHA256 b058ebc66753ec7af3cf96695f62031e263b968f1915957ba9f99c5b6cc3daa6 SHA512 f19a5b7ce2162adb14e03260ac7ca7c237da57b236d5ab97fe07f0594389f608a03d815523dbe7976c76160cf2c2bcd1e06c3cc70dc8b6a57751630c275b670a WHIRLPOOL 75533ee1a925d8f5a0a020afd575d12ea657bcccc279878a38cac42bbc83b4835b00056044399574bc155242bdd8813527ee13e93b1eed2ad4798b6aad0ea567
+MISC ChangeLog 2603 SHA256 6836d3f06da898d7d4d767a0e817e97341e00c2fccb3b65f720963c2be427e3d SHA512 531773c18872dc264d516d426b3636a953aee719b366825f21f49157183fd9fd274a8ed98eb1f4902f4c73070656f0ae3033f901bb7f195c6adc1aee708326af WHIRLPOOL 4842f67f9bbd60cc8295121f9727610718a82970b988deccd272c016d782e197f10007ed193cfbf76c8fba63721f4c8cc032cc7b25fe82560dc85598f739e3bd
+MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2gXDAAoJEEdUh39IaPFNZc0H/1zRw587DNqtgLpF2MOnLsF3
-gYkIZHbT/ccBoM5gxYGw+/ulf4N4/AnhRqLpXL+82ASQfyj7pzrRvci739B3tVEN
-HutP3lsMokdg4EkZtYJ3NcTLcvFMYYGqZMwLSLIEFIgUNoracsxTPjL1JMcsBr8w
-8FB5T4xKsPxI2nq+VhJaEkpmvbjImqM+yByR9yOZKBewuEaXx+x68OGnYg0uXMLJ
-55SUB0HeudbjhsiDJneMVXL4jSfNElg3DGzYjDxZxztXSHG5D3Qy+JCOtSPxP9Ta
-VO/lmNScCadEzqcdK/4MU6NU68mi0hN0hN+gSZhWDkDm0LygG6Ts09nwtbWZ6is=
-=uJdV
+iF4EAREIAAYFAk/9+NgACgkQFYEBGcdFJfLXswEAhoyRnwkFrF2rVrzOFa9Z7nUF
+hI01pPFI7VNJYXTf7gMBAJC4aZqX+Yr2Ae6ARFeWJDB9haWdJs1JSG7c4+BVemNI
+=f9bo
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
new file mode 100644
index 000000000000..da64f3a0389e
--- /dev/null
+++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
@@ -0,0 +1,36 @@
+diff -Naur fsviewer-app-0.2.6.orig/configure.ac fsviewer-app-0.2.6/configure.ac
+--- fsviewer-app-0.2.6.orig/configure.ac	2012-07-11 17:55:06.448981246 +0200
++++ fsviewer-app-0.2.6/configure.ac	2012-07-11 18:04:15.528940159 +0200
+@@ -81,6 +81,8 @@
+              AC_MSG_ERROR([WMaker library not found]))
+ AC_CHECK_LIB(WINGs, WMAppSetMainMenu,,
+              AC_MSG_ERROR([WINGs library not found]))
++AC_CHECK_LIB(WUtil, WMCreatePLString,,
++             AC_MSG_ERROR([WUtil library not found]))
+ 
+ dnl Checks for PropList (not necessary since version 0.2.3b)
+ dnl AC_CHECK_HEADERS(proplist.h,, AC_MSG_WARN(Can't find PropList include-file: Please install libPropList (included in WindowMaker)))
+diff -Naur fsviewer-app-0.2.6.orig/defs/chdef.c fsviewer-app-0.2.6/defs/chdef.c
+--- fsviewer-app-0.2.6.orig/defs/chdef.c	2012-07-11 17:55:06.444981361 +0200
++++ fsviewer-app-0.2.6/defs/chdef.c	2012-07-11 17:55:50.387699640 +0200
+@@ -374,7 +374,7 @@
+ 	SetIntegerForKey(0, "DisplayMCListPixmap");
+ 	
+ 	WMWritePropListToFile(filesDB,
+-                wdefaultspathfordomain("FSViewer"), True);
++                wdefaultspathfordomain("FSViewer"));
+ 	result = 0;
+     }	    
+     else
+diff -Naur fsviewer-app-0.2.6.orig/src/extnInspector.c fsviewer-app-0.2.6/src/extnInspector.c
+--- fsviewer-app-0.2.6.orig/src/extnInspector.c	2012-07-11 17:55:06.452981130 +0200
++++ fsviewer-app-0.2.6/src/extnInspector.c	2012-07-11 17:56:02.315351669 +0200
+@@ -229,7 +229,7 @@
+ 
+     if(numRows > 0)
+ 	WMWritePropListToFile(filesDB,
+-	  wdefaultspathfordomain("FSViewer"), True);
++	  wdefaultspathfordomain("FSViewer"));
+ 
+    if(extn)
+ 	free(extn);
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
index 2dd33d684a03..37b41c961187 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.12 2012/06/14 15:43:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.13 2012/07/11 22:06:05 voyageur Exp $
 
 EAPI=1
 
@@ -40,7 +40,8 @@ DEPEND="
 	x11-libs/libXt
 	x11-proto/xextproto
 	x11-proto/xproto
-	x11-wm/windowmaker"
+	<x11-wm/windowmaker-0.95.0"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_PN}.app-${PV}
 
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
index e82b2ee75830..daa9d786fd0a 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 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/fsviewer/fsviewer-0.2.6.ebuild,v 1.1 2010/06/26 23:42:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild,v 1.2 2012/07/11 22:06:05 voyageur Exp $
 
-EAPI=2
-inherit multilib
+EAPI=4
+inherit autotools eutils multilib
 
 MY_P=${PN}-app-${PV}
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls"
 
-RDEPEND="x11-wm/windowmaker
+RDEPEND=">=x11-wm/windowmaker-0.95.2
 	x11-libs/libXft
 	x11-libs/libXpm
 	x11-libs/libX11"
@@ -26,14 +26,19 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable nls) \
 		--with-appspath=/usr/$(get_libdir)/GNUstep
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
+	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
 	dodoc AUTHORS ChangeLog NEWS README
 }