[patch] The diff between the proposed ebuild and the one in tree.

libsndfile-1.0.25-r1.ebuild.diff (text/plain), 3.26 KB, created by Karl Lindén on 2013-04-20 23:47:31 UTC

--- libsndfile-1.0.25.ebuild	2013-04-21 01:08:26.026163490 +0200
+++ libsndfile-1.0.25-r1.ebuild	2013-04-21 01:44:50.310091463 +0200
@@ -1,64 +1,59 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.11 2013/03/10 12:26:30 vincent Exp $
+# $Header: $
 
-EAPI=5
-inherit autotools eutils flag-o-matic multilib
-
-MY_P=${P/_pre/pre}
+EAPI="5"
+inherit autotools-multilib flag-o-matic
 
 DESCRIPTION="A C library for reading and writing files containing sampled sound"
 HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-if [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-else
-	SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
-fi
+SRC_URI="http://www.mega-nerd.com/${PN}/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm 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"
+KEYWORDS="~alpha ~amd64 ~arm ~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="alsa minimal sqlite static-libs"
 
-RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.3 )
-	alsa? ( media-libs/alsa-lib )
-	sqlite? ( >=dev-db/sqlite-3.2 )"
+RDEPEND="
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )
+	!minimal? (
+		>=media-libs/flac-1.2.1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.2.3[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	sqlite? (
+		>=dev-db/sqlite-3.2
+		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.17-regtests-need-sqlite.patch"
+	"${FILESDIR}/${P}-honour-htmldir.patch"
+)
 
-# Keep this function synced with x11-libs/pango ebuild!
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
+AUTOTOOLS_AUTORECONF="1"
 
 src_prepare() {
 	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' {examples,tests}/Makefile.am || die
 
-	epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch
-
-	AT_M4DIR=M4 eautoreconf
-	epunt_cxx
+	export AT_M4DIR=M4
+	autotools-multilib_src_prepare
 }
 
 src_configure() {
-	multilib_enabled && append-lfs-flags #313259
+	use amd64 && use abi_x86_32 && append-lfs-flags #313259
 
-	econf \
-		$(use_enable sqlite) \
-		$(use_enable static-libs static) \
-		$(use_enable alsa) \
-		$(use_enable !minimal external-libs) \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-octave \
-		--disable-gcc-werror \
+	local myeconfargs=(
+		$(use_enable sqlite)
+		$(use_enable alsa)
+		$(use_enable !minimal external-libs)
+		--disable-octave
+		--disable-gcc-werror
 		--disable-gcc-pipe
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldocdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS ChangeLog NEWS README
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	autotools-multilib_src_configure
 }