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

(Portage version: 2.0.51-r15)

6 files changed, 233 insertions, 8 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index ac661cf97082..e0b965bea853 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.44 2005/02/05 12:49:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.45 2005/02/18 22:49:55 chainsaw Exp $
+
+*flac-1.1.2 (18 Feb 2005)
+
+  18 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/flac-1.1.2-libtool.patch, +files/flac-1.1.2-m4.patch,
+  +flac-1.1.2.ebuild:
+  Version bump to 1.1.2; slotted to avoid breakage. PPC keywords temporarily
+  dropped until the Altivec-on-non-Darwin patches are ported. Closes bug
+  #81291.
 
   05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> flac-1.1.0-r1.ebuild,
   flac-1.1.0-r2.ebuild, flac-1.1.0.ebuild, flac-1.1.1.ebuild:
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 43f8478a2f18..87f626e05b0d 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,15 +1,19 @@
 MD5 6ab3635d825a48fba589f342fb7e72b1 flac-1.1.0-r1.ebuild 1564
-MD5 922263e791c30aa4b5d2db2a4fc41043 flac-1.1.1.ebuild 1650
+MD5 162c91603352a041234de5c4de2a29e9 flac-1.1.2.ebuild 1595
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
 MD5 d4cf0e3139c2341ad8f691156c4b6322 ChangeLog 5817
 MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
-MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
+MD5 922263e791c30aa4b5d2db2a4fc41043 flac-1.1.1.ebuild 1650
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
-MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
 MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
 MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
+MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2 63
+MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
+MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
+MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
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)
diff --git a/media-libs/flac/flac-1.1.2.ebuild b/media-libs/flac/flac-1.1.2.ebuild
new file mode 100644
index 000000000000..bf812b963848
--- /dev/null
+++ b/media-libs/flac/flac-1.1.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.1 2005/02/18 22:49:55 chainsaw Exp $
+
+inherit libtool eutils flag-o-matic gcc
+
+DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
+HOMEPAGE="http://flac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc-macos ~sparc ~x86"
+IUSE="sse xmms"
+
+RDEPEND=">=media-libs/libogg-1.0_rc2
+	xmms? ( media-sound/xmms )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if ! use xmms
+	then
+		sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die
+	fi
+
+	epatch ${FILESDIR}/${P}-m4.patch
+	epatch ${FILESDIR}/${P}-libtool.patch
+	#epatch ${FILESDIR}/${P}-altivec.patch.gz (non-Darwin PPC AltiVec patch needs to be ported)
+
+	elibtoolize --reverse-deps
+}
+
+src_compile() {
+	use hppa && [ "`gcc-fullversion`" == "3.4.0" ] && replace-cpu-flags 2.0 1.0
+
+	econf \
+		--with-pic \
+		`use_enable sse` \
+		|| die
+
+	# the man page ebuild requires docbook2man... yick!
+	sed -i -e 's:include man:include:g' Makefile
+
+	# emake seems to mess up the building of the xmms input plugin
+	make || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+
+	# Keep around old lib
+	preserve_old_lib /usr/$(get_libdir)/libFLAC.so.4
+	preserve_old_lib /usr/$(get_libdir)/libFLAC++.so.2
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC.so.4
+	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC++.so.2
+}
+
+# see #59482
+src_test() { :; }