Punt base.eclass from inherit because it was never used and PATCHES was ignored because of custom src_prepare(). Remove obsolete pkg_postinst() message wrt #434370 by William Throwe.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 27 insertions, 29 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 498b154a529b..445a44b90686 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.333 2012/09/07 12:57:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.334 2012/09/09 08:32:27 ssuominen Exp $
+
+  09 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> alsa-lib-1.0.26.ebuild:
+  Punt base.eclass from inherit because it was never used and PATCHES was
+  ignored because of custom src_prepare(). Remove obsolete pkg_postinst()
+  message wrt #434370 by William Throwe.
 
 *alsa-lib-1.0.26 (07 Sep 2012)
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 26d9873354cd..0d5af1c60c53 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -7,13 +7,17 @@ DIST alsa-lib-1.0.25.tar.bz2 838403 SHA256 5a1a805cf04106316d549ec650116ce6711a1
 DIST alsa-lib-1.0.26.tar.bz2 883076 SHA256 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d SHA512 2f917171c1e2f50947d7b62da468c5febfa91fba5c04b4694171f7fa0e61ddf398daf7e657876bab1f1ec08932e82f147786b10f815172409f057b0fcd69003a WHIRLPOOL c6353ccf335e24e97258f26fed14ce66fff21b721bef1d6648f212653c0c58a99c889784bf7d42cadbc0f2b1514c877fe8ed94f30c7b45d55f9193c335849c0f
 EBUILD alsa-lib-1.0.24.1.ebuild 2608 SHA256 7a8df39d6a94221c1fbbbd40edd4c822f30c8c00cce3422ca2826af46c34a2ca SHA512 c2140933dbb556a8bb581a2162eee22791fa3739af18357b11ec756e613da5aaafa443483e68a0eda2d7a7c6d3fef75559520f8513d3ac9ec4479741704e53e7 WHIRLPOOL a360f0dde09099d3d1ff8528460680bc2b19d5d6678d5ad77d318c5b9c62f8046551062f224223bcc125a4798289f3de0006687df16e6fd587e7bf2c10e67b91
 EBUILD alsa-lib-1.0.25-r1.ebuild 2013 SHA256 d985b016e6c47571d5e9dfc27221c53890b2c5eb16ced78ca7f6f1faecb1705a SHA512 08d12ec65769052ff8d4ad2beec69883cce5df02359f47e721794f09e693fdf662984cf1cd6a42f9044726daf06bc2535fbab55c6172f74f8d76d00a433a8b82 WHIRLPOOL e75cc1d2456f818434a185a6298080d0c5403d71a6704d89be17aadeb098cb61c5c3c86167b0f3e8394b9bcbde0832b8720a6384ad9151158e445152f9cd0eb2
-EBUILD alsa-lib-1.0.26.ebuild 2020 SHA256 d200127c0e79ee73042e6293e0673c85cbf18f9fea49a5afe90bc73b90200566 SHA512 3f6aff01cfa7e8665263bbd39ffd1253eaad55574fa6d73842c2d2708e01136f06a0b7a4d8c8c0d86931ec890b0fbbc0706a815621f236e24819e9bdfe731200 WHIRLPOOL d71891a8f5f46e3b6ce71f9ed49d0790990023301587f2cdb395ec6aa38ad5687cb2acdf060d7ec00aa8b69c7f04b4363df6b86358a229dbdcdd36fb92ec8418
-MISC ChangeLog 49175 SHA256 5fb1d016fed1a4506cbbf19bd6d6a1aec9902db3c99d822f3d7b301e3653ff7e SHA512 0626287b0d3ad4a669d391256b59e1a6220e0b965f25cfc279f6e9529685372dc46b9a4a6ba68b44863968b632ff56c83a5efd732bfd2be394017603f2b01d25 WHIRLPOOL e8d70a11b0d9c639fd6c8937570b9634ab12a40b20cc9160b0f1b7c5109a163600235247059d560190165b5c2d7c8a8b16e4f6051f62eb5cfacf82fcf803efba
+EBUILD alsa-lib-1.0.26.ebuild 1516 SHA256 6f4427ab6afedb57875c4a2877d27028728fcbf9453ad09bf9c166d2f2efe0f3 SHA512 8e2279828e66e028e25fde0dfa36bcc2acca6327f445ca9883e2e2214e5528fa4a7760a0123c426bb6d3fb45e8263b182cc7ae7a101b9be80c8cf2ee03487e86 WHIRLPOOL 327bc7002de5c06b3385ea83b616e600be3bd7e9b579a7f1c85000ebb18130bb3029a59279ed363a98d8e912205670ef698a7feab694e13ba2a02ddbd7c860d3
+MISC ChangeLog 49444 SHA256 5617c2d012ebbead967e131abb05c35a604171cd0a7f7acbeba41a3f116d9883 SHA512 d0719a857cbcd0d207313d87ef51ffef0e3111604eeb15beba7abbae007d9588b416480d0b8cc069728ce4b4fbe6633c45f8d54af4b1c2705894645cc2f4c307 WHIRLPOOL cf3eecbec7f8d28d4c8e6bf937047c0bffc3d27770721b4994dd404249ffd4cf9406cca7fdbafc69992a31893d5d119f24635c397304e1893bb8205b2cef6e8c
 MISC metadata.xml 349 SHA256 68b0f168985d3b03a0997eb9f9338662d1584dc7fe7ea35ae8f7564e5e20c2e3 SHA512 477956b85f7ddddac6b0bb67a52803a569f3ee6011ab917a3d2a60975a11c0a9ef5acedebbcb75bdbd04063e2c6e7aabf10a0c2444dd10492eda4cb8f817f688 WHIRLPOOL c42f98c4da4bd5c20d32bfa6a3d9d68b71aaccbc905cad9a7552366be99c1e1f010279d458b620e97e2c1044cef0af066cf79fc5a1fcecf8fb31c91a3e1e95ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBJ70oACgkQp5vW4rUFj5rNBgCdEWaibvldE+9itoS97rqSKR7q
-BKMAoLI33x4zVrJpnQU09l2P6LgzHTIN
-=qDda
+iQEcBAEBCAAGBQJQTFPSAAoJEEdUh39IaPFNEH0H+QGn8qLHV9FkR44m5vyIJzRN
+mlcDR6sA7tGRatst0EF3yyYTJXlo8ux/qnVzLfRYwRdNq/Vr3AAsN0wMyBHryzyk
+pj+fJzz64X7SAEK6gVExRx1c3D2jghGMRH6QuR6LY6IvXcjecOjf6dwlQMpRB7gL
+SdLzjTlcdADiNo9z4OHlX1dcJKjQcJGfU3iHi89UZrxgud3GDIPwLYFsxsLTFuE8
+adfUngU95LEaM2o015TVjQdDivoDqLDgWPscduDx/sPkHilR73mwNm0Jy+fFD7aS
+wE26j8bxo76yoCX/IzYoHso6C5tQLf0AuVFEGM27XYPJbWwpsqOpvLdgUA/78g8=
+=xytY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild
index 7f1050706b18..04d930172003 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild
@@ -1,37 +1,35 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild,v 1.1 2012/09/07 12:57:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.26.ebuild,v 1.2 2012/09/09 08:32:27 ssuominen Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? 2:2.6"
 
-inherit autotools base python multilib
-
-MY_P=${P/_rc/rc}
-S=${WORKDIR}/${MY_P}
+inherit autotools eutils multilib python
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc debug alisp python"
 
+RDEPEND=""
 DEPEND=">=media-sound/alsa-headers-1.0.25
 	doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND=""
-PATCHES=( "${FILESDIR}/${PV}-extraneous-cflags.diff" )
 
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/1.0.25-extraneous-cflags.diff
 	eautoreconf
 	epunt_cxx
 }
@@ -49,34 +47,25 @@ src_configure() {
 		$(use_with debug) \
 		$(use_enable alisp) \
 		$(use_enable python) \
-		--disable-dependency-tracking \
 		${myconf}
 }
 
 src_compile() {
-	emake || die
+	emake
 
 	if use doc; then
-		emake doc || die "failed to generate docs"
+		emake doc
 		fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
 			xargs -0 sed -i -e "s:${S}::"
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
 
-	dodoc ChangeLog TODO || die
+	dodoc ChangeLog TODO
 	use doc && dohtml -r doc/doxygen/html/*
 }
-
-pkg_postinst() {
-	elog "Please try in-kernel ALSA drivers instead of the alsa-driver ebuild."
-	elog "If alsa-driver works for you where a *recent* kernel does not, we want "
-	elog "to know about this. Our e-mail address is alsa-bugs@gentoo.org"
-	elog "However, if you notice no sound output or instability, please try to "
-	elog "upgrade your kernel to a newer version first."
-}