Version bump.

7 files changed, 246 insertions, 13 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 34833ab34763..c6181e08c784 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.36 2004/08/08 14:48:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.37 2004/10/02 09:53:39 eradicator Exp $
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Version bump.
 
   08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> flac-1.1.0-r2.ebuild:
   Stable on alpha.
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 228fea538336..791006965b08 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8a1425a077ac6ed4d485be55c836fa5d ChangeLog 4595
-MD5 2cbcdde7eec7e12162d31b1c6e0183bb flac-1.1.0-r2.ebuild 1342
+MD5 4b4daf459341f2321a41c583aa99ede3 flac-1.1.1.ebuild 2268
+MD5 29a7092d6fe3a8aa79b2f20461d20a1c flac-1.1.0-r1.ebuild 1529
 MD5 3214d685136ef7a1d3f2d010b5b43acb flac-1.1.0.ebuild 1517
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 29a7092d6fe3a8aa79b2f20461d20a1c flac-1.1.0-r1.ebuild 1529
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
-MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 369bfeb73338c8a5d0e28f5613d869c7 flac-1.1.0-r2.ebuild 1334
+MD5 645d7f8d8cc4cdd1e859f4f17471522f ChangeLog 4675
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
 MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
+MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
+MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBVSFBHTu7gpaalycRAiGSAJ42a4+u7/w9eeYvkFkbjXFbr8njRwCg0FE1
-VluPduKG+XSZciTqOG4X32I=
-=3X/K
+iD8DBQFBXnq6ArHZZzCEUG0RAi3LAJ0QSUfSGLKeAFYTdc8GhLs99tQF0QCeOW1k
+uCCWNVEDZZ+4lyXdGLOYgrw=
+=s5Wj
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.1 b/media-libs/flac/files/digest-flac-1.1.1
new file mode 100644
index 000000000000..7d6444dd7c34
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.1
@@ -0,0 +1 @@
+MD5 c6ccddccf8ad344065698047c2fc7280 flac-1.1.1.tar.gz 1467204
diff --git a/media-libs/flac/files/flac-1.1.1-libtool.patch b/media-libs/flac/files/flac-1.1.1-libtool.patch
new file mode 100644
index 000000000000..ea43e1e34494
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.1-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.1-m4.patch b/media-libs/flac/files/flac-1.1.1-m4.patch
new file mode 100644
index 000000000000..79a012255257
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.1-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.0-r2.ebuild b/media-libs/flac/flac-1.1.0-r2.ebuild
index 95b944243258..d170ee8435b7 100644
--- a/media-libs/flac/flac-1.1.0-r2.ebuild
+++ b/media-libs/flac/flac-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0-r2.ebuild,v 1.8 2004/09/25 07:41:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0-r2.ebuild,v 1.9 2004/10/02 09:53:39 eradicator Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -28,8 +28,8 @@ src_unpack() {
 		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
 	fi
 
-	epatch ${FILESDIR}/flac-1.1.0-m4.patch
-	epatch ${FILESDIR}/flac-1.1.0-libtool.patch
+	epatch ${FILESDIR}/${P}-m4.patch
+	epatch ${FILESDIR}/${P}-libtool.patch
 
 	elibtoolize --reverse-deps
 }
diff --git a/media-libs/flac/flac-1.1.1.ebuild b/media-libs/flac/flac-1.1.1.ebuild
new file mode 100644
index 000000000000..37cc9a0857ff
--- /dev/null
+++ b/media-libs/flac/flac-1.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.1.ebuild,v 1.1 2004/10/02 09:53:39 eradicator Exp $
+
+IUSE="sse xmms"
+
+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="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+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
+
+	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() {
+	# Keep around old lib
+	if [ -f /usr/$(get_libdir)/libFLAC.so.4 ]; then
+		cp /usr/$(get_libdir)/libFLAC.so.4 ${D}/usr/$(get_libdir)
+		touch ${D}/usr/$(get_libdir)/libFLAC.so.4
+		fperms 755 /usr/$(get_libdir)/libFLAC.so.4
+	fi
+	if [ -f /usr/$(get_libdir)/libFLAC++.so.2 ]; then
+		cp /usr/$(get_libdir)/libFLAC++.so.2 ${D}/usr/$(get_libdir)
+		touch ${D}/usr/$(get_libdir)/libFLAC++.so.2
+		fperms 755 /usr/$(get_libdir)/libFLAC++.so.2
+	fi
+
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	if [ -f /usr/$(get_libdir)/libFLAC.so.4 ]; then
+		einfo "An old version of libFLAC was detected on your system."
+		einfo "In order to avoid conflicts, we've kept the old lib"
+		einfo "around.  In order to make full use of the new version"
+		einfo "of libexif, you will need to do the following:"
+		einfo "  revdep-rebuild --soname libFLAC.so.4"
+		einfo "  revdep-rebuild --soname libFLAC++.so.2"
+		einfo
+		einfo "After doing that, you can safely remove /usr/$(get_libdir)/libFLAC.so.4 and libFLAC++.so.2"
+	fi
+}
+