Finish addressing bug #443264 and force configure regeneration to second QA team requests

(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

5 files changed, 51 insertions, 114 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 7b26c1df8cac..cf5c91aa82fd 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.118 2013/01/17 20:55:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.119 2013/01/18 01:28:52 lu_zero Exp $
+
+  18 Jan 2013; Luca Barbato <lu_zero@gentoo.org> grass-6.4.2.ebuild,
+  +files/grass-6.4.2-configure.patch, files/grass-6.4.2-ffmpeg-1.patch,
+  +files/grass-6.4.2-libav-9.patch:
+  Finish addressing bug #443264 and force configure regeneration to second QA
+  team requests
 
   17 Jan 2013; Alexis Ballier <aballier@gentoo.org> grass-6.4.2.ebuild,
   +files/grass-6.4.2-ffmpeg-1.patch:
diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
new file mode 100644
index 000000000000..37b75163c625
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
@@ -0,0 +1,26 @@
+--- grass-6.4.2.orig/configure.in	2012-02-06 11:16:07.000000000 +0100
++++ grass-6.4.2/configure.in	2013-01-17 23:25:41.126387684 +0100
+@@ -1110,9 +1110,9 @@
+ 
+ LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH)
+ 
+-LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH)
+-LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH)
+-LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH)
+ 
+ AC_DEFINE(HAVE_FFMPEG)
+ 
+@@ -1125,8 +1125,8 @@
+ LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
+ 
+ LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
+-LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+-LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+ 
+ fi # $USE_FFMPEG
+ 
diff --git a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
index 73f9f4672f73..ec26ae251529 100644
--- a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
+++ b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
@@ -1,115 +1,6 @@
 Fix build with ffmpeg-1.
 Part of https://bugs.gentoo.org/show_bug.cgi?id=443264
-Note: This patches configure directly to avoid having to rerun autotools there.
 
-Index: grass-6.4.2/configure
-===================================================================
---- grass-6.4.2.orig/configure
-+++ grass-6.4.2/configure
-@@ -10712,9 +10712,9 @@ LDFLAGS="$FFMPEGLIBPATH $LDFLAGS"
- 
- 
- 
--echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
--echo "configure:10717: checking for avcodec_init in -lavcodec" >&5
--ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for avcodec_version in -lavcodec""... $ac_c" 1>&6
-+echo "configure:10717: checking for avcodec_version in -lavcodec" >&5
-+ac_lib_var=`echo avcodec'_'avcodec_version | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
- LIBS="-lavcodec $FFMPEGLIB  $LIBS"
-@@ -10724,10 +10724,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char avcodec_init();
-+char avcodec_version();
- 
- int main() {
--avcodec_init()
-+avcodec_version()
- ; return 0; }
- EOF
- if { (eval echo configure:10734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10748,9 +10748,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- else
-   echo "$ac_t""no" 1>&6
- 
--echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
--echo "configure:10753: checking for avcodec_init in -lavcodec" >&5
--ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for avcodec_version in -lavcodec""... $ac_c" 1>&6
-+echo "configure:10753: checking for avcodec_version in -lavcodec" >&5
-+ac_lib_var=`echo avcodec'_'avcodec_version | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
- LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
-@@ -10760,10 +10760,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char avcodec_init();
-+char avcodec_version();
- 
- int main() {
--avcodec_init()
-+avcodec_version()
- ; return 0; }
- EOF
- if { (eval echo configure:10770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10810,9 +10810,9 @@ LDFLAGS="$FFMPEGLIBPATH $LDFLAGS"
- 
- 
- 
--echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
--echo "configure:10815: checking for av_set_parameters in -lavformat" >&5
--ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for avformat_version in -lavformat""... $ac_c" 1>&6
-+echo "configure:10815: checking for avformat_version in -lavformat" >&5
-+ac_lib_var=`echo avformat'_'avformat_version | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
- LIBS="-lavformat $FFMPEGLIB  $LIBS"
-@@ -10822,10 +10822,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char av_set_parameters();
-+char avformat_version();
- 
- int main() {
--av_set_parameters()
-+avformat_version()
- ; return 0; }
- EOF
- if { (eval echo configure:10832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10846,9 +10846,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- else
-   echo "$ac_t""no" 1>&6
- 
--echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
--echo "configure:10851: checking for av_set_parameters in -lavformat" >&5
--ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for avformat_version in -lavformat""... $ac_c" 1>&6
-+echo "configure:10851: checking for avformat_version in -lavformat" >&5
-+ac_lib_var=`echo avformat'_'avformat_version | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
- LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
-@@ -10858,10 +10858,10 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char av_set_parameters();
-+char avformat_version();
- 
- int main() {
--av_set_parameters()
-+avformat_version()
- ; return 0; }
- EOF
- if { (eval echo configure:10868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
 ===================================================================
 --- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c
@@ -170,7 +61,7 @@ Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
  
      /* write the stream header, if any */
 -    av_write_header(oc);
-+    if(avformat_write_header(oc, NULL) < 0) {
++    if (avformat_write_header(oc, NULL) < 0) {
 +	G_warning(_("Failed to write header"));
 +	return (-1);
 +    }
diff --git a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
new file mode 100644
index 000000000000..7fbe3254f4fd
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
@@ -0,0 +1,11 @@
+--- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c	2013-01-18 02:11:37.570025278 +0100
++++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c	2013-01-18 02:13:01.663022218 +0100
+@@ -159,7 +159,7 @@
+     }
+ 
+     /* open the codec */
+-    if (avcodec_open(c, codec) < 0) {
++    if (avcodec_open2(c, codec, NULL) < 0) {
+ 	G_warning(_("Unable to open codec"));
+ 	return;
+     }
diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild
index b7557c138efc..3c51848f27a6 100644
--- a/sci-geosciences/grass/grass-6.4.2.ebuild
+++ b/sci-geosciences/grass/grass-6.4.2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.5 2013/01/17 20:55:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.6 2013/01/18 01:28:52 lu_zero Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2"
+WANT_AUTOCONF="2.1"
 
-inherit eutils gnome2 multilib python versionator wxwidgets base
+inherit eutils gnome2 multilib python versionator wxwidgets base autotools
 
 MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
 MY_PM=${MY_PM/.}
@@ -93,6 +94,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-pkgconf.patch
 	"${FILESDIR}"/${PN}-6.4.1-libav-0.8.patch
 	"${FILESDIR}"/${PN}-6.4.2-ffmpeg-1.patch
+	"${FILESDIR}"/${PN}-6.4.2-configure.patch
+	"${FILESDIR}"/${PN}-6.4.2-libav-9.patch
 )
 
 REQUIRED_USE="
@@ -131,6 +134,7 @@ pkg_setup() {
 src_prepare() {
 	use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
 	base_src_prepare
+	eautoconf
 }
 
 src_configure() {
@@ -188,7 +192,6 @@ src_configure() {
 		$(use_with cxx) \
 		$(use_with fftw) \
 		$(use_with ffmpeg) \
-		--with-ffmpeg-includes="/usr/include/libavcodec /usr/include/libavdevice /usr/include/libavfilter /usr/include/libavformat /usr/include/libavutil /usr/include/libpostproc /usr/include/libswscale" \
 		$(use_with gmath blas) \
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \