Version bump by Lars Wendler (bug #436588).

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

10 files changed, 25 insertions, 375 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index 5a505e651cac..751b5de3e7c8 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.53 2012/09/05 16:09:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.54 2012/10/02 17:19:38 jer Exp $
+
+*xosview-1.10 (02 Oct 2012)
+
+  02 Oct 2012; Jeroen Roovers <jer@gentoo.org> -xosview-1.8.3-r1.ebuild,
+  -files/xosview-1.8.3-alpha-build-fix.patch, -files/xosview-1.8.3-gcc44.patch,
+  -files/xosview-1.8.3-remove-serialmeter.patch, -xosview-1.9.2.ebuild,
+  -files/xosview-1.9.2-emptyxpaths.patch, +xosview-1.10.ebuild,
+  -files/xosview-emptyxpaths.patch, -files/xosview-resdir.patch:
+  Version bump by Lars Wendler (bug #436588).
 
 *xosview-1.9.4 (05 Sep 2012)
 
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 9d11cc6c7335..9c24292fcd4b 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xosview-1.8.3-alpha-build-fix.patch 748 SHA256 bc5919139e1debda4fb1a90cf50536abb2833fc1bf4be90ff3feb280346bfd41 SHA512 523aca82fb480ae5a406b10c47393410e24fd3343003a3e23a274566984cd6ef73a1cc61126cbeecc91fce01b65c4cd7d6239002d13ae74832db5f818d5a38b9 WHIRLPOOL 42bb2fd155284d11b3bdcc64bbf94aa346ebb535fe061895417a9c55626c916ddc648b417c04b1066301a5f2d9bc2e7760877f2f95ef4dd3eb1306a1933e93b3
-AUX xosview-1.8.3-gcc44.patch 730 SHA256 6afa06f4dc73c2e8c8bdec7f9bdab278f1c82b294ca6cb7e19dc0119780b80f2 SHA512 03c4891c97bba7609976fa25506fd8b4a78f774e1cc76bf979199d8de6b4b00d2077d6e3c070efe6c8f91d1db6bcc439c697bcc4701e94bd636f6de5f98bbca2 WHIRLPOOL 63c41ff51cd0d56a3d23da087464ef0e089ee3e7eab05bd12c825bee98b1044c1806774b78c1c338ac359e4d423c8d0a90a987381ba57d3e624e6aad227f431c
-AUX xosview-1.8.3-remove-serialmeter.patch 2306 SHA256 957edf6f7faeda3f8bdad80ffa982cc95a14833e82636d60e918377fec3f8681 SHA512 e1ddc6ff4a56fd6d831b1c02ad9833092f37fec7e6529761b298513a7c47e2600895d0e7a8a1800544cac47e5459d7b8cbfb0c2fd74502c211d030a4adc2b807 WHIRLPOOL 9c1f4c5b2b1eba26d72199b6bb13b8774b7449fc14050fd2b80f6f696cbb99f6d68a181db1f17b8f5b4d333fd1911d768587d524ebcc634b3ea453f2189524de
-AUX xosview-1.9.2-emptyxpaths.patch 1057 SHA256 2547c05825d7fad7d1bd3408276dbc887e58ff6e8722d840d6a0afddf0a88831 SHA512 d19af8a8b002e6cd166a7bf0b2b74342932a271c401baa5ab63f4371c75ab2e4b8f19a6c041addfa742f4fa7fcd15e1266e691644adc083768bd8f6ecdf44ca0 WHIRLPOOL a1098d0d168d4c4b179492c7cfb86f864e5c835c1476dbd0287e96dc0077058aabecb723e378824be6b0689cf669b7ad00bf563f55606f0436dbf8726a04acb1
-AUX xosview-emptyxpaths.patch 1861 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8 SHA512 65a9fc22b46b41354657084e515a7fc67941b8b533db4f5d45bcf45e28981c83c171df4ec01cf94c2a7d9285c3496ef71e1ad8dd2a9da20edadd2eed5ddbf2f3 WHIRLPOOL 4dc176c4681d2bf5a12a827325150b9c0dfffa8c1817307e71a3775dbaf4bfe27dd02b809f2258d305721649f2aeb2ff1cb09c701fc8a540eb19c5c967f9150a
-AUX xosview-resdir.patch 2253 SHA256 85e40ec105077eadd60ef46a1a9994fff6f0a5d9bb550d120cad21e3e8911e94 SHA512 583f24db8c131ab311a9ebc217db0cdad67e53b2a7987d757a0ba4795771f5349bb3050af51fd5f1382849115a3bb34874ccb8615ffc25d3602ba75972ce8d7a WHIRLPOOL 71c7ab5b0eb08915351b62c4e0c02b11ba72308a606adbb260552ebf5c7fa7882be51e7b88c3b3c58a8e7b9e17214d3fcf88a1a4fe9de724d23f9951f689af01
-DIST xosview-1.8.3.tar.gz 259793 SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
-DIST xosview-1.9.2.tar.gz 259910 SHA256 3d1b7553f49d83c84290f0dbab862fadb34c92f20c03551cc0af73224222d8b3 SHA512 81cda0da851468b2d7e11b8d3f6710c1b7ff2404d820fa3f2894e51f6b1f20d76333c58c005b25d15db8884fc0705cfc094aac98790593d8d8d0a4961eadbb8a WHIRLPOOL 8230b15eef5c17237fc033e4f32c341533aad6ab56cfa72b770ca4371c6cab46eccebdff9cebaec772080e001bab8a516df22f78e431783501181af023776e38
+DIST xosview-1.10.tar.gz 135004 SHA256 25cdfa54a770633b5c0bd77aedaa3044d86952624f3f1bd8834c4b9ff88092d3 SHA512 4dfd21f831f545361156ff1ddfef2c3fd97ca395ea96aa32e966eebae1b2e44b2880b68b280d1494239976d372d79c5b76f41f5f19342209c8acd699edd20a51 WHIRLPOOL 2e7a78866bf9d8578529e7e4a15309672395dd03e7b31ffc854239344e5019dcd1697252555c32defe1f4c20a20f728218cb35e453d84ce058052e02ede37c8d
 DIST xosview-1.9.3.tar.gz 141644 SHA256 b48ef14e889bb987ce3aa601e1f93c16d69dd681a5ffdd612a95e80a6b1dd9e9 SHA512 909b25309a0eb055ee3341aa022934a795b7c9321c6a98328f2fd96cb82d41c065a2549746754c3aa2fe47a4672580aafef5fb0fac2c8e145b193046ccb8cd59 WHIRLPOOL ea0131ee76413195929426a2d34ecde70390edc0ccd76fd706f57f10473f4256a6b2606743acb48c3649876bbd90fc1f1b421993a3760850e5b76eaed660bd17
 DIST xosview-1.9.4.tar.gz 139463 SHA256 5d65457fcc885560946d144846d149c0c9ec8f963f7449c5190e94c7ae3b97ba SHA512 c0b50ec40794017bf9d6a6e21464e20d105b6fdd4d8745f66b94d66167c3d908cae841b9cd124113f29bd08da6ba67f8cc614a91599c84ebc666bd994bf2d924 WHIRLPOOL 6f2355a77dfb68ddf40eee2f6aa56b6272dece7f43e8a2b23cb5eabcc578479da26cf520f45438395994426026316beb464ad1a115b57d2359c46808eeb0ba0b
-EBUILD xosview-1.8.3-r1.ebuild 1041 SHA256 329ccf5498106009cddd58b337c4389f82c415706bc74978b47e4ae7603b2e95 SHA512 588a8aa81a83cfd0d241a02c397b2996cd32aa7f99f1fd2ad39f412c6e4e52c38ee183f373ddd841a3e7bb9d01107d2119af03e3eb53ad59cc1a1d2270a963fd WHIRLPOOL 7f9382f5d30d81a034df7b1b88eb06a4fec90832e51791ded7296a8ff15fed07001d6cef8f71a90c24e67f7a1360502f85ed27a0a7ee68693f8284bcfa27093e
-EBUILD xosview-1.9.2.ebuild 1365 SHA256 539c8f4e399756aae37cd0139798c7c4f27c398f86873d40d3dc9fe5ed30f3ee SHA512 9388d4502962665b7a7d1ffcd77a5e39d0f42a744d75f47a0c9ba93d69066bd289559345f507c3b4d5bd60bbabbeae61a7ee53aea95c323ba464961d9f34ce4c WHIRLPOOL 3f50e9f2b27f133006480293d11b37ded1a53b93caec9e26a308eda44a866cdf6b06f08949c0cfaa149e6c0e48f6309a0cebcccd2d2c6b52e901521dd4b81ea8
+EBUILD xosview-1.10.ebuild 1178 SHA256 d7ea46f6e7be1f178caf866da4ea5f313bf05329f687b132d4952f5fa32cba65 SHA512 656fb7b5d3482cb0eb8636f37d48699853983444d44311328f180cc1795def629a2984314bba2100fabc34ba60a1d627b621b7b0d3c3c6e3f76ec905d1663ad7 WHIRLPOOL 45b80f3ec1b6a7ea657ff774ef8efd743ff65d2c212e14da6027c85541409f3847c0fc1f35d2a1947b68664f58cc9f698bb293a94879e7dfbc9fc0372551f02c
 EBUILD xosview-1.9.3.ebuild 1179 SHA256 442110b093932ae69bdd0646ecd0c5d06ca78b1b24cf53e0aa357311625040b2 SHA512 02d48d78283627d4912114a5879180417fb3b442512b03c834146a215f8a3093f7fb3f469a0cec4d972b9e9c734efab6ab3e191bb67e2d93f50d1b441c8b4aa5 WHIRLPOOL 3d1daab05ca7242e782e0e1514eba6f191b087d934bb288e82f307114039eb0b64af8772d1bc42b07584f90485642db7737c91b3942b18dbbab8d51f461ef53f
 EBUILD xosview-1.9.4.ebuild 1179 SHA256 f6bac729f3733f5ec7ee3704aa9a0c2eae284ffc237da3fdb49c8b96765e9b15 SHA512 030667787054eea0096a28a1633ebd0feeabc5bcb1571b6a8ddb0e155f064896f32995f543b7571f449713294fca2ff3005864b80871b302d692bfa10ee0c9be WHIRLPOOL 34224d6b177ab0769221afabea43454c83c9bbed07c15633abed8d87d8d5685ec72d47771a83134cb208c24d25cf20ca31f84967e300c84fb084d233e10194e9
-MISC ChangeLog 8662 SHA256 5c7e7f0a2a8d9854cad5f525eff60fa01c687688d16bedf4323f7850cfc7b9eb SHA512 f0d817e04e623d52b53c5e0483b3973d4baffd75c98f55d3442fce375f73e37d3e84eba42ac3f5b1b030d9bb3ffcb9bfaa712b7860a08de53af8944671898624 WHIRLPOOL d224843e262f90a4ba9c87336632edf8feddefa8cda2fb61c00ab1a0a8f568eac6244f9951e1fd6392ace352d36c161a335fef6b43447e59b11c91caee50feef
+MISC ChangeLog 9092 SHA256 6ba6e3714c11eb521f1a2af6dcc0b5655db186c4ec0f349140ab7a7da3f7417b SHA512 57e46253450e86bec4c67504e987654c5a2e30c544d31cc6e5203be67d3e9655e80459daa7883de8197863394fcd3cd39e74266d948e19392b3cac81af44fc3d WHIRLPOOL f8fc33c4d1754e6eebe1d3586560b7d39934dadfe48e234f3e9bbbe78d49ad0522d6507818410bec3fef0367d7cc4a378506760697c796fdea958b124bdb17d5
 MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBHeS4ACgkQVWmRsqeSphPIgwCfTZGJFApOvdIRAZ4Mu3QV6G+G
-IZQAn2u3VCNUb4Sp5e+BAj3+s6uA65NN
-=Wx9Q
+iEYEAREIAAYFAlBrIi0ACgkQVWmRsqeSphOqUgCfWH1D5t0xDWsKhR+s3W5RH83+
+jfUAnjkStmgAiu8ZbIrNM9gXVsXxeUGa
+=VRN3
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch b/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch
deleted file mode 100644
index def92a3b05f9..000000000000
--- a/x11-misc/xosview/files/xosview-1.8.3-alpha-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-fix build failure on Alpha
-
-    $ alpha-unknown-linux-gnu-g++ -mieee -pipe -O2 -mcpu=ev4 -mieee -pipe -O2 ... -c intmeter.cc -o intmeter.o
-    intmeter.cc:16:21: fatal error: asm/irq.h: No such file or directory
-    compilation terminated.
-    make[1]: *** [intmeter.o] Error 1
-
-Patch by Kazuyoshi Furutaka <furutaka@jb3.so-net.ne.jp>
-diff -uNr xosview-1.8.3.orig/linux/intmeter.cc xosview-1.8.3/linux/intmeter.cc
---- xosview-1.8.3.orig/linux/intmeter.cc	2006-02-18 13:33:06.000000000 +0900
-+++ xosview-1.8.3/linux/intmeter.cc	2010-10-02 21:04:14.000000000 +0900
-@@ -12,9 +12,6 @@
- #include <fstream>
- #include <sstream>
- #include <stdlib.h>
--#ifdef __alpha__
--#include <asm/irq.h>
--#endif
- 
- 
- static const char *INTFILE     = "/proc/interrupts";
diff --git a/x11-misc/xosview/files/xosview-1.8.3-gcc44.patch b/x11-misc/xosview/files/xosview-1.8.3-gcc44.patch
deleted file mode 100644
index a5aa54944456..000000000000
--- a/x11-misc/xosview/files/xosview-1.8.3-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur xosview-1.8.3.orig/linux/lmstemp.cc xosview-1.8.3/linux/lmstemp.cc
---- xosview-1.8.3.orig/linux/lmstemp.cc	2006-02-18 07:13:07.000000000 +0200
-+++ xosview-1.8.3/linux/lmstemp.cc	2009-08-06 18:45:10.000000000 +0300
-@@ -29,7 +29,7 @@
-           << std::endl;
-     	parent_->done(1);
-     }
--    char *p;
-+    const char *p;
-     if ((p = strrchr(caption,'/')) != 0)
-       _highest = atoi(p+1);
-     else
-diff -ur xosview-1.8.3.orig/xwin.cc xosview-1.8.3/xwin.cc
---- xosview-1.8.3.orig/xwin.cc	2003-10-09 06:39:40.000000000 +0300
-+++ xosview-1.8.3/xwin.cc	2009-08-06 18:44:33.000000000 +0300
-@@ -3,6 +3,7 @@
- //
- 
- #include <X11/Xatom.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include "snprintf.h"
diff --git a/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch b/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
deleted file mode 100644
index 21af07120fee..000000000000
--- a/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/MeterMaker.cc xosview-1.8.3/linux/MeterMaker.cc
---- xosview-1.8.3.vanilla/linux/MeterMaker.cc	2007-01-28 20:09:28.000000000 +0100
-+++ xosview-1.8.3/linux/MeterMaker.cc	2007-01-28 20:19:04.000000000 +0100
-@@ -76,10 +76,12 @@
- #if defined (__arm__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__s390__) || defined(__s390x__)
-   /* these architectures have no ioperm() */
- #else
-+  /*
-   for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
-     if (_xos->isResourceTrue(SerialMeter::getResourceName(
-       (SerialMeter::Device)i)))
-         push(new SerialMeter(_xos, (SerialMeter::Device)i));
-+  */
- #endif
- 
-   // check for the interrupt meter
-diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/serialmeter.cc xosview-1.8.3/linux/serialmeter.cc
---- xosview-1.8.3.vanilla/linux/serialmeter.cc	2007-01-28 20:09:28.000000000 +0100
-+++ xosview-1.8.3/linux/serialmeter.cc	2007-01-28 20:18:08.000000000 +0100
-@@ -10,6 +10,7 @@
- //
- //  In order to use this new serial meter, xosview needs to be suid root.
- //
-+/*
- #include "serialmeter.h"
- #include "xosview.h"
- #include <fcntl.h>
-@@ -154,4 +155,4 @@
-   }
- 
-   return 0;
--}
-+}*/
-diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.cc xosview-1.8.3/snprintf.cc
---- xosview-1.8.3.vanilla/snprintf.cc	2007-01-28 20:09:28.000000000 +0100
-+++ xosview-1.8.3/snprintf.cc	2007-01-28 20:18:47.000000000 +0100
-@@ -1,11 +1,11 @@
- #ifndef HAVE_SNPRINTF
- 
-+/*
- #include <stdarg.h>
- #include <stdio.h>
- 
- extern "C" int snprintf ( char *str, int n, const char *format, ...)
-     {
--    /* punt the warning */
-     n++;
-     va_list ap;
-     va_start(ap, format);
-@@ -13,5 +13,6 @@
-     va_end(ap);
-     return rval;
-     }
-+*/
- 
- #endif
-diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.h xosview-1.8.3/snprintf.h
---- xosview-1.8.3.vanilla/snprintf.h	2007-01-28 20:09:28.000000000 +0100
-+++ xosview-1.8.3/snprintf.h	2007-01-28 20:18:20.000000000 +0100
-@@ -1,10 +1,12 @@
- #ifndef snprintf_h
- #define snprintf_h
- 
-+/*
- #ifndef HAVE_SNPRINTF
- extern "C" int snprintf ( char *str, int n, const char *format, ...);
- #else
- #include <stdio.h>
- #endif
-+*/
- 
- #endif
diff --git a/x11-misc/xosview/files/xosview-1.9.2-emptyxpaths.patch b/x11-misc/xosview/files/xosview-1.9.2-emptyxpaths.patch
deleted file mode 100644
index 9044bb1f708b..000000000000
--- a/x11-misc/xosview/files/xosview-1.9.2-emptyxpaths.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config/configure.in.orig	2012-02-04 13:20:17.730436149 +0100
-+++ config/configure.in	2012-02-04 13:21:05.333936874 +0100
-@@ -12,6 +12,20 @@
-     CXXFLAGS="$CXXFLAGS -I$x_includes"
- fi
- 
-+#
-+# On hpux10 both x_includes and x_libraries seem to be set to ""
-+# This causes compiler options like '-I' and '-L', which break
-+# the build.  So, we avoid empty strings here.
-+#
-+if test -z "$x_includes"
-+then
-+    x_includes=.
-+fi
-+if test -z "$x_libraries"
-+then
-+   x_libraries=.
-+fi
-+
- dnl
- dnl Added a proper check for the snprintf() function
- dnl
-@@ -381,22 +395,6 @@
- AC_SUBST(USE_MOD_VERSIONS)
- dnl  Check for usleep().  Currently, only HP-UX doesn't have it.
- AC_CHECK_FUNCS(usleep)
--
--#
--# On hpux10 both x_includes and x_libraries seem to be set to ""
--# This causes compiler options like '-I' and '-L', which break
--# the build.  So, we avoid empty strings here.
--#
--if test -z "$x_includes"
--then
--    x_includes=.
--fi
--if test -z "$x_libraries"
--then
--   x_libraries=.
--fi
--
--
- AC_SUBST(host_dir)
- AC_OUTPUT(\
-   Makefile:config/Makefile.top.in \
diff --git a/x11-misc/xosview/files/xosview-emptyxpaths.patch b/x11-misc/xosview/files/xosview-emptyxpaths.patch
deleted file mode 100644
index 84ce057740a1..000000000000
--- a/x11-misc/xosview/files/xosview-emptyxpaths.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-
-x_{includes,libraries} should be set *before* using them...
-
---- config/configure.in.old
-+++ config/configure.in
-@@ -9,6 +9,21 @@
- ICE_CXX_BOOL
- ICE_CXX_LONG_LONG
- AC_PATH_X
-+
-+#
-+# On Gentoo and hpux10 both x_includes and x_libraries are set to ""
-+# This causes compiler options like '-I' and '-L', which break
-+# the build.  So, we avoid empty strings here.
-+#
-+if test -z "$x_includes"
-+then
-+    x_includes=.
-+fi
-+if test -z "$x_libraries"
-+then
-+   x_libraries=.
-+fi
-+
- CXXFLAGS="$CXXFLAGS -I$x_includes"
- case $host_os in
- linux*)
-@@ -306,21 +321,6 @@
- AC_SUBST(USE_MOD_VERSIONS)
- dnl  Check for usleep().  Currently, only HP-UX doesn't have it.
- AC_CHECK_FUNCS(usleep)
--
--#
--# On hpux10 both x_includes and x_libraries seem to be set to ""
--# This causes compiler options like '-I' and '-L', which break
--# the build.  So, we avoid empty strings here.
--#
--if test -z "$x_includes"
--then
--    x_includes=.
--fi
--if test -z "$x_libraries"
--then
--   x_libraries=.
--fi
--
- 
- AC_SUBST(host_dir)
- AC_SUBST(NetMeter_Default_Setting)
---- configure.old
-+++ configure
-@@ -3163,6 +3163,21 @@
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
-+
-+#
-+# On Gentoo and hpux10 both x_includes and x_libraries are set to ""
-+# This causes compiler options like '-I' and '-L', which break
-+# the build.  So, we avoid empty strings here.
-+#
-+if test -z "$x_includes"
-+then
-+    x_includes=.
-+fi
-+if test -z "$x_libraries"
-+then
-+   x_libraries=.
-+fi
-+
- CXXFLAGS="$CXXFLAGS -I$x_includes"
- case $host_os in
- linux*)
-@@ -5218,21 +5233,6 @@
- fi
- done
- 
--
--#
--# On hpux10 both x_includes and x_libraries seem to be set to ""
--# This causes compiler options like '-I' and '-L', which break
--# the build.  So, we avoid empty strings here.
--#
--if test -z "$x_includes"
--then
--    x_includes=.
--fi
--if test -z "$x_libraries"
--then
--   x_libraries=.
--fi
--
- 
- 
- 
diff --git a/x11-misc/xosview/files/xosview-resdir.patch b/x11-misc/xosview/files/xosview-resdir.patch
deleted file mode 100644
index f6a0c2b67ec6..000000000000
--- a/x11-misc/xosview/files/xosview-resdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur xosview-1.8.3.orig/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
---- xosview-1.8.3.orig/config/Makefile.top.in	2006-02-18 10:12:33.000000000 +0200
-+++ xosview-1.8.3/config/Makefile.top.in	2009-12-23 18:14:52.000000000 +0200
-@@ -49,7 +49,7 @@
- PREFIX_TO_USE=@prefix@
- BINDIR=$(PREFIX_TO_USE)/bin
- MANDIR=$(PREFIX_TO_USE)/share/man/man1
--XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
-+XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
- PACKAGENAME=xosview-$(VERS)
- DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
- 
-diff -ur xosview-1.8.3.orig/Xrm.cc xosview-1.8.3/Xrm.cc
---- xosview-1.8.3.orig/Xrm.cc	2006-02-18 06:33:04.000000000 +0200
-+++ xosview-1.8.3/Xrm.cc	2009-12-23 18:14:26.000000000 +0200
-@@ -152,20 +152,26 @@
- 
-   //  Merge in the system resource database.
-   char rfilename[2048];
-+  int result;
- 
-   // Get the app-defaults
--  snprintf(rfilename, 2048, "/usr/X11R6/lib/X11/app-defaults/%s",
-+  //  Check /usr/lib/X11 for when /usr/X11R6 compatibility symlink is removed
-+  result = snprintf(rfilename, sizeof rfilename, "/etc/X11/app-defaults/%s",
-       XrmQuarkToString(_class));
--  if (rfilename != NULL)
-+  if (result >= 0 && result < sizeof rfilename)
-+    XrmCombineFileDatabase (rfilename, &_db, 1);
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
-+      XrmQuarkToString(_class));
-+  if (result >= 0 && result < sizeof rfilename)
-     XrmCombineFileDatabase (rfilename, &_db, 1);
-   //  Try a few more, for SunOS/Solaris folks.
--  snprintf(rfilename, 2048, "/usr/openwin/lib/X11/app-defaults/%s",
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/openwin/lib/X11/app-defaults/%s",
-       XrmQuarkToString(_class));
--  if (rfilename != NULL)
-+  if (result >= 0 && result < sizeof rfilename)
-     XrmCombineFileDatabase (rfilename, &_db, 1);
--  snprintf(rfilename, 2048, "/usr/local/X11R6/lib/X11/app-defaults/%s",
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/local/share/X11/app-defaults/%s",
-       XrmQuarkToString(_class));
--  if (rfilename != NULL)
-+  if (result >= 0 && result < sizeof rfilename)
-     XrmCombineFileDatabase (rfilename, &_db, 1);
- 
-   //  Now, check for an XOSView file in the XAPPLRESDIR directory...
-Only in xosview-1.8.3: Xrm.cc.orig
diff --git a/x11-misc/xosview/xosview-1.9.2.ebuild b/x11-misc/xosview/xosview-1.10.ebuild
index d9ad0c40a061..d61442f65c16 100644
--- a/x11-misc/xosview/xosview-1.9.2.ebuild
+++ b/x11-misc/xosview/xosview-1.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.9.2.ebuild,v 1.5 2012/08/19 15:59:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.10.ebuild,v 1.1 2012/10/02 17:19:38 jer Exp $
 
 EAPI=4
 
-inherit autotools eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="X11 operating system viewer"
 HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
@@ -25,15 +25,12 @@ DEPEND="${COMMON_DEPS}
 
 src_prepare() {
 	sed -e 's:lib/X11/app:share/X11/app:g' \
-		-i Xrm.cc config/Makefile.top.in || die
-	sed -e 's:$(CFLAGS)::g' \
-		-e 's:@EXTRA_CXXFLAGS@::g' \
-		-i config/Makefile.config.in || die
-	epatch "${FILESDIR}"/${P}-emptyxpaths.patch
-	pushd config &> /dev/null
-	eautoreconf
-	cp configure ../ || die
-	popd &> /dev/null
+		-i xosview.1 || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
@@ -42,7 +39,7 @@ src_install() {
 	insinto /usr/share/X11/app-defaults
 	newins Xdefaults XOsview
 	doman *.1
-	dodoc CHANGES README README.linux TODO
+	dodoc CHANGES README.linux TODO
 }
 
 pkg_postinst() {
diff --git a/x11-misc/xosview/xosview-1.8.3-r1.ebuild b/x11-misc/xosview/xosview-1.8.3-r1.ebuild
deleted file mode 100644
index d1096dd2aa01..000000000000
--- a/x11-misc/xosview/xosview-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3-r1.ebuild,v 1.3 2012/08/19 15:59:35 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://xosview.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPS="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt"
-
-RDEPEND="${COMMON_DEPS}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/xosview-emptyxpaths.patch
-	epatch "${FILESDIR}"/xosview-resdir.patch
-	epatch "${FILESDIR}"/${P}-remove-serialmeter.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-alpha-build-fix.patch
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe xosview
-	insinto /usr/share/X11/app-defaults
-	newins Xdefaults XOsview
-	doman *.1
-	dodoc CHANGES README README.linux TODO
-}