Version bump (bug #471598).

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

5 files changed, 189 insertions, 1 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index a9b05cafb22d..94129c1285eb 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/flac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.156 2013/05/07 11:58:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.157 2013/05/29 08:30:22 radhermit Exp $
+
+*flac-1.3.0 (29 May 2013)
+
+  29 May 2013; Tim Harder <radhermit@gentoo.org> +flac-1.3.0.ebuild,
+  +files/flac-1.3.0-asneeded.patch, +files/flac-1.3.0-dontbuild-examples.patch,
+  +files/flac-1.3.0-dontbuild-tests.patch:
+  Version bump (bug #471598).
 
   07 May 2013; Michał Górny <mgorny@gentoo.org> flac-1.2.1-r5.ebuild:
   Restore doc-install in build system, applying a fix for out-of-source install
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 000000000000..a38b3202500a
--- /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 000000000000..5c25dd588f2b
--- /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 000000000000..0915a5976609
--- /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/flac-1.3.0.ebuild b/media-libs/flac/flac-1.3.0.ebuild
new file mode 100644
index 000000000000..06c7b0fa17b0
--- /dev/null
+++ b/media-libs/flac/flac-1.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 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.1 2013/05/29 08:30:22 radhermit 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="3dnow altivec +cxx debug ogg sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+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 sse)
+		$(use_enable 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
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		docdir=/usr/share/doc/${PF}/html
+}