Bump to 1.1.2; PPC keywords dropped, patch needs porting. Closes bug #81291.

(Portage version: 2.0.51-r15)

3 files changed, 145 insertions, 0 deletions

diff --git a/media-libs/flac/files/digest-flac-1.1.2 b/media-libs/flac/files/digest-flac-1.1.2
new file mode 100644
index 000000000000..ff97332b0a84
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.2
@@ -0,0 +1 @@
+MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
diff --git a/media-libs/flac/files/flac-1.1.2-libtool.patch b/media-libs/flac/files/flac-1.1.2-libtool.patch
new file mode 100644
index 000000000000..ea43e1e34494
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-libtool.patch
@@ -0,0 +1,111 @@
+diff -Naur flac-1.1.1.orig/configure flac-1.1.1/configure
+--- flac-1.1.1.orig/configure	2004-09-30 19:14:14.393540000 -0700
++++ flac-1.1.1/configure	2004-09-30 19:19:54.583356858 -0700
+@@ -3469,7 +3469,7 @@
+ # This must be Linux ELF.
+ linux-gnu*)
+   case $host_cpu in
+-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
++  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* )
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
+@@ -10465,7 +10465,7 @@
+ else
+ 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
+ 	if test x$GCC = xyes; then
+-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
++		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+ 	fi
+ fi
+ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
+diff -Naur flac-1.1.1.orig/src/plugin_common/Makefile.in flac-1.1.1/src/plugin_common/Makefile.in
+--- flac-1.1.1.orig/src/plugin_common/Makefile.in	2004-09-28 21:18:45.000000000 -0700
++++ flac-1.1.1/src/plugin_common/Makefile.in	2004-09-30 19:20:42.137504142 -0700
+@@ -85,12 +85,12 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
+ DEBUG_TRUE = @DEBUG_TRUE@
+diff -Naur flac-1.1.1.orig/src/share/getopt/Makefile.in flac-1.1.1/src/share/getopt/Makefile.in
+--- flac-1.1.1.orig/src/share/getopt/Makefile.in	2004-09-28 21:18:48.000000000 -0700
++++ flac-1.1.1/src/share/getopt/Makefile.in	2004-09-30 19:21:03.493977488 -0700
+@@ -82,12 +82,12 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
+ DEBUG_TRUE = @DEBUG_TRUE@
+diff -Naur flac-1.1.1.orig/src/share/grabbag/Makefile.in flac-1.1.1/src/share/grabbag/Makefile.in
+--- flac-1.1.1.orig/src/share/grabbag/Makefile.in	2004-09-28 21:18:48.000000000 -0700
++++ flac-1.1.1/src/share/grabbag/Makefile.in	2004-09-30 19:21:32.385206586 -0700
+@@ -82,12 +82,12 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
+ DEBUG_TRUE = @DEBUG_TRUE@
+diff -Naur flac-1.1.1.orig/src/share/replaygain_analysis/Makefile.in flac-1.1.1/src/share/replaygain_analysis/Makefile.in
+--- flac-1.1.1.orig/src/share/replaygain_analysis/Makefile.in	2004-09-28 21:18:49.000000000 -0700
++++ flac-1.1.1/src/share/replaygain_analysis/Makefile.in	2004-09-30 19:21:59.291763405 -0700
+@@ -80,12 +80,12 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
+ DEBUG_TRUE = @DEBUG_TRUE@
+diff -Naur flac-1.1.1.orig/src/share/replaygain_synthesis/Makefile.in flac-1.1.1/src/share/replaygain_synthesis/Makefile.in
+--- flac-1.1.1.orig/src/share/replaygain_synthesis/Makefile.in	2004-09-28 21:18:49.000000000 -0700
++++ flac-1.1.1/src/share/replaygain_synthesis/Makefile.in	2004-09-30 19:22:15.817034518 -0700
+@@ -87,12 +87,12 @@
+ CCAS = @CCAS@
+ CCASFLAGS = @CCASFLAGS@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@ -fPIC
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
+ DEBUG_TRUE = @DEBUG_TRUE@
diff --git a/media-libs/flac/files/flac-1.1.2-m4.patch b/media-libs/flac/files/flac-1.1.2-m4.patch
new file mode 100644
index 000000000000..79a012255257
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-m4.patch
@@ -0,0 +1,33 @@
+diff -Naur flac-1.1.1.orig/configure flac-1.1.1/configure
+--- flac-1.1.1.orig/configure	2004-09-30 19:14:14.393540000 -0700
++++ flac-1.1.1/configure	2004-09-30 19:15:24.279997712 -0700
+@@ -9040,7 +9040,7 @@
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
++    OGG_LIBS="-L$libdir"
+   fi
+ 
+   OGG_LIBS="$OGG_LIBS -logg"
+@@ -9050,7 +9050,7 @@
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_CFLAGS="-I$ogg_prefix/include"
+   elif test "x$prefix" != "xNONE"; then
+-    OGG_CFLAGS="-I$prefix/include"
++    OGG_CFLAGS=""
+   fi
+ 
+   echo "$as_me:$LINENO: checking for Ogg" >&5
+diff -Naur flac-1.1.1.orig/src/libFLAC/libFLAC.m4 flac-1.1.1/src/libFLAC/libFLAC.m4
+--- flac-1.1.1.orig/src/libFLAC/libFLAC.m4	2004-07-19 17:22:39.000000000 -0700
++++ flac-1.1.1/src/libFLAC/libFLAC.m4	2004-09-30 19:16:01.147908537 -0700
+@@ -28,7 +28,7 @@
+   elif test "x$libFLAC_prefix" != "x" ; then
+     LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
+   elif test "$prefix" != "xNONE"; then
+-    LIBFLAC_CFLAGS="-I$prefix/include"
++    LIBFLAC_CFLAGS="-I$libdir"
+   fi
+ 
+   AC_MSG_CHECKING(for libFLAC)