Update st_flags patch, bug 94637.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 198 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 6348f757476e..ea66fe54d8a7 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.153 2005/07/03 09:44:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.154 2005/07/19 20:38:29 kloeri Exp $
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.4.1-st_flags.patch, python-2.4.1-r1.ebuild:
+  Update st_flags patch, bug 94637.
 
   03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild:
   Stable on alpha.
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 251cb6595375..c5dd358a5147 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f40c6e59f67a1d132990508cbba848bc python-2.4.1-r1.ebuild 8216
+MD5 b6b683c2d0b665f8d40d69a029809bf3 python-2.4.1-r1.ebuild 8215
 MD5 5857a314767fd0ae2243590999fe78b2 python-2.2.3-r6.ebuild 4491
-MD5 cd8485e9a1374d0ddcc0c1db14f9b04a ChangeLog 25849
+MD5 4efe10ec3ef92b1065178a8f5222f4e3 ChangeLog 26001
 MD5 3c8848046c093b8d3e1d531b8cfb59d0 python-2.3.5-r1.ebuild 7857
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299
@@ -18,6 +18,7 @@ MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
+MD5 5af982af8ad4befbf15567ae399cf2b9 files/python-2.4.1-st_flags.patch 5649
 MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358
@@ -58,7 +59,7 @@ MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCx7OsKf2g/qXtneoRAsCHAJ9Sb9Y/AGuYakr/zfSIbOMjtQrJVACdEUjD
-iHW2Ft98i3uA3kbNxxBLGIc=
-=jnfW
+iD8DBQFC3WVBKf2g/qXtneoRAt0zAJ4kc8k/1NoleEIPzyca7bpgFN6soQCgkvkz
+p3gab94fbr9oKvNJrNEjjPo=
+=VUaa
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/files/python-2.4.1-st_flags.patch b/dev-lang/python/files/python-2.4.1-st_flags.patch
new file mode 100644
index 000000000000..a042bd257397
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.1-st_flags.patch
@@ -0,0 +1,185 @@
+Only in Python-2.4.1-st_flags/: autom4te.cache
+diff -ur Python-2.4.1/configure Python-2.4.1-st_flags/configure
+--- Python-2.4.1/configure	2005-03-29 01:23:02.000000000 +0200
++++ Python-2.4.1-st_flags/configure	2005-06-19 01:26:10.485461096 +0200
+@@ -16411,6 +16411,116 @@
+ 
+ fi
+ 
++echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5
++echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6
++if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static struct stat ac_aggr;
++if (ac_aggr.st_flags)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_stat_st_flags=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static struct stat ac_aggr;
++if (sizeof ac_aggr.st_flags)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_member_struct_stat_st_flags=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_member_struct_stat_st_flags=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_flags" >&5
++echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6
++if test $ac_cv_member_struct_stat_st_flags = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_FLAGS 1
++_ACEOF
++
++
++fi
++
+ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
+ echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
+ if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
+diff -ur Python-2.4.1/configure.in Python-2.4.1-st_flags/configure.in
+--- Python-2.4.1/configure.in	2005-03-29 01:23:34.000000000 +0200
++++ Python-2.4.1-st_flags/configure.in	2005-06-19 01:25:34.050000128 +0200
+@@ -2421,6 +2421,7 @@
+ AC_STRUCT_TIMEZONE
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ AC_CHECK_MEMBERS([struct stat.st_blksize])
++AC_CHECK_MEMBERS([struct stat.st_flags])
+ AC_STRUCT_ST_BLOCKS
+ 
+ AC_MSG_CHECKING(for time.h that defines altzone)
+Only in Python-2.4.1-st_flags/: configure.in.orig
+diff -ur Python-2.4.1/Modules/posixmodule.c Python-2.4.1-st_flags/Modules/posixmodule.c
+--- Python-2.4.1/Modules/posixmodule.c	2005-03-13 23:18:26.000000000 +0100
++++ Python-2.4.1-st_flags/Modules/posixmodule.c	2005-06-19 01:25:34.048000432 +0200
+@@ -703,6 +703,9 @@
+ #ifdef HAVE_STRUCT_STAT_ST_RDEV
+ 	{"st_rdev",    "device type (if inode device)"},
+ #endif
++#ifdef HAVE_STRUCT_STAT_ST_FLAGS
++	{"st_flags",    "flags set onf ile"},
++#endif
+ 	{0}
+ };
+ 
+@@ -724,6 +727,12 @@
+ #define ST_RDEV_IDX ST_BLOCKS_IDX
+ #endif
+ 
++#ifdef HAVE_STRUCT_STAT_ST_FLAGS
++#define ST_FLAGS_IDX (ST_RDEV_IDX+1)
++#else
++#define ST_FLAGS_IDX ST_RDEV_IDX
++#endif
++
+ static PyStructSequence_Desc stat_result_desc = {
+ 	"stat_result", /* name */
+ 	stat_result__doc__, /* doc */
+@@ -887,6 +896,10 @@
+ 	PyStructSequence_SET_ITEM(v, ST_RDEV_IDX,
+ 			 PyInt_FromLong((long)st.st_rdev));
+ #endif
++#ifdef HAVE_STRUCT_STAT_ST_FLAGS
++	PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX,
++			 PyInt_FromLong((long)st.st_flags));
++#endif
+ 
+ 	if (PyErr_Occurred()) {
+ 		Py_DECREF(v);
+Only in Python-2.4.1-st_flags/Modules: posixmodule.c.orig
+diff -ur Python-2.4.1/pyconfig.h.in Python-2.4.1-st_flags/pyconfig.h.in
+--- Python-2.4.1/pyconfig.h.in	2004-10-13 17:30:55.000000000 +0200
++++ Python-2.4.1-st_flags/pyconfig.h.in	2005-06-19 01:26:10.971387224 +0200
+@@ -480,6 +480,9 @@
+ /* Define to 1 if `st_blocks' is member of `struct stat'. */
+ #undef HAVE_STRUCT_STAT_ST_BLOCKS
+ 
++/* Define to 1 if `st_flags' is member of `struct stat'. */
++#undef HAVE_STRUCT_STAT_ST_FLAGS
++
+ /* Define to 1 if `st_rdev' is member of `struct stat'. */
+ #undef HAVE_STRUCT_STAT_ST_RDEV
+ 
+Only in Python-2.4.1-st_flags/: pyconfig.h.in~
diff --git a/dev-lang/python/python-2.4.1-r1.ebuild b/dev-lang/python/python-2.4.1-r1.ebuild
index 375157648acc..cdc6bd544fd8 100644
--- a/dev-lang/python/python-2.4.1-r1.ebuild
+++ b/dev-lang/python/python-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.2 2005/06/18 19:40:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.3 2005/07/19 20:38:29 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -77,7 +77,7 @@ src_unpack() {
 		setup.py
 
 	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${FILESDIR}/python-2.3.5-st_flags.patch
+	epatch ${FILESDIR}/python-2.4.1-st_flags.patch
 }
 
 src_configure() {