Disable USE symlink by default and mention it in postinst. Run eautoreconf because it was running maintainer-mode and failed due to undefined AC_TYPE_SOCKLEN_T, needed a AT_M4DIR's help.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 29 insertions, 8 deletions

diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index fe45a536b1af..7f4d0cccb45c 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg321
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.45 2009/06/21 07:31:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.46 2009/06/22 04:32:14 ssuominen Exp $
+
+  22 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mpg321-0.2.10.6.ebuild:
+  Disable USE symlink by default and mention it in postinst. Run eautoreconf
+  because it was running maintainer-mode and failed due to undefined
+  AC_TYPE_SOCKLEN_T, needed a AT_M4DIR's help.
 
 *mpg321-0.2.10.6 (21 Jun 2009)
 *mpg321-0.2.10-r4 (21 Jun 2009)
diff --git a/media-sound/mpg321/mpg321-0.2.10.6.ebuild b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
index 611775160d9e..f0f13088199a 100644
--- a/media-sound/mpg321/mpg321-0.2.10.6.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10.6.ebuild,v 1.1 2009/06/21 07:31:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10.6.ebuild,v 1.2 2009/06/22 04:32:14 ssuominen Exp $
 
 EAPI=2
-inherit eutils
+inherit autotools
 
 DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
 HOMEPAGE="http://packages.debian.org/mpg321"
@@ -12,13 +12,12 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa -mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+symlink"
+IUSE="+alsa symlink"
 
 RDEPEND="sys-libs/zlib
 	media-libs/libmad
 	media-libs/libid3tag
-	media-libs/libao
-	!<media-sound/mpg321-0.2.10-r4
+	media-libs/libao[alsa?]
 	symlink? ( !media-sound/mpg123 )"
 DEPEND="${RDEPEND}"
 PDEPEND="symlink? ( virtual/mpg123 )"
@@ -35,14 +34,30 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	AT_M4DIR=m4 eautoreconf
+}
+
 src_configure() {
+	local myao=oss
+	use alsa && myao=alsa09
+
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable symlink mpg123-symlink)
+		$(use_enable symlink mpg123-symlink) \
+		--with-default-audio=${myao}
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	newdoc debian/changelog ChangeLog.debian
 	dodoc AUTHORS BUGS HACKING NEWS README{,.remote} THANKS TODO
 }
+
+pkg_postinst() {
+	if ! use symlink; then
+		ewarn "USE symlink is disabled by default on purpose, to get people"
+		ewarn "to switch back into using mpg123 since it's been freed."
+		ewarn "See ChangeLog.debian in /usr/share/doc/${PF} for details."
+	fi
+}