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.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 31 insertions, 10 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/Manifest b/media-sound/mpg321/Manifest
index 62ed57497fdf..f84a81e4877c 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -3,6 +3,6 @@ AUX mpg321-0.2.10-useragent.patch 610 RMD160 3a6627d053536cbfa42a747a5435ffa4c49
 DIST mpg321-0.2.10.tar.gz 113449 RMD160 c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba SHA1 90268d0d187ddd7625d143b95791cb39a1630b79 SHA256 db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
 DIST mpg321_0.2.10.6.tar.gz 146818 RMD160 1c962a9c21a29c6b5af24dbc539f67c11fc6ad38 SHA1 17da0b9f98380235d896295802b87ab775047da4 SHA256 3185746374713437ee1d6f101369e3009eff92a1b07909e87349cb7631398d5f
 EBUILD mpg321-0.2.10-r4.ebuild 1311 RMD160 17cc2db5795acaabb46467f4b2175ba793ed84c2 SHA1 435a66d99b3f0556603fe30f23a01a959a109f22 SHA256 a67f50ba2175e4df2f1fc9ab3a797f8b2d9240da5b305567e99e0fb98c541fe8
-EBUILD mpg321-0.2.10.6.ebuild 1301 RMD160 d2b8273f2cc5b62bb246c93bef3ad5f71d5848c0 SHA1 0b9d2612d11b13610e664ab90c29a895c3d58625 SHA256 3c3f2b88a9104383ef1c1abc787daabf06dee739f108e813ff154939c305d5c4
-MISC ChangeLog 5945 RMD160 03c8f9a5faee37e225f87760ead5ce1f861d1ffc SHA1 10101f1a8dc0daae4016d25af1d40d3b89d39939 SHA256 9678e0710c93fd3e669c767620308295dcb4c98abd0795a51cfc189eafc3911c
+EBUILD mpg321-0.2.10.6.ebuild 1655 RMD160 4a08b01ec3fa79b5d0a70135f4de1926b97439e7 SHA1 66ca2e7b643aa3d543a05bae3ae45298a25cbe70 SHA256 30a24f49b02c1e987f1631af0c70551d10f05a63a27330b508690a7d0e1da69c
+MISC ChangeLog 6219 RMD160 8bcd948d40d3b07730c9828015878f3b3107d719 SHA1 5477e3e29c91bcc5d4caeb2ae1262a0e409dc13d SHA256 f717605a2aab307e77577f0c93bf3e0600e1c79c9e9244fe869b018c3815fe75
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
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
+}