Version bump by Lars Wendler (bug #436588).

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

9 files changed, 19 insertions, 361 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/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
-}