Fixed xosd dependency. Bug 94143.

Package-Manager: portage-2.0.51.22-r3

4 files changed, 113 insertions, 2 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index a009e910c252..08a3f5308eaf 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/zinf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.34 2005/10/08 16:05:44 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.35 2005/10/22 13:09:32 matsuu Exp $
+
+*zinf-2.2.5-r3 (22 Oct 2005)
+
+  22 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> +zinf-2.2.5-r3.ebuild:
+  Fixed xosd dependency. Bug 94143.
+  Replace gnome USE flag to corba.
 
   08 Oct 2005; Marcelo Goes <vanquirius@gentoo.org> zinf-2.2.5-r2.ebuild:
   Mark 2.2.5-r2 x86 stable.
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index f4154496bd2d..f6f934ee8bd8 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,9 +1,11 @@
 MD5 f70ce7442417fa0d2b36c6f4a655b77e zinf-2.2.5-r2.ebuild 2098
 MD5 15c4260b39deda579a3563c58aae5f36 zinf-2.2.5-r1.ebuild 2301
-MD5 e4e8398e85e97839555e879fd8054e1f ChangeLog 5466
+MD5 6e5af064601d3afcb6e756114693c66d zinf-2.2.5-r3.ebuild 2288
+MD5 c801fcb98208b0de5738d2e7e026328b ChangeLog 5636
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 5f73b5d7a0fb9346d25c7f59e71509b8 files/zinf-2.2.5-cdplay.patch 1042
 MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r1 63
 MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r2 63
+MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r3 63
 MD5 f759a0b5765809ee26d70a83f6c6185b files/zinf-2.2.5-rtp.patch 582
 MD5 ab18405737d54fde371a5e1ceb8dc3e7 files/zinf-2.2.5-configure.patch 3782
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5-r3 b/media-sound/zinf/files/digest-zinf-2.2.5-r3
new file mode 100644
index 000000000000..5038254d1b93
--- /dev/null
+++ b/media-sound/zinf/files/digest-zinf-2.2.5-r3
@@ -0,0 +1 @@
+MD5 140436516d46b3ef440dc1886810510d zinf-2.2.5.tar.gz 2044561
diff --git a/media-sound/zinf/zinf-2.2.5-r3.ebuild b/media-sound/zinf/zinf-2.2.5-r3.ebuild
new file mode 100644
index 000000000000..8b72a8895241
--- /dev/null
+++ b/media-sound/zinf/zinf-2.2.5-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r3.ebuild,v 1.1 2005/10/22 13:09:32 matsuu Exp $
+
+inherit kde-functions eutils flag-o-matic libtool
+
+DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
+HOMEPAGE="http://www.zinf.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -sparc"
+IUSE="alsa arts corba debug esd gtk ipv6 mp3 nls vorbis xosd X"
+
+RDEPEND=">=dev-libs/glib-2
+	sys-libs/gdbm
+	sys-libs/zlib
+	>=sys-libs/ncurses-5.2
+	>=media-libs/musicbrainz-1.0.1
+	alsa? ( >=media-libs/alsa-lib-0.9.8 )
+	arts? ( kde-base/arts )
+	corba? ( =gnome-base/orbit-0* )
+	esd? ( >=media-sound/esound-0.2.12 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	mp3? ( >=media-libs/id3lib-3.8.0 )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )
+	X? ( virtual/x11 )"
+
+# When updating next, check boost to see if the newer versions fix compilation
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=sys-devel/automake-1.7
+	nls? ( sys-devel/gettext )
+	x86? ( dev-lang/nasm )"
+#	experimental? (
+#		>=dev-cpp/gtkmm-2
+#		app-office/mdbtools
+#		dev-db/metakit
+#		dev-libs/boost
+#	)
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-cdplay.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-rtp.patch
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	touch aclocal.m4
+
+	ebegin "Running automake (${WANT_AUTOMAKE})"
+	automake || die
+	eend $?
+
+	ebegin "Running autoconf (${WANT_AUTOCONF})"
+	autoconf || die
+	eend $?
+
+	# fix #94149
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-cmdline"
+
+	# --disable-xosd is bork, #94143.
+	if use xosd ; then
+		myconf="${myconf} --enable-xosd"
+	fi
+
+	# --disable-corba is also bork.
+	if use corba ; then
+		myconf="${myconf} --enable-corba"
+	fi
+
+	if use amd64; then
+		replace-flags -O? -O
+		append-flags -frerun-cse-after-loop
+	fi
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable debug) \
+		$(use_enable esd) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable x86 x86opts) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+}