From 705d67dc126ce8856d65ec31ad01fa396d6a25bf Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 25 Mar 2007 01:35:47 +0000 Subject: [PATCH] Add glib-1.2 dependency, even if we are building -gtk. Bug #172115. Remove old version. Package-Manager: portage-2.1.2.2 --- media-sound/alsaplayer/ChangeLog | 24 ++++-- media-sound/alsaplayer/Manifest | 23 ++--- .../alsaplayer/alsaplayer-0.99.77-r1.ebuild | 5 +- .../alsaplayer/alsaplayer-0.99.77.ebuild | 85 ------------------- .../files/digest-alsaplayer-0.99.77 | 3 - 5 files changed, 26 insertions(+), 114 deletions(-) delete mode 100644 media-sound/alsaplayer/alsaplayer-0.99.77.ebuild delete mode 100644 media-sound/alsaplayer/files/digest-alsaplayer-0.99.77 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 -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 + 13 Feb 2007; Piotr Jaroszyński 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ò + 09 Jul 2006; Diego Pettenò +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ò + 09 Jul 2006; Diego Pettenò -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ò + 20 Apr 2006; Diego Pettenò +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; alsaplayer-0.99.76-r2.ebuild: Stable on ppc. Bug #125479 - 08 Mar 2006; Diego Pettenò + 08 Mar 2006; Diego Pettenò 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ò + 18 Dec 2005; Diego Pettenò +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 metadata.xml: + 19 Apr 2005; Bryan Østergaard metadata.xml: Remove retired developer from metadata.xml. 13 Mar 2005; Jan Brinkmann @@ -117,7 +123,7 @@ 12 Mar 2005; Jan Brinkmann +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ò . Fixes #82744 06 Mar 2005; Joseph Jezak diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest index 3e8fd06a7b42..c4276eb8b090 100644 --- a/media-sound/alsaplayer/Manifest +++ b/media-sound/alsaplayer/Manifest @@ -11,25 +11,18 @@ MD5 109304bdd6fb8813a5b4b5c59aa84a84 files/alsaplayer-0.99.77-ppc-endian-fix.pat RMD160 ea0d3dcc6dd69c9a05b4713656763ef82b06e287 files/alsaplayer-0.99.77-ppc-endian-fix.patch 830 SHA256 2edd1fdf7316bc6bd673e176b938f7541722c5d74c9c971b678c41bb331f608f files/alsaplayer-0.99.77-ppc-endian-fix.patch 830 DIST alsaplayer-0.99.77.tar.bz2 657622 RMD160 a40c25f17ec6f4f81283bb2ee91c0bee27e1a108 SHA1 dffb35c121216399e8f543559456dafd1b4abd6e SHA256 5bfcbb14f5c64f0d5fd56420910f192a1bebac99c8a6e53855a69f64a3f3d6a0 -EBUILD alsaplayer-0.99.77-r1.ebuild 2436 RMD160 ecf65d685096825822dd4f5ae0f383a674106a7f SHA1 e62c8c84309a04aaa8fb70018e109ed05f33c955 SHA256 1a0cf0cafa1df94fd49ef5f4ced8f3552bc86934c5c601feee9eb6d5d278cf0e -MD5 15d237c2674a25d7a50d2cdd972c542c alsaplayer-0.99.77-r1.ebuild 2436 -RMD160 ecf65d685096825822dd4f5ae0f383a674106a7f alsaplayer-0.99.77-r1.ebuild 2436 -SHA256 1a0cf0cafa1df94fd49ef5f4ced8f3552bc86934c5c601feee9eb6d5d278cf0e alsaplayer-0.99.77-r1.ebuild 2436 -EBUILD alsaplayer-0.99.77.ebuild 2084 RMD160 aec8a54e9bc05fc2d005c1ef7e5868754519d7f1 SHA1 bdf5c2ce43a4419a57c3a1d7be420ad2f437fbc1 SHA256 cbf03294f624768e1f27c90319d7459bd48c645a9dd6ff5607161a7ae0da1199 -MD5 3d75c769fe1bf93127ec1a134790bb87 alsaplayer-0.99.77.ebuild 2084 -RMD160 aec8a54e9bc05fc2d005c1ef7e5868754519d7f1 alsaplayer-0.99.77.ebuild 2084 -SHA256 cbf03294f624768e1f27c90319d7459bd48c645a9dd6ff5607161a7ae0da1199 alsaplayer-0.99.77.ebuild 2084 -MISC ChangeLog 9256 RMD160 adb9016a5e5dbd7c9e537dfb89ba8addd3d23ffd SHA1 7e6f29f775882acd21f544c42ead5377b7e81605 SHA256 4bcad1e6edf084ae04fa2c9187c68ab36197043876426114fff677385733a075 -MD5 ee21cd2acc8fcd20a949f548a72a93f8 ChangeLog 9256 -RMD160 adb9016a5e5dbd7c9e537dfb89ba8addd3d23ffd ChangeLog 9256 -SHA256 4bcad1e6edf084ae04fa2c9187c68ab36197043876426114fff677385733a075 ChangeLog 9256 +EBUILD alsaplayer-0.99.77-r1.ebuild 2457 RMD160 04fe80bd47c454a0275c31e8eacd82b46fdd0fa7 SHA1 1b19fe6e519cc4b606737f12827dd5707b17a27c SHA256 fe3a17795d0d3320d178408dda1f0e72f8d09432c8a2a39ba070db5c815505f3 +MD5 b927a3d77fd96ea87c95ce00e2381d84 alsaplayer-0.99.77-r1.ebuild 2457 +RMD160 04fe80bd47c454a0275c31e8eacd82b46fdd0fa7 alsaplayer-0.99.77-r1.ebuild 2457 +SHA256 fe3a17795d0d3320d178408dda1f0e72f8d09432c8a2a39ba070db5c815505f3 alsaplayer-0.99.77-r1.ebuild 2457 +MISC ChangeLog 9476 RMD160 e1b5efff4070ace5f5f738e1a67398b0b44a7102 SHA1 cb8828734889fcf0c0b3056d085ffe36b5a3f9ad SHA256 44a78e1c94659919ac94beb180e7c22b76b77e3724bbfe42e10f1ac9638d0319 +MD5 99c2b1d0217342fc37ec98763bfc0a9b ChangeLog 9476 +RMD160 e1b5efff4070ace5f5f738e1a67398b0b44a7102 ChangeLog 9476 +SHA256 44a78e1c94659919ac94beb180e7c22b76b77e3724bbfe42e10f1ac9638d0319 ChangeLog 9476 MISC metadata.xml 226 RMD160 77b3f176fe8a4602ef10b43118ad4b324debc1dc SHA1 03082d01f1e4be11dac43f56ef16d62fe6dddc9d SHA256 9704abc4f11258f32e53012818f6998efcb9b256c5422148bf9f0fef8bbcba5d MD5 fe89d78289fe2113b0a2d1a0eec7e1a4 metadata.xml 226 RMD160 77b3f176fe8a4602ef10b43118ad4b324debc1dc metadata.xml 226 SHA256 9704abc4f11258f32e53012818f6998efcb9b256c5422148bf9f0fef8bbcba5d metadata.xml 226 -MD5 d0d6502c9b14d958255f5b524c052eb7 files/digest-alsaplayer-0.99.77 259 -RMD160 ce6128f873138b05f4ea6458f3243c4d327f077a files/digest-alsaplayer-0.99.77 259 -SHA256 70f0b326f866960a4b3727c1018932f462836b4edebd75083f850ca5e156039b files/digest-alsaplayer-0.99.77 259 MD5 d0d6502c9b14d958255f5b524c052eb7 files/digest-alsaplayer-0.99.77-r1 259 RMD160 ce6128f873138b05f4ea6458f3243c4d327f077a files/digest-alsaplayer-0.99.77-r1 259 SHA256 70f0b326f866960a4b3727c1018932f462836b4edebd75083f850ca5e156039b files/digest-alsaplayer-0.99.77-r1 259 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 -- 2.26.2