Version bump.

Package-Manager: portage-2.1.3.9

8 files changed, 123 insertions, 93 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 1011b8cf2bbf..ac426ee4d9ed 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.117 2007/09/20 17:35:37 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.118 2007/09/20 17:54:57 drac Exp $
+
+*flac-1.2.1 (20 Sep 2007)
+
+  20 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  +files/flac-1.2.1-asneeded.patch, +files/flac-1.2.1-cflags.patch,
+  +flac-1.2.1.ebuild:
+  Version bump.
 
   20 Sep 2007; Lars Weiler <pylon@gentoo.org> flac-1.1.4.ebuild:
   Stable on ppc; bug #191280.
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index be465929db8c..4ef380921628 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,8 +1,15 @@
+AUX flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d SHA1 a87abf76cbc9db5cf65d6282cdfcf3b5cfcd329c SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63
+MD5 13689b8e6ff0c056bd0be6d61a5ddee4 files/flac-1.2.1-asneeded.patch 840
+RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d files/flac-1.2.1-asneeded.patch 840
+SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63 files/flac-1.2.1-asneeded.patch 840
+AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 SHA1 5698376e901679398b6dac850d8015b1386f1983 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21
+MD5 1051a5f9f97cb98bfc38092893093d19 files/flac-1.2.1-cflags.patch 435
+RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 files/flac-1.2.1-cflags.patch 435
+SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21 files/flac-1.2.1-cflags.patch 435
 DIST flac-1.1.2.tar.gz 1516235 RMD160 58656837b02e211eaed5010d84c4ed59841c82d3 SHA1 65501f3547df99b153951edb2ee7bfc13dd56946 SHA256 ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 DIST flac-1.1.4.tar.gz 1866308 RMD160 7e323ccebbbe453b1dee056d0223f56db0818188 SHA1 b4ce77a96d7ec89a1555b016d90ad4899e613141 SHA256 b774d573b971f71f84386d34b96d388dd2dae3f15735acf91dbd4adff0ce4114
-DIST flac-1.2.0.tar.gz 1904337 RMD160 2d30ce2890031d3d55e75d1637e83aed2836c1dd SHA1 019f50a71a755b2d4247cae8f9fb2264de61916d SHA256 e0f8525025addf40e9a4fab88bbb0d34b3d5835676600c6be83a20a8dfbb5e4e
+DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
 DIST flac-patches-11.tar.bz2 4125 RMD160 42a939adfb0278f4096e7a1155f632960baf62f1 SHA1 93b59fe7507f7ccd213c75de3702578bf214851a SHA256 71bb657fb21f3d6ed5f1aafae96715160e6c3d11bb8733a6ad218f0987913807
-DIST flac-patches-15.tar.bz2 3758 RMD160 aaeb99bc2a5b0882726f643d8cefb9f5034a9202 SHA1 e11eb2e8e45da5aea40217ece76adeb9fe221b14 SHA256 742d9cf636ea8ecb7399c38c751c645b9cbf439b08dc2ab2cf1ef2827b136f06
 DIST flac-patches-8.tar.bz2 7566 RMD160 57b3febba32e4383b580656418d815f671bff089 SHA1 281282c2477bf958416b887bbe0965d3d2703d36 SHA256 7ca7f86ae6e1b1d9318d66f8b2dc1dda9eed96a1761e407ebfd6e6a8d8de0923
 EBUILD flac-1.1.2-r8.ebuild 1902 RMD160 d0d37c2eab6364ae87d8a84f8dbccd0f5fe5b3aa SHA1 78eb4fd2066903c89bdf4405c542caeda7724317 SHA256 3c517a13b499b3395c8e22f7017c0297b0968d574e562fae2ce8d200d4d8ee25
 MD5 e034964db766af7d704b91a816ca48fa flac-1.1.2-r8.ebuild 1902
@@ -12,14 +19,14 @@ EBUILD flac-1.1.4.ebuild 1933 RMD160 f62684cef0153e50ef6d2d4fcce80498d31a4bc6 SH
 MD5 2dd7c2e4fd2d9f35d6618921c68acf73 flac-1.1.4.ebuild 1933
 RMD160 f62684cef0153e50ef6d2d4fcce80498d31a4bc6 flac-1.1.4.ebuild 1933
 SHA256 745ef49327e3b1b1fbc241cc0645e8a00c490b72bfb7ef32d686c06c596f3c80 flac-1.1.4.ebuild 1933
-EBUILD flac-1.2.0.ebuild 1893 RMD160 941b77af2134c61f807b58d760087c24ffd1feaa SHA1 1394aa4d62ae2495c3caf379812e09176caa719b SHA256 086675cd2099a2f5be8c2b24ce795c27e02b3ce14137dc0637ffeab03530eb4e
-MD5 c040a3bf20bf1c2d365d5f9109a9e474 flac-1.2.0.ebuild 1893
-RMD160 941b77af2134c61f807b58d760087c24ffd1feaa flac-1.2.0.ebuild 1893
-SHA256 086675cd2099a2f5be8c2b24ce795c27e02b3ce14137dc0637ffeab03530eb4e flac-1.2.0.ebuild 1893
-MISC ChangeLog 16477 RMD160 d79b992e219280a21405e8881fb0dce5aa55f927 SHA1 c7a6ff36886c46fecc9947d8f902dd207886ddb7 SHA256 5276c88d09ae3781cab4c053b75a2a0eab1dc747fff3a12615998086b65aa512
-MD5 aaf558eb0b3cce36829269ca16b611c6 ChangeLog 16477
-RMD160 d79b992e219280a21405e8881fb0dce5aa55f927 ChangeLog 16477
-SHA256 5276c88d09ae3781cab4c053b75a2a0eab1dc747fff3a12615998086b65aa512 ChangeLog 16477
+EBUILD flac-1.2.1.ebuild 1554 RMD160 08e4ccdb9ee651880421ff5d2cbcafa3cbac015e SHA1 4d83018a03f81d0357160af3f88711e7cfec1678 SHA256 c4a027971d6d675c36f51a8d3b4accd3896ecd4968f4b9c916160713c6db52bb
+MD5 5f40e6623a6cd5f0d67f8c8ddb5afe41 flac-1.2.1.ebuild 1554
+RMD160 08e4ccdb9ee651880421ff5d2cbcafa3cbac015e flac-1.2.1.ebuild 1554
+SHA256 c4a027971d6d675c36f51a8d3b4accd3896ecd4968f4b9c916160713c6db52bb flac-1.2.1.ebuild 1554
+MISC ChangeLog 16659 RMD160 64ef4e237d3ce052d11e39af2d2e48da440a4789 SHA1 961e93cc6e677ec829e579c6b5beccdf25ab6f5a SHA256 4d13fa18be992913c8d3b396d84f8bbaf9db60f7f3ca4b5901fc3faf2fb2aaaa
+MD5 b74051255ca27b75d133ae6606480a61 ChangeLog 16659
+RMD160 64ef4e237d3ce052d11e39af2d2e48da440a4789 ChangeLog 16659
+SHA256 4d13fa18be992913c8d3b396d84f8bbaf9db60f7f3ca4b5901fc3faf2fb2aaaa ChangeLog 16659
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -30,6 +37,6 @@ SHA256 147cd09c6b86759b5e407d46f8c511faa687ba993afcbf00bc44da8a05fd3d1d files/di
 MD5 5b2e08891673b14a81f485267dd1de24 files/digest-flac-1.1.4 479
 RMD160 3bd922e965cbfbbde1f19653f08c5b58f33f6f52 files/digest-flac-1.1.4 479
 SHA256 b89c8cb30133ab8c8b6bdefddb9e994fcfec1264c6a57c2155fca2470f369809 files/digest-flac-1.1.4 479
-MD5 160865b9c2fae9f12d6ca178ab5e8b3d files/digest-flac-1.2.0 479
-RMD160 ce93310102588c8eca8e3f79ac517b8f82b06148 files/digest-flac-1.2.0 479
-SHA256 16ed3943a4dd11306c143400d59d8a64a9825af58b3884ebf8683cff35b2aa1a files/digest-flac-1.2.0 479
+MD5 8c7d52c68177f53a96c7e8abb29e76f2 files/digest-flac-1.2.1 235
+RMD160 dd7c4777804d72a8a3b75166d75a029e24264033 files/digest-flac-1.2.1 235
+SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/digest-flac-1.2.1 235
diff --git a/media-libs/flac/files/digest-flac-1.2.0 b/media-libs/flac/files/digest-flac-1.2.0
deleted file mode 100644
index f2fceb157705..000000000000
--- a/media-libs/flac/files/digest-flac-1.2.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ea176bfb291707b46a537b091c226ae7 flac-1.2.0.tar.gz 1904337
-RMD160 2d30ce2890031d3d55e75d1637e83aed2836c1dd flac-1.2.0.tar.gz 1904337
-SHA256 e0f8525025addf40e9a4fab88bbb0d34b3d5835676600c6be83a20a8dfbb5e4e flac-1.2.0.tar.gz 1904337
-MD5 5e03a8e39896b394d180c493a650886f flac-patches-15.tar.bz2 3758
-RMD160 aaeb99bc2a5b0882726f643d8cefb9f5034a9202 flac-patches-15.tar.bz2 3758
-SHA256 742d9cf636ea8ecb7399c38c751c645b9cbf439b08dc2ab2cf1ef2827b136f06 flac-patches-15.tar.bz2 3758
diff --git a/media-libs/flac/files/digest-flac-1.2.1 b/media-libs/flac/files/digest-flac-1.2.1
new file mode 100644
index 000000000000..061357afea8b
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.2.1
@@ -0,0 +1,3 @@
+MD5 153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz 2009217
+RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc flac-1.2.1.tar.gz 2009217
+SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf flac-1.2.1.tar.gz 2009217
diff --git a/media-libs/flac/files/flac-1.2.1-asneeded.patch b/media-libs/flac/files/flac-1.2.1-asneeded.patch
new file mode 100644
index 000000000000..0d6ffb968988
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-asneeded.patch
@@ -0,0 +1,22 @@
+diff -ur flac-1.2.1.orig/src/flac/Makefile.am flac-1.2.1/src/flac/Makefile.am
+--- flac-1.2.1.orig/src/flac/Makefile.am	2007-09-11 20:56:51.000000000 +0300
++++ flac-1.2.1/src/flac/Makefile.am	2007-09-20 19:38:09.000000000 +0300
+@@ -53,6 +53,6 @@
+ 	$(top_builddir)/src/share/utf8/libutf8.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+ 	@OGG_LIBS@ \
+-	@LIBICONV@ \
++	@LTLIBICONV@ \
+ 	@MINGW_WINSOCK_LIBS@ \
+ 	-lm
+diff -ur flac-1.2.1.orig/src/metaflac/Makefile.am flac-1.2.1/src/metaflac/Makefile.am
+--- flac-1.2.1.orig/src/metaflac/Makefile.am	2007-09-11 20:59:25.000000000 +0300
++++ flac-1.2.1/src/metaflac/Makefile.am	2007-09-20 19:38:25.000000000 +0300
+@@ -49,6 +49,6 @@
+ 	$(top_builddir)/src/share/utf8/libutf8.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+ 	@OGG_LIBS@ \
+-	@LIBICONV@ \
++	@LTLIBICONV@ \
+ 	@MINGW_WINSOCK_LIBS@ \
+ 	-lm
diff --git a/media-libs/flac/files/flac-1.2.1-cflags.patch b/media-libs/flac/files/flac-1.2.1-cflags.patch
new file mode 100644
index 000000000000..3910604a1e79
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-cflags.patch
@@ -0,0 +1,12 @@
+diff -ur flac-1.2.1.orig/configure.in flac-1.2.1/configure.in
+--- flac-1.2.1.orig/configure.in	2007-09-13 18:48:42.000000000 +0300
++++ flac-1.2.1/configure.in	2007-09-20 19:26:05.000000000 +0300
+@@ -301,7 +301,7 @@
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+ 	if test "x$GCC" = xyes; then
+ 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
+-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
++		CFLAGS="$CFLAGS"
+ 	fi
+ fi
+ 
diff --git a/media-libs/flac/flac-1.2.0.ebuild b/media-libs/flac/flac-1.2.0.ebuild
deleted file mode 100644
index 3ca46917279e..000000000000
--- a/media-libs/flac/flac-1.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.0.ebuild,v 1.4 2007/09/15 07:06:17 drac Exp $
-
-inherit autotools eutils libtool toolchain-funcs
-
-PATCHLEVEL="15"
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="http://flac.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="3dnow altivec debug doc ogg sse"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.1.2 )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Enable only for GCC 4.1 and later
-	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
-		export EPATCH_EXCLUDE="180_all_visibility.patch"
-
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable ogg) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs) \
-		--disable-dependency-tracking \
-		--disable-xmms-plugin || die "econf failed."
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		install || die "emake install failed."
-	dodoc AUTHORS README
-
-	use doc || rm -rf "${D}"/usr/share/doc/${PF}/api
-
-	doman man/{flac,metaflac}.1
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	ewarn "packages that linked against flac by running revdep-rebuild"
-}
diff --git a/media-libs/flac/flac-1.2.1.ebuild b/media-libs/flac/flac-1.2.1.ebuild
new file mode 100644
index 000000000000..9c592b26005b
--- /dev/null
+++ b/media-libs/flac/flac-1.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1.ebuild,v 1.1 2007/09/20 17:54:57 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow altivec debug doc hardened ogg sse"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.2 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# asneeded fails with libiconv on non glibc systems
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	# strip upstream forced optimizations
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# fugly, fixme, x86 asm has text relocations..
+	if use x86 && use hardened; then
+		myconf="--disable-asm-optimizations"
+	fi
+
+	econf $(use_enable ogg) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		$(use_enable doc doxygen-docs) \
+		--disable-dependency-tracking \
+		--disable-xmms-plugin \
+		${myconf} || die "econf failed."
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	use doc || rm -rf "${D}"/usr/share/doc/${PN}*
+	dodoc AUTHORS README
+}