Fix building with latest texi2html wrt #422045. Use prune_libtool_files with --all argument because we always want _lash.la from python directory removed. Pull in correct Python 2.x version with python.eclass and PYTHON_DEPEND.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

2 files changed, 40 insertions, 17 deletions

diff --git a/media-sound/lash/ChangeLog b/media-sound/lash/ChangeLog
index 5dafa916c0fb..f87066395dff 100644
--- a/media-sound/lash/ChangeLog
+++ b/media-sound/lash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.35 2012/05/05 08:35:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/ChangeLog,v 1.36 2012/09/03 16:30:28 ssuominen Exp $
+
+  03 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> lash-0.5.4-r1.ebuild:
+  Fix building with latest texi2html wrt #422045. Use prune_libtool_files with
+  --all argument because we always want _lash.la from python directory removed.
+  Pull in correct Python 2.x version with python.eclass and PYTHON_DEPEND.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> lash-0.5.4-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-sound/lash/lash-0.5.4-r1.ebuild b/media-sound/lash/lash-0.5.4-r1.ebuild
index af747e07b3ac..848de4539643 100644
--- a/media-sound/lash/lash-0.5.4-r1.ebuild
+++ b/media-sound/lash/lash-0.5.4-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r1.ebuild,v 1.14 2012/05/05 08:35:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lash/lash-0.5.4-r1.ebuild,v 1.15 2012/09/03 16:30:28 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 
-inherit autotools eutils
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit autotools eutils python
 
 DESCRIPTION="LASH Audio Session Handler"
 HOMEPAGE="http://www.nongnu.org/lash/"
@@ -13,40 +15,56 @@ SRC_URI="http://download.savannah.gnu.org/releases/lash/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="alsa debug gtk python"
+IUSE="alsa debug gtk python static-libs" # doc
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="dev-libs/libxml2
 	media-sound/jack-audio-connection-kit
-	dev-libs/libxml2
+	alsa? ( media-libs/alsa-lib )
 	gtk? ( x11-libs/gtk+:2 )
-	python? ( dev-lang/python )
 	|| ( sys-libs/readline dev-libs/libedit )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	python? ( >=dev-lang/swig-1.3.31 )"
+	python? ( >=dev-lang/swig-1.3.40 )"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc2.8.patch"
-	epatch "${FILESDIR}/${P}-swig_version_comparison.patch"
+	sed -i \
+		-e '/texi2html/ s/-number/&-sections/' \
+		docs/Makefile.am || die #422045
+
+	epatch \
+		"${FILESDIR}"/${P}-glibc2.8.patch \
+		"${FILESDIR}"/${P}-swig_version_comparison.patch
+
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
+	export ac_cv_prog_lash_texi2html=no #422045
+
 	local myconf
 
 	# Yet-another-broken-configure: --enable-pylash would disable it.
-	use python || myconf="${myconf} --disable-pylash"
+	use python || myconf='--disable-pylash'
 
 	econf \
+		$(use_enable static-libs static) \
 		$(use_enable alsa alsa-midi) \
 		$(use_enable gtk gtk2) \
 		$(use_enable debug) \
-		${myconf} \
-		--disable-dependency-tracking
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+	prune_libtool_files --all
 }