Remove virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

4 files changed, 33 insertions, 47 deletions

diff --git a/media-sound/terminatorx/ChangeLog b/media-sound/terminatorx/ChangeLog
index 69e32ceb7408..bf5d0e04a9cf 100644
--- a/media-sound/terminatorx/ChangeLog
+++ b/media-sound/terminatorx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/terminatorx
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.23 2007/07/02 15:20:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.24 2007/07/22 08:20:41 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> terminatorx-3.81.ebuild,
+  terminatorx-3.82.ebuild:
+  Remove virtual/x11 references, and more.
 
   02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Hand to newly-born proaudio herd.
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 055b285b1d1a..3a374b540651 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 2333 RMD160 fe185cb0caba70f250e0e81fc31e2ccca1ec672d SHA1 18a936e5fcb108ba9ed87ff841c0ced0f3cc8b77 SHA256 d293d5352aa23f12c05d6b901218a9fcaa165a113f1ededde34f6e228fd2a04a
-MD5 d7d51dd72fe355966a4e430c14effba3 terminatorx-3.81.ebuild 2333
-RMD160 fe185cb0caba70f250e0e81fc31e2ccca1ec672d terminatorx-3.81.ebuild 2333
-SHA256 d293d5352aa23f12c05d6b901218a9fcaa165a113f1ededde34f6e228fd2a04a terminatorx-3.81.ebuild 2333
-EBUILD terminatorx-3.82.ebuild 1682 RMD160 2d7c07e6af00796c42994eac39d029c3358874df SHA1 147c1d46a31fc4a378e1d8d39fe67de3fd57d740 SHA256 3d6f4c46ebfdf5a0c690e05e58b6d0810f3c4401822c097e3e98c73187f37533
-MD5 1dad859603004b3fecf2bd76d5449055 terminatorx-3.82.ebuild 1682
-RMD160 2d7c07e6af00796c42994eac39d029c3358874df terminatorx-3.82.ebuild 1682
-SHA256 3d6f4c46ebfdf5a0c690e05e58b6d0810f3c4401822c097e3e98c73187f37533 terminatorx-3.82.ebuild 1682
-MISC ChangeLog 3265 RMD160 5528049e198728b78001677e2aebf8ce1bbf0deb SHA1 5e63bc022409775a7758dc896ef2bad0a4be99de SHA256 f7d8e2004bc25249a5e8dada2d9b4ee9f2dc193ef8da1733be6f773fb1016361
-MD5 66766ae5d6107a5f36f1f639189144c3 ChangeLog 3265
-RMD160 5528049e198728b78001677e2aebf8ce1bbf0deb ChangeLog 3265
-SHA256 f7d8e2004bc25249a5e8dada2d9b4ee9f2dc193ef8da1733be6f773fb1016361 ChangeLog 3265
+EBUILD terminatorx-3.81.ebuild 2324 RMD160 3f7b7bcbf70074684e89a62b46e9a25c038b40bc SHA1 5af94b86f4a828e19babbd244e356238a4b97595 SHA256 9fca5ae655a235c444840d44bcd75d5bc3aa086b6a774a85c664f23020d27474
+MD5 020c11fa6b6483df5727f743a7619d38 terminatorx-3.81.ebuild 2324
+RMD160 3f7b7bcbf70074684e89a62b46e9a25c038b40bc terminatorx-3.81.ebuild 2324
+SHA256 9fca5ae655a235c444840d44bcd75d5bc3aa086b6a774a85c664f23020d27474 terminatorx-3.81.ebuild 2324
+EBUILD terminatorx-3.82.ebuild 1626 RMD160 30cdd89e87e264e15f0e68f4a67372d8d6e9bc78 SHA1 8b891b113ccff96929f6e525f5db03250ec33024 SHA256 5eb5f585f109d6e5c8688f47e5f06c2d788d106a1f984a298f57e3c7369e8a8c
+MD5 ac9550cdc7474d52de747211d93ef125 terminatorx-3.82.ebuild 1626
+RMD160 30cdd89e87e264e15f0e68f4a67372d8d6e9bc78 terminatorx-3.82.ebuild 1626
+SHA256 5eb5f585f109d6e5c8688f47e5f06c2d788d106a1f984a298f57e3c7369e8a8c terminatorx-3.82.ebuild 1626
+MISC ChangeLog 3405 RMD160 4ace1555b0e47f9aad5ac71442acddc5de842e14 SHA1 8f770a33ff2a7387c0825091137231c9fce5d0d0 SHA256 b63ce1c680f62bd7ab739be551520991bbebf73c605f29bc6103be0186aee192
+MD5 f71bb93e2048d72ff0241af862f74c98 ChangeLog 3405
+RMD160 4ace1555b0e47f9aad5ac71442acddc5de842e14 ChangeLog 3405
+SHA256 b63ce1c680f62bd7ab739be551520991bbebf73c605f29bc6103be0186aee192 ChangeLog 3405
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -25,10 +22,3 @@ SHA256 00b054d489bf9e839ccc8f5c391dbcc895ecc3d6abe1ebc317c9dd3ed99bc938 files/di
 MD5 99dd37dbadd5eb47a43d7e92491e4296 files/digest-terminatorx-3.82 250
 RMD160 02dd6a4c179dadc84194541104a77e654bbb6e57 files/digest-terminatorx-3.82 250
 SHA256 69653b63d6ab508dfb32ef2d9432dfe69ceffc3591bd2de49dc46366fde50fcc files/digest-terminatorx-3.82 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGiRfvAiZjviIA2XgRAtsxAJ4sWtf+0nLlLk/4HnvPDzKYREelLgCgs2JK
-n8cCrxnDjyjUGGZaf8q00lY=
-=4rLH
------END PGP SIGNATURE-----
diff --git a/media-sound/terminatorx/terminatorx-3.81.ebuild b/media-sound/terminatorx/terminatorx-3.81.ebuild
index 11902b9dda46..017aa8dc97ca 100644
--- a/media-sound/terminatorx/terminatorx-3.81.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.81.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/terminatorx/terminatorx-3.81.ebuild,v 1.17 2007/01/05 20:09:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.18 2007/07/22 08:20:41 drac Exp $
 
 inherit gnome2
 
@@ -21,9 +21,8 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 	sox? ( media-sound/sox )
 	>=x11-libs/gtk+-2.2.0
 	>=dev-libs/glib-2.2.0
-	|| ( ( x11-libs/libXi
-			x11-libs/libXxf86dga )
-		virtual/x11 )
+	x11-libs/libXi
+	x11-libs/libXxf86dga
 	dev-libs/libxml
 	media-libs/audiofile
 	media-libs/ladspa-sdk
@@ -31,18 +30,15 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 	app-text/scrollkeeper
 	media-libs/liblrdf"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			x11-proto/xf86dgaproto )
-		virtual/x11 )"
+	x11-proto/xproto
+	x11-proto/xf86dgaproto"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
+	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
-
+	gnome2_omf_fix "${S}"/doc/terminatorX-manual/C/Makefile.in
 }
 
 src_compile() {
@@ -70,11 +66,11 @@ src_compile() {
 
 	econf ${myconf} || die "econf failed"
 
-	emake || die
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR="${D}" install || die "make install failed."
 }
 
 pkg_postinst() {
diff --git a/media-sound/terminatorx/terminatorx-3.82.ebuild b/media-sound/terminatorx/terminatorx-3.82.ebuild
index 0e0828a35169..0d592ba7b297 100644
--- a/media-sound/terminatorx/terminatorx-3.82.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.82.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/terminatorx/terminatorx-3.82.ebuild,v 1.7 2007/02/15 07:55:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.8 2007/07/22 08:20:41 drac Exp $
 
 inherit gnome2 eutils
 
@@ -22,9 +22,8 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 		|| ( media-sound/mpg123 media-sound/mpg321 ) )
 	>=x11-libs/gtk+-2.2.0
 	>=dev-libs/glib-2.2.0
-	|| ( ( x11-libs/libXi
-			x11-libs/libXxf86dga )
-		virtual/x11 )
+	x11-libs/libXi
+	x11-libs/libXxf86dga
 	dev-libs/libxml
 	media-libs/audiofile
 	media-libs/ladspa-sdk
@@ -32,14 +31,12 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 	app-text/scrollkeeper
 	media-libs/liblrdf"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xproto
-			x11-proto/xf86dgaproto )
-		virtual/x11 )"
+	x11-proto/xproto
+	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"
@@ -52,12 +49,11 @@ src_compile() {
 		$(use_enable vorbis) \
 		$(use_enable sox) \
 		|| die "econf failed"
-
-	emake || die "make failed"
+	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
 	newicon gnome-support/terminatorX-app.png terminatorX.png
 	make_desktop_entry terminatorX terminatorX terminatorX.png AudioVideo
 }