Fix building with GCC 4.3 wrt #219633, thanks to Peter Alfredsen. Also fix USE ncurses handling and pass --without-curses instead of --without-ncurses to configure.

Package-Manager: portage-2.1.5_rc6

5 files changed, 93 insertions, 96 deletions

diff --git a/app-admin/xstow/ChangeLog b/app-admin/xstow/ChangeLog
index f0271819881a..b66006774408 100644
--- a/app-admin/xstow/ChangeLog
+++ b/app-admin/xstow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/xstow
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.9 2007/02/21 19:49:52 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.10 2008/04/28 21:22:20 drac Exp $
+
+  28 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xstow-0.5.1-gcc43.patch, xstow-0.5.1.ebuild:
+  Fix building with GCC 4.3 wrt #219633, thanks to Peter Alfredsen. Also fix
+  USE ncurses handling and pass --without-curses instead of
+  --without-ncurses to configure.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 329e9b326d9f..3b8e6d74807b 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,5 @@
-AUX xstow-0.4.6-configure-ncurses.diff 2211 RMD160 30556fe4825a1039076b1e72a10f32959495b9f4 SHA1 1b5fac528868c63c8a04e48adff302b209d97790 SHA256 d842c4d053b93218bec0efbbbcb1dbea7c0a4311ccbde573edb38103b34b1359
+AUX xstow-0.5.1-gcc43.patch 2015 RMD160 0b95af42897df38578eff6bea7def830d6673324 SHA1 a7a6c438e50169ec4224b797566c2840c4b30510 SHA256 08d00d639f79bdfd4f4c81bea467f98bd6617ca6a47e5cee6ce2e91d1187e293
 DIST xstow-0.5.1.tar.gz 138091 RMD160 961205ef5625945daf746c093621fdaccbcf287f SHA1 79a7175b47b09ce615067850eb4d72e2ac2f75e5 SHA256 7543a46dd61a352647c74d60080d8a2c50db0c0b178316b6a367d7e60e2b38cf
-EBUILD xstow-0.5.1.ebuild 674 RMD160 659c25bdcac468d3fc70c0d635ad98ec83edb106 SHA1 8c8eb7d69be50576a45818fc127990161c30ad8c SHA256 58d3457c2b195c374b63e34ba1eff2965f4d1ce14c1b47a9a42b7a129ea2a745
-MISC ChangeLog 977 RMD160 44bb30c22ac3fa33074c33f8478073e655e8a6ba SHA1 f072d25170413e28e9b23b1f9b2df4bfe84b6cda SHA256 27275f1ef0d87aa48f0585bc5c966ee8a9f35ecb13df192d540665ed4ef7e5ed
+EBUILD xstow-0.5.1.ebuild 839 RMD160 31ca5ca12ffa7294f45f220b026c3e96494b2081 SHA1 797baaeb8966f4cf7d9513d1adfd9ff9c1b03466 SHA256 3a5e9551451753a5ac489d8858f6d0ff3b3e6047a2187e5f6fb9f1fa5672f426
+MISC ChangeLog 1252 RMD160 e722b2507881e3d78312f604c8d579505b3bdc99 SHA1 41b84755108bb51f5cf61f7d867d6db1c7353be7 SHA256 edfa1157de5f46bcd5c9fa15a46ba672a3206545273cc221966964f89d47594d
 MISC metadata.xml 330 RMD160 7173b5fd88df6a834caa6022fd238047d96b58e9 SHA1 74ab7ca3c46d4ea9162ff073826a6e34357ccf4e SHA256 769474d3a7e37580d4833c265b70721f1b0f316dc6ba60577d529e67d51c0e65
diff --git a/app-admin/xstow/files/xstow-0.4.6-configure-ncurses.diff b/app-admin/xstow/files/xstow-0.4.6-configure-ncurses.diff
deleted file mode 100644
index 11ae4ad30858..000000000000
--- a/app-admin/xstow/files/xstow-0.4.6-configure-ncurses.diff
+++ /dev/null
@@ -1,82 +0,0 @@
---- xstow-0.4.6/configure	2002-12-06 08:12:57.000000000 -0500
-+++ xstow-0.4.6-new/configure	2003-03-03 16:50:00.000000000 -0500
-@@ -4180,70 +4180,6 @@
- if test $ac_cv_header_curses_h = yes; then
- 
- 				  # test which libraray to use
--				  echo "$as_me:4183: checking for initscr in -lcurses" >&5
--echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
--if test "${ac_cv_lib_curses_initscr+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcurses  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line 4191 "configure"
--#include "confdefs.h"
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char initscr ();
--int
--main ()
--{
--initscr ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4210: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:4213: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4216: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:4219: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_curses_initscr=yes
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--ac_cv_lib_curses_initscr=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:4230: result: $ac_cv_lib_curses_initscr" >&5
--echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
--if test $ac_cv_lib_curses_initscr = yes; then
--
--						  support_curses=1
--				  		  LDFLAGS_DYNAMIC="$LDFLAGS -lcurses"
--
--cat >>confdefs.h <<\EOF
--#define HAVE_CURSES_H 1
--EOF
--
--else
--   support_curses=0
--fi
--
--				  if test $support_curses -eq 0; then
--
- 				  echo "$as_me:4247: checking for initscr in -lncurses" >&5
- echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
- if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
-@@ -4306,8 +4242,6 @@
-    support_curses=0
- fi
- 
--				  fi
--
- else
- 
- 				  support_curses=0
diff --git a/app-admin/xstow/files/xstow-0.5.1-gcc43.patch b/app-admin/xstow/files/xstow-0.5.1-gcc43.patch
new file mode 100644
index 000000000000..ded9e32cc577
--- /dev/null
+++ b/app-admin/xstow/files/xstow-0.5.1-gcc43.patch
@@ -0,0 +1,67 @@
+--- xstow-0.5.1.orig/src/format.h
++++ xstow-0.5.1/src/format.h
+@@ -648,17 +648,17 @@
+ 		
+ 		switch( num_of_args )
+ 		{
+-		    case 1: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 1: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ) ); break;
+-		    case 2: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 2: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ), D( b ) ); break;
+-		    case 3: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 3: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ), D( b ), D( c ) ); break;
+-		    case 4: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 4: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ), D( b ), D( c ), D( d ) ); break;
+-		    case 5: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 5: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ), D( b ), D( c ), D( d ), D( e ) ); break;
+-		    case 6: n = std::snprintf( buffer, buffer_size, format.c_str(),
++		    case 6: n = snprintf( buffer, buffer_size, format.c_str(),
+ 					       D( a ), D( b ), D( c ), D( d ), D( e ), D( f ) ); break;
+ 		}
+ 		
+--- xstow-0.5.1.orig/src/main.cpp
++++ xstow-0.5.1/src/main.cpp
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <iostream>
+ 
+ #include "local_config.h"
+--- xstow-0.5.1.orig/src/cppdir.cpp
++++ xstow-0.5.1/src/cppdir.cpp
+@@ -1,6 +1,8 @@
+ #include "cppdir.h"
+ #include "debug.h"
+ 
++#include <cstdlib>
++
+ #define OUT(level) DEBUG_OUT( level, MODULE_CPPDIR)
+ 
+ extern "C" {
+--- xstow-0.5.1.orig/src/setup.cpp
++++ xstow-0.5.1/src/setup.cpp
+@@ -5,6 +5,8 @@
+ #include "debug.h"
+ #include "nignore.h"
+ 
++#include <cstdlib>
++
+ #undef OUT
+ 
+ #define OUT( level ) DEBUG_OUT( level, MODULE_SETUP )
+--- xstow-0.5.1.orig/src/tree.cpp
++++ xstow-0.5.1/src/tree.cpp
+@@ -26,6 +26,7 @@
+ 
+ 
+ #include <algorithm>
++#include <cstring>
+ 
+ #define OUT(level) DEBUG_OUT(level, MODULE_TREE)
+ 
+
+
diff --git a/app-admin/xstow/xstow-0.5.1.ebuild b/app-admin/xstow/xstow-0.5.1.ebuild
index a395dc977e54..e48ce1c62137 100644
--- a/app-admin/xstow/xstow-0.5.1.ebuild
+++ b/app-admin/xstow/xstow-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-0.5.1.ebuild,v 1.3 2006/08/01 04:35:31 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-0.5.1.ebuild,v 1.4 2008/04/28 21:22:20 drac Exp $
 
 inherit eutils
 
@@ -10,18 +10,24 @@ SRC_URI="mirror://sourceforge/xstow/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="ncurses"
 
-DEPEND="virtual/libc
-	ncurses? ( sys-libs/ncurses )"
+DEPEND="ncurses? ( sys-libs/ncurses )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
 
 src_compile() {
-	econf `use_with ncurses` || die
-	emake || die
+	econf --disable-dependency-tracking $(use_with ncurses curses)
+	emake || die "emake failed."
 }
 
 src_install() {
-	dodoc README AUTHORS NEWS README TODO ChangeLog
-	make DESTDIR=${D} PACKAGE=${P} install || die
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" \
+		install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }