fix bug #74881

Package-Manager: portage-2.0.51.19

4 files changed, 116 insertions, 10 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index 5104cb01f59e..9974186d4b90 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xosview
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.19 2004/12/28 22:10:10 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.20 2005/04/20 10:01:30 truedfx Exp $
+
+  20 Apr 2005; Harald van Dijk <truedfx@gentoo.org>
+  +files/xosview-emptyxpaths.patch, xosview-1.8.2.ebuild:
+  move up check for "empty" X paths to make it actually work (bug #74881)
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index c8cb072ed3b9..b8a6b1397157 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,7 +1,8 @@
-MD5 a1075589e79840dcb8c2afda7ad8b5d9 ChangeLog 3763
-MD5 26335e66a65db22f72ce4657bf7b79d2 xosview-1.8.1.ebuild 995
-MD5 baee5f2e5731148d9d99fac225504b73 xosview-1.8.2.ebuild 1123
+MD5 7157c576afa36d303d0ba0736f4645be ChangeLog 3948
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
-MD5 faeccca9ef506e145c54e58b72a5b3af files/xosview-1.8.1-kernel-2.5+.diff 4609
-MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2 65
+MD5 26335e66a65db22f72ce4657bf7b79d2 xosview-1.8.1.ebuild 995
+MD5 5b1d41ccdef822a8eb7858b6af71d044 xosview-1.8.2.ebuild 1216
 MD5 eddb6473d81018249d098b1d013fd044 files/digest-xosview-1.8.1 65
+MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2 65
+MD5 faeccca9ef506e145c54e58b72a5b3af files/xosview-1.8.1-kernel-2.5+.diff 4609
+MD5 e5d743e89fadcc4cc2facb642650e018 files/xosview-emptyxpaths.patch 1861
diff --git a/x11-misc/xosview/files/xosview-emptyxpaths.patch b/x11-misc/xosview/files/xosview-emptyxpaths.patch
new file mode 100644
index 000000000000..84ce057740a1
--- /dev/null
+++ b/x11-misc/xosview/files/xosview-emptyxpaths.patch
@@ -0,0 +1,95 @@
+
+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/xosview-1.8.2.ebuild b/x11-misc/xosview/xosview-1.8.2.ebuild
index e23041575551..025be297fd0c 100644
--- a/x11-misc/xosview/xosview-1.8.2.ebuild
+++ b/x11-misc/xosview/xosview-1.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.2.ebuild,v 1.8 2004/12/16 10:10:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.2.ebuild,v 1.9 2005/04/20 10:01:30 truedfx Exp $
 
-inherit gnuconfig
+inherit eutils gnuconfig
 
 DESCRIPTION="X11 operating system viewer"
 SRC_URI="mirror://sourceforge/xosview/${P}.tar.gz"
@@ -15,6 +15,12 @@ KEYWORDS="x86 alpha ppc amd64 sparc ppc64"
 DEPEND="virtual/x11"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xosview-emptyxpaths.patch
+}
+
 src_compile() {
 	# 2.6 kernel compatibility has been fixed upstream...
 	#if [ `uname -r | cut -d. -f1` -eq 2 -a `uname -r | cut -d. -f2` -ge 5 -a `uname -r | cut -d. -f2` -le 6 ] ; then