fix deps, old

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

3 files changed, 7 insertions, 94 deletions

diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 56de3abc603a..dc3d081d1729 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,6 +1,4 @@
-DIST terminatorX-3.81.tar.gz 505489 RMD160 b32ab21601e5b04985cbf5b7f9e2a1610e4649f9 SHA1 7d48b6f80ce450a5f575061f17864d012d3dc182 SHA256 184ef864d12c7e072707b8cd71b8184becd297b9b5a57fc5a84374678338734f
 DIST terminatorX-3.82.tar.gz 545693 RMD160 d8d053ba95ec9ac7805a9f7806f0451ca66e28cb SHA1 ebe387109ca90480fe108a587b4934ccc93d0744 SHA256 0021d9eaa60d19f54520828ce93ae36a35e0e6cbfc2b10ae6c9ff7dd574602f0
-EBUILD terminatorx-3.81.ebuild 2370 RMD160 2593d59a4978f3d7536bcbcb87449e1b9fe3557e SHA1 ec3b66d9a8f3c22c0d267e9ef1b925d02d431dfb SHA256 2ff0cba4557ab407f59891ed02240fc9a75f2ec780137e45126c64e572aa213a
-EBUILD terminatorx-3.82.ebuild 1634 RMD160 76f2913d1885bee5f3cd69f1e85f94a5896e7fe0 SHA1 c4bd898e73e7f87437fd30370c19209f4a83b8c9 SHA256 f164a9f01a7cdb1af25c7b39c225f671519b4d99e4f47fd63b7d868c0b3164ff
+EBUILD terminatorx-3.82.ebuild 1618 RMD160 a8acd997e5cb902316bf6df597f421efc9c8a809 SHA1 77b098190b79f23fe838b5ec0c337a732efabaa6 SHA256 e266b2c52f558300dcf3fd74f068d704f3e0a1c19f0d1a04b79580abaf82015f
 MISC ChangeLog 4044 RMD160 24d5661741c92e3de37a1a440ca021a4c249b1af SHA1 91995086fb8e6a9106cf80d85e40e2321ea8f440 SHA256 b49ca2fb61127b8f9d009bb846db3bc579f09697515479116e152d6532aead79
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
diff --git a/media-sound/terminatorx/terminatorx-3.81.ebuild b/media-sound/terminatorx/terminatorx-3.81.ebuild
deleted file mode 100644
index 01fd545bda6f..000000000000
--- a/media-sound/terminatorx/terminatorx-3.81.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.20 2008/04/10 18:37:44 aballier Exp $
-
-inherit gnome2
-
-MY_P=${P/terminatorx/terminatorX}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION='realtime audio synthesizer that allows you to "scratch" on digitally sampled audio data'
-HOMEPAGE="http://www.terminatorx.org/"
-SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 sparc"
-IUSE="3dnow alsa mpeg vorbis oss sox"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
-	mpeg? ( media-sound/madplay )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	sox? ( media-sound/sox )
-	>=x11-libs/gtk+-2.2.0
-	>=dev-libs/glib-2.2.0
-	x11-libs/libXi
-	x11-libs/libXxf86dga
-	dev-libs/libxml
-	media-libs/audiofile
-	media-libs/ladspa-sdk
-	media-libs/ladspa-cmt
-	app-text/scrollkeeper
-	media-libs/liblrdf"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/xf86dgaproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# we need the omf fix, or else we get access violation
-	# errors related to sandbox
-	gnome2_omf_fix "${S}"/doc/terminatorX-manual/C/Makefile.in
-}
-
-src_compile() {
-	local myconf=""
-
-	use 3dnow \
-		&& myconf="${myconf} --enable-3dnow"
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-	use mpeg \
-		&& myconf="${myconf} --enable-mad" \
-		|| myconf="${myconf} --disable-mad" \
-		|| myconf="${myconf} --disable-mpg123"
-	use vorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis" \
-		|| myconf="${myconf} --disable-ogg123"
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		#|| myconf="${myconf} --disable-oss" # Doesn't work
-	use sox \
-		&& myconf="${myconf} --enable-sox" \
-		|| myconf="${myconf} --disable-sox"
-
-	econf ${myconf} || die "econf failed"
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-}
-
-pkg_postinst() {
-	elog "Since Version 3.73 terminatorX supports running"
-	elog "suid root. If you install the terminatorX binary"
-	elog "suid root it will then create the engine thread"
-	elog "with realtime priority."
-	ewarn "Please read http://www.terminatorx.cx/faq.html#11"
-	ewarn "for details and potential security risks."
-}
diff --git a/media-sound/terminatorx/terminatorx-3.82.ebuild b/media-sound/terminatorx/terminatorx-3.82.ebuild
index c726d745bb26..105510b832e6 100644
--- a/media-sound/terminatorx/terminatorx-3.82.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.13 2008/05/17 09:26:20 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.14 2009/08/14 08:24:30 ssuominen Exp $
 
 inherit gnome2 eutils
 
@@ -15,16 +15,16 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE="alsa mad vorbis sox"
 
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
+RDEPEND="alsa? ( media-libs/alsa-lib )
 	mad? ( media-sound/madplay )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+	vorbis? ( media-libs/libvorbis )
 	sox? ( media-sound/sox
 		virtual/mpg123 )
-	>=x11-libs/gtk+-2.2.0
-	>=dev-libs/glib-2.2.0
+	>=x11-libs/gtk+-2.2
+	>=dev-libs/glib-2.2
 	x11-libs/libXi
 	x11-libs/libXxf86dga
-	dev-libs/libxml
+	dev-libs/libxml2
 	media-libs/audiofile
 	media-libs/ladspa-sdk
 	media-libs/ladspa-cmt