Add media-libs/flac-1.3.0, media-libs/flac-1.3.0-r1, media-libs/flac-1.3.1-r1 with x32 fix, update README.md

10 files changed, 422 insertions, 0 deletions

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
new file mode 100644
index 00000000..1a933e4f
--- /dev/null
+++ b/media-libs/flac/Manifest
@@ -0,0 +1,11 @@
+AUX flac-1.3.0-asneeded.patch 644 SHA256 cc00133b8916f29e750b7eb80b9b3180a8f7c4b6cba9cf59540edbac3d1e21d5 SHA512 0fcf92e98b7ac03d5e4ecddfb0827591837bae4f8b3cb03027d1220f06d6422fec3636317c5229e6e0c086bc924e4d0780050abb2de65697b883e6cbf4bec85f WHIRLPOOL 6652f0ec8bf19dd854eb1992fa108dc3c243938574a75f8a12d6b16809759902177be28556d9c9e2117421ead90cf13383a9f05285859be890e113e96ec74bf5
+AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787018b10c6a0e27cdb51a34953faffc653b7a SHA512 f5e8414956a3aab75f512c4dd5c28fa173198d28fec93ffd289f55d5ba5f604fed116854a1347f8bbfb6c0cfc59912707869177465cde346add97e485993e5a7 WHIRLPOOL 830f991657e9c816a2a19e70a674f11e57da03cbd985729e0e7b47e57da05f008f2f90f01208b4715ced2a69024677dc18a45fc96bf730973edc439076484b61
+AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00
+AUX flac-1.3.0-metaflac_strcat.patch 503 SHA256 0a2efaa33e933d2fb3b8aca8cba7704e222edf68552ec283bf2c4f40e513a5a9 SHA512 461e0f11dd5e04e4ba05e535ff38fc8ae7a085686945b809715de232a1c14ff5721d6e7fb70f40025c2740789d90cda464ff008dda7880e1f147c936d0e41903 WHIRLPOOL 906503c9a8702c6e5d08efd6a0389648e4845b498e6db8fb4f7b959a53370777a2816ec85a91e008128f7bd9baafb80f9dd62b4470356fa518fc31abca3c4762
+AUX flac-1.3.1-cflags.patch 786 SHA256 077cbb1c3254218e257bcee5ae1b22b5cadd02eba085163c8bc51da2041e1862 SHA512 4c639023861b8508d7a1be2bdafd4ff33d398b2399ce97350890b25394c4ebd9745d622053305723cc85acb2391b46364caba1cdbf3b3723a9cf05971306b7b0 WHIRLPOOL 54a918b35e656568663f0abb134191d5520866811a9c37631e5d48602987e2db2f842884c4c7eb1f764da82eb6bdbb27ec1a25e7e0cffbea60b159e347796985
+AUX flac-1.3.1-x32.patch 1398 SHA256 6073a3fbd8f3c200c1037679205cf33e7acfdc7675e64bf6518029c930dca8c3 SHA512 8a0014f7e850c774a9d4ed893488c877a629a3dac627b5ea8fdcd4f3b197a9fb24a60a03145277abfda5ab173e64328cbda9cc1c8ec9c82f51cd9672bc92694d WHIRLPOOL b4649d3273b6297786efefd814b8f1c44663ff932d6f3c49db5eaf5b2a928572486666e63b644796cf36f71c5ac138dc44d8a2cd5b23a50695d970553498630d
+DIST flac-1.3.0.tar.xz 1084256 SHA256 fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc SHA512 9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 WHIRLPOOL e328f41db3aa7f6404a1596ac2fddd437fefc031fc9f1ea91420104054d338029120d526ac58b2a6994811a8f2f7cc107e120789113340e48dec842ea9013196
+DIST flac-1.3.1.tar.xz 941848 SHA256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c SHA512 923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 WHIRLPOOL abda096c0c1392499a613cc99c917cd519a20936bb98390a466c971ee981385a0e249e80f0bdac27b1eb6566a3392c1a4cb6ff9a6695952f16127a0b290fa5d4
+EBUILD flac-1.3.0-r1.ebuild 1838 SHA256 3ec9c33a0bb32b6d13d1e0a8d8f11e11039a640c3b63d4ec2677a44ff528fed2 SHA512 5460cc8b3d52f69564e69e6db08eb0f8ce26d33aa09cddd1813d51e70724e7de40f44cc6d1866a50ac50c81cb079734117da964796df3df8b04396abfdcb8353 WHIRLPOOL 15793fb8625d76bfe47c322eb24ff62ed15525be9c33f0fcc120df15575c219892d927e8465b96ae9630abc3a43b872e95c53b8cab076278fe6220652b0464a9
+EBUILD flac-1.3.0.ebuild 1781 SHA256 eb0253edcc000b4cec7d5ba8f8eda102579f3399116026682af67b0c7d95a316 SHA512 9ae9f211126a1a0074c9bb6f5b0b391f417097b3ddbae1c9c6c1b42a58907af64519570d394b00e508c6a3e60e0c499c981afd0569866bf1aee6bf16a094090d WHIRLPOOL 04925ae120229ac3dc84759e0eb4320897bf20aac8e50d190375ded0b10589bf8c49183432c59c92a04a6977a60e513223b59ce19f90dc0046e89d2371674a9f
+EBUILD flac-1.3.1-r1.ebuild 2139 SHA256 17f73f19e85e60af46ab697fe88a7f69853504494097b7e53727aeffb0a3ed26 SHA512 1c7121a4cf78db95999755896e8ef8dfea263a74e00ad9c8b5ea087dde48812cc601516e06b49e73981c17b37123745918ae11a28b81f11b7bf3a656188a20ab WHIRLPOOL 4f767d2b468a0f46f55d698517b2d2d97af906dd5d734e17da1b4f1cd8ad1960cb453ad5021740cf776a117fb71c9fcfd96ed1bbab558d1d41afbbc6140c5ff7
diff --git a/media-libs/flac/files/flac-1.3.0-asneeded.patch b/media-libs/flac/files/flac-1.3.0-asneeded.patch
new file mode 100644
index 00000000..a38b3202
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.0-asneeded.patch
@@ -0,0 +1,21 @@
+--- flac-1.3.0/src/flac/Makefile.am
++++ flac-1.3.0/src/flac/Makefile.am
+@@ -51,7 +51,7 @@
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+ 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+-	@LIBICONV@ \
++	@LTLIBICONV@ \
+ 	-lm
+ 
+ CLEANFILES = flac.exe
+--- flac-1.3.0/src/metaflac/Makefile.am
++++ flac-1.3.0/src/metaflac/Makefile.am
+@@ -48,6 +48,6 @@
+ 	$(top_builddir)/src/share/getopt/libgetopt.la \
+ 	$(top_builddir)/src/share/utf8/libutf8.la \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la \
+-	@LIBICONV@
++	@LTLIBICONV@
+ 
+ CLEANFILES = metaflac.exe
diff --git a/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch b/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch
new file mode 100644
index 00000000..5c25dd58
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch
@@ -0,0 +1,30 @@
+--- flac-1.3.0/configure.ac
++++ flac-1.3.0/configure.ac
+@@ -319,6 +319,12 @@
+ fi
+ AC_SUBST(OGG_PACKAGE)
+ 
++dnl Build examples?
++AC_ARG_ENABLE(examples,
++       AS_HELP_STRING([--disable-examples], [Don't build examples during make]),,
++       enable_examples="yes")
++AM_CONDITIONAL(EXAMPLES, [test "$enable_examples" = "yes"])
++
+ dnl check for i18n(internationalization); these are from libiconv/gettext
+ AM_ICONV
+ AM_LANGINFO_CODESET
+--- flac-1.3.0/Makefile.am
++++ flac-1.3.0/Makefile.am
+@@ -31,7 +31,11 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = doc include m4 man src examples test build objs
++SUBDIRS = doc include m4 man src test build objs
++
++if EXAMPLES
++SUBDIRS += examples
++endif
+ 
+ EXTRA_DIST = \
+ 	COPYING.FDL \
diff --git a/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch b/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch
new file mode 100644
index 00000000..0915a597
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch
@@ -0,0 +1,66 @@
+--- flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
++++ flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
+@@ -21,7 +21,7 @@
+ 	test_cuesheet.vcproj
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
+-noinst_PROGRAMS = test_cuesheet
++check_PROGRAMS = test_cuesheet
+ test_cuesheet_SOURCES = \
+ 	main.c
+ test_cuesheet_LDADD = \
+--- flac-1.3.0/src/test_grabbag/picture/Makefile.am
++++ flac-1.3.0/src/test_grabbag/picture/Makefile.am
+@@ -21,7 +21,7 @@
+ 	test_picture.vcproj
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
+-noinst_PROGRAMS = test_picture
++check_PROGRAMS = test_picture
+ test_picture_SOURCES = \
+ 	main.c
+ 
+--- flac-1.3.0/src/test_libFLAC/Makefile.am
++++ flac-1.3.0/src/test_libFLAC/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include
+ 
+-noinst_PROGRAMS = test_libFLAC
++check_PROGRAMS = test_libFLAC
+ 
+ if OS_IS_WINDOWS
+ win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
+--- flac-1.3.0/src/test_libFLAC++/Makefile.am
++++ flac-1.3.0/src/test_libFLAC++/Makefile.am
+@@ -21,7 +21,7 @@
+ 	test_libFLAC++.vcproj
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
+-noinst_PROGRAMS = test_libFLAC++
++check_PROGRAMS = test_libFLAC++
+ test_libFLAC___LDADD = \
+ 	$(top_builddir)/src/share/grabbag/libgrabbag.la \
+ 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
+--- flac-1.3.0/src/test_seeking/Makefile.am
++++ flac-1.3.0/src/test_seeking/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
+ 
+-noinst_PROGRAMS = test_seeking
++check_PROGRAMS = test_seeking
+ test_seeking_LDADD = \
+ 	$(top_builddir)/src/libFLAC/libFLAC.la
+ 
+--- flac-1.3.0/src/test_streams/Makefile.am
++++ flac-1.3.0/src/test_streams/Makefile.am
+@@ -21,7 +21,7 @@
+ 	test_streams.vcproj
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
+-noinst_PROGRAMS = test_streams
++check_PROGRAMS = test_streams
+ test_streams_SOURCES = \
+ 	main.c
+ 
diff --git a/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch b/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
new file mode 100644
index 00000000..84813017
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.0-metaflac_strcat.patch
@@ -0,0 +1,15 @@
+From upstream:
+
+http://git.xiph.org/?p=flac.git;a=commit;h=606fdfcaece19d3e05434bde57c289102a369069
+
+--- src/metaflac/utils.c
++++ src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ 	*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ 	if(0 == *dest)
+ 		die("out of memory growing string");
+-	safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++	safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+ 
+ static inline int local_isprint(int c)
diff --git a/media-libs/flac/files/flac-1.3.1-cflags.patch b/media-libs/flac/files/flac-1.3.1-cflags.patch
new file mode 100644
index 00000000..758e7b31
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.1-cflags.patch
@@ -0,0 +1,23 @@
+--- flac-1.3.1/configure.ac
++++ flac-1.3.1/configure.ac
+@@ -348,12 +348,8 @@
+ 
+ if test "x$debug" = xtrue; then
+ 	CPPFLAGS="-DDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
+-	CFLAGS="-g $CFLAGS"
+ else
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-	CFLAGS="-O3 -funroll-loops $CFLAGS"
+ fi
+ 
+ XIPH_GCC_VERSION
+@@ -363,7 +359,6 @@
+ 	CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+ 
+ 	XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
+-	XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
+ 
+ 	AC_LANG_PUSH([C++])
+ 	XIPH_ADD_CXXFLAGS([-Weffc++])
diff --git a/media-libs/flac/files/flac-1.3.1-x32.patch b/media-libs/flac/files/flac-1.3.1-x32.patch
new file mode 100644
index 00000000..e9b31878
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.1-x32.patch
@@ -0,0 +1,46 @@
+--- configure.ac.dist	2015-03-07 15:03:56.570459411 +0000
++++ configure.ac	2015-03-07 15:13:02.847469169 +0000
+@@ -105,19 +105,30 @@
+ asm_optimisation=no
+ case "$host_cpu" in
+ 	x86_64)
+-		if test $ac_cv_sizeof_voidp = 4 ; then
+-			# This must be a 32 bit user space running on 64 bit kernel so treat
+-			# this as ia32.
+-			cpu_ia32=true
+-			AC_DEFINE(FLAC__CPU_IA32)
+-			AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
+-		else
+-			# x86_64 user space and kernel.
+-			cpu_x86_64=true
+-			AC_DEFINE(FLAC__CPU_X86_64)
+-			AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
+-			fi
+-		asm_optimisation=$asm_opt
++		case "$host" in
++			*gnux32)
++				# x32 user space and 64 bit kernel.
++				cpu_x86_64=true
++				AC_DEFINE(FLAC__CPU_X86_64)
++				AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
++				asm_optimisation=$asm_opt
++				;;
++			*)
++				if test $ac_cv_sizeof_voidp = 4 ; then
++					# This must be a 32 bit user space running on 64 bit kernel so treat
++					# this as ia32.
++					cpu_ia32=true
++					AC_DEFINE(FLAC__CPU_IA32)
++					AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
++				else
++					# x86_64 user space and kernel.
++					cpu_x86_64=true
++					AC_DEFINE(FLAC__CPU_X86_64)
++					AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64])
++				fi
++				asm_optimisation=$asm_opt
++				;;
++		esac
+ 		;;
+ 	i*86)
+ 		cpu_ia32=true
diff --git a/media-libs/flac/flac-1.3.0-r1.ebuild b/media-libs/flac/flac-1.3.0-r1.ebuild
new file mode 100644
index 00000000..749e77b7
--- /dev/null
+++ b/media-libs/flac/flac-1.3.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0-r1.ebuild,v 1.1 2014/09/27 22:16:21 ssuominen Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+inherit autotools-multilib
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_3dnow altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	abi_x86_32? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-dontbuild-tests.patch
+		"${FILESDIR}"/${P}-dontbuild-examples.patch
+		"${FILESDIR}"/${P}-metaflac_strcat.patch
+	)
+
+	AT_M4DIR="m4" autotools-multilib_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable altivec)
+		--disable-doxygen-docs
+		--disable-xmms-plugin
+		$(use_enable cxx cpplibs)
+		$(use_enable ogg)
+		--disable-examples
+	)
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	if [[ ${UID} != 0 ]]; then
+		autotools-multilib_src_test -j1
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/flac/flac-1.3.0.ebuild b/media-libs/flac/flac-1.3.0.ebuild
new file mode 100644
index 00000000..a0cdf00d
--- /dev/null
+++ b/media-libs/flac/flac-1.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0.ebuild,v 1.13 2014/06/18 19:27:19 mgorny Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+inherit autotools-multilib
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_3dnow altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	abi_x86_32? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-dontbuild-tests.patch
+		"${FILESDIR}"/${P}-dontbuild-examples.patch
+	)
+
+	AT_M4DIR="m4" autotools-multilib_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable altivec)
+		--disable-doxygen-docs
+		--disable-xmms-plugin
+		$(use_enable cxx cpplibs)
+		$(use_enable ogg)
+		--disable-examples
+	)
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	if [[ ${UID} != 0 ]]; then
+		autotools-multilib_src_test -j1
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/flac/flac-1.3.1-r1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild
new file mode 100644
index 00000000..1a6d7d1e
--- /dev/null
+++ b/media-libs/flac/flac-1.3.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.1-r1.ebuild,v 1.14 2015/03/03 08:22:55 dlan Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+inherit autotools autotools-multilib
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="altivec +cxx debug doc ogg cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	abi_x86_32? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-x32.patch
+		"${FILESDIR}"/${P}-cflags.patch
+		"${FILESDIR}"/${PN}-1.3.0-asneeded.patch
+		"${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch
+		"${FILESDIR}"/${PN}-1.3.0-dontbuild-examples.patch
+	)
+
+	AT_M4DIR="m4" autotools-multilib_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable altivec)
+		--disable-doxygen-docs
+		--disable-xmms-plugin
+		$(use_enable cxx cpplibs)
+		$(use_enable ogg)
+		--disable-examples
+		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+
+		# cross-compile fix (bug #521446)
+		# no effect if ogg support is disabled
+		--with-ogg
+	)
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	if [[ ${UID} != 0 ]]; then
+		autotools-multilib_src_test -j1
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+
+	use doc || rm -r "${ED}"/usr/share/doc/${PF}/html
+}