Remove mpg123 -symlink as deprecated feature.

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

5 files changed, 12 insertions, 121 deletions

diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index e10e0e995da7..8f0591a3d37b 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,10 @@
 # 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.54 2009/08/31 19:24:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.55 2009/09/06 16:59:03 ssuominen Exp $
+
+  06 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mpg321-0.2.10.6.ebuild:
+  Remove mpg123 -symlink as deprecated feature.
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> mpg321-0.2.10.6.ebuild:
   stable ppc64, bug 278596
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index 709f0b20609c..2abd1c8f5e5e 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -1,6 +1,4 @@
-AUX mpg321-0.2.10-file-descriptors-leak.patch 1933 RMD160 f7dd5c7217a6d249f95b08645bf4f697df0a9df6 SHA1 656bbb6a4c51462974640f3e319799504e0ef1cd SHA256 6d963f8930eac4601424b200a15cbbeb273c8df92e36eda43c5b7be2d1d33e65
-AUX mpg321-0.2.10-useragent.patch 610 RMD160 3a6627d053536cbfa42a747a5435ffa4c492d411 SHA1 d0e8dd54f031a8e92c47b8a7badd9536d33046e4 SHA256 444714cfc74853e29c2a58682c208b47453f577d709f9f5bb030f2af39d04271
 DIST mpg321_0.2.10.6.tar.gz 146818 RMD160 1c962a9c21a29c6b5af24dbc539f67c11fc6ad38 SHA1 17da0b9f98380235d896295802b87ab775047da4 SHA256 3185746374713437ee1d6f101369e3009eff92a1b07909e87349cb7631398d5f
-EBUILD mpg321-0.2.10.6.ebuild 1645 RMD160 8347277280a1a5f1e6409e35136750d983c48866 SHA1 5c7a2b8cc689b76569643d60ea46d80895309bfe SHA256 5abd7858b111a35bd99621e12b6b4f56a227cb567f55f30febde54fd230b5600
-MISC ChangeLog 7021 RMD160 ed02433bd2c467b0266eabbbac40c59ce1398fbb SHA1 8b37bfe9abe1ddb36d876f465993caa7c950a943 SHA256 ae8083716cb6b5bc4459c64b3711f5e2fd19f7848429a2a2d284437e490eed95
+EBUILD mpg321-0.2.10.6.ebuild 1030 RMD160 ff249ebdf697e08e2b6d8f0ff4036652ee1c0e57 SHA1 a2f64c92278795d73b5e71e22bcef1323e19de51 SHA256 1914e6a99d5d01e26237e868e5b5889d597eeffaea9912d51e476b7a88cefd25
+MISC ChangeLog 7153 RMD160 fc644f1f1c6abbffabfedc296dc39d678af8e9d5 SHA1 77444c93dbd7d0436ce47404e7801ba5791e83b3 SHA256 67f9c7c607050079dd3012ba26108282af7a981ee8e37e0c4691f454641fa8c8
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch b/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
deleted file mode 100644
index 04fc698e2e79..000000000000
--- a/media-sound/mpg321/files/mpg321-0.2.10-file-descriptors-leak.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From upstream (Debian in this case), should be fixed in >= 0.2.10.6.
-
-diff -ur mpg321-0.2.10.orig/mpg321.c mpg321-0.2.10/mpg321.c
---- mpg321-0.2.10.orig/mpg321.c	Sat Mar 23 23:49:20 2002
-+++ mpg321-0.2.10/mpg321.c	Sat Nov 13 00:50:25 2004
-@@ -188,7 +188,7 @@
-             
-             else
-             {
--                printf(names[i]);
-+                printf("%s", names[i]);
-                 free(names[i]);
-             }
-         }
-@@ -203,7 +203,7 @@
-             if (!names[i])  {
-                 fprintf (stderr, emptystring);
-             }   else    {
--                fprintf (stderr, names[i]);
-+                fprintf (stderr, "%s", names[i]);
-                 free (names[i]);
-             }
-             if (i%2) fprintf (stderr, "\n");
-@@ -410,12 +410,14 @@
-             
-             if(fstat(fd, &stat) == -1)
-             {
-+            	close(fd);
-                 mpg321_error(currentfile);
-                 continue;
-             }
-             
-             if (!S_ISREG(stat.st_mode))
-             {
-+            	close(fd);
-                 continue;
-             }
-             
-@@ -432,6 +434,7 @@
-             if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0))
-                                 == MAP_FAILED)
-             {
-+            	close(fd);
-                 mpg321_error(currentfile);
-                 continue;
-             }
-@@ -509,9 +512,6 @@
- 
-         mad_decoder_finish(&decoder);
- 
--        if (quit_now)
--            break;
--
-         if (playbuf.frames)
-              free(playbuf.frames);
- 
-@@ -521,6 +521,7 @@
-         if (playbuf.fd == -1)
-         {
-             munmap(playbuf.buf, playbuf.length);
-+            close(fd);
-         }
- 
-         else
-@@ -535,10 +536,6 @@
-         ao_close(playdevice);
- 
-     ao_shutdown();
--
--#if defined(RAW_SUPPORT) || defined(HTTP_SUPPORT) || defined(FTP_SUPPORT) 
--    if(fd) close(fd);
--#endif
- 
-     return(0);
- }
diff --git a/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch b/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch
deleted file mode 100644
index b6bac82dba1f..000000000000
--- a/media-sound/mpg321/files/mpg321-0.2.10-useragent.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Provide an User-Agent when requesting via HTTP by Frank Ruell. See, FreeBSD PR #84898.
-
---- network.c.orig
-+++ network.c
-@@ -225,7 +225,8 @@
-      * a html page and not the stream */
-     snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n"
- /*  "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */
--             "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host);
-+             "User-Agent: mpg321/%s\r\n"
-+             "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, VERSION, host);
- 
-     send(tcp_sock, http_request, strlen(http_request), 0);
- 
diff --git a/media-sound/mpg321/mpg321-0.2.10.6.ebuild b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
index c18600942aba..33bb9b6f90ac 100644
--- a/media-sound/mpg321/mpg321-0.2.10.6.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10.6.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2009/08/31 19:24:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10.6.ebuild,v 1.10 2009/09/06 16:59:03 ssuominen Exp $
 
 EAPI=2
 inherit autotools
@@ -12,27 +12,13 @@ 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="+alsa symlink"
+IUSE="alsa"
 
 RDEPEND="sys-libs/zlib
 	media-libs/libmad
 	media-libs/libid3tag
-	media-libs/libao[alsa?]
-	symlink? ( !media-sound/mpg123 )"
+	media-libs/libao[alsa?]"
 DEPEND="${RDEPEND}"
-PDEPEND="symlink? ( virtual/mpg123 )"
-
-pkg_setup() {
-	local link="${ROOT}usr/bin/mpg123"
-	local msg="Removing invalid symlink ${link}"
-	if use symlink; then
-		if [ -L "${link}" ]; then
-			ebegin "${msg}"
-			rm -f "${link}" || die "${msg} failed, please open a bug."
-			eend $?
-		fi
-	fi
-}
 
 src_prepare() {
 	AT_M4DIR=m4 eautoreconf
@@ -44,20 +30,12 @@ src_configure() {
 
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable symlink mpg123-symlink) \
+		--disable-mpg123-symlink \
 		--with-default-audio=${myao}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	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
-}