Add glib-1.2 dependency, even if we are building -gtk. Bug #172115.

Remove old version.
(Portage version: 2.1.2.2)

4 files changed, 18 insertions, 99 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index c9a65bd65c1f..c6bbaf9e437e 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.56 2007/02/19 06:26:20 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.57 2007/03/25 01:35:47 dirtyepic Exp $
+
+  25 Mar 2007; Ryan Hill <dirtyepic@gentoo.org> -alsaplayer-0.99.77.ebuild,
+  alsaplayer-0.99.77-r1.ebuild:
+  Add glib-1.2 dependency, even if we are building -gtk. Bug #172115.
+  
+  Remove old version.
 
 *alsaplayer-0.99.77-r1 (19 Feb 2007)
 
@@ -21,7 +27,7 @@
   alsaplayer-0.99.77.ebuild:
   Keyworded ~sparc wrt #166464
 
-  13 Feb 2007; Piotr Jaroszyński <peper@gentoo.org>
+  13 Feb 2007; Piotr Jaroszyński <peper@gentoo.org>
   alsaplayer-0.99.77.ebuild:
   Add ~amd64 wrt bug #166464.
 
@@ -39,11 +45,11 @@
   -alsaplayer-0.99.76-r2.ebuild, alsaplayer-0.99.76-r3.ebuild:
   Mark 0.99.76-r3 stable on ia64.  Remove 0.99.76-r2. #125479
 
-  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsaplayer-0.99.76-cxxflags.patch, alsaplayer-0.99.76-r3.ebuild:
   Force a decent behaviour with respect to C(XX)FLAGS.
 
-  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   -alsaplayer-0.99.76.ebuild, -alsaplayer-0.99.76-r1.ebuild:
   Drop old versions.
 
@@ -60,7 +66,7 @@
 
 *alsaplayer-0.99.76-r3 (20 Apr 2006)
 
-  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsaplayer-0.99.76-join-null-thread.patch,
   +alsaplayer-0.99.76-r3.ebuild:
   Add patch to void crashing on cleanup, thanks to Matthias Langer for the
@@ -73,13 +79,13 @@
   10 Mar 2006; <nixnut@gentoo.org> alsaplayer-0.99.76-r2.ebuild:
   Stable on ppc. Bug #125479
 
-  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   alsaplayer-0.99.76.ebuild:
   Don't depend on doxygen in runtime.
 
 *alsaplayer-0.99.76-r2 (18 Dec 2005)
 
-  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   +alsaplayer-0.99.76-r2.ebuild:
   Drop gtk useflag for new revision, as it does not handle Unicode correctly,
   leading to crashes. See bug #103751.
@@ -106,7 +112,7 @@
   added missing libsndfile dependency, fixes #89597. also changed deprecated
   oggvorbis to vorbis.
 
-  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
 
   13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
@@ -117,7 +123,7 @@
 
   12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   +alsaplayer-0.99.76-r1.ebuild:
-  applied a cleanup patch which was suggested by Diego Pettenò
+  applied a cleanup patch which was suggested by Diego Pettenò
   <dgp85@users.sourceforge.net>. Fixes #82744
 
   06 Mar 2005; Joseph Jezak <josejx@gentoo.org>
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild
index e49ea0409825..edbd0ad8894b 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild,v 1.1 2007/02/19 06:26:20 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.77-r1.ebuild,v 1.2 2007/03/25 01:35:47 dirtyepic Exp $
 
 inherit eutils autotools
 
@@ -19,7 +19,6 @@ RDEPEND="
 	audiofile? ( media-libs/audiofile )
 	esd? ( media-sound/esound )
 	flac? ( media-libs/flac )
-	gtk? ( =x11-libs/gtk+-1.2* )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	nas? ( media-libs/nas )
@@ -29,6 +28,8 @@ RDEPEND="
 	xosd? ( x11-libs/xosd )"
 
 DEPEND="${RDEPEND}
+	=dev-libs/glib-1.2*
+	gtk? ( =x11-libs/gtk+-1.2* )
 	doc? ( app-doc/doxygen )
 	nls? ( sys-devel/gettext )"
 
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.77.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.77.ebuild
deleted file mode 100644
index cb6904bb0008..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.77.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.77.ebuild,v 1.5 2007/02/18 15:30:35 nixnut Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A heavily multi-threaded pluggable audio player."
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-IUSE="alsa audiofile doc esd flac gtk jack mikmod nas nls ogg opengl oss vorbis xosd"
-
-RDEPEND="
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
-	esd? ( media-sound/esound )
-	flac? ( media-libs/flac )
-	gtk? ( >=x11-libs/gtk+-2.6 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	nas? ( media-libs/nas )
-	ogg? ( media-libs/libogg )
-	opengl? ( virtual/opengl )
-	vorbis? ( media-libs/libvorbis )
-	xosd? ( x11-libs/xosd )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${P}-ppc-endian-fix.patch
-	epatch "${FILESDIR}"/${P}-join-null-thread.patch
-	epatch "${FILESDIR}"/${P}-cxxflags.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	use xosd ||
-		export ac_cv_lib_xosd_xosd_create="no"
-
-	use doc ||
-		export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	if use ogg && use flac; then
-		myconf="${myconf} --enable-oggflac"
-	fi
-
-	econf \
-		$(use_enable audiofile) \
-		$(use_enable esd) \
-		$(use_enable flac) \
-		$(use_enable gtk gtk2) \
-		$(use_enable jack) \
-		$(use_enable mikmod) \
-		$(use_enable nas) \
-		$(use_enable opengl) \
-		$(use_enable oss) \
-		$(use_enable nls) \
-		$(use_enable sparc) \
-		$(use_enable vorbis oggvorbis) \
-		${myconf} \
-		--disable-gtk \
-		--disable-sgi \
-		--disable-dependency-tracking \
-		|| die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${D}/usr/share/doc/${PF}" install \
-		|| die "make install failed"
-
-	dodoc AUTHORS ChangeLog README TODO
-	dodoc docs/wishlist.txt
-}
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.77 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.77
deleted file mode 100644
index 385f3c3f0ed7..000000000000
--- a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.77
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3280795b199ae1bb245559ccbbca5c02 alsaplayer-0.99.77.tar.bz2 657622
-RMD160 a40c25f17ec6f4f81283bb2ee91c0bee27e1a108 alsaplayer-0.99.77.tar.bz2 657622
-SHA256 5bfcbb14f5c64f0d5fd56420910f192a1bebac99c8a6e53855a69f64a3f3d6a0 alsaplayer-0.99.77.tar.bz2 657622